@tscircuit/fake-snippets 0.0.116 → 0.0.118

package/dist/index.js

@@ -351,6 +351,10 @@ var orgAccountSchema = z.object({
   is_owner: z.boolean().default(false),
   created_at: z.string().datetime()
 });
+var userPermissionsSchema = z.object({
+  can_manage_org: z.boolean().optional(),
+  can_manage_package: z.boolean().optional()
+});
 var publicOrgSchema = z.object({
   org_id: z.string(),
   //.uuid(),
@@ -363,10 +367,7 @@ var publicOrgSchema = z.object({
   package_count: z.number(),
   github_handle: z.string().optional(),
   created_at: z.string(),
-  user_permissions: z.object({
-    can_manage_org: z.boolean().optional(),
-    can_manage_package: z.boolean().optional()
-  }).optional()
+  user_permissions: userPermissionsSchema.optional()
 });
 var databaseSchema = z.object({
   idCounter: z.number().default(0),

package/dist/schema.d.ts

@@ -1165,6 +1165,17 @@ declare const orgAccountSchema: z.ZodObject<{
     is_owner?: boolean | undefined;
 }>;
 type OrgAccount = z.infer<typeof orgAccountSchema>;
+declare const userPermissionsSchema: z.ZodObject<{
+    can_manage_org: z.ZodOptional<z.ZodBoolean>;
+    can_manage_package: z.ZodOptional<z.ZodBoolean>;
+}, "strip", z.ZodTypeAny, {
+    can_manage_org?: boolean | undefined;
+    can_manage_package?: boolean | undefined;
+}, {
+    can_manage_org?: boolean | undefined;
+    can_manage_package?: boolean | undefined;
+}>;
+type UserPermissions = z.infer<typeof userPermissionsSchema>;
 declare const publicOrgSchema: z.ZodObject<{
     org_id: z.ZodString;
     owner_account_id: z.ZodString;
@@ -2910,4 +2921,4 @@ declare const databaseSchema: z.ZodObject<{
 }>;
 type DatabaseSchema = z.infer<typeof databaseSchema>;
 
-export { type Account, type AccountPackage, type AccountSnippet, type AiReview, type DatabaseSchema, type Datasheet, type GithubInstallation, type JlcpcbOrderState, type JlcpcbOrderStepRun, type LoginPage, type Order, type OrderFile, type OrderQuote, type OrgAccount, type Organization, type Package, type PackageBuild, type PackageFile, type PackageRelease, type PublicOrgSchema, type QuotedComponent, type Session, type ShippingOption, type Snippet, accountPackageSchema, accountSchema, accountSnippetSchema, aiReviewSchema, databaseSchema, datasheetPinInformationSchema, datasheetSchema, errorResponseSchema, errorSchema, githubInstallationSchema, jlcpcbOrderStateSchema, jlcpcbOrderStepRunSchema, loginPageSchema, orderFileSchema, orderQuoteSchema, orderSchema, orgAccountSchema, orgSchema, packageBuildSchema, packageFileSchema, packageReleaseSchema, packageSchema, publicOrgSchema, quotedComponentSchema, sessionSchema, shippingInfoSchema, snippetSchema };
+export { type Account, type AccountPackage, type AccountSnippet, type AiReview, type DatabaseSchema, type Datasheet, type GithubInstallation, type JlcpcbOrderState, type JlcpcbOrderStepRun, type LoginPage, type Order, type OrderFile, type OrderQuote, type OrgAccount, type Organization, type Package, type PackageBuild, type PackageFile, type PackageRelease, type PublicOrgSchema, type QuotedComponent, type Session, type ShippingOption, type Snippet, type UserPermissions, accountPackageSchema, accountSchema, accountSnippetSchema, aiReviewSchema, databaseSchema, datasheetPinInformationSchema, datasheetSchema, errorResponseSchema, errorSchema, githubInstallationSchema, jlcpcbOrderStateSchema, jlcpcbOrderStepRunSchema, loginPageSchema, orderFileSchema, orderQuoteSchema, orderSchema, orgAccountSchema, orgSchema, packageBuildSchema, packageFileSchema, packageReleaseSchema, packageSchema, publicOrgSchema, quotedComponentSchema, sessionSchema, shippingInfoSchema, snippetSchema, userPermissionsSchema };

package/dist/schema.js

@@ -346,6 +346,10 @@ var orgAccountSchema = z.object({
   is_owner: z.boolean().default(false),
   created_at: z.string().datetime()
 });
+var userPermissionsSchema = z.object({
+  can_manage_org: z.boolean().optional(),
+  can_manage_package: z.boolean().optional()
+});
 var publicOrgSchema = z.object({
   org_id: z.string(),
   //.uuid(),
@@ -358,10 +362,7 @@ var publicOrgSchema = z.object({
   package_count: z.number(),
   github_handle: z.string().optional(),
   created_at: z.string(),
-  user_permissions: z.object({
-    can_manage_org: z.boolean().optional(),
-    can_manage_package: z.boolean().optional()
-  }).optional()
+  user_permissions: userPermissionsSchema.optional()
 });
 var databaseSchema = z.object({
   idCounter: z.number().default(0),
@@ -413,5 +414,6 @@ export {
   quotedComponentSchema,
   sessionSchema,
   shippingInfoSchema,
-  snippetSchema
+  snippetSchema,
+  userPermissionsSchema
 };

package/fake-snippets-api/lib/db/schema.ts

@@ -419,6 +419,12 @@ export const orgAccountSchema = z.object({
 })
 export type OrgAccount = z.infer<typeof orgAccountSchema>
 
+export const userPermissionsSchema = z.object({
+  can_manage_org: z.boolean().optional(),
+  can_manage_package: z.boolean().optional(),
+})
+export type UserPermissions = z.infer<typeof userPermissionsSchema>
+
 export const publicOrgSchema = z.object({
   org_id: z.string(), //.uuid(),
   owner_account_id: z.string(), //.uuid(),
@@ -429,12 +435,7 @@ export const publicOrgSchema = z.object({
   package_count: z.number(),
   github_handle: z.string().optional(),
   created_at: z.string(),
-  user_permissions: z
-    .object({
-      can_manage_org: z.boolean().optional(),
-      can_manage_package: z.boolean().optional(),
-    })
-    .optional(),
+  user_permissions: userPermissionsSchema.optional(),
 })
 export type PublicOrgSchema = z.infer<typeof publicOrgSchema>
 

package/fake-snippets-api/routes/api/orgs/get_member.ts

@@ -0,0 +1,67 @@
+import { withRouteSpec } from "fake-snippets-api/lib/middleware/with-winter-spec"
+import { z } from "zod"
+import {
+  orgAccountSchema,
+  userPermissionsSchema,
+} from "fake-snippets-api/lib/db/schema"
+
+export default withRouteSpec({
+  methods: ["GET"],
+  commonParams: z.object({
+    org_id: z.string().optional(),
+    org_name: z.string().optional(),
+    account_id: z.string(),
+  }),
+  auth: "optional_session",
+  jsonResponse: z.object({
+    org_member: orgAccountSchema.merge(
+      z.object({ org_member_permissions: userPermissionsSchema.nullable() }),
+    ),
+  }),
+})(async (req, ctx) => {
+  const { org_id, org_name, account_id } = req.commonParams
+
+  const org = ctx.db.getOrg(
+    {
+      org_id,
+      org_name,
+    },
+    ctx.auth,
+  )
+
+  if (!org) {
+    return ctx.error(404, {
+      error_code: "org_not_found",
+      message: "Organization not found",
+    })
+  }
+
+  const memberOrgAccount = ctx.db.getOrganizationAccount({
+    org_id: org.org_id,
+    account_id: account_id,
+  })
+
+  const memberOrg = ctx.db.getOrg(
+    {
+      org_id,
+      org_name,
+    },
+    {
+      account_id: account_id!,
+    },
+  )
+
+  if (!memberOrgAccount) {
+    return ctx.error(404, {
+      error_code: "member_not_found",
+      message: "Member not found in organization",
+    })
+  }
+
+  return ctx.json({
+    org_member: {
+      ...memberOrgAccount,
+      org_member_permissions: memberOrg,
+    },
+  })
+})

package/fake-snippets-api/routes/api/orgs/list_members.ts

@@ -1,6 +1,9 @@
 import { withRouteSpec } from "fake-snippets-api/lib/middleware/with-winter-spec"
 import { z } from "zod"
-import { accountSchema } from "fake-snippets-api/lib/db/schema"
+import {
+  accountSchema,
+  userPermissionsSchema,
+} from "fake-snippets-api/lib/db/schema"
 
 export default withRouteSpec({
   methods: ["GET", "POST"],
@@ -15,7 +18,12 @@ export default withRouteSpec({
     ),
   auth: "optional_session",
   jsonResponse: z.object({
-    members: z.array(accountSchema.extend({ joined_at: z.string() })),
+    org_members: z.array(
+      accountSchema.omit({ shippingInfo: true }).extend({
+        joined_at: z.string(),
+        org_member_permissions: userPermissionsSchema,
+      }),
+    ),
   }),
 })(async (req, ctx) => {
   const params = req.commonParams as { org_id?: string; name?: string }
@@ -40,8 +48,19 @@ export default withRouteSpec({
       if (m.org_id !== org.org_id) return undefined
       const account = ctx.db.getAccount(m.account_id)
       if (!account) return undefined
+      const memberOrg = ctx.db.getOrg(
+        {
+          org_id: org.org_id,
+          org_name: org.org_name,
+        },
+        {
+          account_id: account.account_id,
+        },
+      )
+
       return {
         ...account,
+        user_permissions: memberOrg,
         joined_at: m.created_at,
       }
     })
@@ -56,15 +75,32 @@ export default withRouteSpec({
       (acc) => acc.account_id === org.owner_account_id,
     )
     if (owner) {
+      const memberOrg = ctx.db.getOrg(
+        {
+          org_id: org.org_id,
+          org_name: org.org_name,
+        },
+        {
+          account_id: owner.account_id,
+        },
+      )
       fullMembers = [
         ...members,
         {
           ...owner,
+          user_permissions: memberOrg,
           joined_at: org.created_at,
         },
       ]
     }
   }
-
-  return ctx.json({ members: fullMembers })
+  return ctx.json({
+    org_members: fullMembers.map((m) => ({
+      ...m,
+      org_member_permissions: m.user_permissions ?? {
+        can_manage_org: false,
+        can_manage_package: false,
+      },
+    })),
+  })
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/fake-snippets",
-  "version": "0.0.116",
+  "version": "0.0.118",
   "type": "module",
   "repository": {
     "type": "git",
@@ -81,7 +81,7 @@
     "@tscircuit/3d-viewer": "^0.0.407",
     "@tscircuit/assembly-viewer": "^0.0.5",
     "@tscircuit/create-snippet-url": "^0.0.8",
-    "@tscircuit/eval": "^0.0.406",
+    "@tscircuit/eval": "^0.0.410",
     "@tscircuit/layout": "^0.0.29",
     "@tscircuit/mm": "^0.0.8",
     "@tscircuit/pcb-viewer": "^1.11.218",

package/src/components/CmdKMenu.tsx

@@ -208,7 +208,7 @@ const CmdKMenu = () => {
   }, [allAccounts, searchQuery])
 
   const { data: recentPackages = [] } = useQuery<Package[]>(
-    ["userPackages", currentUser],
+    ["cmdKMenuPackages", currentUser],
     async () => {
       if (!currentUser) return []
       try {
@@ -226,6 +226,8 @@ const CmdKMenu = () => {
       enabled: !!currentUser && !searchQuery,
       retry: false,
       refetchOnWindowFocus: false,
+      refetchOnMount: false,
+      cacheTime: 24 * 60 * 60 * 1000,
     },
   )