@umbraco-cms/backoffice 17.1.0 → 17.2.0-rc2

package/dist-cms/packages/documents/documents/publishing/unpublish/entity-bulk-action/unpublish.bulk-action.js

@@ -1,9 +1,11 @@
 import { UmbUnpublishDocumentEntityAction } from '../entity-action/index.js';
 import { UMB_DOCUMENT_ENTITY_TYPE, UMB_DOCUMENT_UNPUBLISH_MODAL } from '../../../constants.js';
 import { UmbDocumentPublishingRepository } from '../../repository/index.js';
+import { UmbDocumentPublishEntityBulkAction } from '../../publish/entity-bulk-action/publish.bulk-action.js';
+import { UmbDocumentItemRepository } from '../../../item/repository/index.js';
 import { umbConfirmModal, umbOpenModal } from '../../../../../core/modal/index.js';
 import { UmbEntityBulkActionBase } from '../../../../../core/entity-bulk-action/index.js';
-import { UMB_APP_LANGUAGE_CONTEXT, UmbLanguageCollectionRepository } from '../../../../../language/index.js';
+import { UmbLanguageCollectionRepository } from '../../../../../language/index.js';
 import { UmbVariantId } from '../../../../../core/variant/index.js';
 import { UmbLocalizationController } from '../../../../../../libs/localization-api/index.js';
 import { UMB_ENTITY_CONTEXT } from '../../../../../core/entity/index.js';
@@ -18,7 +20,6 @@ export class UmbDocumentUnpublishEntityBulkAction extends UmbEntityBulkActionBas
         }
         const entityType = entityContext.getEntityType();
         const unique = entityContext.getUnique();
-        const notificationContext = await this.getContext(UMB_NOTIFICATION_CONTEXT);
         const localize = new UmbLocalizationController(this);
         if (!entityType)
             throw new Error('Entity type not found');
@@ -34,75 +35,43 @@ export class UmbDocumentUnpublishEntityBulkAction extends UmbEntityBulkActionBas
             await action.execute();
             return;
         }
+        // Fetch document items and languages in parallel
+        const itemRepository = new UmbDocumentItemRepository(this._host);
         const languageRepository = new UmbLanguageCollectionRepository(this._host);
