create-nextblock 0.16.4 → 0.17.1

package/templates/nextblock-template/app/cms/settings/extra-translations/actions.ts

@@ -1,276 +1,276 @@
-'use server';
-
-import { createClient } from '@nextblock-cms/db/server';
-import { revalidatePath, updateTag } from 'next/cache';
-import { z } from '../../../../lib/zod-config';
-
-import {
-  getOrderedTranslationLanguageCodes,
-  prepareTranslationCsvImport,
-  type TranslationWorkspaceItem,
-} from '@nextblock-cms/utils';
-
-const translationSchema = z.object({
-  key: z.string().min(1, 'Key is required.'),
-  en: z.string().min(1, 'English translation is required.'),
-});
-
-const EXTRA_TRANSLATIONS_PATH = '/cms/settings/extra-translations';
-const PUBLIC_TRANSLATIONS_CACHE_TAG = 'public-layout-translations';
-
-type TranslationMutationState = {
-  success?: boolean;
-  translation?: TranslationWorkspaceItem;
-  error?: string;
-  errors?: Record<string, string[] | undefined>;
-};
-
-async function verifyAdmin(supabase: ReturnType<typeof createClient>) {
-  const {
-    data: { user },
-  } = await supabase.auth.getUser();
-
-  if (!user) {
-    return false;
-  }
-
-  const { data: profile } = await supabase
-    .from('profiles')
-    .select('role')
-    .eq('id', user.id)
-    .single();
-
-  return profile?.role === 'ADMIN';
-}
-
-async function getConfiguredLanguageCodes() {
-  const supabase = createClient();
-  const { data, error } = await supabase
-    .from('languages')
-    .select('code, name')
-    .order('is_default', { ascending: false })
-    .order('name', { ascending: true });
-
-  if (error) {
-    throw new Error(`Failed to fetch languages: ${error.message}`);
-  }
-
-  return getOrderedTranslationLanguageCodes(data ?? []);
-}
-
-function revalidateTranslationViews() {
-  revalidatePath(EXTRA_TRANSLATIONS_PATH);
-  updateTag(PUBLIC_TRANSLATIONS_CACHE_TAG);
-}
-
-export async function createTranslation(
-  prevState: TranslationMutationState | null,
-  formData: FormData
-): Promise<TranslationMutationState> {
-  void prevState;
-
-  const supabase = createClient();
-
-  if (!(await verifyAdmin(supabase))) {
-    return { error: 'Unauthorized: Admin role required.' };
-  }
-
-  const data = {
-    key: formData.get('key') as string,
-    en: formData.get('en') as string,
-  };
-
-  const validatedFields = translationSchema.safeParse(data);
-
-  if (!validatedFields.success) {
-    return {
-      errors: validatedFields.error.flatten().fieldErrors,
-    };
-  }
-
-  const { data: insertedTranslation, error } = await supabase
-    .from('translations')
-    .insert({
-      key: validatedFields.data.key,
-      translations: { en: validatedFields.data.en },
-    })
-    .select('key, translations, created_at, updated_at')
-    .single();
-
-  if (error || !insertedTranslation) {
-    return {
-      error: error?.message ?? 'Failed to create translation.',
-    };
-  }
-
-  revalidateTranslationViews();
-
-  return {
-    success: true,
-    translation: insertedTranslation as TranslationWorkspaceItem,
-  };
-}
-
-export async function getTranslations() {
-  const supabase = createClient();
-  const { data, error } = await supabase
-    .from('translations')
-    .select('key, translations, created_at, updated_at')
-    .order('key');
-
-  if (error) {
-    console.error('Error fetching translations:', error);
-    return [];
-  }
-
-  return (data ?? []) as TranslationWorkspaceItem[];
-}
-
-export async function updateTranslation(
-  prevState: TranslationMutationState | null,
-  formData: FormData
-): Promise<TranslationMutationState> {
-  void prevState;
-
-  const supabase = createClient();
-
-  if (!(await verifyAdmin(supabase))) {
-    return { error: 'Unauthorized: Admin role required.' };
-  }
-
-  const data = Object.fromEntries(formData.entries());
-  const key = data.key as string;
-
-  if (!key) {
-    return {
-      error: 'Translation key is required.',
-    };
-  }
-
-  const languageEntries = Object.entries(data).filter(
-    ([fieldKey]) => fieldKey !== 'key'
-  );
-
-  if (languageEntries.length === 0) {
-    return {
-      error: 'No translation values were provided.',
-    };
-  }
-
-  const { data: existingData, error: fetchError } = await supabase
-    .from('translations')
-    .select('key, translations, created_at, updated_at')
-    .eq('key', key)
-    .single();
-
-  if (fetchError || !existingData) {
-    return {
-      error: fetchError
-        ? `Failed to fetch existing translation: ${fetchError.message}`
-        : `Translation with key "${key}" was not found.`,
-    };
-  }
-
-  const nextTranslations = {
-    ...((existingData.translations as Record<string, string>) ?? {}),
-  };
-
-  for (const [languageCode, value] of languageEntries) {
-    nextTranslations[languageCode] = value as string;
-  }
-
-  const { data: updatedTranslation, error } = await supabase
-    .from('translations')
-    .update({ translations: nextTranslations })
-    .eq('key', key)
-    .select('key, translations, created_at, updated_at')
-    .single();
-
-  if (error || !updatedTranslation) {
-    return {
-      error:
-        error?.message ??
-        `Translation with key "${key}" could not be updated.`,
-    };
-  }
-
-  revalidateTranslationViews();
-
-  return {
-    success: true,
-    translation: updatedTranslation as TranslationWorkspaceItem,
-  };
-}
-
-export async function importTranslationsCsvAction(csvText: string) {
-  try {
-    const supabase = createClient();
-
-    if (!(await verifyAdmin(supabase))) {
-      return {
-        success: false as const,
-        createdCount: 0,
-        updatedCount: 0,
-        skippedCount: 0,
-        error: 'Unauthorized: Admin role required.',
-      };
-    }
-
-    const [existingTranslations, languageCodes] = await Promise.all([
-      getTranslations(),
-      getConfiguredLanguageCodes(),
-    ]);
-    const importResult = prepareTranslationCsvImport({
-      csvText,
-      existingItems: existingTranslations,
-      languageCodes,
-    });
-
-    if (!importResult.success) {
-      return importResult;
-    }
-
-    const rowsToUpsert = [
-      ...importResult.createdRows,
-      ...importResult.updatedRows,
-    ].map((row) => ({
-      key: row.key,
-      translations: row.translations,
-    }));
-
-    if (rowsToUpsert.length > 0) {
-      const { error } = await supabase
-        .from('translations')
-        .upsert(rowsToUpsert, { onConflict: 'key' });
-
-      if (error) {
-        return {
-          success: false as const,
-          createdCount: 0,
-          updatedCount: 0,
-          skippedCount: importResult.skippedCount,
-          error: error.message,
-        };
-      }
-    }
-
-    revalidateTranslationViews();
-
-    return {
-      success: true as const,
-      createdCount: importResult.createdCount,
-      updatedCount: importResult.updatedCount,
-      skippedCount: importResult.skippedCount,
-      translations: await getTranslations(),
-    };
-  } catch (error) {
-    return {
-      success: false as const,
-      createdCount: 0,
-      updatedCount: 0,
-      skippedCount: 0,
-      error:
-        error instanceof Error ? error.message : 'Failed to import translation CSV.',
-    };
-  }
-}
+'use server';
+
+import { createClient } from '@nextblock-cms/db/server';
+import { revalidatePath, updateTag } from 'next/cache';
+import { z } from '../../../../lib/zod-config';
+
+import {
+  getOrderedTranslationLanguageCodes,
+  prepareTranslationCsvImport,
+  type TranslationWorkspaceItem,
+} from '@nextblock-cms/utils';
+
+const translationSchema = z.object({
+  key: z.string().min(1, 'Key is required.'),
+  en: z.string().min(1, 'English translation is required.'),
+});
+
+const EXTRA_TRANSLATIONS_PATH = '/cms/settings/extra-translations';
+const PUBLIC_TRANSLATIONS_CACHE_TAG = 'public-layout-translations';
+
+type TranslationMutationState = {
+  success?: boolean;
+  translation?: TranslationWorkspaceItem;
+  error?: string;
+  errors?: Record<string, string[] | undefined>;
+};
+
+async function verifyAdmin(supabase: ReturnType<typeof createClient>) {
+  const {
+    data: { user },
+  } = await supabase.auth.getUser();
+
+  if (!user) {
+    return false;
+  }
+
+  const { data: profile } = await supabase
+    .from('profiles')
+    .select('role')
+    .eq('id', user.id)
+    .single();
+
+  return profile?.role === 'ADMIN';
+}
+
+async function getConfiguredLanguageCodes() {
+  const supabase = createClient();
+  const { data, error } = await supabase
+    .from('languages')
+    .select('code, name')
+    .order('is_default', { ascending: false })
+    .order('name', { ascending: true });
+
+  if (error) {
+    throw new Error(`Failed to fetch languages: ${error.message}`);
+  }
+
+  return getOrderedTranslationLanguageCodes(data ?? []);
+}
+
+function revalidateTranslationViews() {
+  revalidatePath(EXTRA_TRANSLATIONS_PATH);
+  updateTag(PUBLIC_TRANSLATIONS_CACHE_TAG);
+}
+
+export async function createTranslation(
+  prevState: TranslationMutationState | null,
+  formData: FormData
+): Promise<TranslationMutationState> {
+  void prevState;
+
+  const supabase = createClient();
+
+  if (!(await verifyAdmin(supabase))) {
+    return { error: 'Unauthorized: Admin role required.' };
+  }
+
+  const data = {
+    key: formData.get('key') as string,
+    en: formData.get('en') as string,
+  };
+
+  const validatedFields = translationSchema.safeParse(data);
+
+  if (!validatedFields.success) {
+    return {
+      errors: validatedFields.error.flatten().fieldErrors,
+    };
+  }
+
+  const { data: insertedTranslation, error } = await supabase
+    .from('translations')
+    .insert({
+      key: validatedFields.data.key,
+      translations: { en: validatedFields.data.en },
+    })
+    .select('key, translations, created_at, updated_at')
+    .single();
+
+  if (error || !insertedTranslation) {
+    return {
+      error: error?.message ?? 'Failed to create translation.',
+    };
+  }
+
+  revalidateTranslationViews();
+
+  return {
+    success: true,
+    translation: insertedTranslation as TranslationWorkspaceItem,
+  };
+}
+
+export async function getTranslations() {
+  const supabase = createClient();
+  const { data, error } = await supabase
+    .from('translations')
+    .select('key, translations, created_at, updated_at')
+    .order('key');
+
+  if (error) {
+    console.error('Error fetching translations:', error);
+    return [];
+  }
+
+  return (data ?? []) as TranslationWorkspaceItem[];
+}
+
+export async function updateTranslation(
+  prevState: TranslationMutationState | null,
+  formData: FormData
+): Promise<TranslationMutationState> {
+  void prevState;
+
+  const supabase = createClient();
+
+  if (!(await verifyAdmin(supabase))) {
+    return { error: 'Unauthorized: Admin role required.' };
+  }
+
+  const data = Object.fromEntries(formData.entries());
+  const key = data.key as string;
+
+  if (!key) {
+    return {
+      error: 'Translation key is required.',
+    };
+  }
+
+  const languageEntries = Object.entries(data).filter(
+    ([fieldKey]) => fieldKey !== 'key'
+  );
+
+  if (languageEntries.length === 0) {
+    return {
+      error: 'No translation values were provided.',
+    };
+  }
+
+  const { data: existingData, error: fetchError } = await supabase
+    .from('translations')
+    .select('key, translations, created_at, updated_at')
+    .eq('key', key)
+    .single();
+
+  if (fetchError || !existingData) {
+    return {
+      error: fetchError
+        ? `Failed to fetch existing translation: ${fetchError.message}`
+        : `Translation with key "${key}" was not found.`,
+    };
+  }
+
+  const nextTranslations = {
+    ...((existingData.translations as Record<string, string>) ?? {}),
+  };
+
+  for (const [languageCode, value] of languageEntries) {
+    nextTranslations[languageCode] = value as string;
+  }
+
+  const { data: updatedTranslation, error } = await supabase
+    .from('translations')
+    .update({ translations: nextTranslations })
+    .eq('key', key)
+    .select('key, translations, created_at, updated_at')
+    .single();
+
+  if (error || !updatedTranslation) {
+    return {
+      error:
+        error?.message ??
+        `Translation with key "${key}" could not be updated.`,
+    };
+  }
+
+  revalidateTranslationViews();
+
+  return {
+    success: true,
+    translation: updatedTranslation as TranslationWorkspaceItem,
+  };
+}
+
+export async function importTranslationsCsvAction(csvText: string) {
+  try {
+    const supabase = createClient();
+
+    if (!(await verifyAdmin(supabase))) {
+      return {
+        success: false as const,
+        createdCount: 0,
+        updatedCount: 0,
+        skippedCount: 0,
+        error: 'Unauthorized: Admin role required.',
+      };
+    }
+
+    const [existingTranslations, languageCodes] = await Promise.all([
+      getTranslations(),
+      getConfiguredLanguageCodes(),
+    ]);
+    const importResult = prepareTranslationCsvImport({
+      csvText,
+      existingItems: existingTranslations,
+      languageCodes,
+    });
+
+    if (!importResult.success) {
+      return importResult;
+    }
+
+    const rowsToUpsert = [
+      ...importResult.createdRows,
+      ...importResult.updatedRows,
+    ].map((row) => ({
+      key: row.key,
+      translations: row.translations,
+    }));
+
+    if (rowsToUpsert.length > 0) {
+      const { error } = await supabase
+        .from('translations')
+        .upsert(rowsToUpsert, { onConflict: 'key' });
+
+      if (error) {
+        return {
+          success: false as const,
+          createdCount: 0,
+          updatedCount: 0,
+          skippedCount: importResult.skippedCount,
+          error: error.message,
+        };
+      }
+    }
+
+    revalidateTranslationViews();
+
+    return {
+      success: true as const,
+      createdCount: importResult.createdCount,
+      updatedCount: importResult.updatedCount,
+      skippedCount: importResult.skippedCount,
+      translations: await getTranslations(),
+    };
+  } catch (error) {
+    return {
+      success: false as const,
+      createdCount: 0,
+      updatedCount: 0,
+      skippedCount: 0,
+      error:
+        error instanceof Error ? error.message : 'Failed to import translation CSV.',
+    };
+  }
+}

