@glw907/cairn-cms 0.29.0 → 0.33.0

package/src/lib/sveltekit/content-routes.ts

@@ -22,15 +22,20 @@ export interface NavConcept {
   label: string;
 }
 
-/** The admin layout's data: site identity, the signed-in user, the nav, and the active path. */
+/** The admin layout's data: site identity, the signed-in user, the nav, the active path, and theme. */
 export interface LayoutData {
   siteName: string;
-  user: { displayName: string; role: Role };
+  user: { displayName: string; email: string; role: Role };
   concepts: NavConcept[];
   pathname: string;
   canManageEditors: boolean;
   /** The nav menu's label when the site configures one; gates the Navigation nav entry. Null otherwise. */
   navLabel: string | null;
+  /** The admin theme resolved for SSR: the persisted cookie choice, or the light default. */
+  theme: 'cairn-admin' | 'cairn-admin-dark';
+  /** The nav group labels the user has collapsed, from the persisted cookie. Read at SSR so a
+   *  collapsed group renders collapsed with no flash. Empty when none are collapsed. */
+  collapsedNav: string[];
 }
 
 /** One row in a concept's list view. */
@@ -83,6 +88,8 @@ export interface ContentEvent {
   request: Request;
   locals: { editor?: Editor | null };
   platform?: { env?: GithubKeyEnv };
+  /** SvelteKit's cookie jar; the layout load reads the persisted admin theme. Optional for non-route callers. */
+  cookies?: { get(name: string): string | undefined };
 }
 
 /** Injectable dependencies; tests stub the token mint to avoid signing a real key. */
@@ -109,16 +116,24 @@ export function createContentRoutes(runtime: CairnRuntime, deps: ContentRoutesDe
   const mintToken =
     deps.mintToken ?? ((env: GithubKeyEnv) => cachedInstallationToken(appCredentials(runtime.backend, env)));
 
-  /** Layout load for every admin page: the nav, the user, and the active path. */
+  /** Layout load for every admin page: the nav, the user, the active path, and the resolved theme. */
   function layoutLoad(event: ContentEvent): LayoutData {
     const editor = sessionOf(event);
+    const cookieTheme = event.cookies?.get('cairn-admin-theme');
+    const theme = cookieTheme === 'cairn-admin-dark' ? 'cairn-admin-dark' : 'cairn-admin';
+    const cookieCollapsed = event.cookies?.get('cairn-admin-nav-collapsed');
+    const collapsedNav = cookieCollapsed
+      ? cookieCollapsed.split(',').map((part) => decodeURIComponent(part)).filter(Boolean)
+      : [];
     return {
       siteName: runtime.siteName,
-      user: { displayName: editor.displayName, role: editor.role },
+      user: { displayName: editor.displayName, email: editor.email, role: editor.role },
       concepts: runtime.concepts.map((c) => ({ id: c.id, label: c.label })),
       pathname: event.url.pathname,
       canManageEditors: editor.role === 'owner',
       navLabel: runtime.navMenu?.label ?? null,
+      theme,
+      collapsedNav,
     };
   }
 
@@ -338,14 +353,17 @@ export function createContentRoutes(runtime: CairnRuntime, deps: ContentRoutesDe
     throw redirect(303, `/admin/${concept.id}/${id}?${savedQuery}`);
   }
 
-  /** Delete an entry. Block-until-clean: refuse while inbound links exist (naming them), else commit
-   *  the file removal and the manifest patch in one commit. The inbound recheck here is the
-   *  authoritative gate, closing the load-to-delete race. */
-  async function deleteAction(event: ContentEvent): Promise<ReturnType<typeof fail> | never> {
-    const editor = sessionOf(event);
-    const concept = conceptOf(runtime, event.params);
-    const id = event.params.id ?? '';
-    if (!isValidId(id)) throw error(400, 'Invalid entry id');
+  /** The shared delete core. Block-until-clean: refuse while inbound links exist (naming them), else
+   *  commit the file removal and the manifest patch in one commit. The inbound recheck here is the
+   *  authoritative gate, closing the load-to-delete race. Both the editor delete (id from params) and
+   *  the list delete (id from the form body) call this with an already-validated id, so the guard is
+   *  enforced once. */
+  async function deleteEntry(
+    event: ContentEvent,
+    concept: ConceptDescriptor,
+    id: string,
+    editor: Editor,
+  ): Promise<ReturnType<typeof fail> | never> {
     const path = `${concept.dir}/${filenameFromId(id)}`;
     const token = await mintToken(event.platform?.env ?? {});
 
@@ -355,7 +373,7 @@ export function createContentRoutes(runtime: CairnRuntime, deps: ContentRoutesDe
     const manifest = manifestRaw === null ? emptyManifest() : parseManifest(manifestRaw);
     const inbound = inboundLinks(manifest, concept.id, id);
     if (inbound.length) {
-      return fail(409, { inboundLinks: inbound });
+      return fail(409, { inboundLinks: inbound, id });
     }
 
     const nextManifest = serializeManifest(removeEntry(manifest, concept.id, id));
@@ -379,6 +397,25 @@ export function createContentRoutes(runtime: CairnRuntime, deps: ContentRoutesDe
     throw redirect(303, `/admin/${concept.id}`);
   }
 
+  /** Delete an entry from its editor. The id comes from the route param. */
+  async function deleteAction(event: ContentEvent): Promise<ReturnType<typeof fail> | never> {
+    const editor = sessionOf(event);
+    const concept = conceptOf(runtime, event.params);
+    const id = event.params.id ?? '';
+    if (!isValidId(id)) throw error(400, 'Invalid entry id');
+    return deleteEntry(event, concept, id, editor);
+  }
+
+  /** Delete an entry from the concept list. The id comes from the form body. */
+  async function listDeleteAction(event: ContentEvent): Promise<ReturnType<typeof fail> | never> {
+    const editor = sessionOf(event);
+    const concept = conceptOf(runtime, event.params);
+    const form = await event.request.formData();
+    const id = String(form.get('id') ?? '');
+    if (!isValidId(id)) throw error(400, 'Invalid entry id');
+    return deleteEntry(event, concept, id, editor);
+  }
+
   /** Rename an entry: change its slug, move the file, and rewrite every inbound cairn token in one
    *  atomic commit, so no internal link breaks. The collision check and the inbound recompute here
    *  are the authoritative gate. The same last-writer-wins manifest race as save and delete applies,
@@ -466,5 +503,5 @@ export function createContentRoutes(runtime: CairnRuntime, deps: ContentRoutesDe
     throw redirect(303, `/admin/${concept.id}/${newId}?renamed=1`);
   }
 
-  return { layoutLoad, indexRedirect, listLoad, createAction, editLoad, saveAction, deleteAction, renameAction, mintToken };
+  return { layoutLoad, indexRedirect, listLoad, createAction, editLoad, saveAction, deleteAction, listDeleteAction, renameAction, mintToken };
 }