-        const { data: languageData } = await languageRepository.requestCollection({});
-        const options = (languageData?.items ?? []).map((language) => ({
-            language,
-            variant: {
-                name: language.name,
-                culture: language.unique,
-                state: null,
-                createDate: null,
-                publishDate: null,
-                updateDate: null,
-                segment: null,
-                scheduledPublishDate: null,
-                scheduledUnpublishDate: null,
-                flags: [],
-            },
-            unique: new UmbVariantId(language.unique, null).toString(),
-            culture: language.unique,
-            segment: null,
-        }));
-        const eventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
-        if (!eventContext) {
-            throw new Error('Event context not found');
-        }
-        const event = new UmbRequestReloadChildrenOfEntityEvent({
-            entityType,
-            unique,
-        });
-        // If there is only one language available, we can skip the modal and unpublish directly:
-        if (options.length === 1) {
-            const localizationController = new UmbLocalizationController(this._host);
+        const [{ data: documentItems }, { data: languageData }] = await Promise.all([
+            itemRepository.requestItems(this.selection),
+            languageRepository.requestCollection({}),
+        ]);
+        if (!documentItems?.length)
+            return;
+        const { allInvariant, options } = UmbDocumentPublishEntityBulkAction.buildVariantOptions(documentItems, languageData?.items ?? []);
+        // If there is only one language available, or all selected documents are invariant, we can skip the modal and unpublish directly:
+        if (options.length === 1 || allInvariant) {
             const confirm = await umbConfirmModal(this, {
-                headline: localizationController.term('actions_unpublish'),
-                content: localizationController.term('prompt_confirmListViewUnpublish'),
+                headline: localize.term('actions_unpublish'),
+                content: localize.term('prompt_confirmListViewUnpublish'),
                 color: 'warning',
-                confirmLabel: localizationController.term('actions_unpublish'),
+                confirmLabel: localize.term('actions_unpublish'),
             }).catch(() => false);
             if (confirm !== false) {
-                const variantId = new UmbVariantId(options[0].language.unique, null);
-                const publishingRepository = new UmbDocumentPublishingRepository(this._host);
-                let documentCnt = 0;
-                for (let i = 0; i < this.selection.length; i++) {
-                    const id = this.selection[i];
-                    const { error } = await publishingRepository.unpublish(id, [variantId]);
-                    if (!error) {
-                        documentCnt++;
-                    }
-                }
+                // For invariant documents, use null culture; otherwise use the first language
+                const variantId = allInvariant
+                    ? UmbVariantId.CreateInvariant()
+                    : new UmbVariantId(options[0].language.unique, null);
+                const documentCnt = await this.#unpublishDocuments(this.selection, [variantId]);
+                const notificationContext = await this.getContext(UMB_NOTIFICATION_CONTEXT);
                 notificationContext?.peek('positive', {
                     data: {
                         headline: localize.term('speechBubbles_contentUnpublished'),
                         message: localize.term('speechBubbles_editMultiContentUnpublishedText', documentCnt),
                     },
                 });
-                eventContext.dispatchEvent(event);
+                await this.#reloadChildren(entityType, unique);
             }
             return;
         }
-        // Figure out the default selections
-        // TODO: Missing features to pre-select the variant that fits with the variant-id of the tree/collection? (Again only relevant if the action is executed from a Tree or Collection) [NL]
-        const selection = [];
-        const context = await this.getContext(UMB_APP_LANGUAGE_CONTEXT);
-        if (!context)
-            throw new Error('App language context not found');
-        const appCulture = context.getAppCulture();
-        // If the app language is one of the options, select it by default:
-        if (appCulture && options.some((o) => o.unique === appCulture)) {
-            selection.push(new UmbVariantId(appCulture, null).toString());
-        }
+        // Pre-select all cultures from the selected documents
+        const selection = options.map((o) => o.unique);
         const result = await umbOpenModal(this, UMB_DOCUMENT_UNPUBLISH_MODAL, {
             data: {
                 options,
@@ -112,23 +81,34 @@ export class UmbDocumentUnpublishEntityBulkAction extends UmbEntityBulkActionBas
         if (!result?.selection.length)
             return;
         const variantIds = result?.selection.map((x) => UmbVariantId.FromString(x)) ?? [];
-        const repository = new UmbDocumentPublishingRepository(this._host);
         if (variantIds.length) {
-            let documentCnt = 0;
-            for (const unique of this.selection) {
-                const { error } = await repository.unpublish(unique, variantIds);
-                if (!error) {
-                    documentCnt++;
-                }
-            }
+            const documentCnt = await this.#unpublishDocuments(this.selection, variantIds);
+            const notificationContext = await this.getContext(UMB_NOTIFICATION_CONTEXT);
             notificationContext?.peek('positive', {
                 data: {
                     headline: localize.term('speechBubbles_contentUnpublished'),
                     message: localize.term('speechBubbles_editMultiVariantUnpublishedText', documentCnt, localize.list(variantIds.map((v) => v.culture ?? ''))),
                 },
             });
-            eventContext.dispatchEvent(event);
+            await this.#reloadChildren(entityType, unique);
         }
     }
+    async #unpublishDocuments(uniques, variantIds) {
+        const repository = new UmbDocumentPublishingRepository(this._host);
+        let successCount = 0;
+        for (const unique of uniques) {
+            const { error } = await repository.unpublish(unique, variantIds);
+            if (!error)
+                successCount++;
+        }
+        return successCount;
+    }
+    async #reloadChildren(entityType, unique) {
+        const eventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
+        if (!eventContext)
+            return;
+        const event = new UmbRequestReloadChildrenOfEntityEvent({ entityType, unique });
+        eventContext.dispatchEvent(event);
+    }
 }
 export { UmbDocumentUnpublishEntityBulkAction as api };

package/dist-cms/packages/documents/documents/recycle-bin/collection-action/manifests.d.ts

@@ -0,0 +1 @@
+export declare const manifests: Array<UmbExtensionManifest>;

package/dist-cms/packages/documents/documents/recycle-bin/collection-action/manifests.js

