create-nextblock 0.14.1 → 0.14.4

package/templates/nextblock-template/app/cms/components/github-connect-actions.ts

@@ -1,102 +1,102 @@
-'use server';
-
-import { cookies } from 'next/headers';
-import { revalidatePath } from 'next/cache';
-import { createClient } from '@nextblock-cms/db/server';
-import {
-  startDeviceFlow,
-  pollDeviceFlowOnce,
-  installSyncWorkflow,
-} from '../../../lib/updates/github-device';
-import { markSyncWorkflowInstalled } from '../../../lib/updates/check-upstream';
-
-const DEVICE_COOKIE = 'nb_gh_device';
-
-/** ADMIN gate, mirroring the rest of the CMS server entry points. */
-async function isAdmin(): Promise<boolean> {
-  const supabase = createClient();
-  const {
-    data: { user },
-  } = await supabase.auth.getUser();
-  if (!user) return false;
-  const { data: profile, error } = await supabase
-    .from('profiles')
-    .select('role')
-    .eq('id', user.id)
-    .single();
-  return !error && profile?.role === 'ADMIN';
-}
-
-export interface StartConnectResult {
-  ok: boolean;
-  userCode?: string;
-  verificationUri?: string;
-  interval?: number;
-  expiresIn?: number;
-  error?: string;
-}
-
-/** Begin the device flow; stash the device code in an httpOnly cookie for polling. */
-export async function startGithubConnect(): Promise<StartConnectResult> {
-  if (!(await isAdmin())) return { ok: false, error: 'Administrator role required.' };
-
-  try {
-    const flow = await startDeviceFlow();
-    const store = await cookies();
-    store.set(DEVICE_COOKIE, flow.deviceCode, {
-      httpOnly: true,
-      secure: process.env.NODE_ENV === 'production',
-      sameSite: 'lax',
-      path: '/cms',
-      maxAge: flow.expiresIn,
-    });
-    return {
-      ok: true,
-      userCode: flow.userCode,
-      verificationUri: flow.verificationUri,
-      interval: flow.interval,
-      expiresIn: flow.expiresIn,
-    };
-  } catch (caught) {
-    return { ok: false, error: caught instanceof Error ? caught.message : 'Could not start GitHub connect.' };
-  }
-}
-
-export type PollConnectResult =
-  | { status: 'installed'; htmlUrl?: string }
-  | { status: 'pending'; slowDown?: boolean }
-  | { status: 'error'; error: string };
-
-/** Poll once; on authorization, install the workflow and clear the device cookie. */
-export async function pollGithubConnect(): Promise<PollConnectResult> {
-  if (!(await isAdmin())) return { status: 'error', error: 'Administrator role required.' };
-
-  const store = await cookies();
-  const deviceCode = store.get(DEVICE_COOKIE)?.value;
-  if (!deviceCode) {
-    return { status: 'error', error: 'Connect session expired — start again.' };
-  }
-
-  const poll = await pollDeviceFlowOnce(deviceCode);
-
-  if (poll.status === 'pending') return { status: 'pending', slowDown: poll.slowDown };
-
-  if (poll.status === 'authorized') {
-    const install = await installSyncWorkflow(poll.token);
-    store.delete({ name: DEVICE_COOKIE, path: '/cms' });
-    if (install.ok) {
-      // We just installed the workflow — flip the onboarding state now instead of waiting
-      // for the throttled background poll / GitHub's registration lag.
-      await markSyncWorkflowInstalled();
-      revalidatePath('/cms', 'layout');
-      return { status: 'installed', htmlUrl: install.htmlUrl };
-    }
-    return { status: 'error', error: install.error ?? 'Could not install the workflow.' };
-  }
-
-  // expired / denied / error — clear the session.
-  store.delete({ name: DEVICE_COOKIE, path: '/cms' });
-  if (poll.status === 'expired') return { status: 'error', error: 'Authorization timed out — start again.' };
-  if (poll.status === 'denied') return { status: 'error', error: 'Authorization was declined.' };
-  return { status: 'error', error: poll.error };
-}
+'use server';
+
+import { cookies } from 'next/headers';
+import { revalidatePath } from 'next/cache';
+import { createClient } from '@nextblock-cms/db/server';
+import {
+  startDeviceFlow,
+  pollDeviceFlowOnce,
+  installSyncWorkflow,
+} from '../../../lib/updates/github-device';
+import { markSyncWorkflowInstalled } from '../../../lib/updates/check-upstream';
+
+const DEVICE_COOKIE = 'nb_gh_device';
+
+/** ADMIN gate, mirroring the rest of the CMS server entry points. */
+async function isAdmin(): Promise<boolean> {
+  const supabase = createClient();
+  const {
+    data: { user },
+  } = await supabase.auth.getUser();
+  if (!user) return false;
+  const { data: profile, error } = await supabase
+    .from('profiles')
+    .select('role')
+    .eq('id', user.id)
+    .single();
+  return !error && profile?.role === 'ADMIN';
+}
+
+export interface StartConnectResult {
+  ok: boolean;
+  userCode?: string;
+  verificationUri?: string;
+  interval?: number;
+  expiresIn?: number;
+  error?: string;
+}
+
+/** Begin the device flow; stash the device code in an httpOnly cookie for polling. */
+export async function startGithubConnect(): Promise<StartConnectResult> {
+  if (!(await isAdmin())) return { ok: false, error: 'Administrator role required.' };
+
+  try {
+    const flow = await startDeviceFlow();
+    const store = await cookies();
+    store.set(DEVICE_COOKIE, flow.deviceCode, {
+      httpOnly: true,
+      secure: process.env.NODE_ENV === 'production',
+      sameSite: 'lax',
+      path: '/cms',
+      maxAge: flow.expiresIn,
+    });
+    return {
+      ok: true,
+      userCode: flow.userCode,
+      verificationUri: flow.verificationUri,
+      interval: flow.interval,
+      expiresIn: flow.expiresIn,
+    };
+  } catch (caught) {
+    return { ok: false, error: caught instanceof Error ? caught.message : 'Could not start GitHub connect.' };
+  }
+}
+
+export type PollConnectResult =
+  | { status: 'installed'; htmlUrl?: string }
+  | { status: 'pending'; slowDown?: boolean }
+  | { status: 'error'; error: string };
+
+/** Poll once; on authorization, install the workflow and clear the device cookie. */
+export async function pollGithubConnect(): Promise<PollConnectResult> {
+  if (!(await isAdmin())) return { status: 'error', error: 'Administrator role required.' };
+
+  const store = await cookies();
+  const deviceCode = store.get(DEVICE_COOKIE)?.value;
+  if (!deviceCode) {
+    return { status: 'error', error: 'Connect session expired — start again.' };
+  }
+
+  const poll = await pollDeviceFlowOnce(deviceCode);
+
+  if (poll.status === 'pending') return { status: 'pending', slowDown: poll.slowDown };
+
+  if (poll.status === 'authorized') {
+    const install = await installSyncWorkflow(poll.token);
+    store.delete({ name: DEVICE_COOKIE, path: '/cms' });
+    if (install.ok) {
+      // We just installed the workflow — flip the onboarding state now instead of waiting
+      // for the throttled background poll / GitHub's registration lag.
+      await markSyncWorkflowInstalled();
+      revalidatePath('/cms', 'layout');
+      return { status: 'installed', htmlUrl: install.htmlUrl };
+    }
+    return { status: 'error', error: install.error ?? 'Could not install the workflow.' };
+  }
+
+  // expired / denied / error — clear the session.
+  store.delete({ name: DEVICE_COOKIE, path: '/cms' });
+  if (poll.status === 'expired') return { status: 'error', error: 'Authorization timed out — start again.' };
+  if (poll.status === 'denied') return { status: 'error', error: 'Authorization was declined.' };
+  return { status: 'error', error: poll.error };
+}

