@umbraco-cms/backoffice 17.3.4 → 17.4.0-rc

package/dist-cms/packages/documents/documents/collection/action/create-document-collection-action.element.js

@@ -7,16 +7,21 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../../workspace/constants.js';
 import { UMB_CREATE_DOCUMENT_WORKSPACE_PATH_PATTERN } from '../../paths.js';
 import { UMB_DOCUMENT_ENTITY_TYPE, UMB_DOCUMENT_ROOT_ENTITY_TYPE } from '../../entity.js';
-import { css, customElement, html, map, property, state } from '../../../../../external/lit/index.js';
+import { UMB_DOCUMENT_CREATE_OPTIONS_MODAL } from '../../entity-actions/create/constants.js';
+import { css, customElement, html, property, repeat, state } from '../../../../../external/lit/index.js';
 import { UmbDocumentTypeStructureRepository } from '../../../document-types/index.js';
+import { UmbDocumentBlueprintItemRepository } from '../../../document-blueprints/index.js';
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
+import { umbOpenModal } from '../../../../core/modal/index.js';
 let UmbCreateDocumentCollectionActionElement = class UmbCreateDocumentCollectionActionElement extends UmbLitElement {
     #documentTypeStructureRepository;
+    #documentBlueprintItemRepository;
     constructor() {
         super();
         this._allowedDocumentTypes = [];
         this._popoverOpen = false;
         this.#documentTypeStructureRepository = new UmbDocumentTypeStructureRepository(this);
+        this.#documentBlueprintItemRepository = new UmbDocumentBlueprintItemRepository(this);
         this.consumeContext(UMB_DOCUMENT_WORKSPACE_CONTEXT, (workspaceContext) => {
             this.observe(workspaceContext?.unique, (unique) => {
                 this._documentUnique = unique;
@@ -53,6 +58,43 @@ let UmbCreateDocumentCollectionActionElement = class UmbCreateDocumentCollection
             documentTypeUnique: item.unique,
         });
     }
+    #onClick(event, item) {
+        // Let modified/non-primary clicks (open in new tab, new window, etc.) use native link navigation.
+        if (event.button !== 0 || event.ctrlKey || event.metaKey || event.shiftKey || event.altKey) {
+            return;
+        }
+        // Cancel native anchor navigation and stop the window-level router-slot click handler
+        // (see core/router/router-slot/util/anchor.ts) from SPA-navigating before we can decide
+        // whether to open the blueprint picker.
+        event.preventDefault();
+        event.stopPropagation();
+        this.#onSelect(item);
+    }
+    async #onSelect(item) {
+        if (!item.unique) {
+            throw new Error('Item unique is missing');
+        }
+        const createUrl = this.#getCreateUrl(item);
+        const { data } = await this.#documentBlueprintItemRepository.requestItemsByDocumentType(item.unique);
+        if (!data?.length) {
+            history.pushState(null, '', createUrl);
+            return;
+        }
+        await umbOpenModal(this, UMB_DOCUMENT_CREATE_OPTIONS_MODAL, {
+            data: {
+                parent: {
+                    unique: this._documentUnique ?? null,
+                    entityType: this._documentUnique ? UMB_DOCUMENT_ENTITY_TYPE : UMB_DOCUMENT_ROOT_ENTITY_TYPE,
+                },
+                documentType: this._documentTypeUnique ? { unique: this._documentTypeUnique } : null,
+                preselectedDocumentType: {
+                    unique: item.unique,
+                    icon: item.icon ?? undefined,
+                    blueprints: data,
+                },
+            },
+        });
+    }
     render() {
         return this._allowedDocumentTypes.length !== 1 ? this.#renderDropdown() : this.#renderCreateButton();
     }
@@ -67,7 +109,12 @@ let UmbCreateDocumentCollectionActionElement = class UmbCreateDocumentCollection
             ' ' +
             this.localize.string(item.name);
         return html `
-			<uui-button color="default" href=${this.#getCreateUrl(item)} label=${label} look="outline"></uui-button>
+			<uui-button
+				color="default"
+				href=${this.#getCreateUrl(item)}
+				label=${label}
+				look="outline"
+				@click=${(event) => this.#onClick(event, item)}></uui-button>
 		`;
     }
     #renderDropdown() {
