PR into main [#746 #749 #750 #751 #756 #758 #759 #760 #762 #763 #764 #766 #767 #769 #770 #771 #772]

.env.sample

@@ -1,7 +1,7 @@
 VITE_SUPABASE_URL=supabase url
-VITE_SUPABASE_ANON_KEY=supabase anon key
-SUPABASE_SERVICE_KEY=supabase service key
+VITE_SUPABASE_PUBLISHABLE_DEFAULT_KEY=supabase anon key
+SUPABASE_SECRET_KEY=supabase service key
 
 CHAIBUILDER_APP_KEY=chai builder app id
 CHAIBUILDER_DATABASE_URL=postgres database url
-AI_GATEWAY_API_KEY=Vercel AI Gateway API Key
+AI_GATEWAY_API_KEY=#optional Vercel AI Gateway API Key

frameworks/nextjs/package.json

@@ -7,13 +7,13 @@
     "build": "npx tailwindcss -c tailwind.config.ts -i './app/(public)/public.css' -o ./public/chaistyles.css --minify && next build",
     "start": "next start",
     "lint": "eslint",
-    "preview": "opennextjs-cloudflare build && opennextjs-cloudflare preview",
+    "preview": "opennextjs-cloudflare preview",
     "cf-build": "npx tailwindcss -c tailwind.config.ts -i './app/(public)/public.css' -o ./public/chaistyles.css --minify && opennextjs-cloudflare build",
     "deploy": "opennextjs-cloudflare build && opennextjs-cloudflare deploy",
     "cf-typegen": "wrangler types --env-interface CloudflareEnv cloudflare-env.d.ts"
   },
   "dependencies": {
-    "@chaibuilder/sdk": "4.0.0-beta.32",
+    "@chaibuilder/sdk": "link:../../",
     "@opennextjs/cloudflare": "^1.16.4",
     "@supabase/ssr": "^0.8.0",
     "@supabase/supabase-js": "^2.90.1",

package.json

@@ -185,6 +185,7 @@
     "compressorjs": "^1.2.1",
     "culori": "^4.0.2",
     "date-fns": "^4.1.0",
+    "eta": "^4.5.1",
     "flagged": "3.0.0",
     "framer-motion": "12.23.20",
     "fuse.js": "7.1.0",

src/actions/builder/actions-registery.ts

@@ -26,7 +26,6 @@ import { GetLibraryItemsAction } from "./get-library-items";
 import { GetPageRevisionsAction } from "./get-page-revisions";
 import { GetPageTypesAction } from "./get-page-types";
 import { GetRevisionPageAction } from "./get-revision-page";
-import { GetRoleAndPermissionsAction } from "./get-role-and-permissions";
 import { GetSiteWideDataAction } from "./get-site-wide-data";
 import { GetTemplatesByTypeAction } from "./get-templates-by-type";
 import { GetWebsitePagesAction } from "./get-website-pages";
@@ -42,6 +41,8 @@ import { UpdatePageAction } from "./update-page";
 import { UpdatePageMetadataAction } from "./update-page-metadata";
 import { UpdateWebsiteFieldsAction } from "./update-website-fields";
 import { UpsertLibraryItemAction } from "./upsert-library-item";
+import { GetWebsiteDataAction } from "./get-website-data";
+import { GetPageAllDataAction } from "./get-page-all-data";
 
 /**
  * Registry of all available actions
@@ -102,7 +103,8 @@ class ChaiActionsRegistry {
     this.register("GET_PAGE_TYPES", new GetPageTypesAction());
     this.register("SEARCH_PAGE_TYPE_ITEMS", new SearchPageTypeItemsAction());
     this.register("GET_DYNAMIC_PAGES", new GetDynamicPagesAction());
-    this.register("GET_ROLE_AND_PERMISSIONS", new GetRoleAndPermissionsAction());
+    this.register("GET_WEBSITE_DATA", new GetWebsiteDataAction());
+    this.register("GET_PAGE_ALL_DATA", new GetPageAllDataAction());
     // Add more actions here as they are created
   }
 

src/actions/builder/base-action.ts

@@ -71,7 +71,12 @@ export abstract class ChaiBaseAction<T = any, K = any> implements ChaiAction<T,
    * Verify if the user has access to the app
    * @throws ActionError if the user does not have access
    */
-  protected async verifyAccess(): Promise<void> {
+  /**
+   * Get user access data from the database
+   * @returns The user access record
+   * @throws ActionError if access check fails
+   */
+  protected async getUserAccess(): Promise<any> {
     if (!this.context) {
       throw new ActionError("Context not set", "CONTEXT_NOT_SET", 500);
     }
@@ -100,6 +105,12 @@ export abstract class ChaiBaseAction<T = any, K = any> implements ChaiAction<T,
     if (!userAccess || userAccess.length === 0) {
       throw new ActionError("User does not have access to this app", "UNAUTHORIZED", 401);
     }
+
+    return userAccess[0];
+  }
+
+  protected async verifyAccess(): Promise<void> {
+    await this.getUserAccess();
   }
 
   /**

src/actions/builder/check-user-access.ts

@@ -1,13 +1,23 @@
 import { z } from "zod";
 import { ChaiBaseAction } from "./base-action";
 
-export class CheckUserAccessAction extends ChaiBaseAction<any, { access: boolean }> {
+type CheckUserAccessResponse = {
+  access: boolean;
+  role: string;
+  permissions: string[] | null;
+};
+
+export class CheckUserAccessAction extends ChaiBaseAction<any, CheckUserAccessResponse> {
   protected getValidationSchema() {
     return z.any();
   }
 
-  async execute(): Promise<{ access: boolean }> {
-    await this.verifyAccess();
-    return { access: true };
+  async execute(): Promise<CheckUserAccessResponse> {
+    const user = await this.getUserAccess();
+    return {
+      access: true,
+      role: user.role || "user",
+      permissions: (user.permissions as string[]) || null,
+    };
   }
 }

src/actions/builder/get-page-all-data.ts

@@ -0,0 +1,69 @@
+import { z } from "zod";
+import { ChaiBaseAction } from "./base-action";
+import { GetBuilderPageDataAction } from "./get-builder-page-data";
+import { GetDraftPageAction } from "./get-draft-page";
+import { GetLanguagePagesAction } from "./get-language-pages";
+
+type GetPageAllDataActionData = {
+  id: string;
+  lang: string;
+  pageType?: string;
+  pageProps?: any;
+};
+
+type GetPageAllDataActionResponse = {
+  draftPage: any;
+  builderPageData: any;
+  languagePages: any[];
+};
+
+/**
+ * Get Page All Data Action
+ * Consolidates GET_DRAFT_PAGE, GET_BUILDER_PAGE_DATA, and GET_LANGUAGE_PAGES into a single API call
+ * This reduces the number of HTTP requests and improves page load performance
+ */
+export class GetPageAllDataAction extends ChaiBaseAction<GetPageAllDataActionData, GetPageAllDataActionResponse> {
+  protected getValidationSchema() {
+    return z.object({
+      id: z.string(),
+      lang: z.string(),
+      pageType: z.string().optional(),
+      pageProps: z.any().optional().default({}),
+    });
+  }
+
+  async execute(data: GetPageAllDataActionData): Promise<GetPageAllDataActionResponse> {
+    const { id, lang, pageType, pageProps = {} } = data;
+
+    // Initialize sub-actions
+    const draftPageAction = new GetDraftPageAction();
+    const builderPageDataAction = new GetBuilderPageDataAction();
+    const languagePagesAction = new GetLanguagePagesAction();
+
+    // Set context on all sub-actions
+    if (this.context) {
+      draftPageAction.setContext(this.context);
+      builderPageDataAction.setContext(this.context);
+      languagePagesAction.setContext(this.context);
+    }
+
+    try {
+      // Execute all actions in parallel for optimal performance
+      const [draftPage, builderPageData, languagePages] = await Promise.all([
+        draftPageAction.execute({ id }),
+        builderPageDataAction.execute({ lang, pageType, pageProps }),
+        languagePagesAction.execute({ id }),
+      ]);
+
+      return {
+        draftPage,
+        builderPageData,
+        languagePages,
+      };
+    } catch (error) {
+      // Re-throw with more context about which action failed
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      throw new Error(`Failed to fetch page data: ${errorMessage}`);
+    }
+  }
+}

src/actions/builder/get-website-data.ts

@@ -0,0 +1,58 @@
+import { z } from "zod";
+import { ChaiBaseAction } from "./base-action";
+import { GetCollectionsAction } from "./get-collections";
+import { GetLibrariesAction } from "./get-libraries";
+import { GetPageTypesAction } from "./get-page-types";
+import { GetWebsitePagesAction } from "./get-website-pages";
+import { GetWebsiteSettingsAction } from "./get-website-settings";
+
+type GetWebsiteDataActionData = Record<string, never>;
+
+type GetWebsiteDataActionResponse = {
+  websiteSettings: any;
+  websitePages: any;
+  pageTypes: any;
+  libraries: any;
+  collections: any;
+};
+
+export class GetWebsiteDataAction extends ChaiBaseAction<GetWebsiteDataActionData, GetWebsiteDataActionResponse> {
+  protected getValidationSchema() {
+    return z.object({}).optional().default({});
+  }
+
+  async execute(): Promise<GetWebsiteDataActionResponse> {
+    const websiteSettingsAction = new GetWebsiteSettingsAction();
+    const websitePagesAction = new GetWebsitePagesAction();
+    const pageTypesAction = new GetPageTypesAction();
+    const librariesAction = new GetLibrariesAction();
+    const collectionsAction = new GetCollectionsAction();
+
+    // Set context on all sub-actions
+    if (this.context) {
+      websiteSettingsAction.setContext(this.context);
+      websitePagesAction.setContext(this.context);
+      pageTypesAction.setContext(this.context);
+      librariesAction.setContext(this.context);
+      collectionsAction.setContext(this.context);
+    }
+
+    // Execute remaining actions in parallel
+    // NOTE: websitePagesAction fetches only primary pages (lang = "")
+    const [websiteSettings, websitePages, pageTypes, libraries, collections] = await Promise.all([
+      websiteSettingsAction.execute({ draft: true }),
+      websitePagesAction.execute({ lang: "" }),
+      pageTypesAction.execute(),
+      librariesAction.execute(),
+      collectionsAction.execute(),
+    ]);
+
+    return {
+      websiteSettings,
+      websitePages,
+      pageTypes,
+      libraries,
+      collections,
+    };
+  }
+}

src/actions/builder/get-website-pages.ts

@@ -24,6 +24,10 @@ type GetWebsitePagesActionResponse = Array<{
   primaryPage?: string | null;
   isTemplate: boolean;
   changes: string[] | null;
+  lang: string;
+  designTokens: unknown;
+  links: string | null;
+  partialBlocks: string | null;
 }>;
 
 export class GetWebsitePagesAction extends ChaiBaseAction<GetWebsitePagesActionData, GetWebsitePagesActionResponse> {
@@ -59,6 +63,10 @@ export class GetWebsitePagesAction extends ChaiBaseAction<GetWebsitePagesActionD
           dynamicSlugCustom: schema.appPages.dynamicSlugCustom,
           primaryPage: schema.appPages.primaryPage,
           changes: schema.appPages.changes,
+          lang: schema.appPages.lang,
+          designTokens: schema.appPages.designTokens,
+          links: schema.appPages.links,
+          partialBlocks: schema.appPages.partialBlocks,
         })
         .from(schema.appPages)
         .where(and(eq(schema.appPages.app, appId), eq(schema.appPages.lang, lang))),
@@ -97,6 +105,10 @@ export class GetWebsitePagesAction extends ChaiBaseAction<GetWebsitePagesActionD
       pageType: page.pageType ?? "page",
       isTemplate: templatePageIds.has(page.id),
       changes: page.changes as string[] | null,
+      lang: page.lang,
+      designTokens: page.designTokens,
+      links: page.links,
+      partialBlocks: page.partialBlocks,
     }));
   }
 }

src/actions/builder/get-website-settings.ts

@@ -16,6 +16,7 @@ type GetWebsiteSettingsActionResponse = {
   theme: any; // Making it more flexible to match database schema
   appKey: string;
   designTokens?: any;
+  appChanges?: string[];
 };
 
 export class GetWebsiteSettingsAction extends ChaiBaseAction<
@@ -47,6 +48,7 @@ export class GetWebsiteSettingsAction extends ChaiBaseAction<
           languages: targetTable.languages,
           settings: targetTable.settings,
           designTokens: targetTable.designTokens,
+          changes: targetTable.changes,
         })
         .from(targetTable)
         .where(eq(targetTable.id, appId))
@@ -63,6 +65,8 @@ export class GetWebsiteSettingsAction extends ChaiBaseAction<
 
     const settings = first(config);
 
+    const appChanges = ((settings as any)?.changes ?? []) as string[];
+
     return {
       ...this.getDefaultSettings(),
       ...settings,
@@ -72,6 +76,7 @@ export class GetWebsiteSettingsAction extends ChaiBaseAction<
       theme: settings?.theme || this.getDefaultSettings().theme,
       // Generate deterministic app key like the original implementation
       appKey: this.generateDeterministicUuid(appId),
+      appChanges,
     };
   }