package/templates/nextblock-template/app/cms/components/system-alerts-actions.ts

@@ -1,31 +1,31 @@
-'use server';
-
-import { revalidatePath } from 'next/cache';
-import { createClient } from '@nextblock-cms/db/server';
-
-/**
- * Mark a system alert resolved (dismiss it from the dashboard banner). Runs as the
- * signed-in user; the system_alerts UPDATE RLS policy restricts this to ADMINs, so a
- * non-admin caller simply updates zero rows. Inserts are service-role only.
- */
-export async function resolveSystemAlert(
-  id: string,
-): Promise<{ ok: boolean; error?: string }> {
-  if (!id) return { ok: false, error: 'Missing alert id.' };
-
-  const supabase = createClient();
-  const {
-    data: { user },
-  } = await supabase.auth.getUser();
-  if (!user) return { ok: false, error: 'Not authenticated.' };
-
-  const { error } = await supabase
-    .from('system_alerts')
-    .update({ is_resolved: true, resolved_at: new Date().toISOString() })
-    .eq('id', id);
-
-  if (error) return { ok: false, error: error.message };
-
-  revalidatePath('/cms', 'layout');
-  return { ok: true };
-}
+'use server';
+
+import { revalidatePath } from 'next/cache';
+import { createClient } from '@nextblock-cms/db/server';
+
+/**
+ * Mark a system alert resolved (dismiss it from the dashboard banner). Runs as the
+ * signed-in user; the system_alerts UPDATE RLS policy restricts this to ADMINs, so a
+ * non-admin caller simply updates zero rows. Inserts are service-role only.
+ */
+export async function resolveSystemAlert(
+  id: string,
+): Promise<{ ok: boolean; error?: string }> {
+  if (!id) return { ok: false, error: 'Missing alert id.' };
+
+  const supabase = createClient();
+  const {
+    data: { user },
+  } = await supabase.auth.getUser();
+  if (!user) return { ok: false, error: 'Not authenticated.' };
+
+  const { error } = await supabase
+    .from('system_alerts')
+    .update({ is_resolved: true, resolved_at: new Date().toISOString() })
+    .eq('id', id);
+
+  if (error) return { ok: false, error: error.message };
+
+  revalidatePath('/cms', 'layout');
+  return { ok: true };
+}

package/templates/nextblock-template/app/cms/custom-blocks/[id]/edit/page.tsx

