@riducms/admin 0.1.5 → 0.2.1

package/src/core/plugins/row-label-registry.ts

@@ -1,7 +1,11 @@
+import type { Component } from "svelte";
+import type { RowLabelComponentProps } from "@riducms/plugin";
+import type { AdminConfig } from "@riducms/plugin/admin";
 import type { RowLabelPlugin, RowLabelSnapshot, RowLabelValue } from "@riducms/plugin";
 import type { SchemaField } from "@riducms/protocol";
 
 export class RowLabelRegistry {
+	constructor(private readonly local: NonNullable<AdminConfig["rowLabels"]> = {}) {}
 	#plugins = new Map<string, RowLabelPlugin>();
 
 	register(plugin: RowLabelPlugin) {
@@ -12,22 +16,38 @@ export class RowLabelRegistry {
 		this.#plugins.set(identity, plugin);
 	}
 
-	resolve(field: SchemaField): RowLabelPlugin | undefined {
+	resolve(
+		field: SchemaField
+	): { component: Component<RowLabelComponentProps>; config: unknown } | undefined {
 		const component = field.nested?.rowLabelComponent;
 		if (component === undefined) return undefined;
-		const identity = rowLabelIdentity(component.plugin, component.component);
+		if (component.reference !== undefined) {
+			const local = this.local[component.reference as `app:${string}`];
+			if (local === undefined)
+				throw new Error(
+					`No local row label ${component.reference} is registered for ${field.path}.`
+				);
+			return {
+				component: local.component as Component<RowLabelComponentProps>,
+				config: local.decode(field),
+			};
+		}
+		const identity = rowLabelIdentity(component.plugin ?? "", component.component ?? "");
 		const plugin = this.#plugins.get(identity);
 		if (plugin === undefined) {
 			throw new Error(
 				`No admin row label component can render field ${field.path} (plugin "${component.plugin}", component "${component.component}")`
 			);
 		}
-		return plugin;
+		return { component: plugin.component, config: component.config };
 	}
 }
 
-export function createRowLabelRegistry(plugins: readonly RowLabelPlugin[] = []): RowLabelRegistry {
-	const registry = new RowLabelRegistry();
+export function createRowLabelRegistry(
+	plugins: readonly RowLabelPlugin[] = [],
+	local: AdminConfig["rowLabels"] = {}
+): RowLabelRegistry {
+	const registry = new RowLabelRegistry(local);
 	for (const plugin of plugins) registry.register(plugin);
 	return registry;
 }

package/src/core/runtime/admin-runtime.svelte.ts

@@ -1,5 +1,6 @@
+import { validateAdminConfig, type AdminConfig } from "@riducms/plugin/admin";
 import {
-	resolveAdminPluginExtensions,
+	resolveAdminExtensions,
 	type AdminDashboardPanel,
 	type AdminLoginComponent,
 	type AdminAccountComponent,
@@ -13,8 +14,7 @@ import {
 	type AdminDocumentView,
 	type AdminListCell,
 	type AdminPlugin,
-	type AdminPluginRoute,
-	type FieldPlugin,
+	type AdminRoute,
 } from "@riducms/plugin";
 import type { AuthSession, OperationCapabilities, SchemaManifest } from "@riducms/protocol";
 import { RiduError } from "@riducms/sdk";
@@ -48,7 +48,7 @@ class StalePreferenceSessionError extends Error {
 }
 
 export class AdminRuntime {
-	manifest = $state<SchemaManifest>();
+	manifest = $state.raw<SchemaManifest>();
 	manifestRevision = $state(0);
 	documentRevision = $state(0);
 	session = $state<AuthSession<AdminDocument>>();
@@ -150,7 +150,7 @@ export class AdminRuntime {
 		return true;
 	}
 
-	readonly pluginRoutes: readonly AdminPluginRoute[];
+	readonly pluginRoutes: readonly AdminRoute[];
 	readonly dashboardPanels: readonly AdminDashboardPanel[];
 	readonly loginComponents: readonly AdminLoginComponent[];
 	readonly accountComponents: readonly AdminAccountComponent[];
@@ -169,14 +169,12 @@ export class AdminRuntime {
 	constructor(
 		readonly client: AdminClient,
 		readonly plugins: readonly AdminPlugin[] = [],
-		fieldPlugins: readonly FieldPlugin[] = [],
 		languages?: readonly TranslationLanguage[],
-		readonly fields: FieldRegistry = createCoreFieldRegistry([
-			...plugins.flatMap((plugin) => plugin.fields),
-			...fieldPlugins,
-		])
+		readonly fields: FieldRegistry = createCoreFieldRegistry(plugins),
+		readonly editors: NonNullable<AdminConfig["fields"]> = {},
+		readonly application: AdminConfig = {}
 	) {
-		const extensions = resolveAdminPluginExtensions(plugins);
+		const extensions = resolveAdminExtensions(plugins, application);
 		this.pluginRoutes = extensions.routes;
 		this.dashboardPanels = extensions.dashboard;
 		this.loginComponents = extensions.login;
@@ -190,8 +188,14 @@ export class AdminRuntime {
 		this.listCells = extensions.listCells;
 		this.documentActions = extensions.documentActions;
 		this.documentViews = extensions.documentViews;
-		this.rowLabels = createRowLabelRegistry(extensions.rowLabels);
-		this.i18n = new AdminI18nController(client, () => this.session, languages, extensions.messages);
+		this.rowLabels = createRowLabelRegistry(extensions.rowLabels, application.rowLabels);
+		this.i18n = new AdminI18nController(
+			client,
+			() => this.session,
+			languages,
+			extensions.messages,
+			extensions.applicationMessages
+		);
 		this.#applyTheme();
 		if (typeof window !== "undefined") {
 			window.matchMedia("(prefers-color-scheme: dark)").addEventListener("change", () => {
@@ -435,6 +439,10 @@ export class AdminRuntime {
 		try {
 			const manifest = await this.client.schema();
 			if (request !== this.#manifestRequest) return;
+			validateAdminConfig(
+				{ ...this.application, plugins: this.plugins, fields: this.editors },
+				manifest
+			);
 			this.manifest = manifest;
 			this.manifestRevision += 1;
 			this.#configureContentLocale();
@@ -487,6 +495,10 @@ export class AdminRuntime {
 		try {
 			const manifest = await this.client.schema();
 			if (request !== this.#manifestRequest) return;
+			validateAdminConfig(
+				{ ...this.application, plugins: this.plugins, fields: this.editors },
+				manifest
+			);
 			this.manifest = manifest;
 			this.manifestRevision += 1;
 			this.#configureContentLocale();

package/src/features/auth/account-route.svelte

@@ -1,4 +1,6 @@
 <script lang="ts">
+	import { untrack } from "svelte";
+	import { connectDocumentLiveValidation } from "@admin/core/forms/live-validation.svelte";
 	import { useNavigate } from "@hvniel/svelte-router";
 	import PaletteIcon from "~icons/lucide/palette";
 	import RotateCcwIcon from "~icons/lucide/rotate-ccw";
@@ -19,6 +21,8 @@
 	const notifications = getNotificationCenter();
 	const navigate = useNavigate();
 	const form = new FormController({}, runtime.i18n);
+	connectDocumentLiveValidation(form, runtime.client);
+	$effect(() => () => form.disposeBindings());
 	let loading = $state(true);
 	let error = $state<string>();
 	let profilePending = $state(false);
@@ -69,13 +73,15 @@
 		const locale = contentLocale;
 		if (slug === undefined || id === undefined) return;
 		const abort = new AbortController();
-		void load(slug, id, locale, abort.signal);
+		untrack(() => load(slug, id, locale, abort.signal));
 		return () => abort.abort();
 	});
 
 	$effect(() => runtime.registerContentLocaleBlocker(() => form.dirty || form.submitting));
 
 	async function load(slug: string, id: string, locale: string | undefined, signal: AbortSignal) {
+		form.setResource({ collection: slug, id });
+		form.setLocalization(locale);
 		loading = true;
 		error = undefined;
 		try {
@@ -84,7 +90,7 @@
 				runtime.client.collectionAccess(slug, { id, signal, locale }),
 			]);
 			if (signal.aborted) return;
-			form.reset(document);
+			form.reset(document, collection?.fields ?? []);
 			form.setLocalization(locale, document._localization?.sources);
 			form.setAccess(access, "update");
 		} catch (cause) {
@@ -249,10 +255,9 @@
 						class="justify-self-start"
 						type="submit"
 						disabled={profilePending || !form.dirty || form.access?.operations.update !== true}
+						aria-busy={form.submitting}
 					>
-						{profilePending
-							? runtime.i18n.t("account:savingProfile")
-							: runtime.i18n.t("account:saveProfile")}
+						{runtime.i18n.t("account:saveProfile")}
 					</Button>
 				</form>
 			{/if}

package/src/features/auth/account-security-route.svelte

@@ -333,7 +333,7 @@
 						<span class="ridu-field-label">{runtime.i18n.t("account:expiration")}</span>
 						<DateValueControl
 							id="api-key-expiry"
-							appearance="dayAndTime"
+							appearance="date-time"
 							value={apiKeyExpiry}
 							label={runtime.i18n.t("account:expiration")}
 							onValueChange={(next) => (apiKeyExpiry = next)}

package/src/features/collections/collection-list-bulk-editor.svelte

@@ -36,8 +36,8 @@
 	let wasOpen = $state(false);
 	const field = $derived(fields.find((candidate) => candidate.name === fieldName));
 	const fieldLabel = $derived(field?.admin.label ?? runtime.i18n.t("collections:chooseField"));
-	const selectedChoiceLabel = $derived(
-		field?.select?.choices.find((choice) => choice.value === value)?.label ??
+	const selectedOptionLabel = $derived(
+		field?.select?.options.find((option) => option.value === value)?.label ??
 			(value === "" ? runtime.i18n.t("collections:clearValue") : value)
 	);
 
@@ -104,13 +104,13 @@
 					<Select type="single" {value} onValueChange={(next) => (value = next)}>
 						<SelectTrigger class="w-full" aria-label={runtime.i18n.t("collections:value")}>
 							<span class={value === "" ? "text-foreground-placeholder" : undefined}>
-								{selectedChoiceLabel}
+								{selectedOptionLabel}
 							</span>
 						</SelectTrigger>
 						<SelectContent>
 							<SelectItem value="" label={runtime.i18n.t("collections:clearValue")} />
-							{#each field.select?.choices ?? [] as choice (choice.value)}
-								<SelectItem value={choice.value} label={choice.label} />
+							{#each field.select?.options ?? [] as option (option.value)}
+								<SelectItem value={option.value} label={option.label} />
 							{/each}
 						</SelectContent>
 					</Select>
@@ -129,7 +129,7 @@
 				{:else if field?.type === "date"}
 					<DateValueControl
 						id={`bulk-edit-${field.id}`}
-						appearance={field.date?.pickerAppearance}
+						appearance={field.date?.format}
 						{value}
 						label={runtime.i18n.t("collections:value")}
 						onValueChange={(next) => (value = next)}

package/src/features/collections/collection-list-controller.svelte.ts

@@ -1,4 +1,4 @@
-import type { AccessCapabilitiesEnvelope, Pagination, SchemaSelectChoice } from "@riducms/protocol";
+import type { AccessCapabilitiesEnvelope, Pagination, SchemaSelectOption } from "@riducms/protocol";
 import type { AdminI18n } from "@riducms/translations";
 
 import type { AdminClient, AdminDocument } from "@admin/core/api/admin-client";
@@ -15,7 +15,7 @@ interface CollectionListControllerOptions {
 	get titleField(): string | undefined;
 	get status(): string;
 	get statusField(): string | undefined;
-	get statusChoices(): readonly SchemaSelectChoice[];
+	get statusOptions(): readonly SchemaSelectOption[];
 	get versioned(): boolean;
 	get trashOnly(): boolean;
 	get folderField(): string | undefined;
@@ -92,7 +92,7 @@ export class CollectionListController {
 				titleField: this.options.titleField,
 				status: this.options.status,
 				statusField: this.options.statusField,
-				statusValues: this.options.statusChoices.map((choice) => choice.value),
+				statusValues: this.options.statusOptions.map((option) => option.value),
 				trashOnly: this.options.trashOnly,
 				folderField: this.options.folderField,
 				folderID: this.options.folderID,
@@ -278,7 +278,7 @@ export class CollectionListController {
 	};
 
 	statusLabel = (value: string) => {
-		const configured = this.options.statusChoices.find((choice) => choice.value === value)?.label;
+		const configured = this.options.statusOptions.find((option) => option.value === value)?.label;
 		if (configured !== undefined) return configured;
 		const normalized = value.toLocaleLowerCase(this.options.i18n.language);
 		if (normalized === "published") return this.options.i18n.t("documents:published");
@@ -296,7 +296,7 @@ export class CollectionListController {
 	updated = (document: AdminDocument) => formatUpdated(document.updatedAt, this.options.i18n);
 	created = (document: AdminDocument) => formatUpdated(document.createdAt, this.options.i18n);
 
-	choiceCount = (choice: SchemaSelectChoice) => this.statusCounts[choice.value];
+	optionCount = (option: SchemaSelectOption) => this.statusCounts[option.value];
 
 	toggleDocument = (id: string, checked: boolean) => {
 		if (!this.selectionControlsReady || !this.docs.some((document) => document.id === id)) return;

package/src/features/collections/collection-list-filter-popover.svelte

@@ -75,7 +75,7 @@
 	function addFilter() {
 		if (field === undefined) return;
 		const filterValue = operator === "exists" ? value || "true" : value;
-		if (operator !== "exists" && filterValue === "") return;
+		if (operator !== "exists" && filterValue === "" && field?.type !== "text-list") return;
 		onFiltersChange([...filters, { field: field.path, operator, value: filterValue }]);
 		value = "";
 	}
@@ -163,21 +163,21 @@
 								aria-label={i18n.t("collections:filterValue")}
 							>
 								<span class={value === "" ? "text-foreground-placeholder" : undefined}>
-									{field.select?.choices.find((choice) => choice.value === value)?.label ??
+									{field.select?.options.find((option) => option.value === value)?.label ??
 										i18n.t("collections:chooseValue")}
 								</span>
 							</SelectTrigger>
 							<SelectContent>
 								<SelectItem value="" label={i18n.t("collections:chooseValue")} />
-								{#each field.select?.choices ?? [] as choice}
-									<SelectItem value={choice.value} label={choice.label} />
+								{#each field.select?.options ?? [] as option}
+									<SelectItem value={option.value} label={option.label} />
 								{/each}
 							</SelectContent>
 						</Select>
 					{:else if field.type === "date"}
 						<DateValueControl
 							id={`collection-filter-${field.id}`}
-							appearance={field.date?.pickerAppearance}
+							appearance={field.date?.format}
 							{value}
 							label={i18n.t("collections:filterValue")}
 							size="toolbar"
@@ -186,7 +186,7 @@
 					{:else}
 						<Input
 							aria-label={i18n.t("collections:filterValue")}
-							type={field.type === "number" ? "number" : "text"}
+							type={field.type === "number" || field.type === "number-list" ? "number" : "text"}
 							class="h-8"
 							bind:value
 						/>

package/src/features/collections/collection-list-route.svelte

@@ -65,7 +65,7 @@
 	const statusField = $derived(
 		collection?.fields.find((field) => field.type === "select" && field.name === "status")
 	);
-	const statusChoices = $derived(statusField?.select?.choices ?? []);
+	const statusOptions = $derived(statusField?.select?.options ?? []);
 	const searchParams = $derived(new URLSearchParams(location.search));
 	const localization = $derived(runtime.manifest?.application.localization);
 	const requestedLocale = $derived(searchParams.get("locale"));
@@ -95,7 +95,7 @@
 	let referenceLabels = $state.raw<Record<string, string>>({});
 	let searchInput = $state<HTMLInputElement | null>(null);
 	const activeStatus = $derived(
-		statusChoices.some((choice) => choice.value === requestedStatus) ? requestedStatus : ""
+		statusOptions.some((option) => option.value === requestedStatus) ? requestedStatus : ""
 	);
 	const bulkEditableFields = $derived(
 		collection?.fields.filter(
@@ -183,8 +183,8 @@
 		get statusField() {
 			return statusField?.name;
 		},
-		get statusChoices() {
-			return statusChoices;
+		get statusOptions() {
+			return statusOptions;
 		},
 		get versioned() {
 			return collection?.capabilities.versions === true;
@@ -224,7 +224,7 @@
 		statusColumnAvailable,
 	} = $derived(controller);
 	const {
-		choiceCount,
+		optionCount,
 		canReadField,
 		deletePermanent,
 		bulkDelete,
@@ -512,13 +512,12 @@
 			return value === true ? runtime.i18n.t("general:yes") : runtime.i18n.t("general:no");
 		}
 		if (field.type === "select" || field.type === "radio") {
-			return field.select?.choices.find((choice) => choice.value === value)?.label ?? String(value);
+			return field.select?.options.find((option) => option.value === value)?.label ?? String(value);
 		}
 		if (field.type === "array") return summarizeRows(value, "row");
 		if (field.type === "blocks") return summarizeRows(value, "block");
 		if (field.type === "json" || field.plugin !== undefined) return summarizeStructured(value);
-		if (field.type === "date")
-			return formatDateDisplay(value, field.date?.pickerAppearance, runtime.i18n);
+		if (field.type === "date") return formatDateDisplay(value, field.date?.format, runtime.i18n);
 		if (referenceField(field)) {
 			return runtime.i18n.formatList(
 				fieldReferences(field, value).map(
@@ -769,7 +768,7 @@
 		</div>
 	</header>
 
-	{#if statusChoices.length > 0 && !trashOnly}
+	{#if statusOptions.length > 0 && !trashOnly}
 		<div
 			class="mt-6 flex h-9 w-full items-center justify-start gap-5 border-b border-control-border"
 			role="group"
@@ -786,15 +785,15 @@
 					{runtime.i18n.formatNumber(allDocuments)}
 				</span>
 			</button>
-			{#each statusChoices as choice (choice.value)}
-				{const statusCount = $derived(choiceCount(choice))}
+			{#each statusOptions as option (option.value)}
+				{const statusCount = $derived(optionCount(option))}
 				<button
 					type="button"
 					class="relative h-9 flex-none cursor-pointer px-px pb-2.5 text-[13px] text-foreground-muted outline-none after:absolute after:inset-x-0 after:bottom-[-1px] after:h-0.5 after:bg-primary after:opacity-0 after:transition-opacity hover:text-foreground-strong focus-visible:outline-2 focus-visible:outline-primary/60 focus-visible:outline-offset-2 aria-pressed:text-foreground-strong aria-pressed:after:opacity-100"
-					aria-pressed={activeStatus === choice.value}
-					onclick={() => selectStatus(choice.value)}
+					aria-pressed={activeStatus === option.value}
+					onclick={() => selectStatus(option.value)}
 				>
-					{choice.label}
+					{option.label}
 					{#if statusCount !== undefined}
 						<span class="font-mono ms-1 text-[9.5px] text-foreground-faint">
 							{runtime.i18n.formatNumber(statusCount)}

package/src/features/collections/list-workspace.ts

@@ -1,3 +1,4 @@
+import { resolveBlockTypes } from "@riducms/protocol";
 import type { SchemaCollection, SchemaField } from "@riducms/protocol";
 import type { AdminI18n } from "@riducms/translations";
 
@@ -13,7 +14,8 @@ export type ListFilterOperator =
 	| "greaterThanEqual"
 	| "lessThan"
 	| "lessThanEqual"
-	| "exists";
+	| "exists"
+	| "in";
 
 export interface ListFilter {
 	field: string;
@@ -58,6 +60,7 @@ export function listColumnFields(collection: SchemaCollection | undefined, title
 
 export function filterableFields(fields: readonly SchemaField[]) {
 	return fields.flatMap((field) => {
+		if (field.queryRestricted) return [];
 		if (field.type === "group" || field.type === "array" || field.type === "blocks") {
 			return nestedFields(field, "filters");
 		}
@@ -67,8 +70,11 @@ export function filterableFields(fields: readonly SchemaField[]) {
 
 export function sortableField(field: SchemaField) {
 	return (
+		field.queryRestricted !== true &&
 		field.virtual === undefined &&
 		field.join === undefined &&
+		field.type !== "text-list" &&
+		field.type !== "number-list" &&
 		field.type !== "array" &&
 		field.type !== "blocks" &&
 		field.type !== "group" &&
@@ -96,6 +102,7 @@ export function defaultListColumns(
 }
 
 export function filterOperatorsFor(field: SchemaField): readonly ListFilterOperator[] {
+	if (field.type === "text-list" || field.type === "number-list") return ["in", "exists"];
 	if (field.type === "number" || field.type === "date") return orderedOperators;
 	if (field.type === "text" || field.type === "textarea" || field.type === "email") {
 		return textOperators;
@@ -105,6 +112,7 @@ export function filterOperatorsFor(field: SchemaField): readonly ListFilterOpera
 
 export function filterOperatorLabel(operator: ListFilterOperator, i18n: AdminI18n) {
 	const labels: Record<ListFilterOperator, Parameters<AdminI18n["t"]>[0]> = {
+		in: "collections:operatorIncludesItem",
 		equals: "collections:operatorEquals",
 		notEquals: "collections:operatorNotEquals",
 		like: "collections:operatorLike",
@@ -165,19 +173,19 @@ export function buildListFilterWhere(
 	const byName = new Map(fields.map((field) => [field.path, field]));
 	return filters.flatMap((filter): Record<string, unknown>[] => {
 		const field = byName.get(filter.field);
-		if (field === undefined) return [];
+		if (field === undefined || !filterOperatorsFor(field).includes(filter.operator)) return [];
 		if (filter.operator === "exists") {
 			return [{ [filter.field]: { exists: filter.value !== "false" } }];
 		}
-		if (filter.value === "") return [];
+		if (filter.value === "" && field.type !== "text-list") return [];
 		let value: string | number | boolean = filter.value;
-		if (field.type === "number") {
+		if (field.type === "number" || field.type === "number-list") {
 			value = Number(filter.value);
 			if (!Number.isFinite(value)) return [];
 		} else if (field.type === "checkbox") {
 			value = filter.value === "true";
 		}
-		return [{ [filter.field]: { [filter.operator]: value } }];
+		return [{ [filter.field]: { [filter.operator]: filter.operator === "in" ? [value] : value } }];
 	});
 }
 
@@ -222,16 +230,21 @@ export function visibleColumnNames(encoded: string | null, fallback: readonly st
 }
 
 function nestedFields(field: SchemaField, mode: "columns" | "filters"): SchemaField[] {
+	if (mode === "filters" && field.queryRestricted) return [];
 	if (field.type === "blocks") {
 		if (mode === "columns") return [];
-		return (field.blocks?.types ?? []).flatMap((block) =>
+		return (resolveBlockTypes(field.blocks) ?? []).flatMap((block) =>
 			block.fields.flatMap((child) =>
-				withListLabel(child, `${field.admin.label} > ${block.label}`, mode)
+				withListLabel(child, `${field.admin.label} > ${block.labels.singular}`, mode)
 			)
 		);
 	}
 	return (field.nested?.fields ?? []).flatMap((child) =>
-		withListLabel(child, field.admin.label, mode)
+		withListLabel(
+			field.queryRestricted ? { ...child, queryRestricted: true } : child,
+			field.admin.label,
+			mode
+		)
 	);
 }
 
@@ -254,6 +267,7 @@ function withListLabel(
 
 function filterableLeaf(field: SchemaField) {
 	return (
+		field.queryRestricted !== true &&
 		field.virtual === undefined &&
 		field.join === undefined &&
 		field.plugin === undefined &&

package/src/features/documents/document-controller.svelte.ts

@@ -1,3 +1,4 @@
+import { connectDocumentLiveValidation } from "@admin/core/forms/live-validation.svelte";
 import type { DocumentLockEnvelope, SchemaCollection } from "@riducms/protocol";
 import { RiduError } from "@riducms/sdk";
 import { tick, untrack } from "svelte";
@@ -85,6 +86,7 @@ export class DocumentController {
 
 	constructor(readonly options: DocumentControllerOptions) {
 		this.form = new FormController({}, options.runtime.i18n);
+		connectDocumentLiveValidation(this.form, options.runtime.client);
 		$effect(() => {
 			const slug = this.options.slug;
 			const documentID = this.options.global ? slug : this.options.documentID;
@@ -146,6 +148,7 @@ export class DocumentController {
 		});
 
 		$effect(() => () => {
+			this.form.disposeBindings();
 			this.#saveRequest?.abort();
 			this.#imageRequest?.abort();
 			if (this.#copyResetTimer !== undefined) window.clearTimeout(this.#copyResetTimer);
@@ -929,7 +932,7 @@ export class DocumentController {
 		this.imageOutcomeUncertain = false;
 		this.form.setAccess(undefined, documentID === undefined ? "create" : "update");
 		if (documentID === undefined) {
-			this.form.reset(initialFormValues(collection.fields));
+			this.form.reset(initialFormValues(collection.fields), collection.fields);
 			this.form.setLocalization(locale);
 			this.versions = [];
 			this.currentDocument = undefined;
@@ -1179,7 +1182,10 @@ export class DocumentController {
 
 	#applyDocument(document: AdminDocument, recoverDraft = false) {
 		this.currentDocument = document;
-		this.form.reset(documentFormValues(this.collection?.fields ?? [], document));
+		this.form.reset(
+			documentFormValues(this.collection?.fields ?? [], document),
+			this.collection?.fields ?? []
+		);
 		this.form.setLocalization(this.contentLocale, document._localization?.sources);
 		this.currentRevision = typeof document._revision === "number" ? document._revision : 0;
 		this.currentStatus = document._status === "draft" ? "draft" : "published";