Merge pull request #62 from grahamannett/graham/layoutToggle

Graham/layout toggle allows

Author: z-priest

src/graph/graphFunctions.ts

@@ -15,7 +15,7 @@ import { GraphQueryResult } from '../db/db_types';
 export class GraphUtils {
     public db: StigDB;
     public cy: cytoscape.Core;
-    public positionsSaved: boolean = false;
+    public skipLayout: boolean = false;
 
     constructor(cy: cytoscape.Core, db: StigDB) {
         this.cy = cy;
@@ -149,7 +149,7 @@ export class GraphUtils {
      */
     private addMetadataToNodes(metadata: object, nodes: cytoscape.CollectionReturnValue) {
         if (metadata == null) return;
-        this.positionsSaved = true;
+        this.skipLayout = true;
 
         nodes.map(node => {
             let obj = metadata.find(x => x.id === node.id());
@@ -338,7 +338,10 @@ export class GraphUtils {
      * @memberof GraphUtils
      */
     public myLayout(layout_type: keyof LayoutsType): void {
-        if (this.positionsSaved) return;
+        if (this.skipLayout) {
+            this.skipLayout = !this.skipLayout;
+            return;
+        }
         const layout = this.cy.layout(layouts[layout_type]);
         layout.run();
         // layout.promiseOn('layoutstop').then((event) => {

src/main.ts

@@ -328,14 +328,14 @@ export class main {
                     }
                 } else {
                     // edge
-                    // input_data.type 
+                    // input_data.type
                     let relationship_file = "";
 
                     // objects that shouldn't be related to other objects or only require the fundamental relationship types
-                    let common = ["artifact", "autonomous-system", "directory", "domain-name", "email-addr", 
+                    let common = ["artifact", "autonomous-system", "directory", "domain-name", "email-addr",
                                   "email-message", "file", "grouping", "ipv4-addr", "ipv6-addr", "language-content",
                                   "location", "mac-addr", "mutex", "network-traffic", "note", "observed-data",
-                                  "opinion", "process", "report", "software", "url", "user-account", "vulnerability", 
+                                  "opinion", "process", "report", "software", "url", "user-account", "vulnerability",
                                   "windows-registry-key", "x509-certificate"];
 
                     let target_obj_type = (input_data.source_ref).slice(0,-38);
@@ -346,7 +346,7 @@ export class main {
                     } else {
                         relationship_file = target_obj_type + "-relationship";
                     }
-                    
+
                     editor.buildWidget(ele, relationship_file , input_data);
                 }
                 $('button#btn-export-single').button('option', 'disabled', false);
@@ -399,7 +399,7 @@ export class main {
                 if (ele.source().data('raw_data') === undefined || ele.target().data('raw_data') === undefined) {
                     return;
                 }
-                
+
                 const input_data = ele.data('raw_data');
                 if (input_data === undefined) {
 
@@ -487,7 +487,6 @@ export class main {
                             // this.result
                             // addToGraph(JSON.parse(e.target.result))
                             addToGraph(JSON.parse(r.result as string));
-                            graph_utils.myLayout(StigSettings.Instance.layout.toLowerCase());
                         };
                         r.readAsText(f);
                     }
@@ -556,8 +555,8 @@ export class main {
                 let ourres = '';
                 try {
                     const formdata: StixObject = editor.editor.getValue();
-                    db.updateDB(formdata).then((r) => { 
-                        result = r; 
+                    db.updateDB(formdata).then((r) => {
+                        result = r;
                         // ourres = result[0]['type'];
                     });
                 } catch (e) {
@@ -568,7 +567,7 @@ export class main {
                 $('button.btn-commit').button('option', 'disabled', true);
                 $('.message-status').html(`Committed 1 object to the database.`);
             });
-    
+
             /***********************************************************************************
             *
             *  Widget Bar Code
@@ -679,34 +678,34 @@ export class main {
                 }
               ],
             }));
-          
+
             function makePopper(ele) {
               let ref = ele.popperRef(); // used only for positioning
-          
+
               ele.tippy = tippy(ref, { // tippy options:
                 content: () => {
                   let content = document.createElement('div');
-          
+
                   content.innerHTML = ele.id();
-          
+
                   return content;
                 },
                 trigger: 'manual' // probably want manual mode
               });
             }
-          
+
             cy.ready(function() {
               cy.elements().forEach(function(ele) {
                 makePopper(ele);
               });
             });
-          
+
             cy.elements().unbind('mouseover');
             cy.elements().bind('mouseover', (event) => event.target.tippy.show());
-          
+
             cy.elements().unbind('mouseout');
             cy.elements().bind('mouseout', (event) => event.target.tippy.hide());
-          
+
         });
         //*/
     }