@@ -1,66 +1,66 @@
-import React from "react";
-import Link from "next/link";
-import { ArrowLeft, AlertCircle } from "lucide-react";
-import { Button } from "@nextblock-cms/ui";
-import { BlockComposer } from "../../components/BlockComposer";
-import { getCustomBlockDefinition } from "../../actions";
-
-interface EditCustomBlockPageProps {
-  params: Promise<{
-    id: string;
-  }>;
-}
-
-export const dynamic = "force-dynamic";
-
-export default async function EditCustomBlockPage(props: EditCustomBlockPageProps) {
-  const params = await props.params;
-  const blockId = params.id;
-
-  try {
-    const res = await getCustomBlockDefinition(blockId);
-
-    if (!res.success || !res.data) {
-      return (
-        <div className="flex flex-col items-center justify-center text-center py-16 px-4 max-w-md mx-auto">
-          <div className="h-12 w-12 rounded-full bg-destructive/10 flex items-center justify-center text-destructive mb-4">
-            <AlertCircle className="h-6 w-6" />
-          </div>
-          <h3 className="text-lg font-semibold">Block Not Found</h3>
-          <p className="text-sm text-muted-foreground mt-2">
-            The custom block definition you are trying to edit could not be loaded. It may have been deleted or does not exist.
-          </p>
-          <Button asChild className="mt-6" variant="outline">
-            <Link href="/cms/custom-blocks">
-              <ArrowLeft className="mr-2 h-4 w-4" /> Back to Blocks
-            </Link>
-          </Button>
-        </div>
-      );
-    }
-
-    return (
-      <div className="w-full">
-        <BlockComposer initialData={res.data} mode="edit" />
-      </div>
-    );
-  } catch (err) {
-    console.error("Error loading custom block definition for edit:", err);
-    return (
-      <div className="flex flex-col items-center justify-center text-center py-16 px-4 max-w-md mx-auto">
-        <div className="h-12 w-12 rounded-full bg-destructive/10 flex items-center justify-center text-destructive mb-4">
-          <AlertCircle className="h-6 w-6" />
-        </div>
-        <h3 className="text-lg font-semibold">Unexpected Error</h3>
-        <p className="text-sm text-muted-foreground mt-2">
-          An error occurred while trying to load the custom block definition. Please try again.
-        </p>
-        <Button asChild className="mt-6" variant="outline">
-          <Link href="/cms/custom-blocks">
-            <ArrowLeft className="mr-2 h-4 w-4" /> Back to Blocks
-          </Link>
-        </Button>
-      </div>
-    );
-  }
-}
+import React from "react";
+import Link from "next/link";
+import { ArrowLeft, AlertCircle } from "lucide-react";
+import { Button } from "@nextblock-cms/ui";
+import { BlockComposer } from "../../components/BlockComposer";
+import { getCustomBlockDefinition } from "../../actions";
+
+interface EditCustomBlockPageProps {
+  params: Promise<{
+    id: string;
+  }>;
+}
+
+export const dynamic = "force-dynamic";
+
+export default async function EditCustomBlockPage(props: EditCustomBlockPageProps) {
+  const params = await props.params;
+  const blockId = params.id;
+
+  try {
+    const res = await getCustomBlockDefinition(blockId);
+
+    if (!res.success || !res.data) {
+      return (
+        <div className="flex flex-col items-center justify-center text-center py-16 px-4 max-w-md mx-auto">
+          <div className="h-12 w-12 rounded-full bg-destructive/10 flex items-center justify-center text-destructive mb-4">
+            <AlertCircle className="h-6 w-6" />
+          </div>
+          <h3 className="text-lg font-semibold">Block Not Found</h3>
+          <p className="text-sm text-muted-foreground mt-2">
+            The custom block definition you are trying to edit could not be loaded. It may have been deleted or does not exist.
+          </p>
+          <Button asChild className="mt-6" variant="outline">
+            <Link href="/cms/custom-blocks">
+              <ArrowLeft className="mr-2 h-4 w-4" /> Back to Blocks
+            </Link>
+          </Button>
+        </div>
+      );
+    }
+
+    return (
+      <div className="w-full">
+        <BlockComposer initialData={res.data} mode="edit" />
+      </div>
+    );
+  } catch (err) {
+    console.error("Error loading custom block definition for edit:", err);
+    return (
+      <div className="flex flex-col items-center justify-center text-center py-16 px-4 max-w-md mx-auto">
+        <div className="h-12 w-12 rounded-full bg-destructive/10 flex items-center justify-center text-destructive mb-4">
+          <AlertCircle className="h-6 w-6" />
+        </div>
+        <h3 className="text-lg font-semibold">Unexpected Error</h3>
+        <p className="text-sm text-muted-foreground mt-2">
+          An error occurred while trying to load the custom block definition. Please try again.
+        </p>
+        <Button asChild className="mt-6" variant="outline">
+          <Link href="/cms/custom-blocks">
+            <ArrowLeft className="mr-2 h-4 w-4" /> Back to Blocks
+          </Link>
+        </Button>
+      </div>
+    );
+  }
+}