@actuate-media/cms-admin 0.25.0 → 0.26.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/AdminRoot.d.ts.map +1 -1
- package/dist/AdminRoot.js +3 -3
- package/dist/AdminRoot.js.map +1 -1
- package/dist/__tests__/views/general-settings.render.test.d.ts +2 -0
- package/dist/__tests__/views/general-settings.render.test.d.ts.map +1 -0
- package/dist/__tests__/views/general-settings.render.test.js +105 -0
- package/dist/__tests__/views/general-settings.render.test.js.map +1 -0
- package/dist/actuate-admin.css +1 -1
- package/dist/views/Settings.d.ts +3 -1
- package/dist/views/Settings.d.ts.map +1 -1
- package/dist/views/Settings.js +9 -28
- package/dist/views/Settings.js.map +1 -1
- package/dist/views/settings/GeneralSettingsTab.d.ts +7 -0
- package/dist/views/settings/GeneralSettingsTab.d.ts.map +1 -0
- package/dist/views/settings/GeneralSettingsTab.js +19 -0
- package/dist/views/settings/GeneralSettingsTab.js.map +1 -0
- package/dist/views/settings/LanguageRegionCard.d.ts +10 -0
- package/dist/views/settings/LanguageRegionCard.d.ts.map +1 -0
- package/dist/views/settings/LanguageRegionCard.js +48 -0
- package/dist/views/settings/LanguageRegionCard.js.map +1 -0
- package/dist/views/settings/SeoRobotsDefaultsCard.d.ts +12 -0
- package/dist/views/settings/SeoRobotsDefaultsCard.d.ts.map +1 -0
- package/dist/views/settings/SeoRobotsDefaultsCard.js +45 -0
- package/dist/views/settings/SeoRobotsDefaultsCard.js.map +1 -0
- package/dist/views/settings/SiteIndexStatusCard.d.ts +12 -0
- package/dist/views/settings/SiteIndexStatusCard.d.ts.map +1 -0
- package/dist/views/settings/SiteIndexStatusCard.js +51 -0
- package/dist/views/settings/SiteIndexStatusCard.js.map +1 -0
- package/dist/views/settings/SiteInformationCard.d.ts +11 -0
- package/dist/views/settings/SiteInformationCard.d.ts.map +1 -0
- package/dist/views/settings/SiteInformationCard.js +21 -0
- package/dist/views/settings/SiteInformationCard.js.map +1 -0
- package/dist/views/settings/components.d.ts +38 -0
- package/dist/views/settings/components.d.ts.map +1 -0
- package/dist/views/settings/components.js +43 -0
- package/dist/views/settings/components.js.map +1 -0
- package/dist/views/settings/useGeneralSettings.d.ts +79 -0
- package/dist/views/settings/useGeneralSettings.d.ts.map +1 -0
- package/dist/views/settings/useGeneralSettings.js +286 -0
- package/dist/views/settings/useGeneralSettings.js.map +1 -0
- package/package.json +3 -3
- package/src/AdminRoot.tsx +5 -3
- package/src/__tests__/views/general-settings.render.test.tsx +135 -0
- package/src/views/Settings.tsx +17 -120
- package/src/views/settings/GeneralSettingsTab.tsx +126 -0
- package/src/views/settings/LanguageRegionCard.tsx +119 -0
- package/src/views/settings/SeoRobotsDefaultsCard.tsx +149 -0
- package/src/views/settings/SiteIndexStatusCard.tsx +184 -0
- package/src/views/settings/SiteInformationCard.tsx +122 -0
- package/src/views/settings/components.tsx +198 -0
- package/src/views/settings/useGeneralSettings.ts +376 -0
|
@@ -0,0 +1,376 @@
|
|
|
1
|
+
'use client'
|
|
2
|
+
|
|
3
|
+
import { useCallback, useEffect, useMemo, useState } from 'react'
|
|
4
|
+
import { cmsApi } from '../../lib/api.js'
|
|
5
|
+
|
|
6
|
+
/** Editable + computed shape of the General tab form. */
|
|
7
|
+
export interface GeneralSettingsForm {
|
|
8
|
+
siteTitle: string
|
|
9
|
+
tagline: string
|
|
10
|
+
siteUrl: string
|
|
11
|
+
language: string
|
|
12
|
+
timezone: string
|
|
13
|
+
defaultNoIndex: boolean
|
|
14
|
+
defaultNoFollow: boolean
|
|
15
|
+
noIndexNonProduction: boolean
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export type SettingsSource = 'config' | 'environment' | 'database' | 'plugin' | 'computed'
|
|
19
|
+
|
|
20
|
+
export interface SettingsSourceMetadata {
|
|
21
|
+
source: SettingsSource
|
|
22
|
+
editable: boolean
|
|
23
|
+
reason?: string
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export type IndexStatusLevel =
|
|
27
|
+
| 'indexable'
|
|
28
|
+
| 'protected'
|
|
29
|
+
| 'blocked'
|
|
30
|
+
| 'partially_blocked'
|
|
31
|
+
| 'unknown'
|
|
32
|
+
|
|
33
|
+
export interface SiteIndexStatus {
|
|
34
|
+
status: IndexStatusLevel
|
|
35
|
+
severity: 'success' | 'warning' | 'danger' | 'neutral'
|
|
36
|
+
label: string
|
|
37
|
+
description: string
|
|
38
|
+
environment: string
|
|
39
|
+
checks: Array<{
|
|
40
|
+
key: string
|
|
41
|
+
label: string
|
|
42
|
+
value: string
|
|
43
|
+
status: 'pass' | 'warning' | 'fail' | 'unknown'
|
|
44
|
+
}>
|
|
45
|
+
actions: Array<{ label: string; href?: string; action?: string }>
|
|
46
|
+
lastAuditAt: string | null
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
export interface ValidationIssue {
|
|
50
|
+
field: keyof GeneralSettingsForm
|
|
51
|
+
message: string
|
|
52
|
+
severity: 'error' | 'warning'
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
const EMPTY_FORM: GeneralSettingsForm = {
|
|
56
|
+
siteTitle: '',
|
|
57
|
+
tagline: '',
|
|
58
|
+
siteUrl: '',
|
|
59
|
+
language: 'en',
|
|
60
|
+
timezone: 'UTC',
|
|
61
|
+
defaultNoIndex: false,
|
|
62
|
+
defaultNoFollow: false,
|
|
63
|
+
noIndexNonProduction: false,
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/** Validate a site URL: absolute http(s), no trailing slash, parseable. */
|
|
67
|
+
export function validateSiteUrl(value: string): { valid: boolean; error?: string } {
|
|
68
|
+
const trimmed = value.trim()
|
|
69
|
+
if (!trimmed) return { valid: true }
|
|
70
|
+
let url: URL
|
|
71
|
+
try {
|
|
72
|
+
url = new URL(trimmed)
|
|
73
|
+
} catch {
|
|
74
|
+
return { valid: false, error: 'Enter a valid absolute URL, e.g. https://example.com' }
|
|
75
|
+
}
|
|
76
|
+
if (url.protocol !== 'http:' && url.protocol !== 'https:') {
|
|
77
|
+
return { valid: false, error: 'Site URL must start with http:// or https://' }
|
|
78
|
+
}
|
|
79
|
+
if (trimmed.endsWith('/')) {
|
|
80
|
+
return { valid: false, error: 'Remove the trailing slash (e.g. https://example.com)' }
|
|
81
|
+
}
|
|
82
|
+
return { valid: true }
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
/** Best-effort IANA timezone check using the Intl API. */
|
|
86
|
+
export function isValidTimeZone(tz: string): boolean {
|
|
87
|
+
if (!tz) return false
|
|
88
|
+
try {
|
|
89
|
+
new Intl.DateTimeFormat('en-US', { timeZone: tz })
|
|
90
|
+
return true
|
|
91
|
+
} catch {
|
|
92
|
+
return false
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
/** Best-effort BCP 47 locale check. */
|
|
97
|
+
export function isValidLocale(locale: string): boolean {
|
|
98
|
+
if (!locale) return false
|
|
99
|
+
try {
|
|
100
|
+
// Throws RangeError on structurally invalid tags.
|
|
101
|
+
new Intl.Locale(locale)
|
|
102
|
+
return /^[a-zA-Z]{2,3}([-_][a-zA-Z0-9]{2,8})*$/.test(locale)
|
|
103
|
+
} catch {
|
|
104
|
+
return false
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
function validate(form: GeneralSettingsForm, isProduction: boolean): ValidationIssue[] {
|
|
109
|
+
const issues: ValidationIssue[] = []
|
|
110
|
+
if (!form.siteTitle.trim()) {
|
|
111
|
+
issues.push({ field: 'siteTitle', message: 'Site Title is required.', severity: 'error' })
|
|
112
|
+
}
|
|
113
|
+
const urlCheck = validateSiteUrl(form.siteUrl)
|
|
114
|
+
if (!urlCheck.valid) {
|
|
115
|
+
issues.push({ field: 'siteUrl', message: urlCheck.error!, severity: 'error' })
|
|
116
|
+
} else if (!form.siteUrl.trim() && isProduction) {
|
|
117
|
+
issues.push({
|
|
118
|
+
field: 'siteUrl',
|
|
119
|
+
message: 'Site URL is not set — canonical, sitemap, and Open Graph URLs may be invalid.',
|
|
120
|
+
severity: 'warning',
|
|
121
|
+
})
|
|
122
|
+
}
|
|
123
|
+
if (!isValidLocale(form.language)) {
|
|
124
|
+
issues.push({
|
|
125
|
+
field: 'language',
|
|
126
|
+
message: 'Language must be a valid locale code, e.g. en-US.',
|
|
127
|
+
severity: 'error',
|
|
128
|
+
})
|
|
129
|
+
}
|
|
130
|
+
if (!isValidTimeZone(form.timezone)) {
|
|
131
|
+
issues.push({
|
|
132
|
+
field: 'timezone',
|
|
133
|
+
message: 'Timezone must be a valid IANA name, e.g. America/Los_Angeles.',
|
|
134
|
+
severity: 'error',
|
|
135
|
+
})
|
|
136
|
+
}
|
|
137
|
+
return issues
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
interface SeoConfigResponse {
|
|
141
|
+
static?: { site?: Record<string, any> | null }
|
|
142
|
+
overrides?: { site?: Record<string, any> | null } | null
|
|
143
|
+
effective?: { site?: Record<string, any> | null }
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
type SaveState = 'idle' | 'saving' | 'success' | 'error'
|
|
147
|
+
|
|
148
|
+
export interface UseGeneralSettings {
|
|
149
|
+
loading: boolean
|
|
150
|
+
loadError: string | null
|
|
151
|
+
form: GeneralSettingsForm
|
|
152
|
+
setField: <K extends keyof GeneralSettingsForm>(key: K, value: GeneralSettingsForm[K]) => void
|
|
153
|
+
dirty: boolean
|
|
154
|
+
issues: ValidationIssue[]
|
|
155
|
+
hasErrors: boolean
|
|
156
|
+
indexStatus: SiteIndexStatus | null
|
|
157
|
+
sources: Record<string, SettingsSourceMetadata>
|
|
158
|
+
isProduction: boolean
|
|
159
|
+
saveState: SaveState
|
|
160
|
+
saveError: string | null
|
|
161
|
+
save: () => Promise<void>
|
|
162
|
+
reset: () => void
|
|
163
|
+
refetch: () => void
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
/**
|
|
167
|
+
* Loads the General tab from its three real backends — the `settings` global
|
|
168
|
+
* (site info / locale), the shared `/seo/config` (site URL + robots defaults),
|
|
169
|
+
* and the computed `/seo/index-status` — tracks a dirty diff, and on save
|
|
170
|
+
* writes each field back to its OWNING store (never a duplicate), preserving
|
|
171
|
+
* unrelated keys.
|
|
172
|
+
*/
|
|
173
|
+
export function useGeneralSettings(canEdit: boolean): UseGeneralSettings {
|
|
174
|
+
const [loading, setLoading] = useState(true)
|
|
175
|
+
const [loadError, setLoadError] = useState<string | null>(null)
|
|
176
|
+
const [baseline, setBaseline] = useState<GeneralSettingsForm>(EMPTY_FORM)
|
|
177
|
+
const [form, setForm] = useState<GeneralSettingsForm>(EMPTY_FORM)
|
|
178
|
+
const [indexStatus, setIndexStatus] = useState<SiteIndexStatus | null>(null)
|
|
179
|
+
const [sources, setSources] = useState<Record<string, SettingsSourceMetadata>>({})
|
|
180
|
+
// Full settings-global blob so a partial save never wipes AI/security keys.
|
|
181
|
+
const [settingsBlob, setSettingsBlob] = useState<Record<string, unknown>>({})
|
|
182
|
+
const [overrideSite, setOverrideSite] = useState<Record<string, any>>({})
|
|
183
|
+
const [saveState, setSaveState] = useState<SaveState>('idle')
|
|
184
|
+
const [saveError, setSaveError] = useState<string | null>(null)
|
|
185
|
+
const [reloadKey, setReloadKey] = useState(0)
|
|
186
|
+
|
|
187
|
+
useEffect(() => {
|
|
188
|
+
let cancelled = false
|
|
189
|
+
setLoading(true)
|
|
190
|
+
setLoadError(null)
|
|
191
|
+
Promise.all([
|
|
192
|
+
cmsApi<Record<string, any>>('/globals/settings'),
|
|
193
|
+
cmsApi<SeoConfigResponse>('/seo/config'),
|
|
194
|
+
cmsApi<SiteIndexStatus>('/seo/index-status'),
|
|
195
|
+
])
|
|
196
|
+
.then(([settingsRes, seoRes, statusRes]) => {
|
|
197
|
+
if (cancelled) return
|
|
198
|
+
if (settingsRes.error && settingsRes.status !== 404) {
|
|
199
|
+
setLoadError(settingsRes.error)
|
|
200
|
+
}
|
|
201
|
+
const settingsData = settingsRes.data ?? {}
|
|
202
|
+
const seo = seoRes.data ?? {}
|
|
203
|
+
const effectiveSite = seo.effective?.site ?? {}
|
|
204
|
+
const staticSite = seo.static?.site ?? {}
|
|
205
|
+
const overSite = seo.overrides?.site ?? {}
|
|
206
|
+
const robots = effectiveSite.robots ?? {}
|
|
207
|
+
|
|
208
|
+
const loaded: GeneralSettingsForm = {
|
|
209
|
+
siteTitle: String(settingsData.siteTitle ?? ''),
|
|
210
|
+
tagline: String(settingsData.tagline ?? ''),
|
|
211
|
+
siteUrl: String(effectiveSite.siteUrl ?? settingsData.siteUrl ?? ''),
|
|
212
|
+
language: String(settingsData.language ?? 'en'),
|
|
213
|
+
timezone: String(settingsData.timezone ?? 'UTC'),
|
|
214
|
+
defaultNoIndex: robots.defaultNoIndex === true,
|
|
215
|
+
defaultNoFollow: robots.defaultNoFollow === true,
|
|
216
|
+
noIndexNonProduction: robots.noIndexNonProduction === true,
|
|
217
|
+
}
|
|
218
|
+
|
|
219
|
+
// Site URL is config-managed when actuate.config.ts supplies it.
|
|
220
|
+
const siteUrlFromConfig = Boolean(staticSite.siteUrl)
|
|
221
|
+
setSources({
|
|
222
|
+
siteUrl: siteUrlFromConfig
|
|
223
|
+
? { source: 'config', editable: false, reason: 'Set in actuate.config.ts' }
|
|
224
|
+
: { source: 'database', editable: canEdit },
|
|
225
|
+
siteTitle: { source: 'database', editable: canEdit },
|
|
226
|
+
tagline: { source: 'database', editable: canEdit },
|
|
227
|
+
language: { source: 'database', editable: canEdit },
|
|
228
|
+
timezone: { source: 'database', editable: canEdit },
|
|
229
|
+
seoDefaults: {
|
|
230
|
+
source: 'plugin',
|
|
231
|
+
editable: canEdit,
|
|
232
|
+
reason: 'Shared with the SEO section',
|
|
233
|
+
},
|
|
234
|
+
})
|
|
235
|
+
|
|
236
|
+
setBaseline(loaded)
|
|
237
|
+
setForm(loaded)
|
|
238
|
+
setSettingsBlob(settingsData)
|
|
239
|
+
setOverrideSite(overSite ?? {})
|
|
240
|
+
if (!seoRes.error && statusRes.data) setIndexStatus(statusRes.data)
|
|
241
|
+
})
|
|
242
|
+
.catch(() => {
|
|
243
|
+
if (!cancelled) setLoadError('Failed to load settings.')
|
|
244
|
+
})
|
|
245
|
+
.finally(() => {
|
|
246
|
+
if (!cancelled) setLoading(false)
|
|
247
|
+
})
|
|
248
|
+
return () => {
|
|
249
|
+
cancelled = true
|
|
250
|
+
}
|
|
251
|
+
}, [reloadKey, canEdit])
|
|
252
|
+
|
|
253
|
+
const setField = useCallback(
|
|
254
|
+
<K extends keyof GeneralSettingsForm>(key: K, value: GeneralSettingsForm[K]) => {
|
|
255
|
+
setForm((prev) => ({ ...prev, [key]: value }))
|
|
256
|
+
setSaveState('idle')
|
|
257
|
+
},
|
|
258
|
+
[],
|
|
259
|
+
)
|
|
260
|
+
|
|
261
|
+
const isProduction = (indexStatus?.environment ?? '') === 'production'
|
|
262
|
+
|
|
263
|
+
const dirty = useMemo(
|
|
264
|
+
() =>
|
|
265
|
+
(Object.keys(form) as Array<keyof GeneralSettingsForm>).some((k) => form[k] !== baseline[k]),
|
|
266
|
+
[form, baseline],
|
|
267
|
+
)
|
|
268
|
+
|
|
269
|
+
const issues = useMemo(() => validate(form, isProduction), [form, isProduction])
|
|
270
|
+
const hasErrors = issues.some((i) => i.severity === 'error')
|
|
271
|
+
|
|
272
|
+
const refetchStatus = useCallback(async () => {
|
|
273
|
+
const res = await cmsApi<SiteIndexStatus>('/seo/index-status')
|
|
274
|
+
if (!res.error && res.data) setIndexStatus(res.data)
|
|
275
|
+
}, [])
|
|
276
|
+
|
|
277
|
+
const save = useCallback(async () => {
|
|
278
|
+
if (!canEdit || hasErrors) return
|
|
279
|
+
setSaveState('saving')
|
|
280
|
+
setSaveError(null)
|
|
281
|
+
|
|
282
|
+
const siteUrlEditable = sources.siteUrl?.editable !== false
|
|
283
|
+
const siteInfoChanged =
|
|
284
|
+
form.siteTitle !== baseline.siteTitle ||
|
|
285
|
+
form.tagline !== baseline.tagline ||
|
|
286
|
+
form.language !== baseline.language ||
|
|
287
|
+
form.timezone !== baseline.timezone
|
|
288
|
+
const siteUrlChanged = siteUrlEditable && form.siteUrl !== baseline.siteUrl
|
|
289
|
+
const robotsChanged =
|
|
290
|
+
form.defaultNoIndex !== baseline.defaultNoIndex ||
|
|
291
|
+
form.defaultNoFollow !== baseline.defaultNoFollow ||
|
|
292
|
+
form.noIndexNonProduction !== baseline.noIndexNonProduction
|
|
293
|
+
|
|
294
|
+
try {
|
|
295
|
+
// 1. Site info → the `settings` global (preserve AI/security/layout keys,
|
|
296
|
+
// and drop legacy robots/siteUrl duplicates so SEO config owns them).
|
|
297
|
+
// Read-modify-write against a fresh fetch so a concurrent save from the
|
|
298
|
+
// Security/AI tabs (same global blob) is never clobbered.
|
|
299
|
+
if (siteInfoChanged) {
|
|
300
|
+
const current = await cmsApi<Record<string, unknown>>('/globals/settings')
|
|
301
|
+
const blob = { ...(current.data ?? settingsBlob) }
|
|
302
|
+
delete blob.defaultNoIndex
|
|
303
|
+
delete blob.defaultNoFollow
|
|
304
|
+
delete blob.noIndexNonProduction
|
|
305
|
+
delete blob.siteUrl
|
|
306
|
+
const payload = {
|
|
307
|
+
...blob,
|
|
308
|
+
siteTitle: form.siteTitle.trim(),
|
|
309
|
+
tagline: form.tagline.trim(),
|
|
310
|
+
language: form.language,
|
|
311
|
+
timezone: form.timezone,
|
|
312
|
+
}
|
|
313
|
+
const res = await cmsApi('/globals/settings', {
|
|
314
|
+
method: 'PUT',
|
|
315
|
+
body: JSON.stringify(payload),
|
|
316
|
+
})
|
|
317
|
+
if (res.error) throw new Error(res.error)
|
|
318
|
+
setSettingsBlob(payload)
|
|
319
|
+
}
|
|
320
|
+
|
|
321
|
+
// 2. Site URL + robots defaults → the SHARED SEO config (merge over the
|
|
322
|
+
// current override site so SEO-tab fields aren't lost).
|
|
323
|
+
if (siteUrlChanged || robotsChanged) {
|
|
324
|
+
const nextSite: Record<string, any> = { ...overrideSite }
|
|
325
|
+
if (siteUrlChanged) nextSite.siteUrl = form.siteUrl.trim() || undefined
|
|
326
|
+
if (robotsChanged) {
|
|
327
|
+
nextSite.robots = {
|
|
328
|
+
...(overrideSite.robots ?? {}),
|
|
329
|
+
defaultNoIndex: form.defaultNoIndex,
|
|
330
|
+
defaultNoFollow: form.defaultNoFollow,
|
|
331
|
+
noIndexNonProduction: form.noIndexNonProduction,
|
|
332
|
+
}
|
|
333
|
+
}
|
|
334
|
+
const res = await cmsApi('/seo/config', {
|
|
335
|
+
method: 'PUT',
|
|
336
|
+
body: JSON.stringify({ site: nextSite }),
|
|
337
|
+
})
|
|
338
|
+
if (res.error) throw new Error(res.error)
|
|
339
|
+
setOverrideSite(nextSite)
|
|
340
|
+
}
|
|
341
|
+
|
|
342
|
+
setBaseline(form)
|
|
343
|
+
setSaveState('success')
|
|
344
|
+
await refetchStatus()
|
|
345
|
+
} catch (err) {
|
|
346
|
+
setSaveState('error')
|
|
347
|
+
setSaveError(err instanceof Error ? err.message : 'Failed to save settings.')
|
|
348
|
+
}
|
|
349
|
+
}, [canEdit, hasErrors, form, baseline, settingsBlob, overrideSite, sources, refetchStatus])
|
|
350
|
+
|
|
351
|
+
const reset = useCallback(() => {
|
|
352
|
+
setForm(baseline)
|
|
353
|
+
setSaveState('idle')
|
|
354
|
+
setSaveError(null)
|
|
355
|
+
}, [baseline])
|
|
356
|
+
|
|
357
|
+
const refetch = useCallback(() => setReloadKey((k) => k + 1), [])
|
|
358
|
+
|
|
359
|
+
return {
|
|
360
|
+
loading,
|
|
361
|
+
loadError,
|
|
362
|
+
form,
|
|
363
|
+
setField,
|
|
364
|
+
dirty,
|
|
365
|
+
issues,
|
|
366
|
+
hasErrors,
|
|
367
|
+
indexStatus,
|
|
368
|
+
sources,
|
|
369
|
+
isProduction,
|
|
370
|
+
saveState,
|
|
371
|
+
saveError,
|
|
372
|
+
save,
|
|
373
|
+
reset,
|
|
374
|
+
refetch,
|
|
375
|
+
}
|
|
376
|
+
}
|