create-nextblock 0.12.8 → 0.12.11

package/templates/nextblock-template/app/cms/users/components/UserForm.tsx

@@ -1,28 +1,28 @@
-"use client";
-
-import { CustomerProfileForm, ExtendedProfileUpdateData, addressesMatch, type CustomerAddressInput } from "@nextblock-cms/ecommerce";
-import MediaPickerDialog from "../../media/components/MediaPickerDialog";
-import type { Database } from "@nextblock-cms/db";
-import { useSearchParams } from "next/navigation";
-
-
+"use client";
+
+import { CustomerProfileForm, ExtendedProfileUpdateData, addressesMatch, type CustomerAddressInput } from "@nextblock-cms/ecommerce";
+import MediaPickerDialog from "../../media/components/MediaPickerDialog";
+import type { Database } from "@nextblock-cms/db";
+import { useSearchParams } from "next/navigation";
+
+
 type Profile = Database['public']['Tables']['profiles']['Row'];
 
-interface UserFormProps {
-  userToEditAuth: { email: string | undefined; id: string };
-  userToEditProfile: Profile | null;
-  userToEditAddresses: {
-    billingAddress: CustomerAddressInput | null;
-    shippingAddress: CustomerAddressInput | null;
-  };
-  formAction: (formData: FormData) => Promise<{ error?: string } | void>;
-}
-
-export default function UserForm({ userToEditAuth, userToEditProfile, userToEditAddresses, formAction }: UserFormProps) {
-  const searchParams = useSearchParams();
-  const successMsg = searchParams.get('success');
-
-  const handleAdminSave = async (data: ExtendedProfileUpdateData) => {
+interface UserFormProps {
+  userToEditAuth: { email: string | undefined; id: string };
+  userToEditProfile: Profile | null;
+  userToEditAddresses: {
+    billingAddress: CustomerAddressInput | null;
+    shippingAddress: CustomerAddressInput | null;
+  };
+  formAction: (formData: FormData) => Promise<{ error?: string } | void>;
+}
+
+export default function UserForm({ userToEditAuth, userToEditProfile, userToEditAddresses, formAction }: UserFormProps) {
+  const searchParams = useSearchParams();
+  const successMsg = searchParams.get('success');
+
+  const handleAdminSave = async (data: ExtendedProfileUpdateData) => {
       const formData = new FormData();
       // Only append if defined to avoid null string issues if server doesn't handle them, 
       // but server action expects strings or checks presence.
@@ -34,12 +34,12 @@ export default function UserForm({ userToEditAuth, userToEditProfile, userToEdit
       if (data.phone !== undefined) formData.append('phone', data.phone || '');
       if (data.role !== undefined) formData.append('role', data.role);
       
-      formData.append('billing_address', JSON.stringify(data.billing_address ?? null));
-      formData.append('shipping_address', JSON.stringify(data.shipping_address ?? null));
-      formData.append('use_billing_for_shipping', data.use_billing_for_shipping ? 'true' : 'false');
-
-      return await formAction(formData);
-  };
+      formData.append('billing_address', JSON.stringify(data.billing_address ?? null));
+      formData.append('shipping_address', JSON.stringify(data.shipping_address ?? null));
+      formData.append('use_billing_for_shipping', data.use_billing_for_shipping ? 'true' : 'false');
+
+      return await formAction(formData);
+  };
 
   return (
     <div className="max-w-4xl mx-auto">
@@ -47,21 +47,21 @@ export default function UserForm({ userToEditAuth, userToEditProfile, userToEdit
           initialData={{
               full_name: userToEditProfile?.full_name || '',
               avatar_url: userToEditProfile?.avatar_url || '',
-              website: userToEditProfile?.website || '',
-              github_username: userToEditProfile?.github_username || '',
-              phone: userToEditProfile?.phone || '',
-              role: userToEditProfile?.role || 'USER',
-              billing_address: userToEditAddresses.billingAddress,
-              shipping_address: userToEditAddresses.shippingAddress,
-              use_billing_for_shipping:
-                !userToEditAddresses.shippingAddress ||
-                addressesMatch(
-                  userToEditAddresses.billingAddress,
-                  userToEditAddresses.shippingAddress
-                ),
-          }}
-          MediaPickerComponent={MediaPickerDialog}
-          isAdmin={true}
+              website: userToEditProfile?.website || '',
+              github_username: userToEditProfile?.github_username || '',
+              phone: userToEditProfile?.phone || '',
+              role: userToEditProfile?.role || 'USER',
+              billing_address: userToEditAddresses.billingAddress,
+              shipping_address: userToEditAddresses.shippingAddress,
+              use_billing_for_shipping:
+                !userToEditAddresses.shippingAddress ||
+                addressesMatch(
+                  userToEditAddresses.billingAddress,
+                  userToEditAddresses.shippingAddress
+                ),
+          }}
+          MediaPickerComponent={MediaPickerDialog}
+          isAdmin={true}
           email={userToEditAuth.email}
           onAction={handleAdminSave}
           initialSuccessMessage={successMsg}

package/templates/nextblock-template/app/lib/site-settings.ts

@@ -1,105 +1,105 @@
-import 'server-only';
-import { unstable_cache } from 'next/cache';
-import { createClient as createSupabaseJsClient } from '@supabase/supabase-js';
-import type { Database } from '@nextblock-cms/db';
-import {
-  resolveSupabaseAnonKey,
-  resolveSupabaseServiceKey,
-  resolveSupabaseUrl,
-} from '../../lib/setup/env-status';
-import {
-  DEFAULT_SITE_TITLE,
-  DEFAULT_SITE_DESCRIPTION,
-  DEFAULT_SITE_KEYWORDS,
-} from './seo';
-
-export const SITE_SETTINGS_CACHE_TAG = 'public-site-settings';
-const SITE_SETTINGS_REVALIDATE_SECONDS = 60;
-
-export interface SiteSettings {
-  siteTitle: string;
-  siteDescription: string;
-  siteKeywords: string;
-}
-
-/**
- * Service-role (or anon) Supabase client used for cached, request-agnostic
- * reads of public layout/SEO data. Shared by the root layout and the public
- * route `generateMetadata` functions.
- */
-export function createStaticSupabaseClient() {
-  // Fall back to a dummy host when unconfigured (fresh clone, pre-/setup) so the
-  // root layout can still render rather than crashing the whole app on boot. Callers
-  // (getSiteSettings + the getCached* helpers) already swallow failures and use
-  // fallbacks, and loadLayoutData short-circuits before reaching here when there is
-  // no Supabase env at all.
-  const supabaseUrl = resolveSupabaseUrl() || 'https://dummy.supabase.co';
-  const supabaseKey =
-    resolveSupabaseServiceKey() || resolveSupabaseAnonKey() || 'dummy-anon-key';
-
-  return createSupabaseJsClient<Database>(supabaseUrl, supabaseKey, {
-    auth: {
-      persistSession: false,
-      autoRefreshToken: false,
-      detectSessionInUrl: false,
-    },
-  });
-}
-
-/**
- * Cached read of the site-wide SEO identity (title / description / keywords)
- * from the `site_settings` key-value store. This is the single source of truth
- * used for both `<title>`/OpenGraph metadata and the header brand.
- */
-export const getSiteSettings = unstable_cache(
-  async (): Promise<SiteSettings> => {
-    const fallback: SiteSettings = {
-      siteTitle: DEFAULT_SITE_TITLE,
-      siteDescription: DEFAULT_SITE_DESCRIPTION,
-      siteKeywords: DEFAULT_SITE_KEYWORDS,
-    };
-
-    // Unconfigured instance (pre-/setup): the static client would point at the dummy
-    // host, so the fetch fails with a noisy DNS error before falling back. Skip it and
-    // return SEO defaults directly. (generateMetadata calls this even on /setup.)
-    if (!process.env.NEXT_PUBLIC_SUPABASE_URL) {
-      return fallback;
-    }
-
-    try {
-      const supabase = createStaticSupabaseClient();
-      const { data, error } = await supabase
-        .from('site_settings')
-        .select('key, value')
-        .in('key', ['site_title', 'site_description', 'site_keywords']);
-
-      if (error || !data) {
-        // PGRST205 = table not found: the schema isn't migrated yet (e.g. mid-setup,
-        // right after the connection is saved but before `npm run db:migrate`). That's an
-        // expected transient state — don't shout about it. Real errors still log.
-        if (error && error.code !== 'PGRST205') {
-          console.error('Error fetching cached site settings:', error);
-        }
-        return fallback;
-      }
-
-      const settings: Record<string, string> = {};
-      data.forEach((item) => {
-        if (typeof item.value === 'string') {
-          settings[item.key] = item.value;
-        }
-      });
-
-      return {
-        siteTitle: settings.site_title?.trim() || fallback.siteTitle,
-        siteDescription: settings.site_description?.trim() || fallback.siteDescription,
-        siteKeywords: settings.site_keywords?.trim() || fallback.siteKeywords,
-      };
-    } catch (caught) {
-      console.error('Unexpected error fetching site settings:', caught);
-      return fallback;
-    }
-  },
-  ['public-site-settings'],
-  { revalidate: SITE_SETTINGS_REVALIDATE_SECONDS, tags: [SITE_SETTINGS_CACHE_TAG] }
-);
+import 'server-only';
+import { unstable_cache } from 'next/cache';
+import { createClient as createSupabaseJsClient } from '@supabase/supabase-js';
+import type { Database } from '@nextblock-cms/db';
+import {
+  resolveSupabaseAnonKey,
+  resolveSupabaseServiceKey,
+  resolveSupabaseUrl,
+} from '../../lib/setup/env-status';
+import {
+  DEFAULT_SITE_TITLE,
+  DEFAULT_SITE_DESCRIPTION,
+  DEFAULT_SITE_KEYWORDS,
+} from './seo';
+
+export const SITE_SETTINGS_CACHE_TAG = 'public-site-settings';
+const SITE_SETTINGS_REVALIDATE_SECONDS = 60;
+
+export interface SiteSettings {
+  siteTitle: string;
+  siteDescription: string;
+  siteKeywords: string;
+}
+
+/**
+ * Service-role (or anon) Supabase client used for cached, request-agnostic
+ * reads of public layout/SEO data. Shared by the root layout and the public
+ * route `generateMetadata` functions.
+ */
+export function createStaticSupabaseClient() {
+  // Fall back to a dummy host when unconfigured (fresh clone, pre-/setup) so the
+  // root layout can still render rather than crashing the whole app on boot. Callers
+  // (getSiteSettings + the getCached* helpers) already swallow failures and use
+  // fallbacks, and loadLayoutData short-circuits before reaching here when there is
+  // no Supabase env at all.
+  const supabaseUrl = resolveSupabaseUrl() || 'https://dummy.supabase.co';
+  const supabaseKey =
+    resolveSupabaseServiceKey() || resolveSupabaseAnonKey() || 'dummy-anon-key';
+
+  return createSupabaseJsClient<Database>(supabaseUrl, supabaseKey, {
+    auth: {
+      persistSession: false,
+      autoRefreshToken: false,
+      detectSessionInUrl: false,
+    },
+  });
+}
+
+/**
+ * Cached read of the site-wide SEO identity (title / description / keywords)
+ * from the `site_settings` key-value store. This is the single source of truth
+ * used for both `<title>`/OpenGraph metadata and the header brand.
+ */
+export const getSiteSettings = unstable_cache(
+  async (): Promise<SiteSettings> => {
+    const fallback: SiteSettings = {
+      siteTitle: DEFAULT_SITE_TITLE,
+      siteDescription: DEFAULT_SITE_DESCRIPTION,
+      siteKeywords: DEFAULT_SITE_KEYWORDS,
+    };
+
+    // Unconfigured instance (pre-/setup): the static client would point at the dummy
+    // host, so the fetch fails with a noisy DNS error before falling back. Skip it and
+    // return SEO defaults directly. (generateMetadata calls this even on /setup.)
+    if (!process.env.NEXT_PUBLIC_SUPABASE_URL) {
+      return fallback;
+    }
+
+    try {
+      const supabase = createStaticSupabaseClient();
+      const { data, error } = await supabase
+        .from('site_settings')
+        .select('key, value')
+        .in('key', ['site_title', 'site_description', 'site_keywords']);
+
+      if (error || !data) {
+        // PGRST205 = table not found: the schema isn't migrated yet (e.g. mid-setup,
+        // right after the connection is saved but before `npm run db:migrate`). That's an
+        // expected transient state — don't shout about it. Real errors still log.
+        if (error && error.code !== 'PGRST205') {
+          console.error('Error fetching cached site settings:', error);
+        }
+        return fallback;
+      }
+
+      const settings: Record<string, string> = {};
+      data.forEach((item) => {
+        if (typeof item.value === 'string') {
+          settings[item.key] = item.value;
+        }
+      });
+
+      return {
+        siteTitle: settings.site_title?.trim() || fallback.siteTitle,
+        siteDescription: settings.site_description?.trim() || fallback.siteDescription,
+        siteKeywords: settings.site_keywords?.trim() || fallback.siteKeywords,
+      };
+    } catch (caught) {
+      console.error('Unexpected error fetching site settings:', caught);
+      return fallback;
+    }
+  },
+  ['public-site-settings'],
+  { revalidate: SITE_SETTINGS_REVALIDATE_SECONDS, tags: [SITE_SETTINGS_CACHE_TAG] }
+);