Merge branch 'develop'

Author: aleksbobic

.gitignore

@@ -22,5 +22,5 @@ elasticsearch
 datasets
 metals.*
 
-server/app/data/config/
+server/app/data/config/*
 !server/app/data/config/jucssm.json

app/src/components/feature/searchbar/SearchBar.component.jsx

@@ -26,6 +26,7 @@ function SearchBar(props) {
     const selectedDatasetChange = e => {
         store.search.useDataset(e.target.value);
         store.workflow.resetWorkflow();
+        store.schema.resetOverviewNodeProperties();
     };
 
     useEffect(() => {
@@ -76,6 +77,9 @@ function SearchBar(props) {
                                     variant="filled"
                                     width="200px"
                                     borderEndRadius="0"
+                                    defaultValue={localStorage.getItem(
+                                        'currentDataset'
+                                    )}
                                     style={{
                                         paddingLeft: '40px',
                                         textTransform: 'uppercase',

app/src/stores/SchemaStore.js

@@ -26,6 +26,8 @@ export class SchemaStore {
         makeAutoObservable(this);
     }
 
+    resetOverviewNodeProperties = () => (this.overviewDataNodeProperties = []);
+
     toggleRelationship = id => {
         this.data = this.data.map(entry => {
             if (entry['id'] === id) {

server/app/controllers/graph/converter.py

@@ -73,11 +73,13 @@ def get_overview_graph(
 ):
     search_results_df = pd.DataFrame(search_results)
 
-    nodes, entries_with_nodes = get_nodes(search_results_df, links, anchor, anchor_properties)
+    nodes, entries_with_nodes = get_nodes(
+        search_results_df, links, anchor, anchor_properties
+    )
 
     node_ids_with_labels = get_node_ids_with_labels(nodes)
 
-    edge_tuples = get_overview_edge_tuples(
+    edge_tuple_lookup = get_overview_edge_tuples(
         search_results_df,
         anchor,
         links,
@@ -88,8 +90,9 @@ def get_overview_graph(
 
     nodes = [node for node in nodes if node["feature"] == anchor]
 
-    nx_edges = get_overview_nx_edges(edge_tuples)
-    edges = get_overview_edges(edge_tuples)
+    nx_edges = list(edge_tuple_lookup.keys())
+
+    edges = get_overview_edges(edge_tuple_lookup, nx_edges)
 
     nodes = get_positions(nodes, nx_edges)
 

server/app/services/graph/edge.py

@@ -65,7 +65,7 @@ def get_overview_edge_tuples(
     nodes: List[Node],
     entries_with_nodes,
     node_ids_with_labels,
-) -> List[EnrichedEdgeTuple]:
+):
     overview_schema_paths = get_overview_graph_schema(anchor, links)
 
     candidate_edges = []
@@ -82,6 +82,7 @@ def get_overview_edge_tuples(
     graph.add_edges_from(candidate_edges)
 
     edge_tuples = []
+    edge_tuple_lookup = {}
 
     link_nodes = [node["id"] for node in nodes if node["feature"] in links]
 
@@ -94,29 +95,42 @@ def get_overview_edge_tuples(
                 node_instance for node_instance in nodes if node_instance["id"] == node
             ][0]
 
-            edge_tuples.extend(
-                [
-                    {
-                        "label": node_instance["label"],
-                        "feature": node_instance["feature"],
-                        "edge": edge,
-                    }
-                    for edge in temp_new_edge_tuples
-                ]
-            )
-
-    return edge_tuples
+            # edge_tuples.extend(
+            #     [
+            #         {
+            #             "label": node_instance["label"],
+            #             "feature": node_instance["feature"],
+            #             "edge": edge,
+            #         }
+            #         for edge in temp_new_edge_tuples
+            #     ]
+            # )
+
+            for edge in temp_new_edge_tuples:
+                if edge in edge_tuple_lookup:
+                    edge_tuple_lookup[edge].append(
+                        {
+                            "label": node_instance["label"],
+                            "feature": node_instance["feature"],
+                        }
+                    )
+                else:
+                    edge_tuple_lookup[edge] = [
+                        {
+                            "label": node_instance["label"],
+                            "feature": node_instance["feature"],
+                        }
+                    ]
+
+    return edge_tuple_lookup
+    # return edge_tuples, edge_tuple_lookup
 
 
 @use_timing
-def get_overview_edges(
-    enriched_edge_tuples: List[EnrichedEdgeTuple],
-) -> List[Edge]:
+def get_overview_edges(edge_tuple_lookup, nx_edges) -> List[Edge]:
     """Generate a position for each node in graph."""
 
-    edge_tuples = [edge_tuple["edge"] for edge_tuple in enriched_edge_tuples]
-
-    edge_tuples_counts = Counter(edge_tuples)
+    edge_tuples_counts = Counter(nx_edges)
 
     if edge_tuples_counts.values():
         norm_divisor = max(edge_tuples_counts.values())
@@ -132,11 +146,7 @@ def get_overview_edges(
                 "target": edge[1],
                 "visible": True,
                 "weight": round(edge_tuples_counts[edge] / norm_divisor, 2),
-                "connections": [
-                    {"label": entry["label"], "feature": entry["feature"]}
-                    for entry in enriched_edge_tuples
-                    if entry["edge"] == edge
-                ],
+                "connections": edge_tuple_lookup[edge],
             },
         )
         for edge in edge_tuples_counts