@@ -87,8 +134,11 @@ let UmbCreateDocumentCollectionActionElement = class UmbCreateDocumentCollection
 				@toggle=${this.#onPopoverToggle}>
 				<umb-popover-layout>
 					<uui-scroll-container>
-						${map(this._allowedDocumentTypes, (item) => html `
-								<uui-menu-item label=${this.localize.string(item.name)} href=${this.#getCreateUrl(item)}>
+						${repeat(this._allowedDocumentTypes, (item) => item.unique, (item) => html `
+								<uui-menu-item
+									label=${this.localize.string(item.name)}
+									href=${this.#getCreateUrl(item)}
+									@click=${(event) => this.#onClick(event, item)}>
 									<umb-icon slot="icon" name=${item.icon ?? 'icon-document'}></umb-icon>
 								</uui-menu-item>
 							`)}

package/dist-cms/packages/documents/documents/components/input-document/input-document.element.js

@@ -186,7 +186,7 @@ let UmbInputDocumentElement = class UmbInputDocumentElement extends UmbFormContr
 								.errorMessage=${status.state.error}
 								.errorDetail=${isError ? unique : undefined}
 								?readonly=${this.readonly}
-								?standalone=${this.max === 1}>
+								?standalone=${this.max === 1 && this._statuses?.length === 1}>
 								${when(!this.readonly, () => html `
 										<uui-action-bar slot="actions">
 											<uui-button

package/dist-cms/packages/documents/documents/entity-actions/create/document-create-options-modal.element.d.ts

@@ -5,6 +5,7 @@ export declare class UmbDocumentCreateOptionsModalElement extends UmbModalBaseEl
     private _allowedDocumentTypes;
     private _headline;
     private _availableBlueprints;
+    private _loading;
     firstUpdated(): Promise<void>;
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult[];

package/dist-cms/packages/documents/documents/entity-actions/create/document-create-options-modal.element.js

@@ -22,6 +22,7 @@ let UmbDocumentCreateOptionsModalElement = class UmbDocumentCreateOptionsModalEl
         this._allowedDocumentTypes = [];
         this._headline = `${this.localize.term('create_createUnder')} ${this.localize.term('actionCategories_content')}`;
         this._availableBlueprints = [];
+        this._loading = true;
     }
     #documentTypeStructureRepository;
     #documentItemRepository;
@@ -31,7 +32,25 @@ let UmbDocumentCreateOptionsModalElement = class UmbDocumentCreateOptionsModalEl
     async firstUpdated() {
         const parentUnique = this.data?.parent.unique;
         const documentTypeUnique = this.data?.documentType?.unique || null;
-        this.#retrieveAllowedDocumentTypesOf(documentTypeUnique, parentUnique || null);
+        const preselectedDocumentType = this.data?.preselectedDocumentType;
+        if (preselectedDocumentType?.unique) {
+            this.#documentTypeUnique = preselectedDocumentType.unique;
+            this.#documentTypeIcon = preselectedDocumentType.icon ?? '';
+            if (preselectedDocumentType.blueprints) {
+                this._availableBlueprints = preselectedDocumentType.blueprints;
+            }
+            else {
+                const { data } = await this.#documentBlueprintItemRepository.requestItemsByDocumentType(preselectedDocumentType.unique);
+                this._availableBlueprints = data ?? [];
+            }
+            if (!this._availableBlueprints.length) {
+                this.#onNavigate(preselectedDocumentType.unique);
+            }
+            this._loading = false;
+        }
+        else {
+            this.#retrieveAllowedDocumentTypesOf(documentTypeUnique, parentUnique || null);
+        }
         if (parentUnique) {
             this.#retrieveHeadline(parentUnique);
         }
@@ -42,6 +61,7 @@ let UmbDocumentCreateOptionsModalElement = class UmbDocumentCreateOptionsModalEl
             // TODO: implement pagination, or get 1000?
             this._allowedDocumentTypes = data.items;
         }
+        this._loading = false;
     }
     async #retrieveHeadline(parentUnique) {
         if (!parentUnique)
@@ -79,7 +99,10 @@ let UmbDocumentCreateOptionsModalElement = class UmbDocumentCreateOptionsModalEl
             throw new Error('Document type unique is not defined');
         }
         this.#documentTypeUnique = documentTypeUnique;
-        this.#documentTypeIcon = this._allowedDocumentTypes.find((dt) => dt.unique === documentTypeUnique)?.icon ?? '';
+        const matchedDocumentType = this._allowedDocumentTypes.find((dt) => dt.unique === documentTypeUnique);
+        if (matchedDocumentType) {
+            this.#documentTypeIcon = matchedDocumentType.icon ?? '';
+        }
         const { data } = await this.#documentBlueprintItemRepository.requestItemsByDocumentType(documentTypeUnique);
         this._availableBlueprints = data ?? [];
         if (!this._availableBlueprints.length) {
@@ -129,9 +152,12 @@ let UmbDocumentCreateOptionsModalElement = class UmbDocumentCreateOptionsModalEl
         }
     }
     #renderDocumentTypes() {
+        if (this._loading) {
+            return html `<div id="loader"><uui-loader></uui-loader></div>`;
+        }
         return when(this._allowedDocumentTypes.length === 0, () => this.#renderNoDocumentTypes(), () => repeat(this._allowedDocumentTypes, (documentType) => documentType.unique, (documentType) => html `
 						<uui-ref-node-document-type
-							.name=${this.localize.string(documentType.name)}
+							.name=${this.localize.string(documentType.name) + '...'}
 							.alias=${this.localize.string(documentType.description ?? '')}
 							select-only
 							selectable
@@ -166,6 +192,12 @@ let UmbDocumentCreateOptionsModalElement = class UmbDocumentCreateOptionsModalEl
 			#edit-permissions {
 				margin-top: var(--uui-size-6);
 			}
+
+			#loader {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
 		`,
     ]; }
 };
@@ -178,6 +210,9 @@ __decorate([
 __decorate([
     state()
 ], UmbDocumentCreateOptionsModalElement.prototype, "_availableBlueprints", void 0);
+__decorate([
+    state()
+], UmbDocumentCreateOptionsModalElement.prototype, "_loading", void 0);
 UmbDocumentCreateOptionsModalElement = __decorate([
     customElement('umb-document-create-options-modal')
 ], UmbDocumentCreateOptionsModalElement);

package/dist-cms/packages/documents/documents/entity-actions/create/document-create-options-modal.token.d.ts

@@ -1,3 +1,4 @@
+import type { UmbDocumentBlueprintItemBaseModel } from '../../../document-blueprints/index.js';
 import type { UmbEntityModel } from '../../../../core/entity/index.js';
 import { UmbModalToken } from '../../../../core/modal/index.js';
 export interface UmbDocumentCreateOptionsModalData {
@@ -5,6 +6,11 @@ export interface UmbDocumentCreateOptionsModalData {
     documentType: {
         unique: string;
     } | null;
+    preselectedDocumentType?: {
+        unique: string;
+        icon?: string;
+        blueprints?: Array<UmbDocumentBlueprintItemBaseModel>;
+    } | null;
 }
 export interface UmbDocumentCreateOptionsModalValue {
 }

package/dist-cms/packages/documents/documents/entity-actions/duplicate/modal/duplicate-document-modal.element.js

@@ -35,8 +35,8 @@ let UmbDocumentDuplicateToModalElement = class UmbDocumentDuplicateToModalElemen
         if (!this.data)
             return nothing;
         return html `
-			<umb-body-layout headline="Duplicate">
-				<uui-box id="tree-box" headline="Duplicate to">
+			<umb-body-layout headline=${this.localize.term('general_copy')}>
+				<uui-box id="tree-box" headline=${this.localize.term('actions_copyTo')}>
 					<umb-tree
 						alias=${UMB_DOCUMENT_TREE_ALIAS}
 						.props=${{
@@ -46,8 +46,8 @@ let UmbDocumentDuplicateToModalElement = class UmbDocumentDuplicateToModalElemen
         }}
 						@selection-change=${this.#onTreeSelectionChange}></umb-tree>
 				</uui-box>
-				<uui-box headline="Options">
-					<umb-property-layout label="Relate to original" orientation="vertical"
+				<uui-box headline=${this.localize.term('general_options')}>
+					<umb-property-layout label=${this.localize.term('defaultdialogs_relateToOriginalLabel')} orientation="vertical"
 						><div slot="editor">
 							<uui-toggle
 								@change=${this.#onRelateToOriginalChange}
@@ -55,7 +55,7 @@ let UmbDocumentDuplicateToModalElement = class UmbDocumentDuplicateToModalElemen
 						</div>
 					</umb-property-layout>
 
-					<umb-property-layout label="Include descendants" orientation="vertical"
+					<umb-property-layout label=${this.localize.term('defaultdialogs_includeDescendants')} orientation="vertical"
 						><div slot="editor">
 							<uui-toggle
 								@change=${this.#onIncludeDescendantsChange}
@@ -69,12 +69,12 @@ let UmbDocumentDuplicateToModalElement = class UmbDocumentDuplicateToModalElemen
     }
     #renderActions() {
         return html `
-			<uui-button slot="actions" label="Cancel" @click="${this._rejectModal}"></uui-button>
+			<uui-button slot="actions" label=${this.localize.term('general_cancel')} @click="${this._rejectModal}"></uui-button>
 			<uui-button
 				slot="actions"
 				color="positive"
 				look="primary"
-				label="Duplicate"
+				label=${this.localize.term('general_copy')}
 				@click=${this._submitModal}
 				?disabled=${this._destinationUnique === undefined}></uui-button>
 		`;

package/dist-cms/packages/documents/documents/item/repository/document-item.store.js

@@ -12,7 +12,7 @@ export class UmbDocumentItemStore extends UmbItemStoreBase {
      * @memberof UmbDocumentItemStore
      */
     constructor(host) {
-        super(host, UMB_DOCUMENT_ITEM_STORE_CONTEXT.toString());
+        super(host, UMB_DOCUMENT_ITEM_STORE_CONTEXT);
     }
 }
 export { UmbDocumentItemStore as api };

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

@@ -141,10 +141,10 @@ export class UmbDocumentPublishEntityBulkAction extends UmbEntityBulkActionBase
         // If there is only one language available, or all selected documents are invariant, we can skip the modal and publish directly:
         if (options.length === 1 || allInvariant) {
             const confirm = await umbConfirmModal(this, {
-                headline: localize.term('content_readyToPublish'),
-                content: localize.term('prompt_confirmListViewPublish'),
+                headline: '#content_readyToPublish',
+                content: '#prompt_confirmListViewPublish',
                 color: 'positive',
-                confirmLabel: localize.term('actions_publish'),
+                confirmLabel: '#actions_publish',
             }).catch(() => false);
             if (confirm !== false) {
                 // For invariant documents, use null culture; otherwise use the first language

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

@@ -48,10 +48,10 @@ export class UmbDocumentUnpublishEntityBulkAction extends UmbEntityBulkActionBas
         // 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: localize.term('actions_unpublish'),
-                content: localize.term('prompt_confirmListViewUnpublish'),
+                headline: '#actions_unpublish',
+                content: '#prompt_confirmListViewUnpublish',
                 color: 'warning',
-                confirmLabel: localize.term('actions_unpublish'),
+                confirmLabel: '#actions_unpublish',
             }).catch(() => false);
             if (confirm !== false) {
                 // For invariant documents, use null culture; otherwise use the first language

package/dist-cms/packages/documents/documents/publishing/workspace-context/document-publishing.workspace-context.js

@@ -24,6 +24,7 @@ export class UmbDocumentPublishingWorkspaceContext extends UmbContextBase {
     #eventContext;
     #publishingRepository;
     #publishedDocumentData;
+    #loadingPublishedData;
     #currentUnique;
     #notificationContext;
     #localize;
@@ -35,6 +36,7 @@ export class UmbDocumentPublishingWorkspaceContext extends UmbContextBase {
          */
         this.publishedPendingChanges = new UmbDocumentPublishedPendingChangesManager(this);
         this.#publishingRepository = new UmbDocumentPublishingRepository(this);
+        this.#loadingPublishedData = false;
         this.#localize = new UmbLocalizationController(this);
         this.workspaceAlias = UMB_DOCUMENT_WORKSPACE_ALIAS;
         this.#publishableVariantsFilter = (option) => {
@@ -400,13 +402,27 @@ export class UmbDocumentPublishingWorkspaceContext extends UmbContextBase {
             }
             this.#currentUnique = unique;
             if (isNew === false && unique) {
-                this.#loadAndProcessLastPublished();
+                this.#loadAndProcessLastPublished().catch(() => undefined);
             }
         }, 'uniqueObserver');
-        this.observe(this.#documentWorkspaceContext.persistedData, () => this.#processPendingChanges(), 'umbPersistedDataObserver');
+        this.observe(this.#documentWorkspaceContext.persistedData, () => {
+            // The unique/isNew observer fires before document data is loaded,
+            // so #loadAndProcessLastPublished may return early (no variants yet).
+            // When persistedData arrives and published data hasn't been loaded,
+            // trigger the load now that variant data is available.
+            if (!this.#publishedDocumentData && this.#hasPublishedVariant()) {
+                this.#loadAndProcessLastPublished().catch(() => undefined);
+            }
+            else {
+                this.#processPendingChanges();
+            }
+        }, 'umbPersistedDataObserver');
     }
     #hasPublishedVariant() {
-        const variants = this.#documentWorkspaceContext?.getVariants();
+        // Use persisted data (falls back to current) because this may be called
+        // from the persistedData observer before setCurrent has run.
+        const variants = this.#documentWorkspaceContext?.getPersistedData()?.variants
+            ?? this.#documentWorkspaceContext?.getVariants();
         return (variants?.some((variant) => variant.state === DocumentVariantStateModel.PUBLISHED ||
             variant.state === DocumentVariantStateModel.PUBLISHED_PENDING_CHANGES) ?? false);
     }
@@ -423,9 +439,19 @@ export class UmbDocumentPublishingWorkspaceContext extends UmbContextBase {
         const hasPublishedVariant = this.#hasPublishedVariant();
         if (!hasPublishedVariant)
             return;
-        const { data } = await this.#publishingRepository.published(unique);
-        this.#publishedDocumentData = data;
-        this.#processPendingChanges();
+        // Prevent concurrent loads (e.g. save-and-publish calls #clear then reload,
+        // which can trigger this from both the persistedData observer and explicitly).
+        if (this.#loadingPublishedData)
+            return;
+        this.#loadingPublishedData = true;
+        try {
+            const { data } = await this.#publishingRepository.published(unique);
+            this.#publishedDocumentData = data;
+            this.#processPendingChanges();
+        }
+        finally {
+            this.#loadingPublishedData = false;
+        }
     }
     #processPendingChanges() {
         if (!this.#documentWorkspaceContext)
@@ -438,6 +464,7 @@ export class UmbDocumentPublishingWorkspaceContext extends UmbContextBase {
     }
     #clear() {
         this.#publishedDocumentData = undefined;
+        this.#loadingPublishedData = false;
         this.publishedPendingChanges.clear();
     }
 }

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

@@ -13,7 +13,7 @@ export class UmbDocumentRecycleBinTreeStore extends UmbUniqueTreeStore {
      * @memberof UmbDocumentRecycleBinTreeStore
      */
     constructor(host) {
-        super(host, UMB_DOCUMENT_RECYCLE_BIN_TREE_STORE_CONTEXT.toString());
+        super(host, UMB_DOCUMENT_RECYCLE_BIN_TREE_STORE_CONTEXT);
     }
 }
 export { UmbDocumentRecycleBinTreeStore as api };

package/dist-cms/packages/documents/documents/recycle-bin/tree/tree-item-children/collection/repository/document-recycle-bin-tree-item-children-collection.repository.d.ts

@@ -1,11 +1,6 @@
-import type { UmbCollectionFilterModel, UmbCollectionRepository } from '../../../../../../../core/collection/index.js';
-import { UmbRepositoryBase } from '../../../../../../../core/repository/index.js';
-export declare class UmbDocumentRecycleBinTreeItemChildrenCollectionRepository extends UmbRepositoryBase implements UmbCollectionRepository {
-    #private;
-    requestCollection(filter: UmbCollectionFilterModel): Promise<{
-        data: import("../../../../../../../core/repository/index.js").UmbTargetPagedModel<import("../../../types.js").UmbDocumentRecycleBinTreeItemModel> | undefined;
-        error: Error | import("../../../../../../../core/resources/index.js").UmbApiError | import("../../../../../../../core/resources/index.js").UmbCancelError | import("../../../../../../../core/resources/index.js").UmbError | undefined;
-        asObservable: () => import("rxjs").Observable<import("../../../types.js").UmbDocumentRecycleBinTreeItemModel[]> | undefined;
-    }>;
+import { UmbTreeItemChildrenCollectionRepositoryBase } from '../../../../../../../core/tree/index.js';
+import type { UmbControllerHost } from '../../../../../../../../libs/controller-api/index.js';
+export declare class UmbDocumentRecycleBinTreeItemChildrenCollectionRepository extends UmbTreeItemChildrenCollectionRepositoryBase {
+    constructor(host: UmbControllerHost);
 }
 export { UmbDocumentRecycleBinTreeItemChildrenCollectionRepository as api };

package/dist-cms/packages/documents/documents/recycle-bin/tree/tree-item-children/collection/repository/document-recycle-bin-tree-item-children-collection.repository.js

@@ -1,26 +1,9 @@
-import { UmbDocumentRecycleBinTreeRepository } from '../../../index.js';
-import { UmbRepositoryBase } from '../../../../../../../core/repository/index.js';
-import { UMB_ENTITY_CONTEXT } from '../../../../../../../core/entity/index.js';
-export class UmbDocumentRecycleBinTreeItemChildrenCollectionRepository extends UmbRepositoryBase {
-    #treeRepository = new UmbDocumentRecycleBinTreeRepository(this);
-    async requestCollection(filter) {
-        // TODO: get parent from args
-        const entityContext = await this.getContext(UMB_ENTITY_CONTEXT);
-        if (!entityContext)
-            throw new Error('Entity context not found');
-        const entityType = entityContext.getEntityType();
-        const unique = entityContext.getUnique();
-        if (!entityType)
-            throw new Error('Entity type not found');
-        if (unique === undefined)
-            throw new Error('Unique not found');
-        const parent = { entityType, unique };
-        if (parent.unique === null) {
-            return this.#treeRepository.requestTreeRootItems({ skip: filter.skip, take: filter.take });
-        }
-        else {
-            return this.#treeRepository.requestTreeItemsOf({ parent, skip: filter.skip, take: filter.take });
-        }
+import { UMB_DOCUMENT_RECYCLE_BIN_TREE_REPOSITORY_ALIAS } from '../../../constants.js';
+import { UmbTreeItemChildrenCollectionRepositoryBase } from '../../../../../../../core/tree/index.js';
+export class UmbDocumentRecycleBinTreeItemChildrenCollectionRepository extends UmbTreeItemChildrenCollectionRepositoryBase {
+    constructor(host) {
+        super(host);
+        this._setTreeRepositoryAlias(UMB_DOCUMENT_RECYCLE_BIN_TREE_REPOSITORY_ALIAS);
     }
 }
 export { UmbDocumentRecycleBinTreeItemChildrenCollectionRepository as api };

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

@@ -18,16 +18,14 @@ export class UmbDocumentServerDataSource extends UmbControllerBase {
      * @memberof UmbDocumentServerDataSource
      */
     async createScaffold(preset = {}) {
-        let documentTypeIcon = null;
-        let documentTypeCollection = null;
         const documentTypeUnique = preset.documentType?.unique;
         if (!documentTypeUnique) {
             throw new Error('Document type unique is missing');
         }
         // TODO: investigate if we can use the repository here instead
         const { data } = await new UmbDocumentTypeDetailServerDataSource(this).read(documentTypeUnique);
-        documentTypeIcon = data?.icon ?? null;
-        documentTypeCollection = data?.collection ?? null;
+        const documentTypeIcon = data?.icon ?? null;
+        const documentTypeCollection = data?.collection ?? null;
         const defaultData = {
             entityType: UMB_DOCUMENT_ENTITY_TYPE,
             unique: UmbId.new(),

package/dist-cms/packages/documents/documents/repository/detail/document-detail.store.js

@@ -12,7 +12,7 @@ export class UmbDocumentDetailStore extends UmbDetailStoreBase {
      * @memberof UmbDocumentDetailStore
      */
     constructor(host) {
-        super(host, UMB_DOCUMENT_DETAIL_STORE_CONTEXT.toString());
+        super(host, UMB_DOCUMENT_DETAIL_STORE_CONTEXT);
     }
 }
 export { UmbDocumentDetailStore as api };

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

@@ -1,10 +1,10 @@
-import type { UmbDocumentItemModel } from '../item/repository/types.js';
+import type { UmbDocumentSearchItemModel } from './types.js';
 import { nothing } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../core/lit-element/index.js';
 import type { UmbSearchResultItemModel } from '../../../core/search/index.js';
 export declare class UmbDocumentSearchResultItemElement extends UmbLitElement {
     #private;
-    item?: UmbSearchResultItemModel & UmbDocumentItemModel;
+    item?: UmbSearchResultItemModel & UmbDocumentSearchItemModel;
     private _currentCulture?;
     private _defaultCulture?;
     private _variant?;

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

@@ -43,6 +43,16 @@ let UmbDocumentSearchResultItemElement = class UmbDocumentSearchResultItemElemen
         return (this._variant?.state === DocumentVariantStateModel.DRAFT ||
             this.item?.variants[0]?.state === DocumentVariantStateModel.DRAFT);
     }
+    #getAncestorPath() {
+        return this.item?.ancestors
+            ?.map((a) => {
+            const variant = a.variants.find((v) => v.culture === this._currentCulture) ??
+                a.variants.find((v) => v.culture === this._defaultCulture) ??
+                a.variants[0];
+            return variant?.name ?? '(Untitled)';
+        })
+            .join(' / ');
+    }
     render() {
         if (!this.item)
             return nothing;
@@ -54,7 +64,10 @@ let UmbDocumentSearchResultItemElement = class UmbDocumentSearchResultItemElemen
         };
         return html `
 			${when(this.item.documentType.icon ?? this.item.icon, (icon) => html `<umb-icon name=${icon}></umb-icon>`, () => html `<uui-icon name="icon-document"></uui-icon>`)}
-			<span class=${classMap(classes)}>${label}</span>
+			<span class=${classMap(classes)}>
+				${label}
+				${when(this.item.ancestors?.length, () => html `<small class="ancestors">${this.#getAncestorPath()}</small>`)}
+			</span>
 			<div class="extra">
 				${when(this.item.isTrashed, () => html `
 						<uui-tag look="secondary">
@@ -88,6 +101,12 @@ let UmbDocumentSearchResultItemElement = class UmbDocumentSearchResultItemElemen
 					&.trashed {
 						text-decoration: line-through;
 					}
+					> .ancestors {
+						display: block;
+						opacity: 0.6;
+						font-size: 0.7rem;
+						font-weight: 400;
+					}
 				}
 			}
 		`,

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

@@ -16,6 +16,39 @@ export class UmbDocumentSearchServerDataSource {
     constructor(host) {
         this.#host = host;
     }
+    async #fetchAncestors(ids) {
+        if (!ids.length)
+            return { data: new Map() };
+        const { data, error } = await tryExecute(this.#host, DocumentService.getItemDocumentAncestors({ query: { id: ids } }));
+        if (error)
+            return { error };
+        const ancestorsByItemId = new Map();
+        if (data) {
+            for (const entry of data) {
+                ancestorsByItemId.set(entry.id, entry.ancestors.map((ancestor) => ({
+                    documentType: {
+                        unique: ancestor.documentType.id,
+                        icon: ancestor.documentType.icon,
+                        collection: ancestor.documentType.collection ? { unique: ancestor.documentType.collection.id } : null,
+                    },
+                    entityType: UMB_DOCUMENT_ENTITY_TYPE,
+                    hasChildren: ancestor.hasChildren,
+                    isProtected: ancestor.isProtected,
+                    isTrashed: ancestor.isTrashed,
+                    parent: ancestor.parent ? { unique: ancestor.parent.id } : null,
+                    unique: ancestor.id,
+                    variants: ancestor.variants.map((variant) => ({
+                        name: variant.name,
+                        culture: variant.culture || null,
+                        state: variant.state,
+                        flags: variant.flags,
+                    })),
+                    flags: ancestor.flags,
+                })));
+            }
+        }
+        return { data: ancestorsByItemId };
+    }
     /**
      * Get a list of versions for a document
      * @param {UmbDocumentSearchRequestArgs} args - The arguments for the search
@@ -36,6 +69,10 @@ export class UmbDocumentSearchServerDataSource {
             },
         }));
         if (data) {
+            const ids = data.items.map((item) => item.id);
+            const { data: ancestorsByItemId, error: ancestorsError } = await this.#fetchAncestors(ids);
+            if (ancestorsError)
+                return { error: ancestorsError };
             const mappedItems = data.items.map((item) => {
                 return {
                     documentType: {
@@ -60,6 +97,7 @@ export class UmbDocumentSearchServerDataSource {
                         };
                     }),
                     flags: item.flags,
+                    ancestors: ancestorsByItemId.get(item.id) ?? [],
                 };
             });
             return { data: { items: mappedItems, total: data.total } };

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

@@ -4,6 +4,7 @@ import type { UmbDocumentTypeEntityType } from '../../document-types/index.js';
 export interface UmbDocumentSearchItemModel extends UmbDocumentItemModel {
     name: string;
     href: string;
+    ancestors?: Array<UmbDocumentItemModel>;
 }
 export interface UmbDocumentSearchRequestArgs extends UmbSearchRequestArgs {
     allowedContentTypes?: Array<{

package/dist-cms/packages/documents/documents/tree/document-tree.store.js

@@ -13,7 +13,7 @@ export class UmbDocumentTreeStore extends UmbUniqueTreeStore {
      * @memberof UmbDocumentTreeStore
      */
     constructor(host) {
-        super(host, UMB_DOCUMENT_TREE_STORE_CONTEXT.toString());
+        super(host, UMB_DOCUMENT_TREE_STORE_CONTEXT);
     }
 }
 export default UmbDocumentTreeStore;

package/dist-cms/packages/documents/documents/url/document-urls-data-resolver.js

@@ -72,8 +72,14 @@ export class UmbDocumentUrlsDataResolver extends UmbControllerBase {
         return this.#variantId?.culture || this.#displayVariantId?.culture || this.#appCulture;
     }
     #getDataForCurrentCulture() {
+        // Invariant document: return all URLs. The server tags each URL with the
+        // culture of the domain that produced it.
+        if (this.#variantId?.isCultureInvariant()) {
+            return this.#data;
+        }
+        // Variant document: filter to the culture currently being viewed.
+        // If no culture can be resolved at all, fall back to returning everything.
         const culture = this.#getCurrentCulture();
-        // If there is no culture context (invariant data) we return all urls
         return culture ? this.#data?.filter((x) => x.culture === culture) : this.#data;
     }
 }

package/dist-cms/packages/documents/documents/url/repository/document-url.store.js

@@ -12,7 +12,7 @@ export class UmbDocumentUrlStore extends UmbItemStoreBase {
      * @memberof UmbDocumentUrlStore
      */
     constructor(host) {
-        super(host, UMB_DOCUMENT_URL_STORE_CONTEXT.toString());
+        super(host, UMB_DOCUMENT_URL_STORE_CONTEXT);
     }
 }
 export default UmbDocumentUrlStore;