Reset color schema after new search and persist color schema if runni…

…ng new advanced search
aleksbobic · Aug 22, 2022 · fa1548c · fa1548c
1 parent f63b687
commit fa1548c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/app/src/components/feature/searchbar/SearchBar.component.jsx b/app/src/components/feature/searchbar/SearchBar.component.jsx
@@ -48,6 +48,7 @@ function SearchBar(props) {
                 initialValues={{ search: '' }}
                 onSubmit={values => {
                     store.core.setCurrentGraph('overview');
+                    store.graphInstance.setNodeColorScheme('component');
                     store.search.useDataset(selectedDataset);
                     store.core.resetVisibleDimensions();
                     store.workflow.resetWorkflow();

diff --git a/app/src/stores/GraphStore.js b/app/src/stores/GraphStore.js
@@ -126,11 +126,18 @@ export class GraphStore {
     generateNodeMaterial = (meshBasicMaterialTemplate, node) => {
         const material = meshBasicMaterialTemplate.clone();
 
-        switch (
-            this.store.graphInstance.nodeColorScheme[
+        const currentGraphColorSchemas = Object.keys(
+            this.store.graphInstance.nodeColorSchemeColors[
                 this.store.core.currentGraph
             ]
-        ) {
+        );
+
+        const selectedColorSchemaAttribute =
+            this.store.graphInstance.nodeColorScheme[
+                this.store.core.currentGraph
+            ];
+
+        switch (selectedColorSchemaAttribute) {
             case 'type':
                 material.color.set(
                     this.store.graphInstance.nodeColorSchemeColors[
@@ -149,7 +156,21 @@ export class GraphStore {
                 material.color.set(node.color);
                 break;
             default:
-                material.color.set('white');
+                if (
+                    currentGraphColorSchemas.includes(
+                        selectedColorSchemaAttribute
+                    )
+                ) {
+                    material.color.set(
+                        this.store.graphInstance.nodeColorSchemeColors[
+                            this.store.core.currentGraph
+                        ][selectedColorSchemaAttribute][
+                            node.properties[selectedColorSchemaAttribute]
+                        ]
+                    );
+                } else {
+                    material.color.set('white');
+                }
                 break;
         }
 
@@ -466,7 +487,7 @@ export class GraphStore {
             this.store.search.setSearchIsEmpty(true);
         } else {
             this.store.search.newNodeTypes = response.meta.new_dimensions;
-            console.log(response);
+            // console.log(response);
             if (graphType === 'overview') {
                 // Handle overview graph data
                 this.graphData.meta.query = query;