@aphexcms/cms-core 0.1.16 → 0.2.1

package/dist/components/AdminApp.svelte

@@ -6,16 +6,26 @@
 	import { Alert, AlertDescription, AlertTitle } from '@aphexcms/ui/shadcn/alert';
 	import { Button } from '@aphexcms/ui/shadcn/button';
 	import * as Tabs from '@aphexcms/ui/shadcn/tabs';
+	import * as Popover from '@aphexcms/ui/shadcn/popover';
 	import { page } from '$app/state';
-	import { goto } from '$app/navigation';
+	import { goto, replaceState } from '$app/navigation';
 	import { SvelteURLSearchParams } from 'svelte/reactivity';
 	import type { SchemaType } from '../types/index';
+	import type { UserSessionPreferences } from '../types/organization';
 	import DocumentEditor from './admin/DocumentEditor.svelte';
-	import type { DocumentType } from '../types/index';
-	import { documents } from '../api/index';
-	import { FileText } from 'lucide-svelte';
-
-	type InitDocumentType = Pick<DocumentType, 'name' | 'title' | 'description' | 'icon'>;
+	import { documents, organizations } from '../api/index';
+	import {
+		FileText,
+		ChevronDown,
+		Ellipsis,
+		ArrowDownAZ,
+		ArrowUpZA,
+		ArrowDown01,
+		ArrowUp10,
+		ArrowDownUp
+	} from 'lucide-svelte';
+	import type { Organization } from '../types/organization';
+	import { getOrderingsForSchema } from '../utils/default-orderings';
 
 	interface Props {
 		schemas: SchemaType[];
@@ -26,6 +36,7 @@
 		isReadOnly?: boolean;
 		activeTab?: { value: 'structure' | 'vision' };
 		handleTabChange: (value: string) => void;
+		userPreferences?: UserSessionPreferences | null;
 	}
 
 	let {
@@ -36,9 +47,13 @@
 		graphqlSettings = null,
 		isReadOnly = false,
 		activeTab = { value: 'structure' } as { value: 'structure' | 'vision' },
-		handleTabChange = () => {}
+		handleTabChange = () => {},
+		userPreferences = null
 	}: Props = $props();
 
