sync

Author: Frank

app/web/src/pages/components/context-zero.tsx

@@ -1,35 +1,37 @@
-import { Zero } from "@rocicorp/zero";
-import { useParams } from "@solidjs/router";
-import { schema } from "@opencontrol/zero/schema";
-import { createInitializedContext } from "../../util/context";
-import { useOpenAuth } from "@openauthjs/solid";
-import { useAccount } from "../../components/context-account";
-import { useWorkspace } from "./context-workspace";
+import { Zero } from "@rocicorp/zero"
+import { useParams } from "@solidjs/router"
+import { schema } from "@opencontrol/zero/schema"
+import { createInitializedContext } from "../../util/context"
+import { useOpenAuth } from "@openauthjs/solid"
+import { useAccount } from "../../components/context-account"
+import { useWorkspace } from "./context-workspace"
 
 export const { use: useZero, provider: ZeroProvider } =
   createInitializedContext("ZeroContext", () => {
     const workspace = useWorkspace()
-    const auth = useOpenAuth();
-    const account = useAccount();
+    const auth = useOpenAuth()
+    const account = useAccount()
     const zero = new Zero({
       auth: auth.access,
       server: import.meta.env.VITE_ZERO_URL,
       userID: account.current!.email,
       storageKey: workspace.id,
       schema,
-    });
+    })
 
     zero.query.user.where("workspace_id", workspace.id).preload({
       ttl: "forever",
     })
     zero.query.workspace.where("id", workspace.id).preload({
       ttl: "forever",
     })
+    zero.query.aws_account.where("workspace_id", workspace.id).preload({
+      ttl: "forever",
+    })
 
     return {
       mutate: zero.mutate,
       query: zero.query,
       ready: true,
-    };
-  });
-
+    }
+  })

app/zero/schema.ts

@@ -69,7 +69,7 @@ export const schema = createSchema({
     })),
     relationships(aws_account, (r) => ({
       users: r.many({
-        sourceField: ["id"],
+        sourceField: ["workspace_id"],
         destSchema: user,
         destField: ["workspace_id"],
       }),