@actuate-media/cms-admin 0.24.0 → 0.26.0

package/dist/views/settings/useGeneralSettings.js

@@ -0,0 +1,286 @@
+'use client';
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { cmsApi } from '../../lib/api.js';
+const EMPTY_FORM = {
+    siteTitle: '',
+    tagline: '',
+    siteUrl: '',
+    language: 'en',
+    timezone: 'UTC',
+    defaultNoIndex: false,
+    defaultNoFollow: false,
+    noIndexNonProduction: false,
+};
+/** Validate a site URL: absolute http(s), no trailing slash, parseable. */
+export function validateSiteUrl(value) {
+    const trimmed = value.trim();
+    if (!trimmed)
+        return { valid: true };
+    let url;
+    try {
+        url = new URL(trimmed);
+    }
+    catch {
+        return { valid: false, error: 'Enter a valid absolute URL, e.g. https://example.com' };
+    }
+    if (url.protocol !== 'http:' && url.protocol !== 'https:') {
+        return { valid: false, error: 'Site URL must start with http:// or https://' };
+    }
+    if (trimmed.endsWith('/')) {
+        return { valid: false, error: 'Remove the trailing slash (e.g. https://example.com)' };
+    }
+    return { valid: true };
+}
+/** Best-effort IANA timezone check using the Intl API. */
+export function isValidTimeZone(tz) {
+    if (!tz)
+        return false;
+    try {
+        new Intl.DateTimeFormat('en-US', { timeZone: tz });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/** Best-effort BCP 47 locale check. */
+export function isValidLocale(locale) {
+    if (!locale)
+        return false;
+    try {
+        // Throws RangeError on structurally invalid tags.
+        new Intl.Locale(locale);
+        return /^[a-zA-Z]{2,3}([-_][a-zA-Z0-9]{2,8})*$/.test(locale);
+    }
+    catch {
+        return false;
+    }
+}
+function validate(form, isProduction) {
+    const issues = [];
+    if (!form.siteTitle.trim()) {
+        issues.push({ field: 'siteTitle', message: 'Site Title is required.', severity: 'error' });
+    }
+    const urlCheck = validateSiteUrl(form.siteUrl);
+    if (!urlCheck.valid) {
+        issues.push({ field: 'siteUrl', message: urlCheck.error, severity: 'error' });
+    }
+    else if (!form.siteUrl.trim() && isProduction) {
+        issues.push({
+            field: 'siteUrl',
+            message: 'Site URL is not set — canonical, sitemap, and Open Graph URLs may be invalid.',
+            severity: 'warning',
+        });
+    }
+    if (!isValidLocale(form.language)) {
+        issues.push({
+            field: 'language',
+            message: 'Language must be a valid locale code, e.g. en-US.',
+            severity: 'error',
+        });
+    }
+    if (!isValidTimeZone(form.timezone)) {
+        issues.push({
+            field: 'timezone',
+            message: 'Timezone must be a valid IANA name, e.g. America/Los_Angeles.',
+            severity: 'error',
+        });
+    }
+    return issues;
+}
+/**
+ * Loads the General tab from its three real backends — the `settings` global
+ * (site info / locale), the shared `/seo/config` (site URL + robots defaults),
+ * and the computed `/seo/index-status` — tracks a dirty diff, and on save
+ * writes each field back to its OWNING store (never a duplicate), preserving
+ * unrelated keys.
+ */
+export function useGeneralSettings(canEdit) {
+    const [loading, setLoading] = useState(true);
+    const [loadError, setLoadError] = useState(null);
+    const [baseline, setBaseline] = useState(EMPTY_FORM);
+    const [form, setForm] = useState(EMPTY_FORM);
+    const [indexStatus, setIndexStatus] = useState(null);
+    const [sources, setSources] = useState({});
+    // Full settings-global blob so a partial save never wipes AI/security keys.
+    const [settingsBlob, setSettingsBlob] = useState({});
+    const [overrideSite, setOverrideSite] = useState({});
+    const [saveState, setSaveState] = useState('idle');
+    const [saveError, setSaveError] = useState(null);
+    const [reloadKey, setReloadKey] = useState(0);
+    useEffect(() => {
+        let cancelled = false;
+        setLoading(true);
+        setLoadError(null);
+        Promise.all([
+            cmsApi('/globals/settings'),
+            cmsApi('/seo/config'),
+            cmsApi('/seo/index-status'),
+        ])
+            .then(([settingsRes, seoRes, statusRes]) => {
+            if (cancelled)
+                return;
+            if (settingsRes.error && settingsRes.status !== 404) {
+                setLoadError(settingsRes.error);
+            }
+            const settingsData = settingsRes.data ?? {};
+            const seo = seoRes.data ?? {};
+            const effectiveSite = seo.effective?.site ?? {};
+            const staticSite = seo.static?.site ?? {};
+            const overSite = seo.overrides?.site ?? {};
+            const robots = effectiveSite.robots ?? {};
+            const loaded = {
+                siteTitle: String(settingsData.siteTitle ?? ''),
+                tagline: String(settingsData.tagline ?? ''),
+                siteUrl: String(effectiveSite.siteUrl ?? settingsData.siteUrl ?? ''),
+                language: String(settingsData.language ?? 'en'),
+                timezone: String(settingsData.timezone ?? 'UTC'),
+                defaultNoIndex: robots.defaultNoIndex === true,
+                defaultNoFollow: robots.defaultNoFollow === true,
+                noIndexNonProduction: robots.noIndexNonProduction === true,
+            };
+            // Site URL is config-managed when actuate.config.ts supplies it.
+            const siteUrlFromConfig = Boolean(staticSite.siteUrl);
+            setSources({
+                siteUrl: siteUrlFromConfig
+                    ? { source: 'config', editable: false, reason: 'Set in actuate.config.ts' }
+                    : { source: 'database', editable: canEdit },
+                siteTitle: { source: 'database', editable: canEdit },
+                tagline: { source: 'database', editable: canEdit },
+                language: { source: 'database', editable: canEdit },
+                timezone: { source: 'database', editable: canEdit },
+                seoDefaults: {
+                    source: 'plugin',
+                    editable: canEdit,
+                    reason: 'Shared with the SEO section',
+                },
+            });
+            setBaseline(loaded);
+            setForm(loaded);
+            setSettingsBlob(settingsData);
+            setOverrideSite(overSite ?? {});
+            if (!seoRes.error && statusRes.data)
+                setIndexStatus(statusRes.data);
+        })
+            .catch(() => {
+            if (!cancelled)
+                setLoadError('Failed to load settings.');
+        })
+            .finally(() => {
+            if (!cancelled)
+                setLoading(false);
+        });
+        return () => {
+            cancelled = true;
+        };
+    }, [reloadKey, canEdit]);
+    const setField = useCallback((key, value) => {
+        setForm((prev) => ({ ...prev, [key]: value }));
+        setSaveState('idle');
+    }, []);
+    const isProduction = (indexStatus?.environment ?? '') === 'production';
+    const dirty = useMemo(() => Object.keys(form).some((k) => form[k] !== baseline[k]), [form, baseline]);
+    const issues = useMemo(() => validate(form, isProduction), [form, isProduction]);
+    const hasErrors = issues.some((i) => i.severity === 'error');
+    const refetchStatus = useCallback(async () => {
+        const res = await cmsApi('/seo/index-status');
+        if (!res.error && res.data)
+            setIndexStatus(res.data);
+    }, []);
+    const save = useCallback(async () => {
+        if (!canEdit || hasErrors)
+            return;
+        setSaveState('saving');
+        setSaveError(null);
+        const siteUrlEditable = sources.siteUrl?.editable !== false;
+        const siteInfoChanged = form.siteTitle !== baseline.siteTitle ||
+            form.tagline !== baseline.tagline ||
+            form.language !== baseline.language ||
+            form.timezone !== baseline.timezone;
+        const siteUrlChanged = siteUrlEditable && form.siteUrl !== baseline.siteUrl;
+        const robotsChanged = form.defaultNoIndex !== baseline.defaultNoIndex ||
+            form.defaultNoFollow !== baseline.defaultNoFollow ||
+            form.noIndexNonProduction !== baseline.noIndexNonProduction;
+        try {
+            // 1. Site info → the `settings` global (preserve AI/security/layout keys,
+            //    and drop legacy robots/siteUrl duplicates so SEO config owns them).
+            //    Read-modify-write against a fresh fetch so a concurrent save from the
+            //    Security/AI tabs (same global blob) is never clobbered.
+            if (siteInfoChanged) {
+                const current = await cmsApi('/globals/settings');
+                const blob = { ...(current.data ?? settingsBlob) };
+                delete blob.defaultNoIndex;
+                delete blob.defaultNoFollow;
+                delete blob.noIndexNonProduction;
+                delete blob.siteUrl;
+                const payload = {
+                    ...blob,
+                    siteTitle: form.siteTitle.trim(),
+                    tagline: form.tagline.trim(),
+                    language: form.language,
+                    timezone: form.timezone,
+                };
+                const res = await cmsApi('/globals/settings', {
+                    method: 'PUT',
+                    body: JSON.stringify(payload),
+                });
+                if (res.error)
+                    throw new Error(res.error);
+                setSettingsBlob(payload);
+            }
+            // 2. Site URL + robots defaults → the SHARED SEO config (merge over the
+            //    current override site so SEO-tab fields aren't lost).
+            if (siteUrlChanged || robotsChanged) {
+                const nextSite = { ...overrideSite };
+                if (siteUrlChanged)
+                    nextSite.siteUrl = form.siteUrl.trim() || undefined;
+                if (robotsChanged) {
+                    nextSite.robots = {
+                        ...(overrideSite.robots ?? {}),
+                        defaultNoIndex: form.defaultNoIndex,
+                        defaultNoFollow: form.defaultNoFollow,
+                        noIndexNonProduction: form.noIndexNonProduction,
+                    };
+                }
+                const res = await cmsApi('/seo/config', {
+                    method: 'PUT',
+                    body: JSON.stringify({ site: nextSite }),
+                });
+                if (res.error)
+                    throw new Error(res.error);
+                setOverrideSite(nextSite);
+            }
+            setBaseline(form);
+            setSaveState('success');
+            await refetchStatus();
+        }
+        catch (err) {
+            setSaveState('error');
+            setSaveError(err instanceof Error ? err.message : 'Failed to save settings.');
+        }
+    }, [canEdit, hasErrors, form, baseline, settingsBlob, overrideSite, sources, refetchStatus]);
+    const reset = useCallback(() => {
+        setForm(baseline);
+        setSaveState('idle');
+        setSaveError(null);
+    }, [baseline]);
+    const refetch = useCallback(() => setReloadKey((k) => k + 1), []);
+    return {
+        loading,
+        loadError,
+        form,
+        setField,
+        dirty,
+        issues,
+        hasErrors,
+        indexStatus,
+        sources,
+        isProduction,
+        saveState,
+        saveError,
+        save,
+        reset,
+        refetch,
+    };
+}
+//# sourceMappingURL=useGeneralSettings.js.map

package/dist/views/settings/useGeneralSettings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useGeneralSettings.js","sourceRoot":"","sources":["../../../src/views/settings/useGeneralSettings.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actuate-media/cms-admin",
-  "version": "0.24.0",
+  "version": "0.26.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/actuate-media/actuatecms.git",
@@ -86,8 +86,8 @@
     "happy-dom": "^20.9.0",
     "tailwindcss": "^4.0.0",
     "typescript": "^5.7.0",
-    "vitest": "^3.0.0",
-    "@actuate-media/cms-core": "0.31.0",
+    "vitest": "^4.1.0",
+    "@actuate-media/cms-core": "0.35.0",
     "@actuate-media/component-blocks": "0.2.0"
   },
   "scripts": {

package/src/AdminRoot.tsx

@@ -424,15 +424,17 @@ function AdminShell({
     // Users + API Keys moved into the Settings view as tabs. The legacy
     // top-level routes still resolve — they just land on the matching tab.
     if (matchRoute('/users')) {
-      return <Settings onNavigate={navigate} config={config} initialTab="users" />
+      return <Settings onNavigate={navigate} config={config} session={session} initialTab="users" />
     }
 
     if (matchRoute('/api-keys')) {
-      return <Settings onNavigate={navigate} config={config} initialTab="api-keys" />
+      return (
+        <Settings onNavigate={navigate} config={config} session={session} initialTab="api-keys" />
+      )
     }
 
     if (matchRoute('/settings')) {
-      return <Settings onNavigate={navigate} config={config} />
+      return <Settings onNavigate={navigate} config={config} session={session} />
     }
 
     // Page Builder routes — explicit /page-builder/* takes precedence over

package/src/__tests__/views/general-settings.render.test.tsx

@@ -0,0 +1,135 @@
+// @vitest-environment happy-dom
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { fireEvent, render, screen, waitFor, within } from '@testing-library/react'
+
+// Own the three backends the General tab reads: the `settings` global
+// (site info / locale), the shared `/seo/config` (site URL + robots), and the
+// computed `/seo/index-status` (the status card).
+const STATUS = {
+  status: 'protected',
+  severity: 'warning',
+  label: 'Protected',
+  description: 'Non-production environment is noindexed. Production remains unaffected.',
+  environment: 'preview',
+  checks: [
+    { key: 'environment', label: 'Environment', value: 'Preview', status: 'pass' },
+    { key: 'siteUrl', label: 'Site URL configured', value: 'Yes', status: 'pass' },
+    { key: 'sitemap', label: 'Sitemap enabled', value: 'Yes', status: 'pass' },
+  ],
+  actions: [
+    { label: 'Run SEO Audit', href: '/seo?tab=audit', action: 'run_seo_audit' },
+    { label: 'View robots.txt', href: '/robots.txt' },
+  ],
+  lastAuditAt: null,
+}
+
+const cmsApi = vi.fn(async (endpoint: string, options?: { method?: string }) => {
+  const method = options?.method ?? 'GET'
+  if (endpoint === '/globals/settings' && method === 'GET') {
+    return {
+      data: {
+        siteTitle: 'Actuate Media',
+        tagline: 'A lightweight content management system',
+        language: 'en-US',
+        timezone: 'America/Los_Angeles',
+        aiProvider: 'anthropic',
+      },
+      status: 200,
+    }
+  }
+  if (endpoint === '/seo/config' && method === 'GET') {
+    return {
+      data: {
+        static: { site: null },
+        overrides: { site: {} },
+        effective: {
+          site: {
+            siteUrl: 'https://actuatemedia.com',
+            robots: { defaultNoIndex: false, defaultNoFollow: false, noIndexNonProduction: true },
+          },
+        },
+      },
+      status: 200,
+    }
+  }
+  if (endpoint === '/seo/index-status' && method === 'GET') {
+    return { data: STATUS, status: 200 }
+  }
+  return { data: {}, status: 200 }
+})
+
+vi.mock('../../lib/api.js', () => ({ cmsApi: (e: string, o?: unknown) => cmsApi(e, o as any) }))
+
+const { GeneralSettingsTab } = await import('../../views/settings/GeneralSettingsTab.js')
+
+beforeEach(() => {
+  cmsApi.mockClear()
+})
+
+describe('GeneralSettingsTab', () => {
+  it('renders the index status pill, loaded site info, and a clean (disabled) save bar', async () => {
+    render(<GeneralSettingsTab role="ADMIN" />)
+
+    await screen.findByLabelText('Site Title')
+    const statusCard = screen.getByRole('region', { name: 'Site Index Status' })
+    expect(within(statusCard).getByText('Protected')).toBeTruthy()
+    expect((screen.getByLabelText('Site Title') as HTMLInputElement).value).toBe('Actuate Media')
+    expect((screen.getByLabelText('Site URL') as HTMLInputElement).value).toBe(
+      'https://actuatemedia.com',
+    )
+    // Nothing dirty yet → Save disabled.
+    expect(
+      (screen.getByRole('button', { name: 'Save Changes' }) as HTMLButtonElement).disabled,
+    ).toBe(true)
+  })
+
+  it('enables Save when a field changes and persists site info to the settings global', async () => {
+    render(<GeneralSettingsTab role="ADMIN" />)
+    const title = (await screen.findByLabelText('Site Title')) as HTMLInputElement
+
+    fireEvent.change(title, { target: { value: 'Actuate Media Co' } })
+    const save = screen.getByRole('button', { name: 'Save Changes' }) as HTMLButtonElement
+    expect(save.disabled).toBe(false)
+
+    fireEvent.click(save)
+
+    await waitFor(() =>
+      expect(cmsApi).toHaveBeenCalledWith(
+        '/globals/settings',
+        expect.objectContaining({ method: 'PUT' }),
+      ),
+    )
+  })
+
+  it('blocks save and shows an error for an invalid Site URL', async () => {
+    render(<GeneralSettingsTab role="ADMIN" />)
+    await screen.findByLabelText('Site Title')
+    const url = screen.getByLabelText('Site URL') as HTMLInputElement
+
+    fireEvent.change(url, { target: { value: 'not a url' } })
+
+    expect((await screen.findAllByText(/valid absolute URL/i)).length).toBeGreaterThan(0)
+    expect(
+      (screen.getByRole('button', { name: 'Save Changes' }) as HTMLButtonElement).disabled,
+    ).toBe(true)
+  })
+
+  it('confirms before turning OFF non-production noindex', async () => {
+    render(<GeneralSettingsTab role="ADMIN" />)
+    await screen.findByLabelText('Site Title')
+
+    // The non-production noindex toggle is ON; clicking it should request confirmation.
+    fireEvent.click(screen.getByRole('switch', { name: 'Noindex Non-Production Environments' }))
+
+    expect(
+      await screen.findByText(/Preview and staging environments may become indexable/i),
+    ).toBeTruthy()
+  })
+
+  it('is read-only for non-admins', async () => {
+    render(<GeneralSettingsTab role="EDITOR" />)
+
+    expect(await screen.findByText(/read-only access to settings/i)).toBeTruthy()
+    expect((screen.getByLabelText('Site Title') as HTMLInputElement).disabled).toBe(true)
+  })
+})

package/src/__tests__/views/page-builder-block-renderer.render.test.tsx

@@ -0,0 +1,66 @@
+// @vitest-environment happy-dom
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import type { BlockNode } from '@actuate-media/cms-core'
+
+const cmsApi = vi.fn()
+vi.mock('../../lib/api.js', () => ({ cmsApi: (...args: unknown[]) => cmsApi(...args) }))
+
+const { BlockRenderer } = await import('../../views/page-builder/canvas/BlockRenderer.js')
+
+function formNode(over: Partial<BlockNode> = {}): BlockNode {
+  return {
+    id: 'node-1',
+    type: 'block',
+    settings: { blockType: 'form', variant: 'contact' },
+    data: { formId: 'f1' },
+    ...over,
+  } as BlockNode
+}
+
+beforeEach(() => {
+  cmsApi.mockReset()
+  cmsApi.mockResolvedValue({
+    data: {
+      name: 'Contact Us',
+      fields: [
+        { key: 'name', label: 'Full Name', type: 'text' },
+        { key: 'message', label: 'Message', type: 'textarea' },
+      ],
+    },
+    status: 200,
+  })
+})
+
+describe('canvas BlockRenderer', () => {
+  it('renders the live form preview with the linked form name and fields', async () => {
+    render(<BlockRenderer node={formNode()} selectedNodeId={null} onSelectNode={vi.fn()} />)
+    await waitFor(() => expect(screen.getByText('Contact Us')).toBeTruthy())
+    expect(cmsApi).toHaveBeenCalledWith('/forms/f1')
+    expect(screen.getByText('Full Name')).toBeTruthy()
+  })
+
+  it('selects the node on click', () => {
+    const onSelectNode = vi.fn()
+    const { container } = render(
+      <BlockRenderer
+        node={formNode({ data: {} })}
+        selectedNodeId={null}
+        onSelectNode={onSelectNode}
+      />,
+    )
+    fireEvent.click(container.querySelector('[data-node-id="node-1"]')!)
+    expect(onSelectNode).toHaveBeenCalledWith('node-1')
+  })
+
+  it('falls back to a placeholder for unknown block types', () => {
+    render(
+      <BlockRenderer
+        node={formNode({ settings: { blockType: 'widget' }, data: {} })}
+        selectedNodeId={null}
+        onSelectNode={vi.fn()}
+      />,
+    )
+    expect(screen.getByText('No preview available')).toBeTruthy()
+  })
+})

package/src/__tests__/views/page-builder-form-picker.render.test.tsx

@@ -0,0 +1,54 @@
+// @vitest-environment happy-dom
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import type { FieldDefinition } from '@actuate-media/cms-core'
+
+const cmsApi = vi.fn()
+vi.mock('../../lib/api.js', () => ({ cmsApi: (...args: unknown[]) => cmsApi(...args) }))
+
+const { RelationshipField } = await import('../../views/page-builder/RelationshipField.js')
+
+const formField: FieldDefinition = {
+  type: 'relationship',
+  label: 'Form',
+  relationTo: 'forms',
+} as FieldDefinition
+
+beforeEach(() => {
+  cmsApi.mockReset()
+})
+
+describe('RelationshipField (form block picker)', () => {
+  it('loads forms and lets the editor pick one by id', async () => {
+    cmsApi.mockResolvedValue({
+      data: [
+        { id: 'f1', name: 'Contact Us', slug: 'contact-us' },
+        { id: 'f2', name: 'Event RSVP', slug: 'event-rsvp' },
+      ],
+      status: 200,
+    })
+    const onChange = vi.fn()
+    render(<RelationshipField definition={formField} value="" onChange={onChange} label="Form" />)
+
+    await waitFor(() => expect(screen.getByText('Contact Us')).toBeTruthy())
+    expect(cmsApi).toHaveBeenCalledWith('/forms')
+    expect(screen.getByText('Event RSVP')).toBeTruthy()
+
+    fireEvent.change(screen.getByLabelText('Form'), { target: { value: 'f2' } })
+    expect(onChange).toHaveBeenCalledWith('f2')
+  })
+
+  it('shows an empty hint when the collection has no items', async () => {
+    cmsApi.mockResolvedValue({ data: [], status: 200 })
+    render(<RelationshipField definition={formField} value="" onChange={vi.fn()} label="Form" />)
+    await waitFor(() => expect(screen.getByText('No forms found.')).toBeTruthy())
+  })
+
+  it('degrades to a plain id input when the collection cannot be loaded', async () => {
+    cmsApi.mockResolvedValue({ error: 'boom', status: 500 })
+    render(<RelationshipField definition={formField} value="f9" onChange={vi.fn()} label="Form" />)
+    await waitFor(() =>
+      expect((screen.getByPlaceholderText('Enter forms id…') as HTMLInputElement).value).toBe('f9'),
+    )
+  })
+})