+	// Keep a state of the organization id
+	let currentOrgId = $state<string | null>(page.url.searchParams.get('orgId'));
+
 	// Merge document types with schema icons (schemas have icons, server data doesn't)
 	const documentTypes = $derived(
 		documentTypesFromServer.map((docType) => {
@@ -61,6 +76,9 @@
 	let loading = $state(false);
 	let error = $state<string | null>(null);
 
+	// Organizations lookup map for displaying org names
+	let organizationsMap = $state<Map<string, Organization>>(new Map());
+
 	// Mobile navigation state (Sanity-style)
 	let mobileView = $state<'types' | 'documents' | 'editor'>('types');
 
@@ -71,6 +89,54 @@
 	let editingDocumentId = $state<string | null>(null);
 	let isCreatingDocument = $state(false);
 
+	// Documents list sorting state
+	let sortDropdownOpen = $state(false);
+	let currentSortName = $state<string>('updatedAtDesc'); // Default to "Last Edited"
+
+	// Derive available orderings from current schema
+	const availableOrderings = $derived.by(() => {
+		if (!selectedDocumentType) return [];
+		const schema = schemas.find((s) => s.name === selectedDocumentType);
+		if (!schema) return [];
+		return getOrderingsForSchema(schema);
+	});
+
+	// Get current ordering object (or derive it from currentSortName)
+	const currentOrdering = $derived.by(() => {
+		// First try to find it in availableOrderings
+		let ordering = availableOrderings.find((o) => o.name === currentSortName);
+
+		// If not found (e.g., it's an Asc version we created dynamically), derive it
+		if (!ordering && currentSortName) {
+			const isAsc = currentSortName.endsWith('Asc');
+			const baseName = currentSortName.replace('Desc', '').replace('Asc', '');
+			const descVersion = availableOrderings.find((o) => o.name === `${baseName}Desc`);
+
+			if (descVersion && isAsc) {
+				// Create asc version dynamically
+				ordering = {
+					...descVersion,
+					name: currentSortName,
+					by: descVersion.by.map((rule) => ({ ...rule, direction: 'asc' as const }))
+				};
+			}
+		}
+
+		return ordering || availableOrderings[0];
+	});
+
+	// Build sort string for API
+	// Single field: 'title' (ascending) or '-publishedAt' (descending)
+	// Multiple fields: ['title', '-publishedAt']
+	const sortString = $derived.by(() => {
+		if (!currentOrdering) return undefined;
+		const sortFields = currentOrdering.by.map((rule) =>
+			rule.direction === 'desc' ? `-${rule.field}` : rule.field
+		);
+		// Return array for multiple fields, string for single field
+		return sortFields.length === 1 ? sortFields[0] : sortFields;
+	});
+
 	// Editor stack for nested references
 	interface EditorStackItem {
 		documentId: string;
@@ -120,8 +186,8 @@
 		// If user clicked types/docs, force those panels expanded
 		// Otherwise, prioritize editors over panels
 
-		let typesExpanded = typesActive || true; // Expand types if clicked, or by default
-		let docsExpanded = docsActive || true; // Expand docs if clicked, or by default
+		let typesExpanded: boolean = typesActive || true; // Expand types if clicked, or by default
+		let docsExpanded: boolean = docsActive || true; // Expand docs if clicked, or by default
 		let typesWidth = typesExpanded ? TYPES_EXPANDED : COLLAPSED_WIDTH;
 		let docsWidth = selectedDocumentType ? (docsExpanded ? DOCS_EXPANDED : COLLAPSED_WIDTH) : 0;
 
@@ -301,6 +367,29 @@
 		}
 	});
 
+	// Fetch organizations for lookup (when viewing multi-org documents)
+	$effect(() => {
+		// Re-fetch when includeChildOrganizations changes
+		// const _includeChildren = userPreferences?.includeChildOrganizations;
+
+		async function fetchOrganizations() {
+			try {
+				const result = await organizations.list();
+				if (result.success && result.data) {
+					const map = new Map<string, Organization>();
+					result.data.forEach((org) => {
+						map.set(org.id, org);
+					});
+					organizationsMap = map;
+				}
+			} catch (err) {
+				console.error('Failed to fetch organizations:', err);
+			}
+		}
+
+		fetchOrganizations();
+	});
+
 	// Watch URL params for bookmarkable navigation
 	$effect(() => {
 		const url = page.url;
@@ -338,7 +427,7 @@
 				const stackItems = stackParam.split(',').map((item) => {
 					const [type, id] = item.split(':');
 					return { documentType: type, documentId: id, isCreating: false };
-				});
+				}) as EditorStackItem[];
 
 				// Only update stack and activeEditorIndex if the stack actually changed
 				const stackChanged =
@@ -375,11 +464,16 @@
 			console.log('[URL Effect] Branch: DOCUMENTS (docType only)');
 			currentView = 'documents';
 			mobileView = 'documents';
-			selectedDocumentType = docType;
 			editingDocumentId = null;
 			isCreatingDocument = false;
 			editorStack = [];
-			fetchDocuments(docType);
+			// Only fetch if docType changed (org changes are handled by separate effect)
+			if (selectedDocumentType !== docType) {
+				selectedDocumentType = docType;
+				fetchDocuments(docType);
+			} else {
+				selectedDocumentType = docType;
+			}
 		} else {
 			currentView = 'dashboard';
 			mobileView = 'types';
@@ -395,8 +489,9 @@
 		const orgId = page.url.searchParams.get('orgId');
 
 		// When orgId changes and we have a selected document type, refetch documents
-		if (orgId && selectedDocumentType) {
+		if (orgId && orgId !== currentOrgId && selectedDocumentType) {
 			fetchDocuments(selectedDocumentType);
+			currentOrgId = orgId;
 		}
 	});
 
