Merge branch 'develop' of github.com:invanalabs/graph-explorer into d…

…evelop
invana · May 30, 2021 · fcb87e6 · fcb87e6
2 parents ccb5ddf + 7ff5565
commit fcb87e6
Show file tree

Hide file tree

Showing 6 changed files with 97 additions and 46 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "invana-studio",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Open source graph visualiser.",
   "private": true,
   "homepage": "/",

diff --git a/src/serializers/invana-engine.js b/src/serializers/invana-engine.js
@@ -1,4 +1,5 @@
 import DeSerializerBase from "./base";
+import {STUDIO_SETTINGS} from "../settings";
 
 
 export default class InvanaEngineDeSerializer extends DeSerializerBase {
@@ -26,9 +27,9 @@ export default class InvanaEngineDeSerializer extends DeSerializerBase {
         let _this = this;
         data.forEach(function (d) {
             if (ignoreManagement) {
-                if (d.type === "g:Vertex" && d.label !== "InvanaManagement") {
+                if (d.type === "g:Vertex" && d.label !== STUDIO_SETTINGS.MANAGEMENT_VERTEX_LABEL) {
                     vertices.push(d);
-                } else if (d.type === "g:Edge" && d.label !== "InvanaManagement") {
+                } else if (d.type === "g:Edge" && d.label !== STUDIO_SETTINGS.MANAGEMENT_VERTEX_LABEL) {
                     edges.push(_this.convertEdge2Json(d));
                 }
             } else {
@@ -39,8 +40,6 @@ export default class InvanaEngineDeSerializer extends DeSerializerBase {
                 }
             }
         });
-
-
         return {"nodes": vertices, "links": edges};
     }
 

diff --git a/src/settings/networkOptions.js b/src/settings/networkOptions.js
@@ -1,6 +1,27 @@
 import {STUDIO_SETTINGS} from "./index";
 
 
+export const physicsSettings = {
+
+    forceAtlas2Based: {
+        gravitationalConstant: -56,
+        centralGravity: 0.005,
+        springLength: STUDIO_SETTINGS.RENDERING_EDGES_SETTINGS.length,
+        springConstant: 0.18,
+        avoidOverlap: 1.5
+    },
+    maxVelocity: 146,
+    solver: 'forceAtlas2Based',
+    timestep: 0.35,
+    stabilization: {
+        enabled: true,
+        iterations: 1000,
+        updateInterval: 50,
+        // fit: true
+    }
+
+}
+
 const defaultOptions = {
     // layout: {
     //     hierarchical: false
@@ -14,35 +35,39 @@ const defaultOptions = {
 
     layout: {
         // randomSeed: 100,
-        hierarchical: true
-    },
-    physics: {
-        forceAtlas2Based: {
-            gravitationalConstant: -70,
-            centralGravity: 0.005,
-            springLength: STUDIO_SETTINGS.RENDERING_EDGES_SETTINGS.length,
-            springConstant: 0.18,
-            avoidOverlap: 1
-        },
-        // maxVelocity: 146,
-        solver: "forceAtlas2Based", // forceAtlas2Based
-        // timestep: 0.55,
-        stabilization: {
-            enabled: true,
-            // updateInterval: 100,
-            // iterations: 1000    // YMMV
-        },
-        minVelocity: undefined
-        // barnesHut: {
-        //     gravitationalConstant: -23000,
-        //     centralGravity: 0,
-        //     springLength: 0,
-        //     springConstant: 0.5,
-        //     damping: 1,
-        //     avoidOverlap: 1
-        // }
+        hierarchical: false
+
     },
 
+    physics: physicsSettings,
+
+    // physics: {
+    //     forceAtlas2Based: {
+    //         gravitationalConstant: -70,
+    //         centralGravity: 0.005,
+    //         springLength: STUDIO_SETTINGS.RENDERING_EDGES_SETTINGS.length,
+    //         springConstant: 0.18,
+    //         avoidOverlap: 1
+    //     },
+    //     // maxVelocity: 146,
+    //     solver: "forceAtlas2Based", // forceAtlas2Based
+    //     // timestep: 0.55,
+    //     stabilization: {
+    //         enabled: true,
+    //         // updateInterval: 100,
+    //         // iterations: 1000    // YMMV
+    //     },
+    //     minVelocity: undefined
+    //     // barnesHut: {
+    //     //     gravitationalConstant: -23000,
+    //     //     centralGravity: 0,
+    //     //     springLength: 0,
+    //     //     springConstant: 0.5,
+    //     //     damping: 1,
+    //     //     avoidOverlap: 1
+    //     // }
+    // },
+
     // layout: {
     //     hierarchical: {
     //         enabled: true,

diff --git a/src/web/interface/canvas/canvas-ctrl.js b/src/web/interface/canvas/canvas-ctrl.js
@@ -3,6 +3,8 @@
  */
 
 
+// import {physicsSettings} from "../../../settings/networkOptions";
+
 export default class CanvasController {
 
     constructor(

diff --git a/src/web/viewlets/canvas/graph-canvas.js b/src/web/viewlets/canvas/graph-canvas.js
@@ -780,6 +780,31 @@ export default class GraphCanvas extends DefaultRemoteComponent {
                         </Modal>
                         : <React.Fragment/>
                 }
+                {
+                    this.state.modalContentName === "last-response"
+                        ? <Modal
+                            className={"border-0"}
+                            size="lg"
+                            show={true}
+                            dialogClassName="modal-90w"
+                            backdrop={true}
+                            centered>
+                            <Modal.Header className={"pt-1 pb-1 small"}>
+                                <Modal.Title className={"h5"}>
+                                    Response Viewer
+                                </Modal.Title>
+                            </Modal.Header>
+                            <Modal.Body className={"overflow-auto "}>
+                                <ResponseViewer
+                                    lastResponse={this.state.lastResponse}
+                                    lastResponseElapsedTime={this.state.lastResponseElapsedTime}
+                                    lastResponseStatusCode={this.state.lastResponseStatusCode}
+                                    onClose={() => this.setModalContentName(null)}
+                                />
+                            </Modal.Body>
+                        </Modal>
+                        : <React.Fragment/>
+                }
                 {
                     this.state.isQuerying === true || this.state.isRenderingCanvas === true
                         ? <LoadingDiv statusMessage={this.state.statusMessage}

diff --git a/src/web/viewlets/main-nav.js b/src/web/viewlets/main-nav.js
@@ -90,24 +90,24 @@ export default class MainNav extends React.Component {
 
                                     </Button>
                                 </li>
-                                <li className="nav-item ">
-                                    <a href="https://docs.invana.io" target={"_new"}
-                                       className="d-flex align-items-center  border-bottom justify-content-center
-                        pt-3 pb-3  px-auto  text-dark text-decoration-none  ">
-                                        <FontAwesomeIcon icon={faQuestionCircle}/>
-                                    </a>
-                                </li>
+                        {/*        <li className="nav-item ">*/}
+                        {/*            <a href={STUDIO_SETTINGS.SUPPORT_URL} target={"_new"}*/}
+                        {/*               className="d-flex align-items-center  border-bottom justify-content-center*/}
+                        {/*pt-3 pb-3  px-auto  text-dark text-decoration-none  ">*/}
+                        {/*                <FontAwesomeIcon icon={faQuestionCircle}/>*/}
+                        {/*            </a>*/}
+                        {/*        </li>*/}
                             </React.Fragment>
                             : <React.Fragment/>
                     }
                 </ul>
-                {/*<div className="">*/}
-                {/*    <a href="https://docs.invana.io" target={"_new"}*/}
-                {/*       className="d-flex align-items-center justify-content-center*/}
-                {/*        pt-3 pb-3  px-auto  text-dark text-decoration-none  ">*/}
-                {/*        <FontAwesomeIcon icon={faQuestionCircle}/>*/}
-                {/*    </a>*/}
-                {/*</div>*/}
+                <div className="">
+                    <a href={STUDIO_SETTINGS.SUPPORT_URL} target={"_new"}
+                       className="d-flex align-items-center justify-content-center
+                        pt-3 pb-3  px-auto  text-dark text-decoration-none  ">
+                        <FontAwesomeIcon icon={faQuestionCircle}/>
+                    </a>
+                </div>
                 {/*<div className="border-top">*/}
                 {/*    <a href="/" style={{"height": "23px"}}*/}
                 {/*       className="d-flex align-items-center justify-content-center*/}