@umbraco-cms/backoffice 17.7.0 → 17.8.0-rc

package/dist-cms/packages/documents/documents/modals/document-picker-modal/document-picker-modal.token.js

@@ -0,0 +1,20 @@
+import { UMB_DOCUMENT_SEARCH_PROVIDER_ALIAS } from '../../search/index.js';
+import { UMB_DOCUMENT_TREE_ALIAS } from '../../tree/constants.js';
+import { UMB_DOCUMENT_PICKER_MODAL_ALIAS } from './constants.js';
+import { UmbModalToken } from '../../../../core/modal/index.js';
+/**
+ * Picks documents, browsing the document tree and rendering the document collection at any level whose document type
+ * has one configured.
+ */
+export const UMB_DOCUMENT_PICKER_MODAL = new UmbModalToken(UMB_DOCUMENT_PICKER_MODAL_ALIAS, {
+    modal: {
+        type: 'sidebar',
+        size: 'medium',
+    },
+    data: {
+        treeAlias: UMB_DOCUMENT_TREE_ALIAS,
+        search: {
+            providerAlias: UMB_DOCUMENT_SEARCH_PROVIDER_ALIAS,
+        },
+    },
+});

package/dist-cms/packages/documents/documents/modals/document-picker-modal/index.d.ts

@@ -0,0 +1,3 @@
+export * from './constants.js';
+export * from './document-picker-modal.token.js';
+export type * from './types.js';

package/dist-cms/packages/documents/documents/modals/document-picker-modal/index.js

@@ -0,0 +1,2 @@
+export * from './constants.js';
+export * from './document-picker-modal.token.js';

package/dist-cms/packages/documents/documents/modals/document-picker-modal/manifests.d.ts

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

package/dist-cms/packages/documents/documents/modals/document-picker-modal/manifests.js

@@ -0,0 +1,9 @@
+import { UMB_DOCUMENT_PICKER_MODAL_ALIAS } from './constants.js';
+export const manifests = [
+    {
+        type: 'modal',
+        alias: UMB_DOCUMENT_PICKER_MODAL_ALIAS,
+        name: 'Document Picker Modal',
+        element: () => import('./document-picker-modal.element.js'),
+    },
+];

package/dist-cms/packages/documents/documents/modals/document-picker-modal/types.d.ts

@@ -0,0 +1,6 @@
+import type { UmbDocumentTreeItemModel } from '../../tree/types.js';
+import type { UmbTreePickerModalData, UmbTreePickerModalValue } from '../../../../core/tree/index.js';
+export interface UmbDocumentPickerModalData extends UmbTreePickerModalData<UmbDocumentTreeItemModel> {
+}
+export interface UmbDocumentPickerModalValue extends UmbTreePickerModalValue {
+}

package/dist-cms/packages/documents/documents/modals/document-picker-modal/types.js

@@ -0,0 +1 @@
+export {};

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

@@ -1,2 +1,3 @@
+import { manifests as documentPickerModalManifests } from './document-picker-modal/manifests.js';
 import { manifest as saveModalManifest } from './save-modal/manifest.js';
-export const manifests = [saveModalManifest];
+export const manifests = [saveModalManifest, ...documentPickerModalManifests];

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

@@ -3,4 +3,4 @@ import type { UmbContentVariantPickerData, UmbContentVariantPickerValue } from '
 export type UmbDocumentVariantPickerData = UmbContentVariantPickerData<UmbDocumentVariantOptionModel>;
 export type UmbDocumentVariantPickerValue = UmbContentVariantPickerValue;
 export type * from './save-modal/constants.js';
-export type * from './document-picker-modal.token.js';
+export type * from './document-picker-modal/types.js';

package/dist-cms/packages/documents/documents/property-editors/document-picker/manifests.js