@@ -0,0 +1,23 @@
+import { UMB_DOCUMENT_RECYCLE_BIN_REPOSITORY_ALIAS, UMB_DOCUMENT_RECYCLE_BIN_TREE_ITEM_CHILDREN_COLLECTION_ALIAS, } from '../constants.js';
+import { UMB_COLLECTION_ALIAS_CONDITION, UMB_COLLECTION_HAS_ITEMS_CONDITION_ALIAS, } from '../../../../core/collection/index.js';
+export const manifests = [
+    {
+        type: 'collectionAction',
+        kind: 'emptyRecycleBin',
+        name: 'Document Collection Empty Recycle Bin Action',
+        alias: 'Umb.CollectionAction.Document.EmptyRecycleBin',
+        meta: {
+            label: '#actions_emptyrecyclebin',
+            recycleBinRepositoryAlias: UMB_DOCUMENT_RECYCLE_BIN_REPOSITORY_ALIAS,
+        },
+        conditions: [
+            {
+                alias: UMB_COLLECTION_ALIAS_CONDITION,
+                match: UMB_DOCUMENT_RECYCLE_BIN_TREE_ITEM_CHILDREN_COLLECTION_ALIAS,
+            },
+            {
+                alias: UMB_COLLECTION_HAS_ITEMS_CONDITION_ALIAS,
+            },
+        ],
+    },
+];

package/dist-cms/packages/documents/documents/recycle-bin/manifests.js

@@ -1,3 +1,5 @@
+import { UmbAllowDocumentRecycleBinCurrentUserCondition } from './allow-document-recycle-bin.condition.js';
+import { manifests as collectionManifests } from './collection-action/manifests.js';
 import { manifests as entityActionManifests } from './entity-action/manifests.js';
 import { manifests as menuManifests } from './menu/manifests.js';
 import { manifests as repositoryManifests } from './repository/manifests.js';
@@ -8,8 +10,9 @@ export const manifests = [
         type: 'condition',
         name: 'Allow Document Recycle Bin Current User Condition',
         alias: 'Umb.Condition.CurrentUser.AllowDocumentRecycleBin',
-        api: () => import('./allow-document-recycle-bin.condition.js'),
+        api: UmbAllowDocumentRecycleBinCurrentUserCondition,
     },
+    ...collectionManifests,
     ...entityActionManifests,
     ...menuManifests,
     ...repositoryManifests,

package/dist-cms/packages/documents/documents/recycle-bin/tree/data/manifests.js

@@ -1,4 +1,5 @@
 import { UMB_DOCUMENT_RECYCLE_BIN_TREE_REPOSITORY_ALIAS, UMB_DOCUMENT_RECYCLE_BIN_TREE_STORE_ALIAS, } from '../constants.js';
