rimecms 0.25.1 → 0.25.2

package/dist/core/config/shared/upload-directories.d.ts

@@ -1,9 +1,5 @@
 import type { WithUpload } from '../../collections/upload/util/config.js';
 import type { BuiltCollection } from '../types.js';
-/**
- * Creates an upload directories collection for collections with upload enabled
- * Eg. for medias this will create a collection medias_directories
- */
 /**
  * Creates an upload directories collection for collections with upload enabled
  * Eg. for medias this will create a collection medias_directories

package/dist/core/config/shared/upload-directories.js

@@ -2,76 +2,6 @@ import { validatePath } from '../../collections/upload/util/path.js';
 import { withDirectoriesSuffix } from '../../naming.js';
 import { date } from '../../../fields/date/index.js';
 import { text } from '../../../fields/text/index.js';
-/**
- * Creates an upload directories collection for collections with upload enabled
- * Eg. for medias this will create a collection medias_directories
- */
-// export function makeUploadDirectoriesCollections<C extends Config>(config: C) {
-// 	for (const collection of config.collections || []) {
-// 		if (collection.upload) {
-// 			const slug = withDirectoriesSuffix(collection.slug);
-// 			// If already created skip to the next colleciton
-// 			// for exemple a versions collections of an upload
-// 			// collection should not have a directories related table
-// 			if ((config.collections || []).filter((c) => c.slug === slug).length) continue;
-// 			const directoriesConfig = collection.upload.directories;
-// 			// else create the directory collection
-// 			let directoriesCollection: BuiltCollection = {
-// 				slug: slug as CollectionSlug,
-// 				kebab: withDirectoriesSuffix(toKebabCase(collection.slug)),
-// 				versions: undefined,
-// 				access: {
-// 					read: directoriesConfig?.access?.read || collection.access.read,
-// 					create: directoriesConfig?.access?.create || collection.access.create,
-// 					update: directoriesConfig?.access?.update || collection.access.update,
-// 					delete: directoriesConfig?.access?.delete || collection.access.delete
-// 				},
-// 				fields: [
-// 					text('id').validate(validatePath).unique().required().hidden(),
-// 					text('name').validate((value) => {
-// 						const pattern = /^[a-zA-Z0-9-_ ]+$/;
-// 						if (typeof value !== 'string' || !pattern.test(value)) {
-// 							return 'Incorrect folder name';
-// 						}
-// 						return true;
-// 					}),
-// 					text('parent').hidden(),
-// 					...(directoriesConfig?.fields || []),
-// 					date('createdAt').hidden(),
-// 					date('updatedAt').hidden()
-// 				],
-// 				type: 'collection',
-// 				label: {
-// 					singular: `${collection.slug} directory`,
-// 					plural: `${collection.slug} directories`
-// 				},
-// 				icon: collection.icon,
-// 				$hooks: {
-// 					beforeOperation: directoriesConfig?.$hooks?.beforeOperation || [],
-// 					beforeCreate: [exctractPath, ...(directoriesConfig?.$hooks?.beforeCreate || [])],
-// 					beforeRead: directoriesConfig?.$hooks?.beforeRead || [],
-// 					beforeUpdate: [
-// 						exctractPath,
-// 						prepareDirectoryChildren,
-// 						...(directoriesConfig?.$hooks?.beforeUpdate || [])
-// 					],
-// 					beforeDelete: directoriesConfig?.$hooks?.beforeDelete || [],
-// 					afterCreate: directoriesConfig?.$hooks?.afterCreate || [],
-// 					afterUpdate: [updateDirectoryChildren, ...(directoriesConfig?.$hooks?.afterUpdate || [])],
-// 					afterDelete: directoriesConfig?.$hooks?.afterDelete || []
-// 				},
-// 				asTitle: 'path',
-// 				asThumbnail: collection.asThumbnail,
-// 				panel: false
-// 				// _generateTypes: false,
-// 				// _generateSchema: false
-// 			};
-// 			directoriesCollection = augmentHooks(directoriesCollection);
-// 			config.collections = [...(config.collections || []), directoriesCollection];
-// 		}
-// 	}
-// 	return config;
-// }
 /**
  * Creates an upload directories collection for collections with upload enabled
  * Eg. for medias this will create a collection medias_directories
@@ -79,8 +9,6 @@ import { text } from '../../../fields/text/index.js';
 export function makeUploadDirectoriesCollectionClient(collection) {
     const slug = withDirectoriesSuffix(collection.slug);
     const directoriesConfig = collection.upload.directories;
-    console.log(collection.upload);
-    console.log(directoriesConfig?.fields);
     // else create the directory collection
     let directoriesCollection = {
         slug: slug,

package/dist/fields/relation/component/Relation.svelte

@@ -10,7 +10,6 @@
 	import { getLocaleContext } from '../../../panel/context/locale.svelte';
 	import { panelUrl } from '../../../panel/util/url.js';
 	import { moveItem } from '../../../util/array.js';
-	import { getValueAtPath } from '../../../util/object.js';
 	import { snapshot } from '../../../util/state.js';
 	import { API_PROXY, getAPIProxyContext } from '../../../panel/context/api-proxy.svelte.js';
 	import type { Relation, RelationField } from '../index.js';
@@ -58,7 +57,6 @@
 	function documentToRelationFieldItem(doc: GenericDoc) {
 		const itemInFieldValue = retreiveRelation(doc.id);
 		const item: RelationFieldItem = {
-			label: getValueAtPath(relationConfig.asTitle, doc) || '[untitled]',
 			documentId: doc.id,
 			title: doc.title,
 			editUrl: panelUrl(relationConfig.kebab, doc.id),

package/dist/fields/relation/component/default/Default.svelte

@@ -83,7 +83,7 @@
 		>
 			{#each selectedItems as item (item.documentId)}
 				<Tag onRemove={() => removeValue(item.documentId)} {readOnly}>
-					<a href={item.editUrl}>{item.label}</a>
+					<a href={item.editUrl}>{item.title}</a>
 				</Tag>
 			{/each}
 
@@ -107,8 +107,8 @@
 				{#if inputFocused}
 					<Command.List>
 						{#each availableItems as item (item.documentId)}
-							<Command.Item value={item.label} onSelect={() => onSelect(item)}>
-								<span>{item.label}</span>
+							<Command.Item value={item.title} onSelect={() => onSelect(item)}>
+								<span>{item.title}</span>
 							</Command.Item>
 						{/each}
 						<Command.Empty>Nothing to select</Command.Empty>

package/dist/fields/relation/component/types.d.ts

@@ -3,7 +3,6 @@ import type { GenericDoc } from '../../../core/types/doc.js';
 export type RelationFieldItem = {
     id?: string;
     documentId: string;
-    label: string;
     title: string;
     filename?: string;
     filesize?: string;

package/dist/fields/relation/index.js

@@ -4,6 +4,7 @@ import { PARAMS } from '../../core/constant';
 import { FormFieldBuilder } from '../../core/fields/builders/form-field-builder.js';
 import { trycatchFetch } from '../../util/function';
 import { hasProps, isObjectLiteral } from '../../util/object.js';
+import { toKebabCase } from '../../util/string.js';
 import Cell from './component/Cell.svelte';
 import RelationComponent from './component/Relation.svelte';
 export const ensureRelationExists = async (value, { config }) => {
@@ -13,7 +14,7 @@ export const ensureRelationExists = async (value, { config }) => {
     const getRequsetEvent = await import('$app/server').then((m) => m.getRequestEvent);
     const output = [];
     const retrieveRelation = async (id) => {
-        const [err, response] = await trycatchFetch(`${env.PUBLIC_RIME_URL}/api/${config.relationTo}/${id}?${PARAMS.SELECT}=id`, {
+        const [err, response] = await trycatchFetch(`${env.PUBLIC_RIME_URL}/api/${toKebabCase(config.relationTo)}/${id}?${PARAMS.SELECT}=id`, {
             method: 'GET',
             headers: getRequsetEvent().request.headers
         });

package/dist/fields/rich-text/core/extensions/drag-handle/drag-handle-plugin.js

@@ -21,7 +21,7 @@ const getAbsolutePos = (state, relativePos) => {
     if (!ystate) {
         return -1;
     }
-    return relativePositionToAbsolutePosition(ystate.doc, ystate.type, relativePos, ystate.binding.mapping) || 0;
+    return (relativePositionToAbsolutePosition(ystate.doc, ystate.type, relativePos, ystate.binding.mapping) || 0);
 };
 const getOuterDomNode = (view, domNode) => {
     let tmpDomNode = domNode;
@@ -144,7 +144,6 @@ export const DragHandlePlugin = ({ pluginKey = dragHandlePluginDefaultKey, eleme
                             const newPos = tr.mapping.map(currentNodePos);
                             if (newPos !== currentNodePos) {
                                 // TODO: Remove
-                                // console.log('Position has changed …', { old: currentNodePos, new: newPos }, tr);
                                 // Set the new position for our current node.
                                 currentNodePos = newPos;
                                 // Memorize relative position to retrieve absolute position in case of collaboration

package/dist/fields/rich-text/core/svelte/node-view-renderer.svelte.js

@@ -42,7 +42,6 @@ class SvelteNodeView extends NodeView {
                 context.set(key, ctx);
             }
         }
-        console.log(context);
         const as = this.options.as ?? (this.node.isInline ? 'span' : 'div');
         const target = document.createElement(as);
         target.classList.add(`node-${this.node.type.name}`);

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

@@ -38,8 +38,13 @@
 	h3 {
 		font-variation-settings: 'wght' 600;
 		font-weight: 600;
+		overflow: hidden;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		font-size: var(--rz-text-sm);
 		text-align: center;
-		padding: var(--rz-size-3);
+		margin-block: var(--rz-size-3);
 	}
 	.rz-folder-svg {
 		aspect-ratio: 5 / 4;

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

@@ -8,10 +8,7 @@
 	import * as Dialog from '../../../../ui/dialog/index.js';
 	import { API_PROXY, setAPIProxyContext } from '../../../../../context/api-proxy.svelte.js';
 	import { getConfigContext } from '../../../../../context/config.svelte.js';
-	import {
-		setDocumentFormContext,
-		type FormSuccessData
-	} from '../../../../../context/documentForm.svelte.js';
+	import { setDocumentFormContext } from '../../../../../context/documentForm.svelte.js';
 	import { getUserContext } from '../../../../../context/user.svelte.js';
 
 	type Props = {
@@ -24,13 +21,8 @@
 	const user = getUserContext();
 	const configCtx = getConfigContext();
 	const config = configCtx.getCollection(withDirectoriesSuffix(collection.slug));
-	setAPIProxyContext(API_PROXY.DOCUMENT);
 	let formElement = $state<HTMLFormElement>();
-
-	async function beforeRedirect(data?: FormSuccessData) {
-		open = false;
-		return false;
-	}
+	setAPIProxyContext(API_PROXY.DOCUMENT);
 
 	const form = setDocumentFormContext({
 		element: () => formElement,
@@ -38,7 +30,7 @@
 		config,
 		readOnly: !config.access.update(user.attributes, { id: folder.id }),
 		key: folder._type,
-		beforeRedirect: beforeRedirect
+		afterSuccess: () => (open = false)
 	});
 
 	function handleKeyDown(event: KeyboardEvent) {
@@ -64,11 +56,7 @@
 	<Dialog.Content>
 		{#snippet child({ props })}
 			<form use:form.enhance action={form.buildPanelActionUrl()} bind:this={formElement} {...props}>
-				<Dialog.Header>
-					{t__('common.rename_dialog_title', folder.name)}
-				</Dialog.Header>
 				<RenderFields {form} fields={config.fields} />
-
 				<Dialog.Footer --rz-justify-content="space-between">
 					<Button data-submit disabled={!form.canSubmit} type="submit">{t__('common.save')}</Button>
 					<Button onclick={() => (open = false)} variant="secondary">{t__('common.cancel')}</Button>

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

@@ -45,7 +45,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/{collection.config.slug}/{doc.id}">
+			<a class="rz-list-row__link" href="/panel/{collection.config.kebab}/{doc.id}">
 				{#if doc._thumbnail}
 					<UploadThumbCell url={doc._thumbnail} mimeType={doc.mimeType} />
 				{:else}

package/dist/panel/components/sections/collection/tree/CollectionTree.svelte

@@ -59,7 +59,6 @@
 	};
 
 	const initSortable = () => {
-		console.log('initSortable');
 		// Get all sortable containers including the root and nested ones
 		const sortableContainers = document.querySelectorAll('.rz-collection-sortable');
 

package/dist/panel/context/documentForm.svelte.d.ts

@@ -152,6 +152,7 @@ type Args<T> = {
     element: () => HTMLFormElement | undefined;
     beforeSubmit?: (data: Dic) => Promise<Dic>;
     beforeRedirect?: (data?: FormSuccessData) => Promise<boolean>;
+    afterSuccess?: (doc?: T) => void;
     initial: T;
     config: (AreaSlug extends never ? never : BuiltAreaClient) | BuiltCollectionClient;
     readOnly: boolean;

package/dist/panel/context/documentForm.svelte.js

@@ -24,7 +24,7 @@ import { getCollectionContext } from './collection.svelte.js';
 import { setErrorsContext } from './errors.svelte.js';
 import { getLocaleContext } from './locale.svelte.js';
 import { getUserContext } from './user.svelte.js';
-function createDocumentFormState({ initial, element, config, readOnly, key, onNestedDocumentCreated, onDataChange, beforeSubmit, beforeRedirect, onFieldFocus }) {
+function createDocumentFormState({ initial, element, config, readOnly, key, onNestedDocumentCreated, afterSuccess, onDataChange, beforeSubmit, beforeRedirect, onFieldFocus }) {
     //
     let initialDoc = $state(initial);
     let doc = $state(initial);
@@ -522,6 +522,8 @@ function createDocumentFormState({ initial, element, config, readOnly, key, onNe
                 if (onNestedDocumentCreated)
                     onNestedDocumentCreated(doc);
             }
+            if (afterSuccess)
+                afterSuccess(doc);
         }
         async function handleError(data) {
             // Handle error
@@ -578,8 +580,6 @@ function createDocumentFormState({ initial, element, config, readOnly, key, onNe
         };
     };
     const buildPanelActionUrl = () => {
-        console.log('@buildPanelActionUrl----');
-        console.log(operation);
         // Start with the base URI for the panel
         let panelUri = `/panel/${config.kebab}`;
         // Add the item ID to the URI if we're updating a collection doc

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rimecms",
-	"version": "0.25.1",
+	"version": "0.25.2",
 	"homepage": "https://github.com/bienbiendev/rime",
 	"scripts": {
 		"dev": "vite dev",