@umbraco-cms/backoffice 18.2.1 → 18.3.0-rc

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

@@ -55,6 +55,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: {
@@ -66,11 +71,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;

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

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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 { css, html, customElement, state, property, classMap } from '../../../../../external/lit/index.js';
+import { css, html, customElement, state, property, classMap, nothing } from '../../../../../external/lit/index.js';
 import { UmbTreeItemElementBase } from '../../../../core/tree/index.js';
 let UmbDocumentTreeItemElement = class UmbDocumentTreeItemElement extends UmbTreeItemElementBase {
     constructor() {
@@ -15,6 +15,7 @@ let UmbDocumentTreeItemElement = class UmbDocumentTreeItemElement extends UmbTre
          * @internal
          */
         this._isDraft = false;
+        this._collapsibleCollection = false;
         this._drillableCollection = false;
         // eslint-disable-next-line @typescript-eslint/naming-convention
         this._renderExpandSymbol = () => {
@@ -38,6 +39,7 @@ let UmbDocumentTreeItemElement = class UmbDocumentTreeItemElement extends UmbTre
                 this.requestUpdate('_forceShowExpand', oldValue);
             });
             this.observe(this.#api.drillableCollection, (drillable) => (this._drillableCollection = drillable));
+            this.observe(this.#api.collapsibleCollection, (collapsible) => (this._collapsibleCollection = collapsible));
             this.observe(this.#api.icon, (icon) => (this.#icon = icon || ''));
             this.observe(this.#api.flags, (flags) => (this._flags = flags || []));
         }
@@ -54,24 +56,98 @@ let UmbDocumentTreeItemElement = class UmbDocumentTreeItemElement extends UmbTre
     _getIconName() {
         return this.#icon;
     }
+    _renderChildItem(item) {
+        if (this._collapsibleCollection) {
+            return html `<div class="child">
+				<div class="peek-child"></div>
+				${super._renderChildItem(item)}
+			</div>`;
+        }
+        else {
+            return super._renderChildItem(item);
+        }
+    }
     renderLabel() {
         return html `<span
 			id="label"
 			slot="label"
-			class=${classMap({ draft: this._isDraft, noAccess: this._noAccess })}
-			@dblclick=${this._handleDblClick}>
-			${this._name}
-		</span> `;
+			class=${classMap({ draft: this._isDraft })}
+			@dblclick=${this._handleDblClick}
+			>${this._name}</span
+		>`;
+    }
+    _renderLoadPrevButton() {
+        if (this._drillableCollection)
+            return nothing;
+        return super._renderLoadPrevButton();
+    }
+    _renderLoadNextButton() {
+        if (this._drillableCollection)
+            return nothing;
+        return super._renderLoadNextButton();
     }
     static { this.styles = [
         ...UmbTreeItemElementBase.styles,
         css `
+			:host {
+				--uui-menu-item-flat-structure: 0;
+				/** Keep the external value of --uui-menu-item-indent for the peek-child element [NL] */
+				--umb-tree-item-indent: var(--uui-menu-item-indent, 0);
+			}
+
+			:host([collection]) uui-menu-item {
+				--uui-menu-item-child-indent: 0;
+			}
+			:host([has-children]) uui-menu-item {
+				--umb-menu-item-child-flat-structure: 0;
+			}
+			:host([collection]) uui-menu-item {
+				--umb-menu-item-child-flat-structure: 0;
+			}
+			:host(:not([collection]):not([has-children])) uui-menu-item {
+				--uui-menu-item-flat-structure: var(--umb-menu-item-child-flat-structure, 0);
+			}
+
 			:host([draft]) #label {
 				opacity: 0.6;
 			}
 			:host([draft]) umb-icon {
 				opacity: 0.6;
 			}
+
+			.child {
+				display: flex;
+				flex-direction: row;
+				align-items: flex-start;
+			}
+			umb-tree-item {
+				flex-grow: 1;
+				flex-shrink: 1;
+			}
+			:host([collection]) umb-tree-item {
+				--umb-menu-item-child-flat-structure: 1;
+				--umb-tree-item-indent: 0;
+			}
+
+			.peek-child {
+				position: relative;
+				display: block;
+				flex-grow: 0;
+				flex-shrink: 0;
+				width: calc((2 + var(--umb-tree-item-indent, 0)) * var(--uui-size-4));
+				margin-right: 3px;
+			}
+			.peek-child::after {
+				content: '';
+				position: absolute;
+				top: -11px;
+				right: -9px;
+				border-left: 1px solid var(--uui-color-border-standalone);
+				border-bottom: 1px solid var(--uui-color-border-standalone);
+				border-bottom-left-radius: var(--uui-border-radius);
+				width: 16px;
+				height: 29px;
+			}
 		`,
     ]; }
 };
@@ -84,6 +160,9 @@ __decorate([
 __decorate([
     property({ type: Boolean, reflect: true, attribute: 'draft' })
 ], UmbDocumentTreeItemElement.prototype, "_isDraft", void 0);
+__decorate([
+    property({ type: Boolean, reflect: true, attribute: 'collection' })
+], UmbDocumentTreeItemElement.prototype, "_collapsibleCollection", void 0);
 __decorate([
     state()
 ], UmbDocumentTreeItemElement.prototype, "_drillableCollection", void 0);

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

@@ -10,6 +10,14 @@ export interface UmbDocumentTreeItemModel extends Omit<UmbTreeItemModel, 'flags'
     noAccess: boolean;
     isTrashed: boolean;
     isProtected: boolean;
+    contentType?: {
+        unique: string;
+        icon: string;
+        collection: UmbReferenceByUnique | null;
+    };
+    /**
+     * @deprecated Use `contentType` instead. This field will be removed in v20.
+     */
     documentType: {
         unique: string;
         icon: string;

package/dist-cms/packages/documents/documents/tree/views/document-table-tree-view.element.d.ts

@@ -0,0 +1,15 @@
+import type { TemplateResult } from '../../../../../external/lit/index.js';
+import { UmbTableTreeViewElement } from '../../../../core/tree/index.js';
+import type { UmbTreeItemModel } from '../../../../core/tree/index.js';
+export declare class UmbDocumentTableTreeViewElement extends UmbTableTreeViewElement {
+    #private;
+    protected _showExpandSymbol(item: UmbTreeItemModel): boolean;
+    protected _getExpandPath(item: UmbTreeItemModel, path: string | undefined): string | undefined;
+    protected _renderExpandSymbol(item: UmbTreeItemModel): TemplateResult | undefined;
+}
+export { UmbDocumentTableTreeViewElement as element };
+declare global {
+    interface HTMLElementTagNameMap {
+        'umb-document-table-tree-view': UmbDocumentTableTreeViewElement;
+    }
+}

package/dist-cms/packages/documents/documents/tree/views/document-table-tree-view.element.js

@@ -0,0 +1,33 @@
+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 { UmbTableTreeViewElement } from '../../../../core/tree/index.js';
+let UmbDocumentTableTreeViewElement = class UmbDocumentTableTreeViewElement extends UmbTableTreeViewElement {
+    // A collection the user cannot access stays expandable, so the way down to their start node remains reachable.
+    #hasCollection(item) {
+        const document = item;
+        // TODO (V20): drop the `documentType` fallback when the deprecated field is removed.
+        // eslint-disable-next-line @typescript-eslint/no-deprecated
+        return !!(document.contentType ?? document.documentType)?.collection && !document.noAccess;
+    }
+    _showExpandSymbol(item) {
+        return this.#hasCollection(item) || super._showExpandSymbol(item);
+    }
+    _getExpandPath(item, path) {
+        return path && this.#hasCollection(item) ? `${path}?openCollection=true` : path;
+    }
+    _renderExpandSymbol(item) {
+        return this.#hasCollection(item)
+            ? html `<umb-icon name="icon-list" style="font-size: 8px;"></umb-icon>`
+            : super._renderExpandSymbol(item);
+    }
+};
+UmbDocumentTableTreeViewElement = __decorate([
+    customElement('umb-document-table-tree-view')
+], UmbDocumentTableTreeViewElement);
+export { UmbDocumentTableTreeViewElement };
+export { UmbDocumentTableTreeViewElement as element };

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

@@ -13,6 +13,7 @@ export const manifests = [
         kind: 'table',
         alias: 'Umb.TreeView.Document.Table',
         name: 'Document Table Tree View',
+        element: () => import('./document-table-tree-view.element.js'),
         forTrees: [UMB_DOCUMENT_TREE_ALIAS],
         meta: {
             columns: [

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

@@ -66,7 +66,6 @@ let UmbInputDocumentGranularUserPermissionElement = class UmbInputDocumentGranul
             data: {
                 hideTreeRoot: true,
                 // prevent already selected items to be picked again
-                // TODO: this type is wrong. It should be the tree item type
                 pickableFilter: (treeItem) => !this._items?.map((i) => i.unique).includes(treeItem.unique),
             },
         });