+import { UmbDocumentRecycleBinTreeStore } from './document-recycle-bin-tree.store.js';
 export const manifests = [
     {
         type: 'repository',
@@ -10,6 +11,6 @@ export const manifests = [
         type: 'treeStore',
         alias: UMB_DOCUMENT_RECYCLE_BIN_TREE_STORE_ALIAS,
         name: 'Document Recycle Bin Tree Store',
-        api: () => import('./document-recycle-bin-tree.store.js'),
+        api: UmbDocumentRecycleBinTreeStore,
     },
 ];

package/dist-cms/packages/documents/documents/repository/detail/document-detail.server.data-source.js

@@ -1,4 +1,4 @@
-import { UMB_DOCUMENT_ENTITY_TYPE, UMB_DOCUMENT_PROPERTY_VALUE_ENTITY_TYPE } from '../../entity.js';
+import { UMB_DOCUMENT_ENTITY_TYPE } from '../../entity.js';
 import { UmbId } from '../../../../core/id/index.js';
 import { DocumentService } from '../../../../core/backend-api/index.js';
 import { tryExecute } from '../../../../core/resources/index.js';
@@ -65,7 +65,6 @@ export class UmbDocumentServerDataSource extends UmbControllerBase {
             values: data.values.map((value) => {
                 return {
                     editorAlias: value.editorAlias,
-                    entityType: UMB_DOCUMENT_PROPERTY_VALUE_ENTITY_TYPE,
                     culture: value.culture || null,
                     segment: value.segment || null,
                     alias: value.alias,

package/dist-cms/packages/documents/documents/repository/detail/manifests.js

@@ -1,4 +1,5 @@
 import { UMB_DOCUMENT_DETAIL_REPOSITORY_ALIAS, UMB_DOCUMENT_DETAIL_STORE_ALIAS } from './constants.js';
+import { UmbDocumentDetailStore } from './document-detail.store.js';
 export const manifests = [
     {
         type: 'repository',
@@ -10,6 +11,6 @@ export const manifests = [
         type: 'store',
         alias: UMB_DOCUMENT_DETAIL_STORE_ALIAS,
         name: 'Document Detail Store',
-        api: () => import('./document-detail.store.js'),
+        api: UmbDocumentDetailStore,
     },
 ];

package/dist-cms/packages/documents/documents/rollback/modal/rollback-modal.element.d.ts

@@ -9,6 +9,7 @@ export declare class UmbRollbackModalElement extends UmbModalBaseElement<UmbRoll
     private _isInvariant;
     private _availableVariants;
     private _diffs;
+    private _showDiff;
     constructor();
     get currentVersionHeader(): string;
     render(): import("lit-html").TemplateResult<1>;

package/dist-cms/packages/documents/documents/rollback/modal/rollback-modal.element.js

@@ -33,6 +33,7 @@ let UmbRollbackModalElement = class UmbRollbackModalElement extends UmbModalBase
         this._isInvariant = true;
         this._availableVariants = [];
         this._diffs = [];
+        this._showDiff = false;
         this.#rollbackRepository = new UmbRollbackRepository(this);
         this.#userItemRepository = new UmbUserItemRepository(this);
         this.#localizeDateOptions = {
@@ -141,7 +142,9 @@ let UmbRollbackModalElement = class UmbRollbackModalElement extends UmbModalBase
                 };
             }),
         };
-        await this.#setDiffs();
+        if (this._showDiff) {
+            await this.#setDiffs();
+        }
     }
     async #onRollback() {
         if (!this._selectedVersion)
@@ -188,9 +191,24 @@ let UmbRollbackModalElement = class UmbRollbackModalElement extends UmbModalBase
         this._selectedCulture = value.toString();
         this.#requestVersions();
     }
+    #onToggleDiff(event) {
+        const checkbox = event.target;
+        this._showDiff = checkbox.checked;
+        // If we have toggled on and have a selected version, immediately show the diff.
+        if (this._showDiff && this._selectedVersion) {
+            this.#setDiffs();
+        }
+    }
     #trimQuotes(str) {
         return str.replace(/^['"]|['"]$/g, '');
     }
+    #getPlainValue(alias) {
+        if (alias === 'name') {
+            return this._selectedVersion?.name ?? '';
+        }
+        const prop = this._selectedVersion?.properties.find((x) => x.alias === alias);
+        return prop ? this.#trimQuotes(JSON.stringify(prop.value)) : '';
+    }
     #renderCultureSelect() {
         return html `
 			<uui-select
@@ -260,9 +278,15 @@ let UmbRollbackModalElement = class UmbRollbackModalElement extends UmbModalBase
 					>No selected version</uui-box
 				>
 			`;
+        // Build list of property aliases to display (name + all properties)
+        const propertyAliases = ['name', ...this._selectedVersion.properties.map((p) => p.alias)];
         return html `
 			<uui-box headline=${this.currentVersionHeader} id="box-right">
-				${unsafeHTML(this.localize.term('rollback_diffHelp'))}
+				<uui-toggle
+					label=${this.localize.term('rollback_showDiff')}
+					@change=${this.#onToggleDiff}
+					.checked=${this._showDiff}></uui-toggle>
+				${this._showDiff ? html `<p>${unsafeHTML(this.localize.term('rollback_diffHelp'))}</p>` : nothing}
 				<uui-table>
 					<uui-table-column style="width: 0"></uui-table-column>
 					<uui-table-column></uui-table-column>
@@ -271,19 +295,19 @@ let UmbRollbackModalElement = class UmbRollbackModalElement extends UmbModalBase
 						<uui-table-head-cell>${this.localize.term('general_alias')}</uui-table-head-cell>
 						<uui-table-head-cell>${this.localize.term('general_value')}</uui-table-head-cell>
 					</uui-table-head>
-					${repeat(this._diffs, (item) => item.alias, (item) => {
-            const diff = this._diffs.find((x) => x?.alias === item.alias);
+					${repeat(propertyAliases, (alias) => alias, (alias) => {
+            const diff = this._diffs.find((x) => x?.alias === alias);
             return html `
 								<uui-table-row>
