move visual overview into state store (#809)

openziti · Dec 18, 2024 · 2f3fa58 · 2f3fa58
1 parent 686443c
commit 2f3fa58
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 26 deletions.
diff --git a/ui100/src/ApiConsole.tsx b/ui100/src/ApiConsole.tsx
@@ -18,25 +18,14 @@ interface ApiConsoleProps {
 }
 
 const ApiConsole = ({ user, logout }: ApiConsoleProps) => {
-    const [version, setVersion] = useState("no version set");
-    const [overview, setOverview] = useState(new VisualOverview());
+    const overview = useMetricsStore((state) => state.overview);
+    const updateOverview = useMetricsStore((state) => state.updateOverview);
+    const oldVov = useRef<VisualOverview>(overview);
     const [selectedNode, setSelectedNode] = useState(null as Node);
     const [sidePanel, setSidePanel] = useState(<></>);
-    const oldVov = useRef<VisualOverview>(overview);
     const updateEnvironments = useMetricsStore((state) => state.updateEnvironments);
 
-    useEffect(() => {
-        let api = new MetadataApi();
-        api.version()
-            .then(d => {
-                setVersion(d);
-            })
-            .catch(e => {
-                console.log(e);
-            });
-    }, []);
-
-    const update = () => {
+    const retrieveOverview = () => {
         let cfg = new Configuration({
             headers: {
                 "X-TOKEN": user.token
@@ -47,8 +36,8 @@ const ApiConsole = ({ user, logout }: ApiConsoleProps) => {
             .then(d => {
                 let newVov = mergeVisualOverview(oldVov.current, user, d.accountLimited!, d);
                 if(!nodesEqual(oldVov.current.nodes, newVov.nodes)) {
-                    console.log("refreshed vov", oldVov.current.nodes, newVov.nodes);
-                    setOverview(newVov);
+                    console.log("refreshed vov", oldVov.nodes, newVov.nodes);
+                    updateOverview(newVov);
                     oldVov.current = newVov;
                 }
             })
@@ -58,11 +47,11 @@ const ApiConsole = ({ user, logout }: ApiConsoleProps) => {
     }
 
     useEffect(() => {
-        update();
+        retrieveOverview();
         let mounted = true;
         let interval = setInterval(() => {
             if(mounted) {
-                update();
+                retrieveOverview();
             }
         }, 1000);
         return () => {

diff --git a/ui100/src/Visualizer.tsx b/ui100/src/Visualizer.tsx
@@ -65,9 +65,11 @@ const Visualizer = ({ vov, onSelectionChanged }: VisualizerProps) => {
     }
 
     useEffect(() => {
-        let layouted = layout(vov.nodes, vov.edges);
-        setNodes(layouted.nodes);
-        setEdges(layouted.edges);
+        if(vov) {
+            let layouted = layout(vov.nodes, vov.edges);
+            setNodes(layouted.nodes);
+            setEdges(layouted.edges);
+        }
     }, [vov]);
 
     return (

diff --git a/ui100/src/model/store.ts b/ui100/src/model/store.ts
@@ -1,16 +1,21 @@
 import {create} from "zustand";
 import {Environment} from "../api";
+import {VisualOverview} from "./visualizer.ts";
 
-type State = {
+type MetricsStoreState = {
+    overview: VisualOverview;
     environments: Array<Environment>;
 };
 
-type Action = {
-    updateEnvironments: (environments: State['environments']) => void
+type MetricsStoreAction = {
+    updateOverview: (vov: MetricsStoreState['overview']) => void,
+    updateEnvironments: (environments: MetricsStoreState['environments']) => void
 };
 
-const useMetricsStore = create<State & Action>((set) => ({
+const useMetricsStore = create<MetricsStoreState & MetricsStoreAction>((set) => ({
+    overview: new VisualOverview(),
     environments: new Array<Environment>(),
+    updateOverview: (vov) => set({overview: vov}),
     updateEnvironments: (environments) => set({environments: environments}),
 }));