@@ -7,6 +7,7 @@ export const manifests = [
         name: 'Document Picker Property Editor UI',
         element: () => import('./property-editor-ui-document-picker.element.js'),
         meta: {
+            supportsVariantChange: true,
             label: 'Document Picker',
             propertyEditorSchemaAlias: 'Umbraco.ContentPicker',
             icon: 'icon-document',

package/dist-cms/packages/documents/documents/property-editors/document-start-node-access/document-start-node-access-property-editor-ui.element.d.ts

@@ -0,0 +1,11 @@
+import { UmbStartNodeAccessPropertyEditorUiElementBase } from '../../../../core/property-editor/index.js';
+export declare class UmbDocumentStartNodeAccessPropertyEditorUIElement extends UmbStartNodeAccessPropertyEditorUiElementBase {
+    #private;
+    protected renderPicker(): import("lit-html").TemplateResult<1>;
+}
+export { UmbDocumentStartNodeAccessPropertyEditorUIElement as element };
+declare global {
+    interface HTMLElementTagNameMap {
+        'umb-property-editor-ui-document-start-node-access': UmbDocumentStartNodeAccessPropertyEditorUIElement;
+    }
+}

package/dist-cms/packages/documents/documents/property-editors/document-start-node-access/document-start-node-access-property-editor-ui.element.js

@@ -0,0 +1,29 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { customElement, html } from '../../../../../external/lit/index.js';
+import { UmbStartNodeAccessPropertyEditorUiElementBase } from '../../../../core/property-editor/index.js';
+let UmbDocumentStartNodeAccessPropertyEditorUIElement = class UmbDocumentStartNodeAccessPropertyEditorUIElement extends UmbStartNodeAccessPropertyEditorUiElementBase {
+    #onChange(event) {
+        this._onPick(event.target.selection);
+    }
+    renderPicker() {
+        return html `
+			<umb-input-document
+				.selection=${this._selection}
+				.min=${this._min}
+				.max=${this._max}
+				?readonly=${this.readonly}
+				@change=${this.#onChange}>
+			</umb-input-document>
+		`;
+    }
+};
+UmbDocumentStartNodeAccessPropertyEditorUIElement = __decorate([
+    customElement('umb-property-editor-ui-document-start-node-access')
+], UmbDocumentStartNodeAccessPropertyEditorUIElement);
+export { UmbDocumentStartNodeAccessPropertyEditorUIElement };
+export { UmbDocumentStartNodeAccessPropertyEditorUIElement as element };

package/dist-cms/packages/documents/documents/property-editors/document-start-node-access/manifests.d.ts

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

package/dist-cms/packages/documents/documents/property-editors/document-start-node-access/manifests.js

@@ -0,0 +1,14 @@
+export const manifests = [
+    {
+        type: 'propertyEditorUi',
+        alias: 'Umb.PropertyEditorUi.DocumentStartNodeAccess',
+        name: 'Document Start Node Access Property Editor UI',
+        element: () => import('./document-start-node-access-property-editor-ui.element.js'),
+        meta: {
+            label: 'Document Start Node Access',
+            icon: 'icon-page',
+            group: '#propertyEditorUIGroups_pickers',
+            supportsReadOnly: true,
+        },
+    },
+];

package/dist-cms/packages/documents/documents/property-editors/manifests.js

@@ -1,2 +1,3 @@
 import { manifests as documentPickerManifests } from './document-picker/manifests.js';
-export const manifests = [...documentPickerManifests];
+import { manifests as documentStartNodeAccessManifests } from './document-start-node-access/manifests.js';
+export const manifests = [...documentPickerManifests, ...documentStartNodeAccessManifests];

package/dist-cms/packages/documents/documents/publishing/publish/workspace-action/save-and-publish.action.js

@@ -1,8 +1,8 @@
-import { UmbDocumentUserPermissionCondition } from '../../../user-permissions/document/conditions/document-user-permission.condition.js';
 import { UMB_USER_PERMISSION_DOCUMENT_PUBLISH, UMB_USER_PERMISSION_DOCUMENT_UPDATE, } from '../../../user-permissions/document/constants.js';
 import { UMB_DOCUMENT_PUBLISHING_WORKSPACE_CONTEXT } from '../../workspace-context/constants.js';
-import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../../../constants.js';
+import { UMB_DOCUMENT_USER_PERMISSION_CONDITION_ALIAS, UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../../../constants.js';
 import { UmbWorkspaceActionBase } from '../../../../../core/workspace/index.js';
+import { createExtensionApiByAlias } from '../../../../../core/extension-registry/index.js';
 export class UmbDocumentSaveAndPublishWorkspaceAction extends UmbWorkspaceActionBase {
     constructor(host, args) {
         super(host, args);
@@ -12,21 +12,22 @@ export class UmbDocumentSaveAndPublishWorkspaceAction extends UmbWorkspaceAction
         /* The action is disabled by default because the onChange callback
          will first be triggered when the condition is changed to permitted */
         this.disable();
-        new UmbDocumentUserPermissionCondition(host, {
-            host,
-            config: {
-                alias: 'Umb.Condition.UserPermission.Document',
-                allOf: [UMB_USER_PERMISSION_DOCUMENT_UPDATE, UMB_USER_PERMISSION_DOCUMENT_PUBLISH],
+        // Resolve the condition by alias, so a condition registered in its place is honoured here too.
+        createExtensionApiByAlias(this, UMB_DOCUMENT_USER_PERMISSION_CONDITION_ALIAS, [
+            {
+                config: {
+                    allOf: [UMB_USER_PERMISSION_DOCUMENT_UPDATE, UMB_USER_PERMISSION_DOCUMENT_PUBLISH],
+                },
+                onChange: (permitted) => {
+                    if (permitted) {
+                        this.enable();
+                    }
+                    else {
+                        this.disable();
+                    }
+                },
             },
-            onChange: (permitted) => {
-                if (permitted) {
-                    this.enable();
-                }
-                else {
-                    this.disable();
-                }
-            },
-        });
+        ]);
     }
     async hasAdditionalOptions() {
         const workspaceContext = await this.getContext(UMB_DOCUMENT_WORKSPACE_CONTEXT);

package/dist-cms/packages/documents/documents/publishing/repository/document-publishing.repository.d.ts

@@ -8,14 +8,10 @@ export declare class UmbDocumentPublishingRepository extends UmbRepositoryBase {
      * @param {UmbDocumentDetailModel} model - The Document to create
      * @param {Array<UmbVariantId>} variantIds - The variants to publish after creating
      * @param {string | null} parentUnique - The unique of the parent to create under
-     * @returns {Promise<UmbRepositoryResponse<unknown>>} The result of the create and publish request
+     * @returns {Promise<UmbRepositoryResponse<string>>} The key of the created Document, which may differ from the one submitted
      * @memberof UmbDocumentPublishingRepository
      */
-    createAndPublish(model: UmbDocumentDetailModel, variantIds: Array<UmbVariantId>, parentUnique?: string | null): Promise<import("../../../../core/resources/index.js").UmbApiResponse<{
-        data: unknown;
-        request: Request;
-        response: Response;
-    }>>;
+    createAndPublish(model: UmbDocumentDetailModel, variantIds: Array<UmbVariantId>, parentUnique?: string | null): Promise<import("../../../../core/repository/index.js").UmbDataSourceResponse<string>>;
     /**
      * Updates and publishes an existing Document in a single operation
      * @param {UmbDocumentDetailModel} model - The Document to update

package/dist-cms/packages/documents/documents/publishing/repository/document-publishing.repository.js

@@ -7,7 +7,7 @@ export class UmbDocumentPublishingRepository extends UmbRepositoryBase {
      * @param {UmbDocumentDetailModel} model - The Document to create
      * @param {Array<UmbVariantId>} variantIds - The variants to publish after creating
      * @param {string | null} parentUnique - The unique of the parent to create under
-     * @returns {Promise<UmbRepositoryResponse<unknown>>} The result of the create and publish request
+     * @returns {Promise<UmbRepositoryResponse<string>>} The key of the created Document, which may differ from the one submitted
      * @memberof UmbDocumentPublishingRepository
      */
     async createAndPublish(model, variantIds, parentUnique = null) {

package/dist-cms/packages/documents/documents/publishing/repository/document-publishing.server.data-source.d.ts

@@ -22,11 +22,7 @@ export declare class UmbDocumentPublishingServerDataSource {
      * @returns {Promise<UmbDataSourceResponse>} The result of the create and publish request
      * @memberof UmbDocumentPublishingServerDataSource
      */
-    createAndPublish(model: UmbDocumentDetailModel, variantIds: Array<UmbVariantId>, parentUnique?: string | null): Promise<import("../../../../core/resources/index.js").UmbApiResponse<{
-        data: unknown;
-        request: Request;
-        response: Response;
-    }>>;
+    createAndPublish(model: UmbDocumentDetailModel, variantIds: Array<UmbVariantId>, parentUnique?: string | null): Promise<UmbDataSourceResponse<string>>;
     /**
      * Updates and publishes a Document on the server in a single operation
      * @param {UmbDocumentDetailModel} model - Document Model

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

@@ -36,7 +36,10 @@ export class UmbDocumentPublishingServerDataSource {
         // 201 Created returns only the key (no document body). The workspace reloads after this to refresh
         // its state, so we deliberately do NOT re-read the full document here — that would be a redundant
         // round-trip on top of the reload.
-        return tryExecute(this.#host, DocumentService.postDocumentCreateAndPublish({ body }));
+        const { data, error } = await tryExecute(this.#host, DocumentService.postDocumentCreateAndPublish({ body }));
+        // The generated response type is `unknown` (Swagger has no schema for the empty 201 body), but the
+        // Umb-Generated-Resource interceptor rewrites it to the created document's key at runtime.
+        return { data: data, error };
     }
     /**
      * Updates and publishes a Document on the server in a single operation

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

@@ -17,6 +17,7 @@ import { UmbLocalizationController } from '../../../../../libs/localization-api/
 import { UmbRequestReloadChildrenOfEntityEvent, UmbRequestReloadStructureForEntityEvent, } from '../../../../core/entity-action/index.js';
 import { UmbVariantId } from '../../../../core/variant/index.js';
 import { UMB_ACTION_EVENT_CONTEXT } from '../../../../core/action/index.js';
+import { apiErrorWasNotified } from '../../../../core/resources/index.js';
 import { UMB_NOTIFICATION_CONTEXT } from '../../../../core/notification/index.js';
 import { notifyWorkspaceActionStarting } from '../../../../core/workspace/index.js';
 export class UmbDocumentPublishingWorkspaceContext extends UmbContextBase {
@@ -427,9 +428,11 @@ export class UmbDocumentPublishingWorkspaceContext extends UmbContextBase {
             // Notify only on the publish path. The validation-failure path below already
             // notifies, so a shared top-level .catch would fire a second, contradictory toast. [JOV]
             return this.#performSaveAndPublish(variantIds, saveData).catch((error) => {
-                this.#notificationContext?.peek('danger', {
-                    data: { message: this.#localize.term('speechBubbles_editContentPublishedFailed') },
-                });
+                // When the server reported why, the user has already seen it. Repeating a generic failure here
+                // would contradict it - and mislead, as a rejected publish still leaves the save in effect.
+                if (!apiErrorWasNotified(error?.cause)) {
+                    this.#notify('danger', 'speechBubbles_editContentPublishedFailed');
+                }
                 return Promise.reject(error);
             });
         }, (reason) => this.#saveWithoutPublishing(variantIds, saveData, reason));
@@ -453,14 +456,20 @@ export class UmbDocumentPublishingWorkspaceContext extends UmbContextBase {
             }
             catch {
                 reloadAfterPublishFailed = true;
-                return saveData;
+                return { ...saveData, unique: this.#documentWorkspaceContext.getUnique() ?? saveData.unique };
             }
         };
         await this.#documentWorkspaceContext.performCreateOrUpdate(variantIds, saveData, {
             create: async (data, ids, parent) => {
-                const { error } = await this.#publishingRepository.createAndPublish(data, ids, parent.unique);
+                const { data: createdUnique, error } = await this.#publishingRepository.createAndPublish(data, ids, parent.unique);
                 if (error)
                     throw new Error('Error creating and publishing document', { cause: error });
+                // The server may have assigned a different unique than the one this workspace scaffolded with
+                // (e.g. a Saving notification handler assigning its own key). The reload below reads by the
+                // workspace's current unique, so it must be updated to the actual persisted one first.
+                if (createdUnique) {
+                    this.#documentWorkspaceContext.setUnique(createdUnique);
+                }
                 return loadAfterPublish();
             },
             update: async (data, ids) => {
@@ -483,7 +492,10 @@ export class UmbDocumentPublishingWorkspaceContext extends UmbContextBase {
             });
         }
         await this.#loadAndProcessLastPublished();
-        const event = new UmbRequestReloadStructureForEntityEvent({ unique, entityType });
+        // Re-read the unique: for a new document, the server may have assigned a different one than the
+        // workspace scaffolded with, and `performCreateOrUpdate` above will have re-synced it if so.
+        const persistedUnique = this.#documentWorkspaceContext.getUnique() ?? unique;
+        const event = new UmbRequestReloadStructureForEntityEvent({ unique: persistedUnique, entityType });
         this.#eventContext?.dispatchEvent(event);
     }
     #publishableVariantsFilter;

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

@@ -5,6 +5,7 @@ import { manifests as menuManifests } from './menu/manifests.js';
 import { manifests as repositoryManifests } from './repository/manifests.js';
 import { manifests as rootManifests } from './root/manifests.js';
 import { manifests as treeManifests } from './tree/manifests.js';
+import { manifests as workspaceContextManifests } from './workspace-context/manifests.js';
 export const manifests = [
     {
         type: 'condition',
@@ -18,4 +19,5 @@ export const manifests = [
     ...repositoryManifests,
     ...rootManifests,
     ...treeManifests,
+    ...workspaceContextManifests,
 ];

package/dist-cms/packages/documents/documents/recycle-bin/root/workspace/constants.d.ts

@@ -1 +1,2 @@
 export declare const UMB_DOCUMENT_RECYCLE_BIN_ROOT_WORKSPACE_ALIAS = "Umb.Workspace.Document.RecycleBin.Root";
+export declare const UMB_DOCUMENT_RECYCLE_BIN_ROOT_WORKSPACE_PATH: string;

package/dist-cms/packages/documents/documents/recycle-bin/root/workspace/constants.js

@@ -1 +1,8 @@
+import { UMB_DOCUMENT_RECYCLE_BIN_ROOT_ENTITY_TYPE } from '../entity.js';
+import { UMB_DOCUMENTS_SECTION_PATHNAME } from '../../../../section/paths.js';
+import { UMB_WORKSPACE_PATH_PATTERN } from '../../../../../core/workspace/index.js';
 export const UMB_DOCUMENT_RECYCLE_BIN_ROOT_WORKSPACE_ALIAS = 'Umb.Workspace.Document.RecycleBin.Root';
+export const UMB_DOCUMENT_RECYCLE_BIN_ROOT_WORKSPACE_PATH = UMB_WORKSPACE_PATH_PATTERN.generateAbsolute({
+    sectionName: UMB_DOCUMENTS_SECTION_PATHNAME,
+    entityType: UMB_DOCUMENT_RECYCLE_BIN_ROOT_ENTITY_TYPE,
+});

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

@@ -42,6 +42,11 @@ DocumentService.getTreeDocumentAncestors({
     query: { descendantId: args.treeItem.unique },
 });
 const mapper = (item) => {
+    const contentType = {
+        unique: item.documentType.id,
+        icon: item.documentType.icon,
+        collection: item.documentType.collection ? { unique: item.documentType.collection.id } : null,
+    };
     return {
         unique: item.id,
         parent: {
@@ -53,11 +58,9 @@ const mapper = (item) => {
         isTrashed: true,
         hasChildren: item.hasChildren,
         isProtected: false,
-        documentType: {
-            unique: item.documentType.id,
-            icon: item.documentType.icon,
-            collection: item.documentType.collection ? { unique: item.documentType.collection.id } : null,
-        },
+        contentType,
+        // TODO (V20): remove when the deprecated `documentType` field is removed.
+        documentType: contentType,
         variants: item.variants.map((variant) => {
             return {
                 name: variant.name,

package/dist-cms/packages/documents/documents/recycle-bin/tree/tree-item-children/collection/views/manifests.js

@@ -8,7 +8,7 @@ export const manifests = [
         element: () => import('./document-recycle-bin-tree-item-table-collection-view.element.js'),
         weight: 300,
         meta: {
-            label: 'Table',
+            label: '#collection_tableViewLabel',
             icon: 'icon-table',
             pathName: 'table',
         },

package/dist-cms/packages/documents/documents/recycle-bin/workspace-context/manifests.d.ts

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

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

@@ -0,0 +1,16 @@
+import { UMB_DOCUMENT_WORKSPACE_ALIAS } from '../../workspace/constants.js';
+import { UMB_WORKSPACE_CONDITION_ALIAS } from '../../../../core/workspace/index.js';
+export const manifests = [
+    {
+        type: 'workspaceContext',
+        kind: 'trashable',
+        name: 'Trashable Document Workspace Context',
+        alias: 'Umb.WorkspaceContext.Document.Trashable',
+        conditions: [
+            {
+                alias: UMB_WORKSPACE_CONDITION_ALIAS,
+                match: UMB_DOCUMENT_WORKSPACE_ALIAS,
+            },
+        ],
+    },
+];

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

@@ -96,5 +96,6 @@ const mapRedirectUrl = (item) => ({
     unique: item.id,
     originalUrl: item.originalUrl,
     destinationUrl: item.destinationUrl,
+    created: item.created,
     culture: item.culture ?? null,
 });

package/dist-cms/packages/documents/documents/redirect-management/repository/types.d.ts

@@ -5,6 +5,7 @@ export interface UmbDocumentRedirectUrlModel {
     unique: string;
     originalUrl: string;
     destinationUrl: string;
+    created?: string;
     culture: string | null;
 }
 /**

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

@@ -1,6 +1,9 @@
 import { UmbDocumentCurrentVariantResolver } from '../variant/index.js';
 import { UmbBasicState, UmbObjectState } from '../../../../libs/observable-api/index.js';
 import { UmbControllerBase } from '../../../../libs/class-api/index.js';
+// TODO (V20): drop the `documentType` fallback when the deprecated field is removed.
+// eslint-disable-next-line @typescript-eslint/no-deprecated
+const contentTypeOf = (item) => item?.contentType ?? item?.documentType;
 /**
  * A controller for resolving data for a document tree item
  * @exports
@@ -14,10 +17,10 @@ export class UmbDocumentTreeItemDataResolver extends UmbControllerBase {
         this.#variant = new UmbDocumentCurrentVariantResolver(this);
         this.entityType = this.#data.asObservablePart((x) => x?.entityType);
         this.unique = this.#data.asObservablePart((x) => x?.unique);
-        this.icon = this.#data.asObservablePart((x) => x?.documentType.icon);
-        this.typeUnique = this.#data.asObservablePart((x) => x?.documentType.unique);
+        this.icon = this.#data.asObservablePart((x) => contentTypeOf(x)?.icon);
+        this.typeUnique = this.#data.asObservablePart((x) => contentTypeOf(x)?.unique);
         this.isTrashed = this.#data.asObservablePart((x) => x?.isTrashed);
-        this.hasCollection = this.#data.asObservablePart((x) => !!x?.documentType.collection);
+        this.hasCollection = this.#data.asObservablePart((x) => !!contentTypeOf(x)?.collection);
         this.name = this.#variant.name;
         this.state = this.#variant.state;
         this.isDraft = this.#variant.isDraft;
@@ -123,6 +126,6 @@ export class UmbDocumentTreeItemDataResolver extends UmbControllerBase {
      * @memberof UmbDocumentTreeItemDataResolver
      */
     getHasCollection() {
-        return this.getData()?.documentType.collection != undefined;
+        return contentTypeOf(this.getData())?.collection != undefined;
     }
 }

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

@@ -33,6 +33,11 @@ export class UmbDocumentTreeServerDataSource extends UmbControllerBase {
         return { data: mappedData, error };
     }
     #mapItem(item) {
+        const contentType = {
+            unique: item.documentType.id,
+            icon: item.documentType.icon,
+            collection: item.documentType.collection ? { unique: item.documentType.collection.id } : null,
+        };
         return {
             ancestors: item.ancestors.map((ancestor) => {
                 return {
@@ -51,11 +56,9 @@ export class UmbDocumentTreeServerDataSource extends UmbControllerBase {
             hasChildren: item.hasChildren,
             isProtected: item.isProtected,
             flags: item.flags,
-            documentType: {
-                unique: item.documentType.id,
-                icon: item.documentType.icon,
-                collection: item.documentType.collection ? { unique: item.documentType.collection.id } : null,
-            },
+            contentType,
+            // TODO (V20): remove when the deprecated `documentType` field is removed.
+            documentType: contentType,
             variants: item.variants.map((variant) => {
                 return {
                     name: variant.name,

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 collapsibleCollection: import("rxjs").Observable<boolean>;
     /**
      * Whether the collection replaces expansion for this item.
      *

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

@@ -12,16 +12,12 @@ export class UmbDocumentTreeItemContext extends UmbDefaultTreeItemContext {
     #ancestorsContext;
     #entityContentTypeContext;
     #item;
-    // A collection is only browsed via its Collection view when the user can actually access it.
-    // When the node is a "no access" ancestor of the user's start node, it must remain expandable
-    // in the tree so the user can browse down to their start node.
-    #collapsibleCollection;
     setIsMenu(isMenu) {
         super.setIsMenu(isMenu);
         if (isMenu) {
-            this.observe(this.#collapsibleCollection, (collapsibleCollection) => {
+            this.observe(this.collapsibleCollection, (collapsibleCollection) => {
                 if (collapsibleCollection) {
-                    this._treeItemChildrenManager.setTargetTakeSize(1, 1);
+                    this._treeItemChildrenManager.setTargetTakeSize(0, 0);
                     this.observe(this.hasActiveDescendant, (active) => {
                         if (active === false) {
                             super.hideChildren();
@@ -56,7 +52,7 @@ export class UmbDocumentTreeItemContext extends UmbDefaultTreeItemContext {
         // A collection is only browsed via its Collection view when the user can actually access it.
         // When the node is a "no access" ancestor of the user's start node, it must remain expandable
         // in the tree so the user can browse down to their start node.
-        this.#collapsibleCollection = mergeObservables([this.hasCollection, this.noAccess], ([hasCollection, noAccess]) => hasCollection && !noAccess);
+        this.collapsibleCollection = mergeObservables([this.hasCollection, this.noAccess], ([hasCollection, noAccess]) => hasCollection && !noAccess);
         /**
          * Whether the collection replaces expansion for this item.
          *
@@ -64,7 +60,7 @@ export class UmbDocumentTreeItemContext extends UmbDefaultTreeItemContext {
          * that drills into items takes the user into it. A tree with neither can do no more than expand, so it keeps the
          * expand caret and its children — the subtree would otherwise be unreachable.
          */
-        this.drillableCollection = mergeObservables([this.#collapsibleCollection, this.isMenu, this.drillable], ([collapsibleCollection, isMenu, drillable]) => collapsibleCollection && (isMenu || drillable));
+        this.drillableCollection = mergeObservables([this.collapsibleCollection, this.isMenu, this.drillable], ([collapsibleCollection, isMenu, drillable]) => collapsibleCollection && (isMenu || drillable));
         this.observe(this.isTrashed, (isTrashed) => {
             this.#isTrashedContext.setIsTrashed(isTrashed);
         }, null);
@@ -75,7 +71,9 @@ export class UmbDocumentTreeItemContext extends UmbDefaultTreeItemContext {
     setTreeItem(treeItem) {
         super.setTreeItem(treeItem);
         this.#item.setData(treeItem);
-        const documentTypeUnique = treeItem?.documentType.unique;
+        // TODO (V20): drop the `documentType` fallback when the deprecated field is removed.
+        // eslint-disable-next-line @typescript-eslint/no-deprecated
+        const documentTypeUnique = (treeItem?.contentType ?? treeItem?.documentType)?.unique;
         this.#entityContentTypeContext.setEntityType(documentTypeUnique ? UMB_DOCUMENT_TYPE_ENTITY_TYPE : undefined);
         this.#entityContentTypeContext.setUnique(documentTypeUnique);
     }

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

@@ -1,5 +1,6 @@
 import type { UmbDocumentTreeItemModel } from '../types.js';
 import type { UmbDocumentTreeItemContext } from './document-tree-item.context.js';
+import { nothing } from '../../../../../external/lit/index.js';
 import { UmbTreeItemElementBase } from '../../../../core/tree/index.js';
 export declare class UmbDocumentTreeItemElement extends UmbTreeItemElementBase<UmbDocumentTreeItemModel, UmbDocumentTreeItemContext> {
     #private;
@@ -11,11 +12,15 @@ export declare class UmbDocumentTreeItemElement extends UmbTreeItemElementBase<U
      * @internal
      */
     protected _isDraft: boolean;
+    private _collapsibleCollection;
     private _drillableCollection;
     protected _extractFlags(item: UmbDocumentTreeItemModel | undefined): void;
     protected _getIconName(): string | null | undefined;
+    protected _renderChildItem(item: UmbDocumentTreeItemModel): import("lit-html").TemplateResult<1>;
     _renderExpandSymbol: () => import("lit-html").TemplateResult<1> | undefined;
     renderLabel(): import("lit-html").TemplateResult<1>;
+    protected _renderLoadPrevButton(): import("lit-html").TemplateResult<1> | typeof nothing;
+    protected _renderLoadNextButton(): import("lit-html").TemplateResult<1> | typeof nothing;
     static styles: import("lit").CSSResult[];
 }
 export default UmbDocumentTreeItemElement;