-									<uui-table-cell>${item.alias}</uui-table-cell>
+									<uui-table-cell>${alias}</uui-table-cell>
 									<uui-table-cell>
-										${diff
+										${this._showDiff && diff
                 ? diff.diff.map((part) => part.added
                     ? html `<span class="diff-added">${part.value}</span>`
                     : part.removed
                         ? html `<span class="diff-removed">${part.value}</span>`
                         : part.value)
-                : nothing}
+                : this.#getPlainValue(alias)}
 									</uui-table-cell>
 								</uui-table-row>
 							`;
@@ -462,6 +486,9 @@ __decorate([
 __decorate([
     state()
 ], UmbRollbackModalElement.prototype, "_diffs", void 0);
+__decorate([
+    state()
+], UmbRollbackModalElement.prototype, "_showDiff", void 0);
 UmbRollbackModalElement = __decorate([
     customElement('umb-rollback-modal')
 ], UmbRollbackModalElement);

package/dist-cms/packages/documents/documents/tree/manifests.js

@@ -1,5 +1,6 @@
 import { UMB_DOCUMENT_ENTITY_TYPE, UMB_DOCUMENT_ROOT_ENTITY_TYPE } from '../entity.js';
 import { manifests as reloadTreeItemChildrenManifests } from './reload-tree-item-children/manifests.js';
+import { UmbDocumentTreeStore } from './document-tree.store.js';
 export const UMB_DOCUMENT_TREE_REPOSITORY_ALIAS = 'Umb.Repository.Document.Tree';
 /**
  * @deprecated Use {@link UMB_DOCUMENT_TREE_REPOSITORY_ALIAS} instead. This will be removed in Umbraco 18.
@@ -17,7 +18,7 @@ export const manifests = [
         type: 'treeStore',
         alias: UMB_DOCUMENT_TREE_STORE_ALIAS,
         name: 'Document Tree Store',
-        api: () => import('./document-tree.store.js'),
+        api: UmbDocumentTreeStore,
     },
     {
         type: 'tree',

package/dist-cms/packages/documents/documents/tree/tree-item/document-tree-item.context.d.ts

@@ -12,6 +12,7 @@ export declare class UmbDocumentTreeItemContext extends UmbDefaultTreeItemContex
     readonly flags: import("rxjs").Observable<import("../../../../core/entity-flag/index.js").UmbEntityFlag[]>;
     readonly ancestors: import("rxjs").Observable<import("../../../../core/entity/index.js").UmbEntityModel[]>;
     readonly isTrashed: import("rxjs").Observable<boolean>;
+    readonly noAccess: import("rxjs").Observable<boolean>;
     setIsMenu(isMenu: boolean): void;
     constructor(host: UmbControllerHost);
     setTreeItem(treeItem: UmbDocumentTreeItemModel | undefined): void;

package/dist-cms/packages/documents/documents/tree/tree-item/document-tree-item.context.js

@@ -42,6 +42,7 @@ export class UmbDocumentTreeItemContext extends UmbDefaultTreeItemContext {
         // TODO: Move to API
         this.ancestors = this._treeItem.asObservablePart((item) => item?.ancestors ?? []);
         this.isTrashed = this._treeItem.asObservablePart((item) => item?.isTrashed ?? false);
+        this.noAccess = this._treeItem.asObservablePart((item) => item?.noAccess ?? false);
         this.observe(this.isTrashed, (isTrashed) => {
             this.#isTrashedContext.setIsTrashed(isTrashed);
         });

package/dist-cms/packages/documents/documents/tree/tree-item/document-tree-item.element.d.ts

@@ -3,8 +3,8 @@ import type { UmbDocumentTreeItemContext } from './document-tree-item.context.js
 import { UmbTreeItemElementBase } from '../../../../core/tree/index.js';
 export declare class UmbDocumentTreeItemElement extends UmbTreeItemElementBase<UmbDocumentTreeItemModel, UmbDocumentTreeItemContext> {
     #private;
-    get api(): UmbDocumentTreeItemContext | undefined;
     set api(value: UmbDocumentTreeItemContext | undefined);
+    get api(): UmbDocumentTreeItemContext | undefined;
     private _name;
     /**
      * @internal

package/dist-cms/packages/documents/documents/tree/tree-item/document-tree-item.element.js

@@ -28,9 +28,6 @@ let UmbDocumentTreeItemElement = class UmbDocumentTreeItemElement extends UmbTre
         };
     }
     #api;
-    get api() {
-        return this.#api;
-    }
     set api(value) {
         this.#api = value;
         if (this.#api) {
@@ -43,9 +40,15 @@ let UmbDocumentTreeItemElement = class UmbDocumentTreeItemElement extends UmbTre
             });
             this.observe(this.#api.icon, (icon) => (this.#icon = icon || ''));
             this.observe(this.#api.flags, (flags) => (this._flags = flags || ''));
+            // Observe noAccess from context and update base class property (_noAccess).
+            // This enables access restriction behavior (click prevention) and styling from the base class.
+            this.observe(this.#api.noAccess, (noAccess) => (this._noAccess = noAccess));
         }
         super.api = value;
     }
+    get api() {
+        return this.#api;
+    }
     #icon;
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     _extractFlags(item) {
@@ -55,7 +58,9 @@ let UmbDocumentTreeItemElement = class UmbDocumentTreeItemElement extends UmbTre
         return this.#icon;
     }
     renderLabel() {
-        return html `<span id="label" slot="label" class=${classMap({ draft: this._isDraft })}>${this._name}</span> `;
+        return html `<span id="label" slot="label" class=${classMap({ draft: this._isDraft, noAccess: this._noAccess })}>
+			${this._name}
+		</span> `;
     }
     static { this.styles = [
         ...UmbTreeItemElementBase.styles,

package/dist-cms/packages/documents/documents/tree/utils.d.ts

@@ -0,0 +1,7 @@
+import type { UmbDocumentTreeItemModel } from './types.js';
+/**
+ * Type guard to check if an item is a document tree item with noAccess property
+ * @param {unknown} item - The item to check
+ * @returns {boolean} true if the item is a UmbDocumentTreeItemModel
+ */
+export declare function isDocumentTreeItem(item: unknown): item is UmbDocumentTreeItemModel;

package/dist-cms/packages/documents/documents/tree/utils.js

@@ -0,0 +1,8 @@
+/**
+ * Type guard to check if an item is a document tree item with noAccess property
+ * @param {unknown} item - The item to check
+ * @returns {boolean} true if the item is a UmbDocumentTreeItemModel
+ */
+export function isDocumentTreeItem(item) {
+    return typeof item === 'object' && item !== null && 'noAccess' in item;
+}

package/dist-cms/packages/documents/documents/types.d.ts

@@ -45,6 +45,7 @@ export interface UmbDocumentUrlInfoModel {
 export interface UmbDocumentValueModel<ValueType = unknown> extends UmbElementValueModel<ValueType> {
 }
 export interface UmbDocumentVariantOptionModel extends UmbEntityVariantOptionModel<UmbDocumentVariantModel> {
+    documentCount?: number;
 }
 export interface UmbDocumentVariantPublishModel extends UmbEntityVariantPublishModel {
 }

package/dist-cms/packages/documents/documents/url/repository/manifests.js

@@ -1,4 +1,5 @@
 import { UMB_DOCUMENT_URL_REPOSITORY_ALIAS, UMB_DOCUMENT_URL_STORE_ALIAS } from './constants.js';
+import { UmbDocumentUrlStore } from './document-url.store.js';
 const urlRepository = {
     type: 'repository',
     alias: UMB_DOCUMENT_URL_REPOSITORY_ALIAS,
@@ -9,6 +10,6 @@ const urlStore = {
     type: 'itemStore',
     alias: UMB_DOCUMENT_URL_STORE_ALIAS,
     name: 'Document Url Store',
-    api: () => import('./document-url.store.js'),
+    api: UmbDocumentUrlStore,
 };
 export const manifests = [urlRepository, urlStore];

package/dist-cms/packages/documents/documents/user-permissions/document/conditions/manifests.js

@@ -1,9 +1,10 @@
 import { UMB_DOCUMENT_USER_PERMISSION_CONDITION_ALIAS } from './constants.js';
+import { UmbDocumentUserPermissionCondition } from './document-user-permission.condition.js';
 export const manifests = [
     {
         type: 'condition',
         name: 'Document User Permission Condition',
         alias: UMB_DOCUMENT_USER_PERMISSION_CONDITION_ALIAS,
-        api: () => import('./document-user-permission.condition.js'),
+        api: UmbDocumentUserPermissionCondition,
     },
 ];

package/dist-cms/packages/documents/documents/user-permissions/document-property-value/document-property-value-permission-flow-modal/property-type-modal/property-type-modal.element.js

@@ -83,7 +83,7 @@ let UmbDocumentPropertyValueUserPermissionFlowPropertyTypeModalElement = class U
 				${this._documentTypeProperties.length > 0
             ? repeat(this._documentTypeProperties, (item) => item.unique, (item) => html `
 								<uui-ref-node
-									name=${item.name ?? ''}
+									name=${this.localize.string(item.name ?? '')}
 									detail=${this.#getItemDetail(item)}
 									?selectable=${this._pickableFilter(item)}
 									select-only

package/dist-cms/packages/documents/documents/user-permissions/document-property-value/input-document-property-value-user-permission/input-document-property-value-user-permission.element.js

@@ -173,7 +173,7 @@ let UmbInputDocumentPropertyValueUserPermissionElement = class UmbInputDocumentP
         }
         const documentType = this._documentTypes?.find((item) => item.unique === permission.documentType.unique);
         const propertyType = documentType?.properties.find((item) => item.unique === permission.propertyType.unique);
-        const permissionName = `${documentType?.name}: ${propertyType?.name} (${propertyType?.alias})`;
+        const permissionName = `${this.localize.string(documentType?.name)}: ${this.localize.string(propertyType?.name)} (${propertyType?.alias})`;
         const verbNames = this.#getVerbNamesForPermission(permission);
         return html `
 			<uui-ref-node .name=${permissionName} .detail=${verbNames || ''} readonly>

package/dist-cms/packages/documents/documents/utils.d.ts

@@ -1,5 +1,11 @@
 import type { UmbDocumentVariantOptionModel } from './types.js';
 type VariantType = UmbDocumentVariantOptionModel;
-export declare const sortVariants: (a: VariantType, b: VariantType) => number;
+/**
+ * Sorts document variants based on multiple criteria:
+ * @param {VariantType} a - First variant to compare
+ * @param {VariantType} b - Second variant to compare
+ * @returns {number} - Sorting value
+ */
+export declare function sortVariants(a: VariantType, b: VariantType): number;
 export declare const TimeOptions: Intl.DateTimeFormatOptions;
 export {};

package/dist-cms/packages/documents/documents/utils.js

@@ -13,17 +13,45 @@ const getVariantStateOrderValue = (variant) => {
     }
     return variantStatesOrder[variant.state] || fallbackOrder;
 };
-export const sortVariants = (a, b) => {
-    const compareDefault = (a, b) => (a.language?.isDefault ? -1 : 1) - (b.language?.isDefault ? -1 : 1);
-    // Make sure mandatory variants goes on top, unless they are published, cause then they already goes to the top and then we want to mix them with other published variants.
-    const compareMandatory = (a, b) => a.variant?.state === DocumentVariantStateModel.PUBLISHED_PENDING_CHANGES ||
+// eslint-disable-next-line jsdoc/require-jsdoc
+function compareDefault(a, b) {
+    return (a.language?.isDefault ? -1 : 1) - (b.language?.isDefault ? -1 : 1);
+}
+// Make sure mandatory variants goes on top, unless they are published, cause then they already goes to the top and then we want to mix them with other published variants.
+// eslint-disable-next-line jsdoc/require-jsdoc
+function compareMandatory(a, b) {
+    return a.variant?.state === DocumentVariantStateModel.PUBLISHED_PENDING_CHANGES ||
         a.variant?.state === DocumentVariantStateModel.PUBLISHED
         ? 0
         : (a.language?.isMandatory ? -1 : 1) - (b.language?.isMandatory ? -1 : 1);
-    const compareState = (a, b) => getVariantStateOrderValue(a.variant) - getVariantStateOrderValue(b.variant);
-    const compareName = (a, b) => a.variant?.name.localeCompare(b.variant?.name || '') || 99;
+}
+// eslint-disable-next-line jsdoc/require-jsdoc
+function compareState(a, b) {
+    return getVariantStateOrderValue(a.variant) - getVariantStateOrderValue(b.variant);
+}
+// eslint-disable-next-line jsdoc/require-jsdoc
+function compareName(a, b) {
+    const nameA = a.language?.name;
+    const nameB = b.language?.name;
+    // If both names are missing, consider them equal.
+    if (!nameA && !nameB)
+        return 0;
+    // If only one name is missing, sort the defined name first.
+    if (!nameA)
+        return 1;
+    if (!nameB)
+        return -1;
+    return nameA.localeCompare(nameB);
+}
+/**
+ * Sorts document variants based on multiple criteria:
+ * @param {VariantType} a - First variant to compare
+ * @param {VariantType} b - Second variant to compare
+ * @returns {number} - Sorting value
+ */
+export function sortVariants(a, b) {
     return compareDefault(a, b) || compareMandatory(a, b) || compareState(a, b) || compareName(a, b);
-};
+}
 export const TimeOptions = {
     year: 'numeric',
     month: 'long',

package/dist-cms/packages/documents/documents/workspace/conditions/is-not-trashed/document-is-not-trashed.condition.manifest.js

@@ -1,7 +1,8 @@
 import { UMB_DOCUMENT_IS_NOT_TRASHED_CONDITION_ALIAS } from './constants.js';
+import { UmbDocumentIsNotTrashedWorkspaceCondition } from './document-is-not-trashed.condition.js';
 export const manifest = {
     type: 'condition',
     name: 'Document is not trashed Workspace Condition',
     alias: UMB_DOCUMENT_IS_NOT_TRASHED_CONDITION_ALIAS,
-    api: () => import('./document-is-not-trashed.condition.js'),
+    api: UmbDocumentIsNotTrashedWorkspaceCondition,
 };

package/dist-cms/packages/documents/documents/workspace/conditions/is-trashed/document-is-trashed.condition.manifest.js

@@ -1,7 +1,8 @@
 import { UMB_DOCUMENT_IS_TRASHED_CONDITION_ALIAS } from './constants.js';
+import { UmbDocumentIsTrashedWorkspaceCondition } from './document-is-trashed.condition.js';
 export const manifest = {
     type: 'condition',
     name: 'Document is trashed Workspace Condition',
     alias: UMB_DOCUMENT_IS_TRASHED_CONDITION_ALIAS,
-    api: () => import('./document-is-trashed.condition.js'),
+    api: UmbDocumentIsTrashedWorkspaceCondition,
 };

package/dist-cms/packages/documents/documents/workspace/document-workspace-editor.element.js

@@ -54,6 +54,7 @@ let UmbDocumentWorkspaceEditorElement = class UmbDocumentWorkspaceEditorElement
     #generateRoutes() {
         if (!this.#variants || this.#variants.length === 0 || !this.#appCulture) {
             this._routes = [];
+            this.#ensureForbiddenRoute(this._routes);
             return;
         }
         // Generate split view routes for all available routes
@@ -115,6 +116,16 @@ let UmbDocumentWorkspaceEditorElement = class UmbDocumentWorkspaceEditorElement
                 },
             });
         }
+        this.#ensureForbiddenRoute(routes);
+        this._routes = routes;
+    }
+    /**
+     * Ensure that there is a route to handle forbidden access.
+     * This route will display a forbidden message when the user does not have permission to access certain resources.
+     * Also handles not found routes.
+     * @param routes
+     */
+    #ensureForbiddenRoute(routes = []) {
         routes.push({
             path: '**',
             component: async () => {
@@ -122,7 +133,6 @@ let UmbDocumentWorkspaceEditorElement = class UmbDocumentWorkspaceEditorElement
                 return this.#isForbidden ? router.UmbRouteForbiddenElement : router.UmbRouteNotFoundElement;
             },
         });
-        this._routes = routes;
     }
     render() {
         return !this._loading && this._routes