package/templates/nextblock-template/app/cms/settings/google-analytics/page.tsx

@@ -1,26 +1,26 @@
-// app/cms/settings/google-analytics/page.tsx
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@nextblock-cms/ui';
-import { getGoogleAnalyticsSettings } from './actions';
-import GoogleAnalyticsForm from './components/GoogleAnalyticsForm';
-
-export default async function GoogleAnalyticsSettingsPage() {
-  const settings = await getGoogleAnalyticsSettings();
-
-  return (
-    <div className="max-w-4xl mx-auto">
-      <Card>
-        <CardHeader>
-          <CardTitle>Google Analytics</CardTitle>
-          <CardDescription>
-            Configure Google Tag Manager and Google Analytics 4. These tags load only
-            after a visitor accepts analytics in the Law 25 consent banner (managed under
-            Privacy &amp; Consent), so the default page weight stays at zero tracking bytes.
-          </CardDescription>
-        </CardHeader>
-        <CardContent>
-          <GoogleAnalyticsForm initialSettings={settings} />
-        </CardContent>
-      </Card>
-    </div>
-  );
-}
+// app/cms/settings/google-analytics/page.tsx
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@nextblock-cms/ui';
+import { getGoogleAnalyticsSettings } from './actions';
+import GoogleAnalyticsForm from './components/GoogleAnalyticsForm';
+
+export default async function GoogleAnalyticsSettingsPage() {
+  const settings = await getGoogleAnalyticsSettings();
+
+  return (
+    <div className="max-w-4xl mx-auto">
+      <Card>
+        <CardHeader>
+          <CardTitle>Google Analytics</CardTitle>
+          <CardDescription>
+            Configure Google Tag Manager and Google Analytics 4. These tags load only
+            after a visitor accepts analytics in the Law 25 consent banner (managed under
+            Privacy &amp; Consent), so the default page weight stays at zero tracking bytes.
+          </CardDescription>
+        </CardHeader>
+        <CardContent>
+          <GoogleAnalyticsForm initialSettings={settings} />
+        </CardContent>
+      </Card>
+    </div>
+  );
+}

