refactor zustand store (#185)

codepod-io · Dec 27, 2022 · 9dc2fdb · 9dc2fdb
1 parent d951893
commit 9dc2fdb
Show file tree

Hide file tree

Showing 13 changed files with 1,074 additions and 1,400 deletions.
diff --git a/ui/src/components/Canvas.tsx b/ui/src/components/Canvas.tsx
@@ -1016,6 +1016,7 @@ export function Canvas() {
         id,
         parent: "ROOT",
         type: nodetype2dbtype(type),
+        children: [],
         lang: "python",
         x: position.x,
         y: position.y,
@@ -1254,6 +1255,7 @@ export function Canvas() {
         id,
         parent: "ROOT",
         type: "CODE",
+        children: [],
         lang: "python",
         x: position.x,
         y: position.y,

diff --git a/ui/src/components/Sidebar.tsx b/ui/src/components/Sidebar.tsx
@@ -19,7 +19,7 @@ import { useStore } from "zustand";
 
 import { usePrompt } from "../lib/prompt";
 
-import { RepoContext, selectNumDirty, RoleType } from "../lib/store";
+import { RepoContext, RoleType } from "../lib/store";
 
 import useMe from "../lib/me";
 import { FormControlLabel, FormGroup, Stack, Switch } from "@mui/material";
@@ -228,7 +228,18 @@ function SidebarKernel() {
 function SyncStatus() {
   const store = useContext(RepoContext);
   if (!store) throw new Error("Missing BearContext.Provider in the tree");
-  const dirtyIds = useStore(store, selectNumDirty());
+  // FIXME performance issue
+  const dirtyIds = useStore(store, (state) => {
+    let res: string[] = [];
+    if (state.repoLoaded) {
+      for (const id in state.pods) {
+        if (state.pods[id].dirty) {
+          res.push(id);
+        }
+      }
+    }
+    return res;
+  });
   const clearAllResults = useStore(store, (s) => s.clearAllResults);
   const remoteUpdateAllPods = useStore(store, (s) => s.remoteUpdateAllPods);
   const client = useApolloClient();

diff --git a/ui/src/lib/fetch.tsx b/ui/src/lib/fetch.tsx
@@ -1,6 +1,5 @@
 import { gql } from "@apollo/client";
 
-import { computeNamespace } from "./utils";
 import { Pod } from "./store";
 
 /**
@@ -95,16 +94,13 @@ export function normalize(pods) {
     ROOT: {
       id: "ROOT",
       name: "root",
+      parent: "ROOT0",
       children: [],
       // Adding this to avoid errors
       // XXX should I save these to db?
-      exports: {},
-      imports: {},
-      io: {},
       lang: "python",
       type: "DECK",
       content: "",
-      isSyncing: false,
       x: 0,
       y: 0,
       width: 0,
@@ -155,18 +151,6 @@ export function normalize(pods) {
     if (pod.error) {
       pod.error = JSON.parse(pod.error);
     }
-    if (pod.imports) {
-      pod.imports = JSON.parse(pod.imports);
-    }
-    if (pod.exports) {
-      pod.exports = JSON.parse(pod.exports);
-    }
-    if (pod.reexports) {
-      pod.reexports = JSON.parse(pod.reexports);
-    }
-    if (pod.midports) {
-      pod.midports = JSON.parse(pod.midports);
-    }
     // DEBUG the deck's content seems to be a long string of escaped \
     if (pod.type === "DECK" && pod.content) {
       console.log(
@@ -176,11 +160,6 @@ export function normalize(pods) {
       pod.content = null;
     }
   });
-  pods.forEach((pod) => {
-    pod.ns = computeNamespace(res, pod.id);
-    // set IO
-    pod.io = {};
-  });
   return res;
 }
 

diff --git a/ui/src/lib/nodes.tsx b/ui/src/lib/nodes.tsx
@@ -114,14 +114,14 @@ export function useNodesStateSynced(nodeList) {
           if (!node || node.data?.clientId || getPod(key)) return;
           addPod(null, {
             id: node.id,
+            children: [],
             parent: "ROOT",
-            index: 0,
             type: node.type === "code" ? "CODE" : "DECK",
             lang: "python",
             x: node.position.x,
             y: node.position.y,
-            width: node.style?.width,
-            height: node.style?.height,
+            width: node.style?.width as number,
+            height: node.style?.height as number,
             name: node.data?.name,
             dirty: false,
           });