rimecms 0.31.4 → 0.32.0

package/dist/fields/relation/module.server.js

@@ -1,6 +1,6 @@
 import { getRequestEvent } from '$app/server';
 import { env } from '$env/dynamic/public';
-import { PARAMS } from '../../core/constant.js';
+import { PARAMS } from '../../core/constants.js';
 import { trycatchFetch } from '../../util/function.js';
 import { toKebabCase } from '../../util/string.js';
 /** Real implementation — resolved server-side via `$rime/fields/relation` (see relation/index.ts,
@@ -20,13 +20,8 @@ export const ensureRelationExists = async (value, { config }) => {
     };
     if (value && Array.isArray(value)) {
         for (const relation of value) {
-            let documentId;
-            if (typeof relation === 'string') {
-                documentId = relation;
-            }
-            else {
-                documentId = relation.documentId;
-            }
+            // A `null` element — what `[undefined]` becomes over JSON — names nothing, like an unknown id.
+            const documentId = typeof relation === 'string' ? relation : relation?.documentId;
             if (!documentId) {
                 continue;
             }

package/dist/fields/rich-text/core/features/link/component/link-selector.svelte

@@ -1,14 +1,14 @@
 <script lang="ts">
   import { env } from '$env/dynamic/public';
+  import validate from '../../../../../../core/fields/validate.js';
   import { t__ } from '../../../../../../core/i18n/index.js';
+  import { apiUrl } from '../../../../../../core/routes/util.js';
   import IconButton from '../../../../component/bubble-menu/icon-button/icon-button.svelte';
   import Button from '../../../../../../panel/components/ui/button/button.svelte';
   import * as Command from '../../../../../../panel/components/ui/command/index.js';
   import Input from '../../../../../../panel/components/ui/input/input.svelte';
   import { getAPIProxyContext, type Resource } from '../../../../../../panel/context/api-proxy.svelte.js';
   import { getLocaleContext } from '../../../../../../panel/context/locale.svelte';
-  import { apiUrl } from '../../../../../../util/index.js';
-  import validate from '../../../../../../util/validate.js';
   import { CornerDownLeft, ExternalLink, Link2, Newspaper, Trash } from '@lucide/svelte';
   import type { Editor } from '@tiptap/core';
   import { watch } from 'runed';

package/dist/fields/rich-text/core/features/resource/resource-extension.d.ts

@@ -1,4 +1,4 @@
-import type { PrototypeSlug } from '../../../../../core/types/doc.js';
+import type { PrototypeSlug } from '../../../../../core/prototype/types.js';
 import type { Dic } from '../../../../../util/types.js';
 import { Node } from '@tiptap/core';
 declare module '@tiptap/core' {

package/dist/fields/rich-text/core/features/resource/resource.svelte

@@ -1,10 +1,10 @@
 <script lang="ts">
-  import type { GenericDoc } from '../../../../../core/types/doc.js';
+  import type { GenericDoc } from '../../../../../core/prototype/types.js';
+  import { apiUrl } from '../../../../../core/routes/util.js';
   import Button from '../../../../../panel/components/ui/button/button.svelte';
   import CardResource from '../../../../../panel/components/ui/card-resource/card-resource.svelte';
   import * as Command from '../../../../../panel/components/ui/command/index.js';
   import { getAPIProxyContext } from '../../../../../panel/context/api-proxy.svelte.js';
-  import { apiUrl } from '../../../../../util/index.js';
   import type { NodeViewProps } from '@tiptap/core';
   import { onMount } from 'svelte';
   import NodeViewWrapper from '../../svelte/node-view-wrapper.svelte';

package/dist/fields/rich-text/core/features/upload/upload.svelte

@@ -1,12 +1,12 @@
 <script lang="ts">
-  import type { UploadDoc } from '../../../../../core/types/doc.js';
+  import type { UploadDoc } from '../../../../../core/prototype/collection/upload/types.js';
+  import { apiUrl } from '../../../../../core/routes/util.js';
   import UploadThumbCell from '../../../../../panel/components/sections/collection/upload-thumb-cell/UploadThumbCell.svelte';
   import Button from '../../../../../panel/components/ui/button/button.svelte';
   import * as Command from '../../../../../panel/components/ui/command/index.js';
   import * as Dialog from '../../../../../panel/components/ui/dialog/index.js';
   import Input from '../../../../../panel/components/ui/input/input.svelte';
   import { getAPIProxyContext } from '../../../../../panel/context/api-proxy.svelte.js';
-  import { apiUrl } from '../../../../../util/index.js';
   import { X } from '@lucide/svelte';
   import type { NodeViewProps } from '@tiptap/core';
   import { onMount } from 'svelte';

package/dist/fields/slug/index.d.ts

@@ -54,7 +54,7 @@ export declare class SlugFieldBuilder extends FormFieldBuilder<SlugField> {
         } | undefined;
         defaultValue?: string | DefaultValueFn<string> | undefined;
         isEmpty: (value: unknown) => boolean;
-        _root?: boolean | undefined;
+        root?: boolean | undefined;
         slugify?: string | undefined;
         unique?: boolean | undefined;
         isTitle?: true | undefined;

package/dist/fields/tabs/index.d.ts

@@ -1,6 +1,6 @@
 import { FieldBuilder } from '../../core/fields/builders/field-builder.js';
 import type { Field } from '../types.js';
-import type { WithoutBuilders } from '../../util/types.js';
+import type { WithoutBuilders } from '../../core/fields/types.js';
 export declare const tabs: (...tabs: TabBuilder[]) => TabsBuilder;
 export declare const tab: (name: string) => TabBuilder;
 export declare class TabsBuilder extends FieldBuilder<TabsField> {

package/dist/fields/text/index.d.ts

@@ -51,7 +51,7 @@ export declare class TextFieldBuilder extends FormFieldBuilder<TextField> {
             onChange?: import("../types.js").FieldHookClient[] | undefined;
         } | undefined;
         isEmpty: (value: unknown) => boolean;
-        _root?: boolean | undefined;
+        root?: boolean | undefined;
     } & {
         component: import("svelte").Component<any>;
         cell?: import("svelte").Component<{

package/dist/fields/textarea/index.d.ts

@@ -45,7 +45,7 @@ export declare class TextAreaFieldBuilder extends FormFieldBuilder<TextAreaField
         } | undefined;
         defaultValue?: string | DefaultValueFn<string> | undefined;
         isEmpty: (value: unknown) => boolean;
-        _root?: boolean | undefined;
+        root?: boolean | undefined;
         isTitle?: true | undefined;
         placeholder: string;
     } & {

package/dist/fields/toggle/index.d.ts

@@ -42,7 +42,7 @@ export declare class ToggleFieldBuilder extends BooleanFieldBuilder<ToggleField>
             onChange?: import("../types.js").FieldHookClient[] | undefined;
         } | undefined;
         isEmpty: (value: unknown) => boolean;
-        _root?: boolean | undefined;
+        root?: boolean | undefined;
     } & {
         component: import("svelte").Component<any>;
         cell?: import("svelte").Component<{

package/dist/fields/tree/component/TreeBlock.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { TreeBlock } from '../../../core/types/doc.js';
+  import type { TreeBlock } from '../../../core/prototype/types.js';
   import RenderFields from '../../../panel/components/fields/RenderFields.svelte';
   import { useOnce } from '../../../panel/util/once.svelte.js';
   import { GripVertical } from '@lucide/svelte';

package/dist/fields/tree/component/TreeBlock.svelte.d.ts

@@ -1,4 +1,4 @@
-import type { TreeBlock } from '../../../core/types/doc.js';
+import type { TreeBlock } from '../../../core/prototype/types.js';
 import type { TreeBlockProps } from './props.js';
 declare const TreeBlock: import("svelte").Component<TreeBlockProps, {}, "">;
 type TreeBlock = ReturnType<typeof TreeBlock>;

package/dist/fields/tree/component/props.d.ts

@@ -1,4 +1,4 @@
-import type { TreeBlock } from '../../../core/types/doc.js';
+import type { TreeBlock } from '../../../core/prototype/types.js';
 import type { DocumentFormContext } from '../../../panel/context/documentForm.svelte.js';
 import type { Dic } from '../../../util/types.js';
 import type { TreeBuilder } from '../index.js';

package/dist/fields/tree/index.d.ts

@@ -65,7 +65,7 @@ export declare class TreeBuilder extends FormFieldBuilder<TreeField> {
         };
         defaultValue?: import("../types.js").DefaultValueFn<any> | unknown;
         isEmpty: (value: unknown) => boolean;
-        _root?: boolean;
+        root?: boolean;
         maxDepth: number;
         renderTitle?: TreeFieldBlockRenderTitle;
         addItemLabel: string;

package/dist/fields/tree/index.js

@@ -1,6 +1,7 @@
 import { FieldBuilder } from '../../core/fields/builders/field-builder.js';
 import { FormFieldBuilder } from '../../core/fields/builders/form-field-builder.js';
 import { toPascalCase } from '../../util/string.js';
+import dedent from 'dedent';
 import { number } from '../number/index.js';
 import { text } from '../text/index.js';
 import Cell from './component/Cell.svelte';
@@ -75,7 +76,17 @@ export class TreeBuilder extends FormFieldBuilder {
         };
     }
     generateType() {
-        return `${this.name}: Array<Tree${toPascalCase(this.name)}>,`;
+        const blockTypeName = `Tree${toPascalCase(this.name)}`;
+        const fieldsType = this.get.fields.map((f) => f.use.generateType()).join(',\n');
+        const treeType = dedent `
+    //@shared:start ${blockTypeName}
+     export type ${blockTypeName} = {
+        id: string;
+        ${fieldsType};
+	      _children: ${blockTypeName}[]
+    }
+    //@shared:end`;
+        return `${treeType}\n\n${this.name}: Array<${blockTypeName}>,`;
     }
 }
 /**

package/dist/fields/types.d.ts

@@ -1,10 +1,10 @@
-import type { OperationContext } from '../core/operations/hooks/index.server.js';
+import type { OperationContext } from '../core/pipeline/types.js';
 import type { DocumentFormContext } from '../panel/index.js';
 import type { Dic } from '../util/types.js';
 import type { IconProps } from '@lucide/svelte';
 import type { RequestEvent } from '@sveltejs/kit';
 import type { Component } from 'svelte';
-import type { User } from '../core/collections/auth/types.js';
+import type { User } from '../core/auth/types.js';
 import type { FieldPanelTableConfig } from '../panel/types.js';
 export type { BlocksField, BlocksFieldBlock } from './blocks/index.js';
 export type { CheckboxField } from './checkbox/index.js';
@@ -65,13 +65,8 @@ export type FormField = Field & {
     hooks?: FieldHooks;
     defaultValue?: DefaultValueFn<any> | unknown;
     isEmpty: (value: unknown) => boolean;
-    /**
-     * Force the field to be on the root table
-     * usefull for fields that should not be versioned
-     * ex: _parent for nested structures should always be on the root table to prevent
-     * different versions to have different parents
-     */
-    _root?: boolean;
+    /** Kept on the base row of a versioned config, shared by every version. Set by `$root()`. */
+    root?: boolean;
 };
 export type DefaultValueFn<T> = ({ event }: {
     event?: RequestEvent;

package/dist/index.d.ts

@@ -1,11 +1,13 @@
 import i18n, { t__ } from './core/i18n/index.js';
 import { cache } from './core/plugins/cache/index.js';
+import { openSse } from './core/plugins/sse/index.js';
 import LiveConsumer from './panel/components/sections/live/Consumer.svelte';
 import LiveEdit from './panel/components/sections/live/LiveEdit.svelte';
 import LiveProvider from './panel/components/sections/live/Provider.svelte';
-export { definePlugin } from './core/plugins/index.js';
-export { cache, i18n, LiveConsumer, LiveEdit, LiveProvider, t__ };
 export type { Dictionaries, PanelLanguage } from './core/i18n/index.js';
+export { definePlugin } from './core/plugins/index.js';
+export type { SSEEvent, SSEHandler } from './core/plugins/sse/index.js';
+export { cache, i18n, LiveConsumer, LiveEdit, LiveProvider, openSse, t__ };
 declare module 'rimecms' {
     interface RegisterCollection {
     }
@@ -19,6 +21,7 @@ declare module 'rimecms' {
         AreaSlug: keyof RegisterArea;
         Schema: RegisterSchema['schema'];
         Tables: RegisterSchema['tables'];
+        Relations: RegisterSchema['relations'];
     }
 }
 export type GetRegisterType<K extends keyof Register> = Register[K];

package/dist/index.js

@@ -1,7 +1,8 @@
 import i18n, { t__ } from './core/i18n/index.js';
 import { cache } from './core/plugins/cache/index.js';
+import { openSse } from './core/plugins/sse/index.js';
 import LiveConsumer from './panel/components/sections/live/Consumer.svelte';
 import LiveEdit from './panel/components/sections/live/LiveEdit.svelte';
 import LiveProvider from './panel/components/sections/live/Provider.svelte';
 export { definePlugin } from './core/plugins/index.js';
-export { cache, i18n, LiveConsumer, LiveEdit, LiveProvider, t__ };
+export { cache, i18n, LiveConsumer, LiveEdit, LiveProvider, openSse, t__ };

package/dist/panel/components/Root.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
-  import { page } from '$app/state';
-  import type { User } from '../../core/collections/auth/types.js';
+  import type { User } from '../../core/auth/types.js';
   import type { BuiltConfigClient } from '../../core/config/types.js';
   import Nav from './ui/nav/Nav.svelte';
   import { Toaster } from './ui/sonner';
@@ -31,7 +30,14 @@
   setTitleContext('[untitled]');
   setAPIProxyContext();
 
-  const locale = $derived(setLocaleContext(initialeLocale));
+  // svelte-ignore state_referenced_locally
+  const locale = setLocaleContext(initialeLocale);
+
+  // The layout reloads the locale after a switch; the store follows it in place, and whatever
+  // shows locale-dependent content is keyed on it where it stands.
+  $effect(() => {
+    locale.code = initialeLocale;
+  });
 
   function onResize() {
     if (window.innerWidth < 1024) {
@@ -65,11 +71,9 @@
 
 <div class="rz-panel-root">
   <Nav {setCollapsed} {routes} {isCollapsed} />
-  {#key `${page.url}${locale.code || ''}`}
-    <div class="rz-panel-root__right" class:rz-panel-root__right--navCollapsed={isCollapsed}>
-      {@render children()}
-    </div>
-  {/key}
+  <div class="rz-panel-root__right" class:rz-panel-root__right--navCollapsed={isCollapsed}>
+    {@render children()}
+  </div>
 </div>
 
 <style>

package/dist/panel/components/Root.svelte.d.ts

@@ -1,4 +1,4 @@
-import type { User } from '../../core/collections/auth/types.js';
+import type { User } from '../../core/auth/types.js';
 import type { BuiltConfigClient } from '../../core/config/types.js';
 import type { Route } from '../types.js';
 import { type Snippet } from 'svelte';

package/dist/panel/components/sections/auth/AuthForm.svelte

@@ -115,5 +115,8 @@
 
   .rz-auth.rz-auth--image {
     background-size: cover;
+    .rz-auth__right {
+      background-color: hsl(var(--rz-color-bg) / 0.9);
+    }
   }
 </style>

package/dist/panel/components/sections/collection/StatusDot.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
-  import { VERSIONS_STATUS, type VersionsStatus } from '../../../../core/constant.js';
+  import { type VersionsStatus } from '../../../../core/prototype/shared/versions/constant.js';
+  import { VERSIONS_STATUS } from '../../../../core/prototype/shared/versions/constant.js';
 
   type Props = { status: VersionsStatus };
 

package/dist/panel/components/sections/collection/StatusDot.svelte.d.ts

@@ -1,4 +1,4 @@
-import { type VersionsStatus } from '../../../../core/constant.js';
+import { type VersionsStatus } from '../../../../core/prototype/shared/versions/constant.js';
 type Props = {
     status: VersionsStatus;
 };

package/dist/panel/components/sections/collection/bulk-upload/DropZone.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { PARAMS } from '../../../../../core/constant';
+  import { PARAMS } from '../../../../../core/constants';
   import { t__ } from '../../../../../core/i18n/index.js';
   import SpinLoader from '../../../ui/spin-loader/SpinLoader.svelte';
   import type { CollectionContext } from '../../../../context/collection.svelte';

package/dist/panel/components/sections/collection/folder/FolderEdit.svelte

@@ -1,8 +1,8 @@
 <script lang="ts">
-  import type { Directory } from '../../../../../core/collections/upload/upload';
   import type { BuiltCollectionClient } from '../../../../../core/config/types';
   import { t__ } from '../../../../../core/i18n/index.js';
-  import { withDirectoriesSuffix } from '../../../../../core/naming';
+  import { withDirectoriesSuffix } from '../../../../../core/prototype/collection/upload/naming.js';
+  import type { Directory } from '../../../../../core/prototype/collection/upload/types';
   import RenderFields from '../../../fields/RenderFields.svelte';
   import Button from '../../../ui/button/button.svelte';
   import * as Dialog from '../../../ui/dialog/index.js';

package/dist/panel/components/sections/collection/folder/FolderEdit.svelte.d.ts

@@ -1,5 +1,5 @@
-import type { Directory } from '../../../../../core/collections/upload/upload';
 import type { BuiltCollectionClient } from '../../../../../core/config/types';
+import type { Directory } from '../../../../../core/prototype/collection/upload/types';
 type Props = {
     open: boolean;
     folder: Directory;

package/dist/panel/components/sections/collection/folder/FolderWithActions.svelte

@@ -1,18 +1,18 @@
 <script lang="ts">
   import { goto, invalidateAll } from '$app/navigation';
-  import type { Directory } from '../../../../../core/collections/upload/upload.js';
+  import { resolve } from '$app/paths';
   import type { BuiltCollectionClient } from '../../../../../core/config/types.js';
-  import { PARAMS } from '../../../../../core/constant.js';
-  import { withDirectoriesSuffix } from '../../../../../core/naming.js';
-  import type { GenericDoc } from '../../../../../core/types/doc.js';
+  import { PARAMS } from '../../../../../core/constants.js';
+  import { directoriesKebab } from '../../../../../core/prototype/collection/upload/naming.js';
+  import type { Directory } from '../../../../../core/prototype/collection/upload/types.js';
+  import type { GenericDoc } from '../../../../../core/prototype/types.js';
+  import { apiUrl, panelPath } from '../../../../../core/routes/util.js';
   import Button from '../../../ui/button/button.svelte';
   import ContextMenu from '../../../ui/context-menu/ContextMenu.svelte';
   import ContextMenuItem from '../../../ui/context-menu/ContextMenuItem.svelte';
   import * as Dialog from '../../../ui/dialog/index.js';
   import { getAPIProxyContext } from '../../../../context/api-proxy.svelte.js';
-  import { panelUrl } from '../../../../util/url.js';
   import { trycatchFetch } from '../../../../../util/function.js';
-  import { apiUrl } from '../../../../../util/index.js';
   import { Pencil, Trash2 } from '@lucide/svelte';
   import { toast } from 'svelte-sonner';
   import { t__ } from '../../../../../core/i18n/index.js';
@@ -48,7 +48,7 @@
   );
   const childFiles = $derived(APIProxy.getRessource<{ docs: GenericDoc[] }>(childFilesURL));
   const childFilesCount = $derived(childFiles.data?.docs?.length || 0);
-  const baseFolderApiURL = $derived(`${apiUrl(withDirectoriesSuffix(collection.kebab))}`);
+  const baseFolderApiURL = $derived(`${apiUrl(directoriesKebab(collection.slug))}`);
   const childFoldersURL = $derived(
     `${baseFolderApiURL}?where[parent][equals]=${folder.id}&select=id`
   );
@@ -138,7 +138,7 @@
   }
 
   function handleGoToFolder() {
-    goto(`${panelUrl(collection.kebab)}?${PARAMS.UPLOAD_PATH}=${folder.id}`);
+    goto(resolve(`${panelPath(collection.kebab)}?${PARAMS.UPLOAD_PATH}=${folder.id}`));
   }
 
   function handleDragStart(e: DragEvent) {

package/dist/panel/components/sections/collection/folder/FolderWithActions.svelte.d.ts

@@ -1,5 +1,5 @@
-import type { Directory } from '../../../../../core/collections/upload/upload.js';
 import type { BuiltCollectionClient } from '../../../../../core/config/types.js';
+import type { Directory } from '../../../../../core/prototype/collection/upload/types.js';
 type Props = {
     folder: Directory;
     collection: BuiltCollectionClient;

package/dist/panel/components/sections/collection/grid/create-directory-dialog/CreateDirectoryDialog.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import { invalidateAll } from '$app/navigation';
   import { t__ } from '../../../../../../core/i18n/index.js';
-  import { withDirectoriesSuffix } from '../../../../../../core/naming';
+  import { withDirectoriesSuffix } from '../../../../../../core/prototype/collection/upload/naming.js';
   import RenderFields from '../../../../fields/RenderFields.svelte';
   import Button from '../../../../ui/button/button.svelte';
   import * as Dialog from '../../../../ui/dialog/index.js';

package/dist/panel/components/sections/collection/grid/grid-item/GridItem.svelte

@@ -1,12 +1,14 @@
 <script lang="ts">
   import { goto } from '$app/navigation';
+  import { resolve } from '$app/paths';
   import { page } from '$app/state';
-  import { isUploadConfig } from '../../../../../../core/collections/upload/util/config';
-  import { PARAMS, UPLOAD_PATH } from '../../../../../../core/constant.js';
-  import type { GenericDoc } from '../../../../../../core/types/doc';
+  import { PARAMS } from '../../../../../../core/constants.js';
+  import { UPLOAD_PATH } from '../../../../../../core/prototype/collection/upload/constant.js';
+  import { isUploadConfig } from '../../../../../../core/prototype/collection/upload/util/config';
+  import type { GenericDoc } from '../../../../../../core/prototype/types';
+  import { panelPath } from '../../../../../../core/routes/util';
   import CardDocument from '../../../../ui/card-document/card-document.svelte';
   import Checkbox from '../../../../ui/checkbox/checkbox.svelte';
-  import { panelUrl } from '../../../../../util/url.js';
   import type { BuiltCollection } from '../../../../../../types';
 
   type Props = {
@@ -27,7 +29,7 @@
       ? page.url.searchParams.get(PARAMS.UPLOAD_PATH) || UPLOAD_PATH.ROOT_NAME
       : null;
     const params = uploadPath ? `?${PARAMS.UPLOAD_PATH}=${uploadPath}` : '';
-    goto(`${panelUrl(config.kebab, doc.id)}${params}`);
+    goto(resolve(`${panelPath(config.kebab, doc.id)}${params}`));
   }
 
   function handleDragStart(e: DragEvent) {

package/dist/panel/components/sections/collection/grid/grid-item/GridItem.svelte.d.ts

@@ -1,4 +1,4 @@
-import type { GenericDoc } from '../../../../../../core/types/doc';
+import type { GenericDoc } from '../../../../../../core/prototype/types';
 import type { BuiltCollection } from '../../../../../../types';
 type Props = {
     checked: boolean;

package/dist/panel/components/sections/collection/header/ButtonCreate.svelte

@@ -1,9 +1,10 @@
 <script lang="ts">
+  import { resolve } from '$app/paths';
   import { page } from '$app/state';
-  import { PARAMS } from '../../../../../core/constant.js';
+  import { PARAMS } from '../../../../../core/constants.js';
   import { t__ } from '../../../../../core/i18n/index.js';
+  import { panelPath } from '../../../../../core/routes/util.js';
   import Button from '../../../ui/button/button.svelte';
-  import { panelUrl } from '../../../../util/url';
   import type { BuiltCollection } from '../../../../../types';
   import { CirclePlus } from '@lucide/svelte';
 
@@ -17,16 +18,18 @@
     config.label.create || t__(`common.create_new`, config.label.singular)
   );
 
-  const createURL = $derived.by(() => {
+  const createPathname = $derived.by(() => {
     const currentUploadPath = page.url.searchParams.get(PARAMS.UPLOAD_PATH);
     if (config.upload) {
-      return `${panelUrl(config.kebab)}/create?${PARAMS.UPLOAD_PATH}=${currentUploadPath || 'root'}`;
+      return resolve(
+        `${panelPath(config.kebab)}/create?${PARAMS.UPLOAD_PATH}=${currentUploadPath || 'root'}`
+      );
     }
-    return `${panelUrl(config.kebab)}/create`;
+    return resolve(`${panelPath(config.kebab)}/create`);
   });
 </script>
 
-<Button variant={buttonVariant} size={buttonSize} href={createURL}>
+<Button variant={buttonVariant} size={buttonSize} href={createPathname}>
   {#if isSmallSize}
     <CirclePlus size={16} />
   {:else}

package/dist/panel/components/sections/collection/header/DisplayMode.svelte

@@ -38,7 +38,6 @@
     <List size={17} class="rz-header-display-mode__icon {listIconClass}" />
   </Button>
 
-  <!-- {#if collection.config.upload} -->
   <Button
     size="icon-sm"
     variant={setVariant(DISPLAY_MODE.GRID)}
@@ -47,7 +46,7 @@
   >
     <LayoutGrid size={17} class="rz-header-display-mode__icon {gridIconClass}" />
   </Button>
-  <!-- {/if} -->
+
   {#if collection.config.nested}
     <Button
       size="icon-sm"

package/dist/panel/components/sections/collection/header/Header.svelte

@@ -6,13 +6,10 @@
 
   const collection = getCollectionContext();
   const showSelectUI = $derived(!collection.isNested());
-  const showDisplayMode = $derived(collection.isUpload || collection.config.nested);
 </script>
 
-{#if showDisplayMode}
-  <Separator />
-  <DisplayMode />
-{/if}
+<Separator />
+<DisplayMode />
 
 {#if showSelectUI}
   <Separator />

package/dist/panel/components/sections/collection/list/CollectionList.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { isUploadConfig } from '../../../../../core/collections/upload/util/config';
+  import { isUploadConfig } from '../../../../../core/prototype/collection/upload/util/config';
   import type { CollectionContext } from '../../../../context/collection.svelte.js';
   import Empty from '../Empty.svelte';
   import Folder from '../folder/FolderWithActions.svelte';

package/dist/panel/components/sections/collection/list/header/Header.svelte

@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { t__ } from '../../../../../../core/i18n/index.js';
   import type { FormField } from '../../../../../../fields/types.js';
   import { getCollectionContext } from '../../../../../context/collection.svelte.js';
   import { capitalize } from '../../../../../../util/string.js';
@@ -10,7 +11,9 @@
   let gridTemplateColumn = $state('grid-template-columns: 2fr repeat(1, minmax(0, 1fr));');
 
   $effect(() => {
-    const columnLength = collection.columns.length + 2;
+    // The title, the config's own columns, then the two fixed meta columns — who last edited,
+    // and when. Row.svelte counts the same way, and the two have to agree.
+    const columnLength = collection.columns.length + 3;
     gridTemplateColumn = `grid-template-columns: 2fr repeat(${columnLength - 1}, minmax(0, 1fr));`;
   });
 </script>
@@ -51,6 +54,9 @@
     {/if}
   {/each}
 
+  <!-- Not sortable: the column holds user ids, so ordering by it orders by nothing a reader can see. -->
+  {@render columnHeader(t__('common.updated_by'))}
+
   {@render sortableColumnHeader({ name: 'updatedAt' })}
 </div>
 

package/dist/panel/components/sections/collection/list/row/Row.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import type { BuiltCollection } from '../../../../../../core/config/types.js';
-  import type { GenericDoc } from '../../../../../../core/types/doc.js';
+  import type { GenericDoc } from '../../../../../../core/prototype/types.js';
+  import { panelPath } from '../../../../../../core/routes/util.js';
   import Checkbox from '../../../../ui/checkbox/checkbox.svelte';
   import { getLocaleContext } from '../../../../../context/locale.svelte';
   import { getValueAtPath } from '../../../../../../util/object';
@@ -25,7 +26,8 @@
   let gridTemplateColumn = $state('grid-template-columns: 2fr repeat(1, minmax(0, 1fr));');
 
   $effect(() => {
-    const columnLength = (columns?.length ?? 0) + 2;
+    // See the note in Header.svelte, which counts the same columns.
+    const columnLength = (columns?.length ?? 0) + 3;
     gridTemplateColumn = `grid-template-columns: 2fr repeat(${columnLength - 1}, minmax(0, 1fr));`;
   });
 
@@ -59,7 +61,7 @@
       {/if}
       <label for="checkbox-{doc.id}" class="rz-list-row__title">{doc.title || '[untitled]'}</label>
     {:else}
-      <a class="rz-list-row__link" href="/panel/{config.kebab}/{doc.id}">
+      <a class="rz-list-row__link" href={panelPath(config.kebab, doc.id)}>
         {#if doc._thumbnail}
           <UploadThumbCell url={doc._thumbnail} mimeType={doc.mimeType} />
         {:else}
@@ -86,6 +88,10 @@
     </div>
   {/each}
 
+  <div class="rz-list-row__cell">
+    {doc.updatedBy?.name ?? ''}
+  </div>
+
   <div class="rz-list-row__cell">
     {formattedDate}
   </div>

package/dist/panel/components/sections/collection/list/row/Row.svelte.d.ts

@@ -1,5 +1,5 @@
 import type { BuiltCollection } from '../../../../../../core/config/types.js';
-import type { GenericDoc } from '../../../../../../core/types/doc.js';
+import type { GenericDoc } from '../../../../../../core/prototype/types.js';
 type Props = {
     checked: boolean;
     doc: GenericDoc;