package/templates/nextblock-template/app/cms/settings/logos/components/DeleteLogoButton.tsx

@@ -2,31 +2,31 @@
 
 import { DropdownMenuItem } from "@nextblock-cms/ui";
 import { Trash2 } from "lucide-react";
-import { deleteLogo } from "../actions";
-import { useTransition, useState } from 'react';
-import { ConfirmationModal } from '../../../components/ConfirmationModal';
-import { toast } from 'react-hot-toast';
-import { useRouter } from 'next/navigation';
+import { deleteLogo } from "../actions";
+import { useTransition, useState } from 'react';
+import { ConfirmationModal } from '../../../components/ConfirmationModal';
+import { toast } from 'react-hot-toast';
+import { useRouter } from 'next/navigation';
 
 interface DeleteLogoButtonProps {
   logoId: string;
 }
 
-export default function DeleteLogoButton({ logoId }: DeleteLogoButtonProps) {
-  const router = useRouter();
-  const [isPending, startTransition] = useTransition();
-  const [isModalOpen, setIsModalOpen] = useState(false);
+export default function DeleteLogoButton({ logoId }: DeleteLogoButtonProps) {
+  const router = useRouter();
+  const [isPending, startTransition] = useTransition();
+  const [isModalOpen, setIsModalOpen] = useState(false);
 
   const handleDeleteConfirm = () => {
     startTransition(async () => {
       const result = await deleteLogo(logoId);
       if (result?.error) {
         toast.error(`Error: ${result.error}`);
-      } else {
-          toast.success("Logo deleted successfully");
-          router.refresh();
-      }
-      setIsModalOpen(false);
+      } else {
+          toast.success("Logo deleted successfully");
+          router.refresh();
+      }
+      setIsModalOpen(false);
     });
   };
 
@@ -41,13 +41,13 @@ export default function DeleteLogoButton({ logoId }: DeleteLogoButtonProps) {
         <Trash2 className="mr-2 h-4 w-4" />
         {isPending ? "Deleting..." : "Delete"}
       </DropdownMenuItem>
-      <ConfirmationModal
-        isOpen={isModalOpen}
-        onClose={() => setIsModalOpen(false)}
-        onConfirm={handleDeleteConfirm}
-        title="Delete Brand Logo?"
-        description="This will permanently delete the logo. This action cannot be undone."
-      />
+      <ConfirmationModal
+        isOpen={isModalOpen}
+        onClose={() => setIsModalOpen(false)}
+        onConfirm={handleDeleteConfirm}
+        title="Delete Brand Logo?"
+        description="This will permanently delete the logo. This action cannot be undone."
+      />
     </>
   );
 }