refactor: update organization filtering

bun-tests/fake-snippets-api/routes/orgs/list.test.ts

@@ -21,7 +21,7 @@ test("GET /api/orgs/list - should return user's organizations when un-authentica
   const { axios, seed } = await getTestServer()
 
   const listResponse = await axios.post("/api/orgs/list", {
-    github_handle: seed.account2.github_username,
+    tscircuit_handle: seed.account2.tscircuit_handle,
   })
 
   expect(listResponse.status).toBe(200)

fake-snippets-api/lib/db/db-client.ts

@@ -1709,19 +1709,30 @@ const initializer = combine(databaseSchema.parse({}), (set, get) => ({
   getOrgs: (
     filters?: {
       owner_account_id?: string
+      account_id?: string
       github_handle?: string
       tscircuit_handle?: string
       name?: string
     },
     auth?: { account_id?: string },
   ) => {
-    console.log(filters)
     let orgs = get().organizations
     if (filters?.owner_account_id) {
       orgs = orgs.filter(
         (org) => org.owner_account_id === filters.owner_account_id,
       )
     }
+    if (filters?.account_id) {
+      orgs = orgs.filter((org) => {
+        const isMemberViaOrgAccounts = get().orgAccounts.some(
+          (oa) =>
+            oa.org_id === org.org_id && oa.account_id === filters.account_id,
+        )
+        const isPersonalOrg =
+          org.is_personal_org && org.owner_account_id === filters.account_id
+        return isMemberViaOrgAccounts || isPersonalOrg
+      })
+    }
     if (filters?.github_handle) {
       orgs = orgs.filter((org) => {
         const account = get().accounts.find(

fake-snippets-api/routes/api/orgs/list.ts

@@ -7,27 +7,28 @@ export default withRouteSpec({
   methods: ["GET", "POST"],
   auth: "optional_session",
   commonParams: z.object({
-    github_handle: z.string().optional(),
+    account_id: z.string().optional(),
     tscircuit_handle: z.string().optional(),
   }),
   jsonResponse: z.object({
     ok: z.boolean(),
     orgs: z.array(publicOrgSchema),
   }),
 })(async (req, ctx) => {
-  const { github_handle, tscircuit_handle } = req.commonParams
-  if (!ctx.auth && (!github_handle || !tscircuit_handle)) {
+  const { account_id, tscircuit_handle } = req.commonParams
+  if (!ctx.auth && (!account_id || !tscircuit_handle)) {
     return ctx.error(400, {
       error_code: "invalid_request",
-      message: "You must provide filtering parameters",
+      message:
+        "You must provide either account_id or tscircuit_handle when not authenticated",
     })
   }
 
   const orgs = ctx.db.getOrgs(
     {
-      github_handle,
+      account_id: account_id,
       tscircuit_handle,
-      ...(!github_handle && !tscircuit_handle
+      ...(!account_id && !tscircuit_handle
         ? { owner_account_id: ctx.auth?.account_id }
         : {}),
     },

src/components/dialogs/new-package-save-prompt-dialog.tsx

@@ -48,15 +48,6 @@ export const NewPackageSavePromptDialog = ({
     error: orgsError,
   } = useListUserOrgs()
 
-  const isOwnerPersonalOrg = useMemo(() => {
-    if (!selectedOrgId) return false
-    const selectedOrg = organizations?.find((x) => x.org_id === selectedOrgId)
-    return (
-      selectedOrg?.is_personal_org &&
-      selectedOrg?.owner_account_id == session?.account_id
-    )
-  }, [selectedOrgId, organizations, session?.github_username])
-
   const normalizedPackageName = useMemo(() => {
     if (!packageName.trim()) return ""
     return normalizeName(packageName)

src/hooks/use-list-user-orgs.ts

@@ -3,23 +3,26 @@ import { useAxios } from "@/hooks/use-axios"
 import type { PublicOrgSchema } from "fake-snippets-api/lib/db/schema"
 import { useGlobalStore } from "./use-global-store"
 
-export const useListUserOrgs = (githubHandle?: string) => {
+export const useListUserOrgs = (tscircuit_handle?: string) => {
   const axios = useAxios()
   const session = useGlobalStore((s) => s.session)
-  const github_handle = githubHandle || session?.github_username
 
   return useQuery<PublicOrgSchema[], Error & { status: number }>(
-    ["orgs", "list", github_handle],
+    ["orgs", "list", tscircuit_handle || session?.account_id],
     async () => {
       const { data } = await axios.get("/orgs/list", {
-        ...(github_handle && { params: { github_handle } }),
+        params: tscircuit_handle
+          ? { tscircuit_handle }
+          : session?.account_id
+            ? { account_id: session.account_id }
+            : {},
       })
       return data.orgs
     },
     {
       retry: false,
       refetchOnWindowFocus: false,
-      enabled: Boolean(github_handle),
+      enabled: Boolean(tscircuit_handle || session?.account_id),
     },
   )
 }