Merge pull request #2446 from umbraco/v15/feature/folder-children-collection-workspace-view

Feature: Folder Children Collection Workspace View

Author: nielslyngsoe

src/packages/core/collection/components/boolean-table-column-view/boolean-table-column-view.element.ts

@@ -1,8 +1,7 @@
 import { html, nothing, customElement, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 
-const elementName = 'umb-boolean-table-column-view';
-@customElement(elementName)
+@customElement('umb-boolean-table-column-view')
 export class UmbBooleanTableColumnViewElement extends UmbLitElement {
 	@property({ attribute: false })
 	value = false;
@@ -14,6 +13,6 @@ export class UmbBooleanTableColumnViewElement extends UmbLitElement {
 
 declare global {
 	interface HTMLElementTagNameMap {
-		[elementName]: UmbBooleanTableColumnViewElement;
+		'umb-boolean-table-column-view': UmbBooleanTableColumnViewElement;
 	}
 }

src/packages/core/collection/components/index.ts

@@ -1,9 +1,9 @@
+import './boolean-table-column-view/boolean-table-column-view.element.js';
 import './collection-action-bundle.element.js';
 import './collection-filter-field.element.js';
 import './collection-selection-actions.element.js';
 import './collection-toolbar.element.js';
 import './collection-view-bundle.element.js';
-import './boolean-table-column-view/boolean-table-column-view.element.js';
 import './pagination/collection-pagination.element.js';
 
 export * from './collection-action-bundle.element.js';

src/packages/core/collection/components/pagination/collection-pagination.element.ts

@@ -63,6 +63,10 @@ export class UmbCollectionPaginationElement extends UmbLitElement {
 		UmbTextStyles,
 		css`
 			:host {
+				display: contents;
+			}
+
+			uui-pagination {
 				display: block;
 				margin-top: var(--uui-size-layout-1);
 			}

src/packages/core/collection/default/collection-default.element.ts

@@ -113,11 +113,11 @@ export class UmbCollectionDefaultElement extends UmbLitElement {
 			}
 
 			#router {
-				display: none;
+				visibility: hidden;
 			}
 
 			.has-items #router {
-				display: block;
+				visibility: visible;
 			}
 
 			#empty-state {

src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts

@@ -11,7 +11,7 @@ import {
 } from '@umbraco-cms/backoffice/entity-action';
 import { UmbExtensionApiInitializer } from '@umbraco-cms/backoffice/extension-api';
 import { umbExtensionsRegistry, type ManifestRepository } from '@umbraco-cms/backoffice/extension-registry';
-import type { UmbDetailRepository, UmbRepositoryResponseWithAsObservable } from '@umbraco-cms/backoffice/repository';
+import type { UmbDetailRepository } from '@umbraco-cms/backoffice/repository';
 
 export interface UmbEntityDetailWorkspaceContextArgs {
 	entityType: string;
@@ -47,7 +47,6 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 	public readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);
 
 	protected _getDataPromise?: Promise<any>;
-
 	protected _detailRepository?: DetailRepositoryType;
 
 	#entityContext = new UmbEntityContext(this);
@@ -71,6 +70,7 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 	constructor(host: UmbControllerHost, args: UmbEntityWorkspaceContextArgs) {
 		super(host, args.workspaceAlias);
 		this.#entityType = args.entityType;
+		this.#entityContext.setEntityType(this.#entityType);
 		window.addEventListener('willchangestate', this.#onWillNavigate);
 		this.#observeRepository(args.detailRepositoryAlias);
 	}
@@ -119,12 +119,9 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 		return this.#parent.getValue()?.entityType;
 	}
 
-	/**
-	 * Load the workspace data
-	 * @param {string} unique The unique identifier of the entity to load.
-	 * @returns { Promise<UmbRepositoryResponseWithAsObservable<DetailModelType>> } The data of the entity.
-	 */
-	async load(unique: string): Promise<UmbRepositoryResponseWithAsObservable<DetailModelType>> {
+	async load(unique: string) {
+		this.#entityContext.setEntityType(this.#entityType);
+		this.#entityContext.setUnique(unique);
 		await this.#init;
 		this.resetState();
 		this._getDataPromise = this._detailRepository!.requestByUnique(unique);
@@ -133,8 +130,6 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 		const data = response.data;
 
 		if (data) {
-			this.#entityContext.setEntityType(this.#entityType);
-			this.#entityContext.setUnique(unique);
 			this._data.setPersisted(data);
 			this._data.setCurrent(data);
 			this.setIsNew(false);

src/packages/documents/document-types/components/input-document-type/input-document-type.element.ts

@@ -1,5 +1,5 @@
 import type { UmbDocumentTypeItemModel } from '../../repository/index.js';
-import { UMB_DOCUMENT_TYPE_WORKSPACE_MODAL } from '../../workspace/document-type-workspace.modal-token.js';
+import { UMB_DOCUMENT_TYPE_WORKSPACE_MODAL } from '../../workspace/document-type/document-type-workspace.modal-token.js';
 import type { UmbDocumentTypeTreeItemModel } from '../../tree/types.js';
 import { UMB_EDIT_DOCUMENT_TYPE_WORKSPACE_PATH_PATTERN } from '../../paths.js';
 import { UmbDocumentTypePickerInputContext } from './input-document-type.context.js';

src/packages/documents/document-types/entity-actions/create/manifests.ts

@@ -1,4 +1,5 @@
-import { UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE, UMB_DOCUMENT_TYPE_ROOT_ENTITY_TYPE } from '../../entity.js';
+import { UMB_DOCUMENT_TYPE_ROOT_ENTITY_TYPE } from '../../entity.js';
+import { UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE } from '../../tree/index.js';
 
 export const manifests: Array<UmbExtensionManifest> = [
 	{

src/packages/documents/document-types/entity.ts

@@ -1,10 +1,10 @@
+import type { UmbDocumentTypeFolderEntityType } from './tree/index.js';
+
 export const UMB_DOCUMENT_TYPE_ENTITY_TYPE = 'document-type';
 export const UMB_DOCUMENT_TYPE_ROOT_ENTITY_TYPE = 'document-type-root';
-export const UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE = 'document-type-folder';
 
 export type UmbDocumentTypeEntityType = typeof UMB_DOCUMENT_TYPE_ENTITY_TYPE;
 export type UmbDocumentTypeRootEntityType = typeof UMB_DOCUMENT_TYPE_ROOT_ENTITY_TYPE;
-export type UmbDocumentTypeFolderEntityType = typeof UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE;
 
 export type UmbDocumentTypeEntityTypeUnion =
 	| UmbDocumentTypeEntityType

src/packages/documents/document-types/tree/document-type.tree.server.data-source.ts

@@ -1,9 +1,6 @@
-import {
-	UMB_DOCUMENT_TYPE_ENTITY_TYPE,
-	UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE,
-	UMB_DOCUMENT_TYPE_ROOT_ENTITY_TYPE,
-} from '../entity.js';
+import { UMB_DOCUMENT_TYPE_ENTITY_TYPE, UMB_DOCUMENT_TYPE_ROOT_ENTITY_TYPE } from '../entity.js';
 import type { UmbDocumentTypeTreeItemModel } from './types.js';
+import { UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE } from './folder/index.js';
 import type {
 	UmbTreeAncestorsOfRequestArgs,
 	UmbTreeChildrenOfRequestArgs,

src/packages/documents/document-types/tree/folder/entity.ts

@@ -0,0 +1,2 @@
+export const UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE = 'document-type-folder';
+export type UmbDocumentTypeFolderEntityType = typeof UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE;