@umbraco-cms/backoffice 14.0.0--preview007-6f3189e3 → 14.0.0--preview007-2ee36857

package/dist-cms/packages/core/collection/collection-view.manager.d.ts

@@ -1,6 +1,6 @@
 import { UmbBaseController } from '../../../libs/class-api/index.js';
-import type { UmbControllerHost } from '../../../libs/controller-api/index.js';
 import type { ManifestCollectionView } from '../extension-registry/index.js';
+import type { UmbControllerHost } from '../../../libs/controller-api/index.js';
 import type { UmbRoute } from '../../../shared/router/index.js';
 export interface UmbCollectionViewManagerConfig {
     defaultViewAlias?: string;

package/dist-cms/packages/core/collection/collection-view.manager.js

@@ -61,7 +61,7 @@ _UmbCollectionViewManager_views = new WeakMap(), _UmbCollectionViewManager_curre
     });
 }, _UmbCollectionViewManager_createRoutes = function _UmbCollectionViewManager_createRoutes(views) {
     let routes = [];
-    if (views) {
+    if (views?.length) {
         // find the default view from the config. If it doesn't exist, use the first view
         const defaultView = views.find((view) => view.alias === __classPrivateFieldGet(this, _UmbCollectionViewManager_defaultViewAlias, "f"));
         const fallbackView = defaultView?.meta.pathName || views[0].meta.pathName;

package/dist-cms/packages/core/collection/default/collection-default.context.d.ts

@@ -13,6 +13,7 @@ export declare class UmbDefaultCollectionContext<CollectionItemType = any, Filte
     readonly items: import("rxjs").Observable<CollectionItemType[]>;
     readonly totalItems: import("rxjs").Observable<number>;
     readonly filter: import("rxjs").Observable<object | FilterModelType>;
+    readonly userDefinedProperties: import("rxjs").Observable<any[]>;
     repository?: UmbCollectionRepository;
     readonly pagination: UmbPaginationManager;
     readonly selection: UmbSelectionManager;

package/dist-cms/packages/core/collection/default/collection-default.context.js

@@ -9,7 +9,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _UmbDefaultCollectionContext_instances, _UmbDefaultCollectionContext_manifest, _UmbDefaultCollectionContext_items, _UmbDefaultCollectionContext_totalItems, _UmbDefaultCollectionContext_filter, _UmbDefaultCollectionContext_initResolver, _UmbDefaultCollectionContext_initialized, _UmbDefaultCollectionContext_init, _UmbDefaultCollectionContext_checkIfInitialized, _UmbDefaultCollectionContext_config, _UmbDefaultCollectionContext_configure, _UmbDefaultCollectionContext_onPageChange, _UmbDefaultCollectionContext_observeRepository;
+var _UmbDefaultCollectionContext_instances, _UmbDefaultCollectionContext_manifest, _UmbDefaultCollectionContext_items, _UmbDefaultCollectionContext_totalItems, _UmbDefaultCollectionContext_filter, _UmbDefaultCollectionContext_userDefinedProperties, _UmbDefaultCollectionContext_initResolver, _UmbDefaultCollectionContext_initialized, _UmbDefaultCollectionContext_init, _UmbDefaultCollectionContext_checkIfInitialized, _UmbDefaultCollectionContext_config, _UmbDefaultCollectionContext_configure, _UmbDefaultCollectionContext_onPageChange, _UmbDefaultCollectionContext_observeRepository;
 import { UmbCollectionViewManager } from '../collection-view.manager.js';
 import { UmbContextBase } from '../../../../libs/class-api/index.js';
 import { UmbContextToken } from '../../../../libs/context-api/index.js';
@@ -29,6 +29,8 @@ export class UmbDefaultCollectionContext extends UmbContextBase {
         this.totalItems = __classPrivateFieldGet(this, _UmbDefaultCollectionContext_totalItems, "f").asObservable();
         _UmbDefaultCollectionContext_filter.set(this, new UmbObjectState({}));
         this.filter = __classPrivateFieldGet(this, _UmbDefaultCollectionContext_filter, "f").asObservable();
+        _UmbDefaultCollectionContext_userDefinedProperties.set(this, new UmbArrayState([], (x) => x));
+        this.userDefinedProperties = __classPrivateFieldGet(this, _UmbDefaultCollectionContext_userDefinedProperties, "f").asObservable();
         _UmbDefaultCollectionContext_initResolver.set(this, void 0);
         _UmbDefaultCollectionContext_initialized.set(this, false);
         _UmbDefaultCollectionContext_init.set(this, new Promise((resolve) => {
@@ -106,7 +108,7 @@ export class UmbDefaultCollectionContext extends UmbContextBase {
         this.requestCollection();
     }
 }
-_UmbDefaultCollectionContext_manifest = new WeakMap(), _UmbDefaultCollectionContext_items = new WeakMap(), _UmbDefaultCollectionContext_totalItems = new WeakMap(), _UmbDefaultCollectionContext_filter = new WeakMap(), _UmbDefaultCollectionContext_initResolver = new WeakMap(), _UmbDefaultCollectionContext_initialized = new WeakMap(), _UmbDefaultCollectionContext_init = new WeakMap(), _UmbDefaultCollectionContext_config = new WeakMap(), _UmbDefaultCollectionContext_onPageChange = new WeakMap(), _UmbDefaultCollectionContext_instances = new WeakSet(), _UmbDefaultCollectionContext_checkIfInitialized = function _UmbDefaultCollectionContext_checkIfInitialized() {
+_UmbDefaultCollectionContext_manifest = new WeakMap(), _UmbDefaultCollectionContext_items = new WeakMap(), _UmbDefaultCollectionContext_totalItems = new WeakMap(), _UmbDefaultCollectionContext_filter = new WeakMap(), _UmbDefaultCollectionContext_userDefinedProperties = new WeakMap(), _UmbDefaultCollectionContext_initResolver = new WeakMap(), _UmbDefaultCollectionContext_initialized = new WeakMap(), _UmbDefaultCollectionContext_init = new WeakMap(), _UmbDefaultCollectionContext_config = new WeakMap(), _UmbDefaultCollectionContext_onPageChange = new WeakMap(), _UmbDefaultCollectionContext_instances = new WeakSet(), _UmbDefaultCollectionContext_checkIfInitialized = function _UmbDefaultCollectionContext_checkIfInitialized() {
     if (this.repository) {
         __classPrivateFieldSet(this, _UmbDefaultCollectionContext_initialized, true, "f");
         __classPrivateFieldGet(this, _UmbDefaultCollectionContext_initResolver, "f")?.call(this);
@@ -114,7 +116,13 @@ _UmbDefaultCollectionContext_manifest = new WeakMap(), _UmbDefaultCollectionCont
 }, _UmbDefaultCollectionContext_configure = function _UmbDefaultCollectionContext_configure() {
     this.selection.setMultiple(true);
     this.pagination.setPageSize(__classPrivateFieldGet(this, _UmbDefaultCollectionContext_config, "f").pageSize);
-    __classPrivateFieldGet(this, _UmbDefaultCollectionContext_filter, "f").setValue({ ...__classPrivateFieldGet(this, _UmbDefaultCollectionContext_filter, "f").getValue(), skip: 0, take: __classPrivateFieldGet(this, _UmbDefaultCollectionContext_config, "f").pageSize });
+    __classPrivateFieldGet(this, _UmbDefaultCollectionContext_filter, "f").setValue({
+        ...__classPrivateFieldGet(this, _UmbDefaultCollectionContext_config, "f"),
+        ...__classPrivateFieldGet(this, _UmbDefaultCollectionContext_filter, "f").getValue(),
+        skip: 0,
+        take: __classPrivateFieldGet(this, _UmbDefaultCollectionContext_config, "f").pageSize,
+    });
+    __classPrivateFieldGet(this, _UmbDefaultCollectionContext_userDefinedProperties, "f").setValue(__classPrivateFieldGet(this, _UmbDefaultCollectionContext_config, "f").userDefinedProperties ?? []);
 }, _UmbDefaultCollectionContext_observeRepository = function _UmbDefaultCollectionContext_observeRepository(repositoryAlias) {
     new UmbExtensionApiInitializer(this, umbExtensionsRegistry, repositoryAlias, [this._host], (permitted, ctrl) => {
         this.repository = permitted ? ctrl.api : undefined;

package/dist-cms/packages/core/collection/types.d.ts

@@ -9,12 +9,14 @@ export interface UmbCollectionBulkActionPermissions {
     allowBulkUnpublish: boolean;
 }
 export interface UmbCollectionConfiguration {
+    unique?: string;
+    dataTypeId?: string;
     allowedEntityBulkActions?: UmbCollectionBulkActionPermissions;
-    includeProperties?: Array<any>;
     orderBy?: string;
     orderDirection?: string;
     pageSize?: number;
     useInfiniteEditor?: boolean;
+    userDefinedProperties?: Array<any>;
 }
 export interface UmbCollectionContext {
     setConfig(config: UmbCollectionConfiguration): void;

package/dist-cms/packages/core/components/table/table.element.js

@@ -255,7 +255,7 @@ __decorate([
     property({ type: String, attribute: false })
 ], UmbTableElement.prototype, "orderingColumn", void 0);
 __decorate([
-    property({ type: String, attribute: false })
+    property({ type: Boolean, attribute: false })
 ], UmbTableElement.prototype, "orderingDesc", void 0);
 __decorate([
     state()

package/dist-cms/packages/core/property-editor/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.element.d.ts

@@ -4,7 +4,7 @@ import { UmbLitElement } from '../../../../../lit-element/index.js';
 interface ColumnConfig {
     alias: string;
     header: string;
-    isSystem: boolean;
+    isSystem: 1 | 0;
     nameTemplate?: string;
 }
 /**

package/dist-cms/packages/core/property-editor/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.element.js

@@ -77,7 +77,7 @@ _UmbPropertyEditorUICollectionViewColumnConfigurationElement_onAdd = function _U
     const config = {
         alias: selected.value,
         header: selected.name,
-        isSystem: selected?.group === 'System Fields',
+        isSystem: selected?.group === 'System Fields' ? 1 : 0,
     };
     this.value = [...this.value, config];
     this.dispatchEvent(new UmbPropertyValueChangeEvent());
@@ -112,7 +112,7 @@ _UmbPropertyEditorUICollectionViewColumnConfigurationElement_renderTable = funct
 			</uui-table-row>
 			${repeat(this.value, (configuration) => configuration.alias, (configuration) => html `<uui-table-row>
 						<uui-table-cell><uui-icon name="icon-navigation"></uui-icon></uui-table-cell>
-						${configuration.isSystem
+						${configuration.isSystem === 1
         ? __classPrivateFieldGet(this, _UmbPropertyEditorUICollectionViewColumnConfigurationElement_instances, "m", _UmbPropertyEditorUICollectionViewColumnConfigurationElement_renderSystemFieldRow).call(this, configuration)
         : __classPrivateFieldGet(this, _UmbPropertyEditorUICollectionViewColumnConfigurationElement_instances, "m", _UmbPropertyEditorUICollectionViewColumnConfigurationElement_renderCustomFieldRow).call(this, configuration)}
 						<uui-table-cell>

package/dist-cms/packages/core/property-editor/uis/collection-view/property-editor-ui-collection-view.element.d.ts

@@ -1,6 +1,6 @@
 import type { UmbPropertyEditorConfigCollection } from '../../config/index.js';
-import type { UmbPropertyEditorUiElement } from '../../../extension-registry/index.js';
 import { UmbLitElement } from '../../../lit-element/index.js';
+import type { UmbPropertyEditorUiElement } from '../../../extension-registry/index.js';
 /**
  * @element umb-property-editor-ui-collection-view
  */
@@ -9,6 +9,7 @@ export declare class UmbPropertyEditorUICollectionViewElement extends UmbLitElem
     value?: string;
     private _config?;
     set config(config: UmbPropertyEditorConfigCollection | undefined);
+    constructor();
     render(): import("lit-html").TemplateResult<1>;
 }
 export default UmbPropertyEditorUICollectionViewElement;

package/dist-cms/packages/core/property-editor/uis/collection-view/property-editor-ui-collection-view.element.js

@@ -12,18 +12,43 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _UmbPropertyEditorUICollectionViewElement_instances, _UmbPropertyEditorUICollectionViewElement_mapDataTypeConfigToCollectionConfig;
 import { html, customElement, property, state } from '../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../lit-element/index.js';
+import { UMB_PROPERTY_CONTEXT } from '../../../property/index.js';
+import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../../../../documents/documents/index.js';
 /**
  * @element umb-property-editor-ui-collection-view
  */
 let UmbPropertyEditorUICollectionViewElement = class UmbPropertyEditorUICollectionViewElement extends UmbLitElement {
-    constructor() {
-        super(...arguments);
-        _UmbPropertyEditorUICollectionViewElement_instances.add(this);
-    }
     set config(config) {
         this._config = __classPrivateFieldGet(this, _UmbPropertyEditorUICollectionViewElement_instances, "m", _UmbPropertyEditorUICollectionViewElement_mapDataTypeConfigToCollectionConfig).call(this, config);
     }
+    constructor() {
+        super();
+        _UmbPropertyEditorUICollectionViewElement_instances.add(this);
+        // Gets the Data Type ID for the current property.
+        this.consumeContext(UMB_PROPERTY_CONTEXT, (propertyContext) => {
+            // TODO: [LK:2024-02-01] Replace `UMB_DOCUMENT_WORKSPACE_CONTEXT`
+            // with an abstracted context that supports both document and media workspaces.
+            this.consumeContext(UMB_DOCUMENT_WORKSPACE_CONTEXT, (workspaceContext) => {
+                this.observe(workspaceContext.unique, (unique) => {
+                    if (this._config) {
+                        this._config.unique = unique;
+                    }
+                });
+                this.observe(propertyContext.alias, async (propertyAlias) => {
+                    if (propertyAlias) {
+                        const property = await workspaceContext.structure.getPropertyStructureByAlias(propertyAlias);
+                        if (property && this._config) {
+                            this._config.dataTypeId = property.dataType.unique;
+                            this.requestUpdate('_config');
+                        }
+                    }
+                });
+            });
+        });
+    }
     render() {
+        if (!this._config?.unique || !this._config?.dataTypeId)
+            return html `<uui-loader></uui-loader>`;
         return html `<umb-collection alias="Umb.Collection.Document" .config=${this._config}></umb-collection>`;
     }
 };
@@ -35,6 +60,7 @@ _UmbPropertyEditorUICollectionViewElement_mapDataTypeConfigToCollectionConfig =
         orderDirection: config?.getValueByAlias('orderDirection') ?? 'asc',
         pageSize: Number(config?.getValueByAlias('pageSize')) ?? 50,
         useInfiniteEditor: config?.getValueByAlias('useInfiniteEditor') ?? false,
+        userDefinedProperties: config?.getValueByAlias('includeProperties'),
     };
 };
 __decorate([

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

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _UmbDocumentCollectionToolbarElement_instances, _UmbDocumentCollectionToolbarElement_collectionContext, _UmbDocumentCollectionToolbarElement_inputTimer, _UmbDocumentCollectionToolbarElement_inputTimerAmount, _UmbDocumentCollectionToolbarElement_updateSearch, _UmbDocumentCollectionToolbarElement_renderSearch;
+var _UmbDocumentCollectionToolbarElement_instances, _UmbDocumentCollectionToolbarElement_collectionContext, _UmbDocumentCollectionToolbarElement_inputTimer, _UmbDocumentCollectionToolbarElement_inputTimerAmount, _UmbDocumentCollectionToolbarElement_updateSearch;
 import { css, html, customElement } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../core/lit-element/index.js';
 import { UMB_DEFAULT_COLLECTION_CONTEXT } from '../../../core/collection/index.js';
@@ -33,7 +33,7 @@ let UmbDocumentCollectionToolbarElement = class UmbDocumentCollectionToolbarElem
     render() {
         return html `
 			<umb-collection-action-bundle></umb-collection-action-bundle>
-			${__classPrivateFieldGet(this, _UmbDocumentCollectionToolbarElement_instances, "m", _UmbDocumentCollectionToolbarElement_renderSearch).call(this)}
+			<uui-input @input=${__classPrivateFieldGet(this, _UmbDocumentCollectionToolbarElement_instances, "m", _UmbDocumentCollectionToolbarElement_updateSearch)} label="Search" placeholder="Search..." id="input-search"></uui-input>
 			<umb-collection-view-bundle></umb-collection-view-bundle>
 		`;
     }
@@ -48,11 +48,6 @@ _UmbDocumentCollectionToolbarElement_updateSearch = function _UmbDocumentCollect
     clearTimeout(__classPrivateFieldGet(this, _UmbDocumentCollectionToolbarElement_inputTimer, "f"));
     __classPrivateFieldSet(this, _UmbDocumentCollectionToolbarElement_inputTimer, setTimeout(() => __classPrivateFieldGet(this, _UmbDocumentCollectionToolbarElement_collectionContext, "f")?.setFilter({ filter }), __classPrivateFieldGet(this, _UmbDocumentCollectionToolbarElement_inputTimerAmount, "f")), "f");
 };
-_UmbDocumentCollectionToolbarElement_renderSearch = function _UmbDocumentCollectionToolbarElement_renderSearch() {
-    return html `
-			<uui-input @input=${__classPrivateFieldGet(this, _UmbDocumentCollectionToolbarElement_instances, "m", _UmbDocumentCollectionToolbarElement_updateSearch)} label="Search" placeholder="Search..." id="input-search"></uui-input>
-		`;
-};
 UmbDocumentCollectionToolbarElement.styles = [
     css `
 			:host {

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

@@ -1,7 +1,6 @@
-import type { UmbDocumentDetailModel } from '../types.js';
-import type { UmbDocumentCollectionFilterModel } from './types.js';
+import type { UmbDocumentCollectionFilterModel, UmbDocumentCollectionItemModel } from './types.js';
 import { UmbDefaultCollectionContext } from '../../../core/collection/index.js';
 import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
-export declare class UmbDocumentCollectionContext extends UmbDefaultCollectionContext<UmbDocumentDetailModel, UmbDocumentCollectionFilterModel> {
+export declare class UmbDocumentCollectionContext extends UmbDefaultCollectionContext<UmbDocumentCollectionItemModel, UmbDocumentCollectionFilterModel> {
     constructor(host: UmbControllerHost);
 }

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

@@ -4,9 +4,9 @@ import type { UmbControllerHost } from '../../../../../libs/controller-api/index
 export declare class UmbDocumentCollectionRepository implements UmbCollectionRepository {
     #private;
     constructor(host: UmbControllerHost);
-    requestCollection(filter: UmbDocumentCollectionFilterModel): Promise<{
+    requestCollection(query: UmbDocumentCollectionFilterModel): Promise<{
         data: {
-            items: import("../../tree/types.js").UmbDocumentTreeItemModel[];
+            items: import("../types.js").UmbDocumentCollectionItemModel[];
             total: number;
         };
         error?: undefined;

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

@@ -16,8 +16,8 @@ export class UmbDocumentCollectionRepository {
         _UmbDocumentCollectionRepository_collectionSource.set(this, void 0);
         __classPrivateFieldSet(this, _UmbDocumentCollectionRepository_collectionSource, new UmbDocumentCollectionServerDataSource(host), "f");
     }
-    async requestCollection(filter) {
-        return __classPrivateFieldGet(this, _UmbDocumentCollectionRepository_collectionSource, "f").getCollection(filter);
+    async requestCollection(query) {
+        return __classPrivateFieldGet(this, _UmbDocumentCollectionRepository_collectionSource, "f").getCollection(query);
     }
     destroy() { }
 }

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

@@ -1,13 +1,12 @@
-import type { UmbDocumentCollectionFilterModel } from '../types.js';
-import type { UmbDocumentTreeItemModel } from '../../tree/types.js';
+import type { UmbDocumentCollectionFilterModel, UmbDocumentCollectionItemModel } from '../types.js';
 import type { UmbCollectionDataSource } from '../../../../core/repository/index.js';
 import type { UmbControllerHost } from '../../../../../libs/controller-api/index.js';
-export declare class UmbDocumentCollectionServerDataSource implements UmbCollectionDataSource<UmbDocumentTreeItemModel> {
+export declare class UmbDocumentCollectionServerDataSource implements UmbCollectionDataSource<UmbDocumentCollectionItemModel> {
     #private;
     constructor(host: UmbControllerHost);
-    getCollection(filter: UmbDocumentCollectionFilterModel): Promise<{
+    getCollection(query: UmbDocumentCollectionFilterModel): Promise<{
         data: {
-            items: UmbDocumentTreeItemModel[];
+            items: UmbDocumentCollectionItemModel[];
             total: number;
         };
         error?: undefined;

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

@@ -9,52 +9,52 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _UmbDocumentCollectionServerDataSource_host, _UmbDocumentCollectionServerDataSource_mapper;
-import { UMB_DOCUMENT_ENTITY_TYPE } from '../../entity.js';
-import { DocumentResource } from '../../../../../external/backend-api/index.js';
+var _UmbDocumentCollectionServerDataSource_host;
+import { DirectionModel, DocumentResource } from '../../../../../external/backend-api/index.js';
 import { tryExecuteAndNotify } from '../../../../../shared/resources/index.js';
 export class UmbDocumentCollectionServerDataSource {
     constructor(host) {
         _UmbDocumentCollectionServerDataSource_host.set(this, void 0);
-        // TODO: [LK] Temp solution. Copied from "src/packages/documents/documents/tree/document-tree.server.data-source.ts"
-        _UmbDocumentCollectionServerDataSource_mapper.set(this, (item) => {
-            return {
-                unique: item.id,
-                parentUnique: item.parent ? item.parent.id : null,
-                entityType: UMB_DOCUMENT_ENTITY_TYPE,
-                noAccess: item.noAccess,
-                isTrashed: item.isTrashed,
-                hasChildren: item.hasChildren,
-                isProtected: item.isProtected,
-                documentType: {
-                    unique: item.documentType.id,
-                    icon: item.documentType.icon,
-                    hasCollection: item.documentType.hasListView,
-                },
-                variants: item.variants.map((variant) => {
-                    return {
-                        name: variant.name,
-                        culture: variant.culture || null,
-                        state: variant.state,
-                    };
-                }),
-                name: item.variants[0]?.name, // TODO: this is not correct. We need to get it from the variants. This is a temp solution.
-                isFolder: false,
-            };
-        });
         __classPrivateFieldSet(this, _UmbDocumentCollectionServerDataSource_host, host, "f");
     }
-    async getCollection(filter) {
-        // TODO: [LK] Replace the Management API call with the correct endpoint once it is available.
-        const { data, error } = await tryExecuteAndNotify(__classPrivateFieldGet(this, _UmbDocumentCollectionServerDataSource_host, "f"), DocumentResource.getTreeDocumentRoot(filter));
+    async getCollection(query) {
+        if (!query.unique) {
+            throw new Error('Unique ID is required to fetch a collection.');
+        }
+        if (!query.dataTypeId) {
+            throw new Error('Data type ID is required to fetch a collection.');
+        }
+        const params = {
+            id: query.unique,
+            dataTypeId: query.dataTypeId,
+            orderBy: query.orderBy ?? 'updateDate',
+            orderCulture: query.orderCulture ?? 'en-US',
+            orderDirection: query.orderDirection === 'asc' ? DirectionModel.ASCENDING : DirectionModel.DESCENDING,
+            filter: query.filter,
+            skip: query.skip ?? 0,
+            take: query.take ?? 100,
+        };
+        const { data, error } = await tryExecuteAndNotify(__classPrivateFieldGet(this, _UmbDocumentCollectionServerDataSource_host, "f"), DocumentResource.getCollectionDocumentById(params));
         if (data) {
-            const skip = Number(filter.skip) ?? 0;
-            const take = Number(filter.take) ?? 100;
-            const items = data.items.slice(skip, skip + take).map((item) => __classPrivateFieldGet(this, _UmbDocumentCollectionServerDataSource_mapper, "f").call(this, item));
-            //console.log('UmbDocumentCollectionServerDataSource.getCollection', [data, items]);
+            const items = data.items.map((item) => {
+                // TODO: [LK] Temp solution, review how to get the name from the corresponding variant.
+                const variant = item.variants[0];
+                const model = {
+                    unique: item.id,
+                    createDate: new Date(variant.createDate),
+                    creator: item.creator,
+                    icon: item.documentType.icon,
+                    name: variant.name,
+                    state: variant.state,
+                    updateDate: new Date(variant.updateDate),
+                    updater: item.updater,
+                    values: item.values.map((item) => { return { alias: item.alias, value: item.value }; }),
+                };
+                return model;
+            });
             return { data: { items, total: data.total } };
         }
         return { error };
     }
 }
-_UmbDocumentCollectionServerDataSource_host = new WeakMap(), _UmbDocumentCollectionServerDataSource_mapper = new WeakMap();
+_UmbDocumentCollectionServerDataSource_host = new WeakMap();

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

@@ -1,5 +1,27 @@
-export interface UmbDocumentCollectionFilterModel {
-    skip?: number;
-    take?: number;
-    filter?: string;
+import type { UmbCollectionFilterModel } from '../../../core/collection/index.js';
+export interface UmbDocumentCollectionFilterModel extends UmbCollectionFilterModel {
+    unique: string;
+    dataTypeId?: string;
+    orderBy?: string;
+    orderCulture?: string;
+    orderDirection?: 'asc' | 'desc';
+    userDefinedProperties: Array<{
+        alias: string;
+        header: string;
+        isSystem: boolean;
+    }>;
+}
+export interface UmbDocumentCollectionItemModel {
+    unique: string;
+    createDate: Date;
+    creator?: string | null;
+    icon: string;
+    name: string;
+    state: string;
+    updateDate: Date;
+    updater?: string | null;
+    values: Array<{
+        alias: string;
+        value: string;
+    }>;
 }

package/dist-cms/packages/documents/documents/collection/views/grid/document-grid-collection-view.element.js

@@ -67,7 +67,7 @@ _UmbDocumentGridCollectionViewElement_renderCard = function _UmbDocumentGridColl
 				@open=${() => this._handleOpenCard(item.unique ?? '')}
 				@selected=${() => __classPrivateFieldGet(this, _UmbDocumentGridCollectionViewElement_instances, "m", _UmbDocumentGridCollectionViewElement_onSelect).call(this, item)}
 				@deselected=${() => __classPrivateFieldGet(this, _UmbDocumentGridCollectionViewElement_instances, "m", _UmbDocumentGridCollectionViewElement_onDeselect).call(this, item)}>
-				<uui-icon slot="icon" name=${item.documentType.icon}></uui-icon>
+				<uui-icon slot="icon" name=${item.icon}></uui-icon>
 			</uui-card-content-node>
 		`;
 };

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

@@ -1,5 +1,8 @@
 import { UmbLitElement } from '../../../../../core/lit-element/index.js';
 export declare class UmbDocumentTableCollectionViewElement extends UmbLitElement {
+    #private;
+    private _busy;
+    private _userDefinedProperties?;
     private _items?;
     private _tableConfig;
     private _tableColumns;
@@ -8,7 +11,6 @@ export declare class UmbDocumentTableCollectionViewElement extends UmbLitElement
     private _collectionContext?;
     constructor();
     private _observeCollectionContext;
-    private _createTableItems;
     private _handleSelect;
     private _handleDeselect;
     private _handleOrdering;

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

@@ -4,6 +4,12 @@ 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;
 };
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _UmbDocumentTableCollectionViewElement_instances, _UmbDocumentTableCollectionViewElement_systemColumns, _UmbDocumentTableCollectionViewElement_createTableHeadings, _UmbDocumentTableCollectionViewElement_createTableItems;
 import { css, html, customElement, state } from '../../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../../core/lit-element/index.js';
 import { UmbTextStyles } from '../../../../../../shared/style/index.js';
@@ -11,16 +17,19 @@ import { UMB_DEFAULT_COLLECTION_CONTEXT } from '../../../../../core/collection/i
 let UmbDocumentTableCollectionViewElement = class UmbDocumentTableCollectionViewElement extends UmbLitElement {
     constructor() {
         super();
+        _UmbDocumentTableCollectionViewElement_instances.add(this);
+        this._busy = false;
         this._tableConfig = {
             allowSelection: true,
         };
-        this._tableColumns = [
+        this._tableColumns = [];
+        _UmbDocumentTableCollectionViewElement_systemColumns.set(this, [
             {
                 name: 'Name',
                 alias: 'entityName',
                 allowSorting: true,
             },
-        ];
+        ]);
         this._tableItems = [];
         this._selection = [];
         this.consumeContext(UMB_DEFAULT_COLLECTION_CONTEXT, (instance) => {
@@ -31,36 +40,18 @@ let UmbDocumentTableCollectionViewElement = class UmbDocumentTableCollectionView
     _observeCollectionContext() {
         if (!this._collectionContext)
             return;
+        this.observe(this._collectionContext.userDefinedProperties, (userDefinedProperties) => {
+            this._userDefinedProperties = userDefinedProperties;
+            __classPrivateFieldGet(this, _UmbDocumentTableCollectionViewElement_instances, "m", _UmbDocumentTableCollectionViewElement_createTableHeadings).call(this);
+        });
         this.observe(this._collectionContext.items, (items) => {
             this._items = items;
-            this._createTableItems(this._items);
+            __classPrivateFieldGet(this, _UmbDocumentTableCollectionViewElement_instances, "m", _UmbDocumentTableCollectionViewElement_createTableItems).call(this, this._items);
         });
         this.observe(this._collectionContext.selection.selection, (selection) => {
             this._selection = selection;
         });
     }
-    _createTableItems(items) {
-        this._tableItems = items.map((item) => {
-            if (!item.unique)
-                throw new Error('Item id is missing.');
-            return {
-                id: item.unique,
-                icon: item.documentType.icon,
-                data: [
-                    {
-                        columnAlias: 'entityName',
-                        value: item.name || 'Unnamed Document',
-                    },
-                    // {
-                    // 	columnAlias: 'entityActions',
-                    // 	value: {
-                    // 		entityType: item.entityType,
-                    // 	},
-                    // },
-                ],
-            };
-        });
-    }
     _handleSelect(event) {
         event.stopPropagation();
         const table = event.target;
@@ -77,9 +68,16 @@ let UmbDocumentTableCollectionViewElement = class UmbDocumentTableCollectionView
         const table = event.target;
         const orderingColumn = table.orderingColumn;
         const orderingDesc = table.orderingDesc;
-        console.log(`fetch media items, order column: ${orderingColumn}, desc: ${orderingDesc}`);
+        this._collectionContext?.setFilter({
+            orderBy: orderingColumn,
+            orderDirection: orderingDesc ? 'desc' : 'asc',
+        });
     }
     render() {
+        if (this._busy)
+            return html `<div class="container"><uui-loader></uui-loader></div>`;
+        if (this._tableItems.length === 0)
+            return html `<div class="container"><p>${this.localize.term('content_listViewNoItems')}</p></div>`;
         return html `
 			<umb-table
 				.config=${this._tableConfig}
@@ -92,6 +90,55 @@ let UmbDocumentTableCollectionViewElement = class UmbDocumentTableCollectionView
 		`;
     }
 };
+_UmbDocumentTableCollectionViewElement_systemColumns = new WeakMap();
+_UmbDocumentTableCollectionViewElement_instances = new WeakSet();
+_UmbDocumentTableCollectionViewElement_createTableHeadings = function _UmbDocumentTableCollectionViewElement_createTableHeadings() {
+    if (this._userDefinedProperties && this._userDefinedProperties.length > 0) {
+        const userColumns = this._userDefinedProperties.map((item) => {
+            return {
+                name: item.header,
+                alias: item.alias,
+                elementName: item.elementName,
+                allowSorting: true,
+            };
+        });
+        this._tableColumns = [...__classPrivateFieldGet(this, _UmbDocumentTableCollectionViewElement_systemColumns, "f"), ...userColumns];
+    }
+};
+_UmbDocumentTableCollectionViewElement_createTableItems = function _UmbDocumentTableCollectionViewElement_createTableItems(items) {
+    // TODO: [LK] This is a temporary solution. Let's explore a nicer way to display the values.
+    const getValue = (item, alias) => {
+        switch (alias) {
+            case 'createDate':
+                return item.createDate.toLocaleString();
+            case 'owner':
+                return item.creator;
+            case 'published':
+                return item.state !== 'Draft' ? 'True' : 'False';
+            case 'updateDate':
+                return item.updateDate.toLocaleString();
+            case 'updater':
+                return item.updater;
+            default:
+                return item.values.find((value) => value.alias === alias)?.value ?? '';
+        }
+    };
+    this._tableItems = items.map((item) => {
+        if (!item.unique)
+            throw new Error('Item id is missing.');
+        const data = this._tableColumns?.map((column) => {
+            return {
+                columnAlias: column.alias,
+                value: column.elementName ? item : getValue(item, column.alias),
+            };
+        }) ?? [];
+        return {
+            id: item.unique,
+            icon: item.icon,
+            data: data,
+        };
+    });
+};
 UmbDocumentTableCollectionViewElement.styles = [
     UmbTextStyles,
     css `
@@ -107,8 +154,20 @@ UmbDocumentTableCollectionViewElement.styles = [
 			umb-table {
 				padding: 0; /* To fix the embedded padding in the table component. */
 			}
+
+			.container {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
 		`,
 ];
+__decorate([
+    state()
+], UmbDocumentTableCollectionViewElement.prototype, "_busy", void 0);
+__decorate([
+    state()
+], UmbDocumentTableCollectionViewElement.prototype, "_userDefinedProperties", void 0);
 __decorate([
     state()
 ], UmbDocumentTableCollectionViewElement.prototype, "_items", void 0);

package/dist-cms/packages/documents/documents/conditions/document-workspace-has-collection.condition.js

@@ -21,9 +21,9 @@ export class UmbDocumentWorkspaceHasCollectionCondition extends UmbBaseControlle
         __classPrivateFieldSet(this, _UmbDocumentWorkspaceHasCollectionCondition_onChange, args.onChange, "f");
         this.consumeContext(UMB_DOCUMENT_WORKSPACE_CONTEXT, (context) => {
             this.observe(context.contentTypeHasCollection, (hasCollection) => {
-                this.permitted = hasCollection === true;
+                this.permitted = hasCollection ?? false;
                 __classPrivateFieldGet(this, _UmbDocumentWorkspaceHasCollectionCondition_onChange, "f").call(this);
-            });
+            }, 'observeCollection');
         });
     }
 }

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

@@ -29,7 +29,7 @@ const mapper = (item) => {
         documentType: {
             unique: item.documentType.id,
             icon: item.documentType.icon,
-            hasListView: item.documentType.hasListView,
+            hasCollection: item.documentType.hasListView,
         },
         variants: item.variants.map((variant) => {
             return {