@@ -562,11 +657,17 @@
 	}
 
 	async function fetchDocuments(docType: string) {
+		console.log('FETCHING DOCUMENTS', { sort: sortString });
 		loading = true;
 		error = null;
 
 		try {
-			const result = await documents.list({ docType, limit: 50 });
+			const result = await documents.list({
+				docType,
+				limit: 50,
+				includeChildOrganizations: userPreferences?.includeChildOrganizations ?? false,
+				sort: sortString
+			});
 
 			if (result.success && result.data) {
 				// Find schema for preview config
@@ -599,7 +700,9 @@
 						createdAt: meta.createdAt ? new Date(meta.createdAt) : null,
 						// hasChanges is tracked via publishedHash comparison
 						// If publishedHash is null, it's never been published or has unpublished changes
-						hasChanges: meta.status === 'published' && meta.publishedHash === null
+						hasChanges: meta.status === 'published' && meta.publishedHash === null,
+						// Include organization info for multi-org view
+						organizationId: meta.organizationId || null
 					};
 				});
 			} else {
@@ -736,7 +839,7 @@
 											{#each documentTypes as docType, index (index)}
 												<button
 													onclick={() => navigateToDocumentType(docType.name)}
-													class="hover:bg-muted/50 border-border group flex w-full items-center justify-between border-b p-3 text-left transition-colors first:border-t {selectedDocumentType ===
+													class="hover:bg-muted/50 border-border group flex w-full items-center justify-between border-b p-3 text-left transition-colors {selectedDocumentType ===
 													docType.name
 														? 'bg-muted/50'
 														: ''}"
@@ -753,7 +856,9 @@
 														<div>
 															<h3 class="text-sm font-medium">{docType.title}s</h3>
 															{#if docType.description}
-																<p class="text-muted-foreground text-xs">{docType.description}</p>
+																<p class="text-muted-foreground line-clamp-1 text-xs">
+																	{docType.description}
+																</p>
 															{/if}
 														</div>
 													</div>
@@ -827,7 +932,7 @@
 										{@const currentDocType = documentTypes.find(
 											(t) => t.name === selectedDocumentType
 										)}
-										<div class="border-border bg-muted/20 border-b p-3">
+										<div class="border-border bg-muted/30 border-b p-3">
 											<div class="flex items-center justify-between">
 												<div class="flex items-center gap-3">
 													{#if windowWidth > 620}
@@ -850,29 +955,134 @@
 														</p>
 													</div>
 												</div>
-												{#if !isReadOnly}
-													<Button
-														size="sm"
-														variant="ghost"
-														onclick={() => navigateToCreateDocument(selectedDocumentType!)}
-														class="h-8 w-8 p-0"
-														title="Create new document"
-													>
-														<svg
-															class="h-4 w-4"
-															fill="none"
-															viewBox="0 0 24 24"
-															stroke="currentColor"
+												<div class="flex items-center gap-2">
+													{#if !isReadOnly}
+														<Button
+															size="sm"
+															variant="ghost"
+															onclick={() => navigateToCreateDocument(selectedDocumentType!)}
+															class="h-8 w-8 p-0"
+															title="Create new document"
 														>
-															<path
-																stroke-linecap="round"
-																stroke-linejoin="round"
-																stroke-width="2"
-																d="M12 4v16m8-8H4"
-															/>
-														</svg>
-													</Button>
-												{/if}
+															<svg
+																class="h-4 w-4"
+																fill="none"
+																viewBox="0 0 24 24"
+																stroke="currentColor"
+															>
+																<path
+																	stroke-linecap="round"
+																	stroke-linejoin="round"
+																	stroke-width="2"
+																	d="M12 4v16m8-8H4"
+																/>
+															</svg>
+														</Button>
+													{/if}
+
+													<!-- Sorting Menu Popover -->
+													<Popover.Root bind:open={sortDropdownOpen}>
+														<Popover.Trigger>
+															{#snippet child({ props })}
+																<Button
+																	{...props}
+																	size="sm"
+																	variant="ghost"
+																	class="h-8 w-8 p-0"
+																	title="Sort documents"
+																>
+																	<Ellipsis class="h-4 w-4" />
+																</Button>
+															{/snippet}
+														</Popover.Trigger>
+														<Popover.Content class="w-[240px] p-2">
+															<div class="text-muted-foreground mb-2 px-2 text-xs font-semibold">
+																Sort by
+															</div>
+															<div class="flex flex-col gap-0.5">
+																{#each availableOrderings as ordering (ordering.name)}
+																	{@const fieldName = ordering.by[0]?.field}
+																	{@const baseName = ordering.name
+																		.replace('Desc', '')
+																		.replace('Asc', '')}
+																	{@const isActive =
+																		currentSortName === ordering.name ||
+																		currentSortName === `${baseName}Asc`}
+																	{@const direction =
+																		isActive && currentSortName.endsWith('Asc')
+																			? 'asc'
+																			: ordering.by[0]?.direction}
+																	{@const currentSchema = schemas.find(
+																		(s) => s.name === selectedDocumentType
+																	)}
+																	{@const schemaField = currentSchema?.fields.find(
+																		(f) => f.name === fieldName
+																	)}
+																	{@const fieldType =
+																		schemaField?.type ||
+																		(fieldName === 'updatedAt' || fieldName === 'createdAt'
+																			? 'datetime'
+																			: 'string')}
+																	<button
+																		onclick={async () => {
+																			// Toggle between desc ↔ asc for active field, or select new field (desc)
+																			if (isActive) {
+																				// Toggle direction: desc → asc or asc → desc
+																				const newDirection = direction === 'desc' ? 'asc' : 'desc';
+																				const fieldName = ordering.by[0]?.field;
+																				const baseName = ordering.name
+																					.replace('Desc', '')
+																					.replace('Asc', '');
+																				currentSortName = `${baseName}${newDirection === 'asc' ? 'Asc' : 'Desc'}`;
+																			} else {
+																				// Select this ordering (defaults to desc)
+																				currentSortName = ordering.name;
+																			}
+
+																			if (selectedDocumentType) {
+																				await fetchDocuments(selectedDocumentType);
+																			}
+																		}}
+																		class="hover:bg-muted flex items-center justify-between rounded px-2 py-2 text-left text-sm transition-colors {isActive
+																			? 'bg-muted'
+																			: ''}"
+																	>
+																		<span class={isActive ? 'font-medium' : ''}>
+																			{ordering.title
+																				.replace(' (A-Z)', '')
+																				.replace(' (Z-A)', '')
+																				.replace(' (Newest)', '')
+																				.replace(' (Oldest)', '')
+																				.replace(' (High to Low)', '')
+																				.replace(' (Low to High)', '')}
+																		</span>
+																		{#if isActive}
+																			<span class="text-muted-foreground">
+																				{#if fieldType === 'string'}
+																					{#if direction === 'asc'}
+																						<ArrowDownAZ class="h-4 w-4" />
+																					{:else}
+																						<ArrowUpZA class="h-4 w-4" />
+																					{/if}
+																				{:else if fieldType === 'number' || fieldType === 'date' || fieldType === 'datetime'}
+																					{#if direction === 'asc'}
+																						<ArrowDown01 class="h-4 w-4" />
+																					{:else}
+																						<ArrowUp10 class="h-4 w-4" />
+																					{/if}
+																				{:else if direction === 'asc'}
+																					<ArrowDownUp class="h-4 w-4" />
+																				{:else}
+																					<ArrowDownUp class="h-4 w-4" />
+																				{/if}
+																			</span>
+																		{/if}
+																	</button>
+																{/each}
+															</div>
+														</Popover.Content>
+													</Popover.Root>
+												</div>
 											</div>
 										</div>
 
@@ -889,9 +1099,12 @@
 												</div>
 											{:else if documentsList.length > 0}
 												{#each documentsList as doc, index (index)}
+													{@const isActive = editingDocumentId === doc.id}
 													<button
 														onclick={() => navigateToEditDocument(doc.id, selectedDocumentType!)}
-														class="hover:bg-muted/50 border-border group flex w-full items-center justify-between border-b p-3 text-left transition-colors"
+														class="hover:bg-muted/50 border-border group flex w-full items-center justify-between border-b p-3 text-left transition-colors {isActive
+															? 'bg-muted/50'
+															: ''}"
 													>
 														<div class="flex min-w-0 flex-1 items-center gap-3">
 															<div class="flex h-6 w-6 items-center justify-center">
@@ -903,6 +1116,11 @@
 																{/if}
 															</div>
 															<div class="min-w-0 flex-1">
+																{#if userPreferences?.includeChildOrganizations && doc.organizationId && organizationsMap.has(doc.organizationId)}
+																	<p class="text-muted-foreground/70 truncate text-xs italic">
+																		{organizationsMap.get(doc.organizationId)?.name}
+																	</p>
+																{/if}
 																<h3 class="truncate text-sm font-medium">{doc.title}</h3>
 																{#if doc.subtitle}
 																	<p class="text-muted-foreground truncate text-xs">
@@ -963,10 +1181,25 @@
 												if (selectedDocumentType) {
 													await fetchDocuments(selectedDocumentType);
 												}
-												navigateToEditDocument(docId, selectedDocumentType!);
+												// For first-time creation, just update URL without changing props
+												// This prevents DocumentEditor from reloading and keeps focus
+												if (isCreatingDocument) {
+													const params = new SvelteURLSearchParams(page.url.searchParams);
+													params.set('docId', docId);
+													if (selectedDocumentType) params.set('docType', selectedDocumentType);
+													params.delete('action');
+													replaceState(`/admin?${params.toString()}`, { ...page.state });
+
+													// Update local state immediately to prevent creating duplicate documents
+													isCreatingDocument = false;
+													editingDocumentId = docId;
+												} else {
+													// For subsequent saves, use normal navigation
+													navigateToEditDocument(docId, selectedDocumentType!);
+												}
 											}}
 											onAutoSaved={handleAutoSave}
-											onPublished={async (docId) => {
+											onPublished={async (_) => {
 												if (selectedDocumentType) {
 													await fetchDocuments(selectedDocumentType);
 												}
@@ -1024,9 +1257,9 @@
 											isCreating={stackedEditor.isCreating}
 											onBack={() => handleCloseStackedEditor(index)}
 											onOpenReference={handleOpenReference}
-											onSaved={async (docId) => {}}
+											onSaved={async (_) => {}}
 											onAutoSaved={() => {}}
-											onPublished={async (docId) => {}}
+											onPublished={async (_) => {}}
 											onDeleted={async () => {
 												handleCloseStackedEditor(index);
 											}}

package/dist/components/AdminApp.svelte.d.ts

@@ -1,4 +1,5 @@
 import type { SchemaType } from '../types/index.js';
+import type { UserSessionPreferences } from '../types/organization.js';
 interface Props {
     schemas: SchemaType[];
     documentTypes: Array<{
@@ -19,6 +20,7 @@ interface Props {
         value: 'structure' | 'vision';
     };
     handleTabChange: (value: string) => void;
+    userPreferences?: UserSessionPreferences | null;
 }
 declare const AdminApp: import("svelte").Component<Props, {}, "">;
 type AdminApp = ReturnType<typeof AdminApp>;

package/dist/components/AdminApp.svelte.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AdminApp.svelte.d.ts","sourceRoot":"","sources":["../../src/lib/components/AdminApp.svelte.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAShD,UAAU,KAAK;IACd,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,aAAa,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5E,WAAW,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;IACvE,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE;QAAE,KAAK,EAAE,WAAW,GAAG,QAAQ,CAAA;KAAE,CAAC;IAC9C,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC;AAm8BF,QAAA,MAAM,QAAQ,2CAAwC,CAAC;AACvD,KAAK,QAAQ,GAAG,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC;AAC5C,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"AdminApp.svelte.d.ts","sourceRoot":"","sources":["../../src/lib/components/AdminApp.svelte.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAiBnE,UAAU,KAAK;IACd,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,aAAa,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5E,WAAW,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;IACvE,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE;QAAE,KAAK,EAAE,WAAW,GAAG,QAAQ,CAAA;KAAE,CAAC;IAC9C,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,eAAe,CAAC,EAAE,sBAAsB,GAAG,IAAI,CAAC;CAChD;AA0pCF,QAAA,MAAM,QAAQ,2CAAwC,CAAC;AACvD,KAAK,QAAQ,GAAG,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC;AAC5C,eAAe,QAAQ,CAAC"}

package/dist/components/admin/DocumentEditor.svelte

@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { tick } from 'svelte';
 	import { Button } from '@aphexcms/ui/shadcn/button';
 	import { Badge } from '@aphexcms/ui/shadcn/badge';
 	import { documents } from '../../api/documents';
@@ -9,6 +10,7 @@
 	import { Rule } from '../../field-validation/rule';
 	import { hasUnpublishedChanges } from '../../utils/content-hash';
 	import { setSchemaContext } from '../../schema-context.svelte';
+	import { getDefaultValueForFieldType } from '../../utils/field-defaults';
 
 	interface Props {
 		schemas: SchemaType[];
@@ -146,10 +148,10 @@
 		}
 	});
 
-	// Reset to defaults when creating new document
+	// Initialize new document with field defaults
 	$effect(() => {
 		if (isCreating && schema) {
-			resetToDefaults();
+			initializeDocument();
 		}
 	});
 
@@ -210,6 +212,15 @@
 				console.log('📄 documentData after assignment:', documentData);
 				console.log('📄 Keys in documentData:', Object.keys(documentData));
 				hasUnsavedChanges = false; // Just loaded, so no unsaved changes
+
+				// Run validation on loaded document to show any existing errors
+				await tick(); // Wait for DOM to update with new data
+				schemaFields.forEach((fieldComponent, index) => {
+					const field = schema?.fields[index];
+					if (fieldComponent && field) {
+						fieldComponent.performValidation(documentData[field.name], documentData);
+					}
+				});
 			} else {
 				console.log('❌ Failed to load document data:', response.error);
 				saveError = response.error || 'Failed to load document';
@@ -220,27 +231,53 @@
 		}
 	}
 
-	function resetToDefaults() {
+	async function initializeDocument() {
 		if (!schema) return;
 
-		console.log('🔄 Resetting document data to defaults for new document');
+		console.log('🆕 Initializing new document with field defaults');
 
-		// Reset document data with field defaults
+		// Initialize document data with field defaults
 		const initialData: Record<string, any> = {};
-		schema.fields.forEach((field) => {
-			if (field.type === 'boolean' && 'initialValue' in field) {
-				initialData[field.name] = field.initialValue;
+
+		for (const field of schema.fields) {
+			if ('initialValue' in field && field.initialValue !== undefined) {
+				// Resolve initialValue if it's a function
+				if (typeof field.initialValue === 'function') {
+					try {
+						initialData[field.name] = await field.initialValue();
+					} catch (error) {
+						console.error(`Failed to resolve initialValue for field "${field.name}":`, error);
+						// Fall back to default value for the field type
+						initialData[field.name] = getDefaultValueForFieldType(field.type);
+					}
+				} else {
+					// Use literal initialValue
+					initialData[field.name] = field.initialValue;
+				}
+			} else if (field.type === 'boolean') {
+				// Boolean fields default to false if no initialValue
+				initialData[field.name] = false;
+			} else if (field.type === 'array') {
+				// Array fields default to empty array
+				initialData[field.name] = [];
+			} else if (field.type === 'object') {
+				// Object fields default to empty object
+				initialData[field.name] = {};
+			} else if (field.type === 'number') {
+				// Number fields default to null (not 0, which is a valid value)
+				initialData[field.name] = null;
 			} else {
+				// String and other fields default to empty string
 				initialData[field.name] = '';
 			}
-		});
+		}
 
 		documentData = initialData;
 		fullDocument = null;
 		hasUnsavedChanges = false;
 		lastSaved = null;
 		saveError = null;
-		console.log('✅ Document data reset to:', initialData);
+		console.log('✅ Document initialized with:', initialData);
 	}
 
 	// Check if document has meaningful content (not just empty initialized values)
@@ -360,8 +397,17 @@
 				});
 
 				// Update fullDocument with the response to keep saved data in sync
+				// We need to sync fullDocument to match what we just saved (documentData)
+				// instead of what the server returned, in case server adds extra metadata
 				if (response?.success && response.data) {
-					fullDocument = response.data;
+					const { id: responseId, _meta } = response.data;
+					// Reconstruct fullDocument using the data we sent (documentData)
+					// plus the id and _meta from the response
+					fullDocument = {
+						id: responseId,
+						_meta,
+						...documentData
+					};
 				}
 			}
 
@@ -517,8 +563,8 @@
 
 	// Schema cleanup functions
 	function removeOrphanedField(fieldToRemove: OrphanedField) {
-		// Remove the specific field from document data
-		const newData = { ...documentData };
+		// Deep clone to ensure nested object changes trigger reactivity
+		const newData = JSON.parse(JSON.stringify(documentData));
 
 		if (fieldToRemove.level === 'document') {
 			delete newData[fieldToRemove.key];
@@ -742,6 +788,7 @@
 					{onOpenReference}
 					schemaType={documentType}
 					readonly={isReadOnly}
+					organizationId={fullDocument?._meta?.organizationId}
 				/>
 			{/each}
 		{:else}

package/dist/components/admin/DocumentEditor.svelte.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DocumentEditor.svelte.d.ts","sourceRoot":"","sources":["../../../src/lib/components/admin/DocumentEditor.svelte.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAM1D,UAAU,KAAK;IACd,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,OAAO,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1D,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IACvB,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,eAAe,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACrE,UAAU,CAAC,EAAE,OAAO,CAAC;CACrB;AAsvBF,QAAA,MAAM,cAAc,2CAAwC,CAAC;AAC7D,KAAK,cAAc,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AACxD,eAAe,cAAc,CAAC"}
+{"version":3,"file":"DocumentEditor.svelte.d.ts","sourceRoot":"","sources":["../../../src/lib/components/admin/DocumentEditor.svelte.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAO1D,UAAU,KAAK;IACd,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,OAAO,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1D,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IACvB,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,eAAe,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACrE,UAAU,CAAC,EAAE,OAAO,CAAC;CACrB;AAoyBF,QAAA,MAAM,cAAc,2CAAwC,CAAC;AAC7D,KAAK,cAAc,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AACxD,eAAe,cAAc,CAAC"}