@umbraco-cms/backoffice 14.0.0-rc3 → 14.0.0-rc5

package/dist-cms/packages/core/section/section-sidebar/section-sidebar.element.js

@@ -31,6 +31,7 @@ let UmbSectionSidebarElement = class UmbSectionSidebarElement extends UmbLitElem
 				display: flex;
 				flex-direction: column;
 				z-index: 10;
+				position: relative;
 			}
 
 			#scroll-container {

package/dist-cms/packages/core/section/section-sidebar-context-menu/section-sidebar-context-menu.element.js

@@ -75,13 +75,13 @@ let UmbSectionSidebarContextMenuElement = class UmbSectionSidebarContextMenuElem
     }
     #renderModal() {
         return this._isOpen && this._unique !== undefined && this._entityType
-            ? html `<div id="action-modal" @umb:context-request=${this.#proxyContextRequests}>
+            ? html `<uui-scroll-container id="action-modal" @umb:context-request=${this.#proxyContextRequests}>
 					${this._headline ? html `<h3>${this.localize.string(this._headline)}</h3>` : nothing}
 					<umb-entity-action-list
 						@action-executed=${this.#onActionExecuted}
 						.entityType=${this._entityType}
 						.unique=${this._unique}></umb-entity-action-list>
-				</div>`
+				</uui-scroll-container>`
             : nothing;
     }
     static { this.styles = [
@@ -113,10 +113,10 @@ let UmbSectionSidebarContextMenuElement = class UmbSectionSidebarContextMenuElem
 			}
 			#action-modal {
 				position: absolute;
-				left: var(--umb-section-sidebar-width);
 				height: 100%;
 				z-index: 1;
 				top: 0;
+				right: calc(var(--umb-section-sidebar-width) * -1);
 				width: var(--umb-section-sidebar-width);
 				border: none;
 				border-left: 1px solid var(--uui-color-border);

package/dist-cms/packages/core/section/section-sidebar-menu-with-entity-actions/section-sidebar-menu-with-entity-actions.element.d.ts

@@ -1,6 +1,5 @@
 import { UmbSectionSidebarMenuElement } from '../section-sidebar-menu/section-sidebar-menu.element.js';
 import type { ManifestSectionSidebarAppMenuWithEntityActionsKind } from '../../extension-registry/index.js';
-import '../../menu/menu.element.js';
 export declare class UmbSectionSidebarMenuWithEntityActionsElement extends UmbSectionSidebarMenuElement<ManifestSectionSidebarAppMenuWithEntityActionsKind> {
     renderHeader(): import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];

package/dist-cms/packages/core/section/section-sidebar-menu-with-entity-actions/section-sidebar-menu-with-entity-actions.element.js

@@ -6,8 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { UmbSectionSidebarMenuElement } from '../section-sidebar-menu/section-sidebar-menu.element.js';
 import { css, html, customElement } from '../../../../external/lit/index.js';
-import { umbExtensionsRegistry, } from '../../extension-registry/index.js';
-import '../../menu/menu.element.js';
+import { umbExtensionsRegistry } from '../../extension-registry/index.js';
 const manifestWithEntityActions = {
     type: 'kind',
     alias: 'Umb.Kind.SectionSidebarAppMenuWithEntityActions',

package/dist-cms/packages/core/store/store-base.d.ts

@@ -43,7 +43,7 @@ export declare class UmbStoreBase<StoreItemType = any> extends UmbContextBase<an
      * @returns {Array<StoreItemType>}
      * @memberof UmbStoreBase
      */
-    getItems(uniques: Array<string>): StoreItemType[];
+    getItems(uniques: Array<string>): Array<StoreItemType>;
     /**
      * Returns an observable of the entire store
      * @memberof UmbStoreBase

package/dist-cms/packages/core/temporary-file/temporary-file-manager.class.d.ts

@@ -1,21 +1,21 @@
 import type { UmbControllerHost } from '../../../libs/controller-api/index.js';
 import { UmbControllerBase } from '../../../libs/class-api/index.js';
-export type TemporaryFileStatus = 'success' | 'waiting' | 'error';
-export interface UmbTemporaryFileModel {
-    file: File;
-    unique: string;
-    status: TemporaryFileStatus;
+export declare enum TemporaryFileStatus {
+    SUCCESS = "success",
+    WAITING = "waiting",
+    ERROR = "error"
 }
-export interface UmbTemporaryFileQueueModel extends Partial<UmbTemporaryFileModel> {
+export interface UmbTemporaryFileModel {
     file: File;
+    temporaryUnique: string;
+    status?: TemporaryFileStatus;
 }
-export declare class UmbTemporaryFileManager extends UmbControllerBase {
+export declare class UmbTemporaryFileManager<UploadableItem extends UmbTemporaryFileModel = UmbTemporaryFileModel> extends UmbControllerBase {
     #private;
-    readonly queue: import("rxjs/internal/Observable").Observable<UmbTemporaryFileModel[]>;
+    readonly queue: import("rxjs/internal/Observable").Observable<UploadableItem[]>;
     constructor(host: UmbControllerHost);
-    uploadOne(queueItem: UmbTemporaryFileQueueModel): Promise<Array<UmbTemporaryFileModel>>;
-    upload(queueItems: Array<UmbTemporaryFileQueueModel>): Promise<Array<UmbTemporaryFileModel>>;
+    uploadOne(uploadableItem: UploadableItem): Promise<UploadableItem>;
+    upload(queueItems: Array<UploadableItem>): Promise<Array<UploadableItem>>;
     removeOne(unique: string): void;
     remove(uniques: Array<string>): void;
-    private handleQueue;
 }

package/dist-cms/packages/core/temporary-file/temporary-file-manager.class.js

@@ -1,35 +1,36 @@
 import { UmbTemporaryFileRepository } from './temporary-file.repository.js';
 import { UmbArrayState } from '../../../libs/observable-api/index.js';
 import { UmbControllerBase } from '../../../libs/class-api/index.js';
-import { UmbId } from '../id/index.js';
+///export type TemporaryFileStatus = 'success' | 'waiting' | 'error';
+export var TemporaryFileStatus;
+(function (TemporaryFileStatus) {
+    TemporaryFileStatus["SUCCESS"] = "success";
+    TemporaryFileStatus["WAITING"] = "waiting";
+    TemporaryFileStatus["ERROR"] = "error";
+})(TemporaryFileStatus || (TemporaryFileStatus = {}));
 export class UmbTemporaryFileManager extends UmbControllerBase {
     #temporaryFileRepository;
     #queue;
     constructor(host) {
         super(host);
-        this.#queue = new UmbArrayState([], (item) => item.unique);
+        this.#queue = new UmbArrayState([], (item) => item.temporaryUnique);
         this.queue = this.#queue.asObservable();
         this.#temporaryFileRepository = new UmbTemporaryFileRepository(host);
     }
-    async uploadOne(queueItem) {
+    async uploadOne(uploadableItem) {
         this.#queue.setValue([]);
         const item = {
-            file: queueItem.file,
-            unique: queueItem.unique ?? UmbId.new(),
-            status: queueItem.status ?? 'waiting',
+            status: TemporaryFileStatus.WAITING,
+            ...uploadableItem,
         };
         this.#queue.appendOne(item);
-        return this.handleQueue();
+        return (await this.#handleQueue())[0];
     }
     async upload(queueItems) {
         this.#queue.setValue([]);
-        const items = queueItems.map((item) => ({
-            file: item.file,
-            unique: item.unique ?? UmbId.new(),
-            status: item.status ?? 'waiting',
-        }));
+        const items = queueItems.map((item) => ({ status: TemporaryFileStatus.WAITING, ...item }));
         this.#queue.append(items);
-        return this.handleQueue();
+        return this.#handleQueue();
     }
     removeOne(unique) {
         this.#queue.removeOne(unique);
@@ -37,24 +38,24 @@ export class UmbTemporaryFileManager extends UmbControllerBase {
     remove(uniques) {
         this.#queue.remove(uniques);
     }
-    async handleQueue() {
+    async #handleQueue() {
         const filesCompleted = [];
         const queue = this.#queue.getValue();
         if (!queue.length)
             return filesCompleted;
         for (const item of queue) {
-            if (!item.unique)
+            if (!item.temporaryUnique)
                 throw new Error(`Unique is missing for item ${item}`);
-            const { error } = await this.#temporaryFileRepository.upload(item.unique, item.file);
-            await new Promise((resolve) => setTimeout(resolve, (Math.random() + 0.5) * 1000)); // simulate small delay so that the upload badge is properly shown
+            const { error } = await this.#temporaryFileRepository.upload(item.temporaryUnique, item.file);
+            //await new Promise((resolve) => setTimeout(resolve, (Math.random() + 0.5) * 1000)); // simulate small delay so that the upload badge is properly shown
             let status;
             if (error) {
-                status = 'error';
-                this.#queue.updateOne(item.unique, { ...item, status });
+                status = TemporaryFileStatus.ERROR;
+                this.#queue.updateOne(item.temporaryUnique, { ...item, status });
             }
             else {
-                status = 'success';
-                this.#queue.updateOne(item.unique, { ...item, status });
+                status = TemporaryFileStatus.SUCCESS;
+                this.#queue.updateOne(item.temporaryUnique, { ...item, status });
             }
             filesCompleted.push({ ...item, status });
         }

package/dist-cms/packages/core/themes/manifests.js

@@ -14,14 +14,14 @@ export const themes = [
     {
         type: 'theme',
         alias: 'umb-dark-theme',
-        name: 'Dark',
+        name: 'Dark (Experimental)',
         css: '/umbraco/backoffice/css/dark.theme.css',
         weight: 200,
     },
     {
         type: 'theme',
         alias: 'umb-high-contrast-theme',
-        name: 'High contrast',
+        name: 'High contrast (Experimental)',
         css: '/umbraco/backoffice/css/high-contrast.theme.css',
         weight: 100,
     },

package/dist-cms/packages/core/tree/data/tree-data-source.interface.d.ts

@@ -1,4 +1,4 @@
-import type { UmbTreeItemModelBase } from '../types.js';
+import type { UmbTreeItemModel } from '../types.js';
 import type { UmbTreeAncestorsOfRequestArgs, UmbTreeChildrenOfRequestArgs, UmbTreeRootItemsRequestArgs } from './types.js';
 import type { UmbPagedModel, UmbDataSourceResponse } from '../../repository/index.js';
 import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
@@ -8,7 +8,7 @@ import type { UmbControllerHost } from '../../../../libs/controller-api/index.js
  * @interface UmbTreeDataSourceConstructor
  * @template TreeItemType
  */
-export interface UmbTreeDataSourceConstructor<TreeItemType extends UmbTreeItemModelBase> {
+export interface UmbTreeDataSourceConstructor<TreeItemType extends UmbTreeItemModel> {
     new (host: UmbControllerHost): UmbTreeDataSource<TreeItemType>;
 }
 /**
@@ -17,23 +17,23 @@ export interface UmbTreeDataSourceConstructor<TreeItemType extends UmbTreeItemMo
  * @interface UmbTreeDataSource
  * @template TreeItemType
  */
-export interface UmbTreeDataSource<TreeItemType extends UmbTreeItemModelBase> {
+export interface UmbTreeDataSource<TreeItemType extends UmbTreeItemModel, TreeRootItemsRequestArgsType extends UmbTreeRootItemsRequestArgs = UmbTreeRootItemsRequestArgs, TreeChildrenOfRequestArgsType extends UmbTreeChildrenOfRequestArgs = UmbTreeChildrenOfRequestArgs, TreeAncestorsOfRequestArgsType extends UmbTreeAncestorsOfRequestArgs = UmbTreeAncestorsOfRequestArgs> {
     /**
      * Gets the root items of the tree.
      * @return {*}  {Promise<UmbDataSourceResponse<UmbPagedModel<TreeItemType>>>}
      * @memberof UmbTreeDataSource
      */
-    getRootItems(args: UmbTreeRootItemsRequestArgs): Promise<UmbDataSourceResponse<UmbPagedModel<TreeItemType>>>;
+    getRootItems(args: TreeRootItemsRequestArgsType): Promise<UmbDataSourceResponse<UmbPagedModel<TreeItemType>>>;
     /**
      * Gets the children of the given parent item.
      * @return {*}  {Promise<UmbDataSourceResponse<UmbPagedModel<TreeItemType>>}
      * @memberof UmbTreeDataSource
      */
-    getChildrenOf(args: UmbTreeChildrenOfRequestArgs): Promise<UmbDataSourceResponse<UmbPagedModel<TreeItemType>>>;
+    getChildrenOf(args: TreeChildrenOfRequestArgsType): Promise<UmbDataSourceResponse<UmbPagedModel<TreeItemType>>>;
     /**
      * Gets the ancestors of the given item.
      * @return {*}  {Promise<UmbDataSourceResponse<Array<TreeItemType>>}
      * @memberof UmbTreeDataSource
      */
-    getAncestorsOf(args: UmbTreeAncestorsOfRequestArgs): Promise<UmbDataSourceResponse<Array<TreeItemType>>>;
+    getAncestorsOf(args: TreeAncestorsOfRequestArgsType): Promise<UmbDataSourceResponse<Array<TreeItemType>>>;
 }

package/dist-cms/packages/core/tree/data/tree-repository-base.d.ts

@@ -1,8 +1,8 @@
-import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '../types.js';
+import type { UmbTreeItemModel, UmbTreeRootModel } from '../types.js';
 import type { UmbTreeStore } from './tree-store.interface.js';
 import type { UmbTreeRepository } from './tree-repository.interface.js';
 import type { UmbTreeDataSource, UmbTreeDataSourceConstructor } from './tree-data-source.interface.js';
-import type { UmbTreeAncestorsOfRequestArgs } from './types.js';
+import type { UmbTreeAncestorsOfRequestArgs, UmbTreeChildrenOfRequestArgs, UmbTreeRootItemsRequestArgs } from './types.js';
 import { UmbRepositoryBase } from '../../repository/index.js';
 import type { ProblemDetails } from '../../../../external/backend-api/index.js';
 import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
@@ -14,12 +14,12 @@ import type { UmbContextToken } from '../../../../libs/context-api/index.js';
  * @abstract
  * @class UmbTreeRepositoryBase
  * @extends {UmbRepositoryBase}
- * @implements {UmbTreeRepository<TreeItemType, TreeRootType>}
+ * @implements {UmbTreeRepository}
  * @implements {UmbApi}
  * @template TreeItemType
  * @template TreeRootType
  */
-export declare abstract class UmbTreeRepositoryBase<TreeItemType extends UmbUniqueTreeItemModel, TreeRootType extends UmbUniqueTreeRootModel> extends UmbRepositoryBase implements UmbTreeRepository<TreeItemType, TreeRootType>, UmbApi {
+export declare abstract class UmbTreeRepositoryBase<TreeItemType extends UmbTreeItemModel, TreeRootType extends UmbTreeRootModel, TreeRootItemsRequestArgsType extends UmbTreeRootItemsRequestArgs = UmbTreeRootItemsRequestArgs, TreeChildrenOfRequestArgsType extends UmbTreeChildrenOfRequestArgs = UmbTreeChildrenOfRequestArgs, TreeAncestorsOfRequestArgsType extends UmbTreeAncestorsOfRequestArgs = UmbTreeAncestorsOfRequestArgs> extends UmbRepositoryBase implements UmbTreeRepository<TreeItemType, TreeRootType, TreeRootItemsRequestArgsType, TreeChildrenOfRequestArgsType, TreeAncestorsOfRequestArgsType>, UmbApi {
     protected _init: Promise<unknown>;
     protected _treeStore?: UmbTreeStore<TreeItemType>;
     protected _treeSource: UmbTreeDataSource<TreeItemType>;
@@ -45,7 +45,7 @@ export declare abstract class UmbTreeRepositoryBase<TreeItemType extends UmbUniq
      * @return {*}
      * @memberof UmbTreeRepositoryBase
      */
-    requestRootTreeItems(args: any): Promise<{
+    requestTreeRootItems(args: TreeRootItemsRequestArgsType): Promise<{
         data: import("../../repository/index.js").UmbPagedModel<TreeItemType> | undefined;
         error: any;
         asObservable: () => import("rxjs").Observable<TreeItemType[]>;
@@ -56,7 +56,7 @@ export declare abstract class UmbTreeRepositoryBase<TreeItemType extends UmbUniq
      * @return {*}
      * @memberof UmbTreeRepositoryBase
      */
-    requestTreeItemsOf(args: any): Promise<{
+    requestTreeItemsOf(args: TreeChildrenOfRequestArgsType): Promise<{
         data: import("../../repository/index.js").UmbPagedModel<TreeItemType> | undefined;
         error: any;
         asObservable: () => import("rxjs").Observable<TreeItemType[]>;
@@ -67,7 +67,7 @@ export declare abstract class UmbTreeRepositoryBase<TreeItemType extends UmbUniq
      * @return {*}
      * @memberof UmbTreeRepositoryBase
      */
-    requestTreeItemAncestors(args: UmbTreeAncestorsOfRequestArgs): Promise<{
+    requestTreeItemAncestors(args: TreeAncestorsOfRequestArgsType): Promise<{
         data: TreeItemType[] | undefined;
         error: any;
     }>;

package/dist-cms/packages/core/tree/data/tree-repository-base.js

@@ -5,7 +5,7 @@ import { UmbRepositoryBase } from '../../repository/index.js';
  * @abstract
  * @class UmbTreeRepositoryBase
  * @extends {UmbRepositoryBase}
- * @implements {UmbTreeRepository<TreeItemType, TreeRootType>}
+ * @implements {UmbTreeRepository}
  * @implements {UmbApi}
  * @template TreeItemType
  * @template TreeRootType
@@ -30,7 +30,7 @@ export class UmbTreeRepositoryBase extends UmbRepositoryBase {
      * @return {*}
      * @memberof UmbTreeRepositoryBase
      */
-    async requestRootTreeItems(args) {
+    async requestTreeRootItems(args) {
         await this._init;
         const { data, error: _error } = await this._treeSource.getRootItems(args);
         const error = _error;
@@ -46,15 +46,19 @@ export class UmbTreeRepositoryBase extends UmbRepositoryBase {
      * @memberof UmbTreeRepositoryBase
      */
     async requestTreeItemsOf(args) {
-        if (args.parentUnique === undefined)
+        if (!args.parent)
+            throw new Error('Parent is missing');
+        if (args.parent.unique === undefined)
             throw new Error('Parent unique is missing');
+        if (args.parent.entityType === null)
+            throw new Error('Parent entity type is missing');
         await this._init;
         const { data, error: _error } = await this._treeSource.getChildrenOf(args);
         const error = _error;
         if (data) {
             this._treeStore.appendItems(data.items);
         }
-        return { data, error, asObservable: () => this._treeStore.childrenOf(args.parentUnique) };
+        return { data, error, asObservable: () => this._treeStore.childrenOf(args.parent.unique) };
     }
     /**
      * Requests ancestors of a given item
@@ -63,7 +67,7 @@ export class UmbTreeRepositoryBase extends UmbRepositoryBase {
      * @memberof UmbTreeRepositoryBase
      */
     async requestTreeItemAncestors(args) {
-        if (args.descendantUnique === undefined)
+        if (args.treeItem.unique === undefined)
             throw new Error('Descendant unique is missing');
         await this._init;
         const { data, error: _error } = await this._treeSource.getAncestorsOf(args);

package/dist-cms/packages/core/tree/data/tree-repository.interface.d.ts

@@ -1,4 +1,4 @@
-import type { UmbTreeItemModelBase } from '../types.js';
+import type { UmbTreeItemModel, UmbTreeRootModel } from '../types.js';
 import type { UmbTreeChildrenOfRequestArgs, UmbTreeAncestorsOfRequestArgs, UmbTreeRootItemsRequestArgs } from './types.js';
 import type { UmbPagedModel } from '../../repository/index.js';
 import type { Observable } from '../../../../external/rxjs/index.js';
@@ -12,7 +12,7 @@ import type { UmbApi } from '../../../../libs/extension-api/index.js';
  * @template TreeItemType
  * @template TreeRootType
  */
-export interface UmbTreeRepository<TreeItemType extends UmbTreeItemModelBase = UmbTreeItemModelBase, TreeRootType extends UmbTreeItemModelBase = UmbTreeItemModelBase> extends UmbApi {
+export interface UmbTreeRepository<TreeItemType extends UmbTreeItemModel = UmbTreeItemModel, TreeRootType extends UmbTreeRootModel = UmbTreeRootModel, TreeRootItemsRequestArgsType extends UmbTreeRootItemsRequestArgs = UmbTreeRootItemsRequestArgs, TreeChildrenOfRequestArgsType extends UmbTreeChildrenOfRequestArgs = UmbTreeChildrenOfRequestArgs, TreeAncestorsOfRequestArgsType extends UmbTreeAncestorsOfRequestArgs = UmbTreeAncestorsOfRequestArgs> extends UmbApi {
     /**
      * Requests the root of the tree.
      * @memberof UmbTreeRepository
@@ -26,7 +26,7 @@ export interface UmbTreeRepository<TreeItemType extends UmbTreeItemModelBase = U
      * @param {UmbTreeRootItemsRequestArgs} args
      * @memberof UmbTreeRepository
      */
-    requestRootTreeItems: (args: UmbTreeRootItemsRequestArgs) => Promise<{
+    requestTreeRootItems: (args: TreeRootItemsRequestArgsType) => Promise<{
         data?: UmbPagedModel<TreeItemType>;
         error?: ProblemDetails;
         asObservable?: () => Observable<TreeItemType[]>;
@@ -36,7 +36,7 @@ export interface UmbTreeRepository<TreeItemType extends UmbTreeItemModelBase = U
      * @param {UmbTreeChildrenOfRequestArgs} args
      * @memberof UmbTreeRepository
      */
-    requestTreeItemsOf: (args: UmbTreeChildrenOfRequestArgs) => Promise<{
+    requestTreeItemsOf: (args: TreeChildrenOfRequestArgsType) => Promise<{
         data?: UmbPagedModel<TreeItemType>;
         error?: ProblemDetails;
         asObservable?: () => Observable<TreeItemType[]>;
@@ -46,7 +46,7 @@ export interface UmbTreeRepository<TreeItemType extends UmbTreeItemModelBase = U
      * @param {UmbTreeAncestorsOfRequestArgs} args
      * @memberof UmbTreeRepository
      */
-    requestTreeItemAncestors: (args: UmbTreeAncestorsOfRequestArgs) => Promise<{
+    requestTreeItemAncestors: (args: TreeAncestorsOfRequestArgsType) => Promise<{
         data?: TreeItemType[];
         error?: ProblemDetails;
         asObservable?: () => Observable<TreeItemType[]>;

package/dist-cms/packages/core/tree/data/tree-server-data-source-base.d.ts

@@ -1,14 +1,14 @@
-import type { UmbTreeItemModelBase } from '../types.js';
+import type { UmbTreeItemModelBase, UmbTreeItemModel } from '../types.js';
 import type { UmbTreeDataSource } from './tree-data-source.interface.js';
 import type { UmbTreeAncestorsOfRequestArgs, UmbTreeChildrenOfRequestArgs, UmbTreeRootItemsRequestArgs } from './types.js';
 import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
 import type { UmbPagedModel } from '../../repository/index.js';
 export interface UmbTreeServerDataSourceBaseArgs<ServerTreeItemType extends {
     hasChildren: boolean;
-}, ClientTreeItemType extends UmbTreeItemModelBase> {
-    getRootItems: (args: UmbTreeRootItemsRequestArgs) => Promise<UmbPagedModel<ServerTreeItemType>>;
-    getChildrenOf: (args: UmbTreeChildrenOfRequestArgs) => Promise<UmbPagedModel<ServerTreeItemType>>;
-    getAncestorsOf: (args: UmbTreeAncestorsOfRequestArgs) => Promise<Array<ServerTreeItemType>>;
+}, ClientTreeItemType extends UmbTreeItemModelBase, TreeRootItemsRequestArgsType extends UmbTreeRootItemsRequestArgs = UmbTreeRootItemsRequestArgs, TreeChildrenOfRequestArgsType extends UmbTreeChildrenOfRequestArgs = UmbTreeChildrenOfRequestArgs, TreeAncestorsOfRequestArgsType extends UmbTreeAncestorsOfRequestArgs = UmbTreeAncestorsOfRequestArgs> {
+    getRootItems: (args: TreeRootItemsRequestArgsType) => Promise<UmbPagedModel<ServerTreeItemType>>;
+    getChildrenOf: (args: TreeChildrenOfRequestArgsType) => Promise<UmbPagedModel<ServerTreeItemType>>;
+    getAncestorsOf: (args: TreeAncestorsOfRequestArgsType) => Promise<Array<ServerTreeItemType>>;
     mapper: (item: ServerTreeItemType) => ClientTreeItemType;
 }
 /**
@@ -19,21 +19,21 @@ export interface UmbTreeServerDataSourceBaseArgs<ServerTreeItemType extends {
  */
 export declare abstract class UmbTreeServerDataSourceBase<ServerTreeItemType extends {
     hasChildren: boolean;
-}, ClientTreeItemType extends UmbTreeItemModelBase> implements UmbTreeDataSource<ClientTreeItemType> {
+}, ClientTreeItemType extends UmbTreeItemModel, TreeRootItemsRequestArgsType extends UmbTreeRootItemsRequestArgs = UmbTreeRootItemsRequestArgs, TreeChildrenOfRequestArgsType extends UmbTreeChildrenOfRequestArgs = UmbTreeChildrenOfRequestArgs, TreeAncestorsOfRequestArgsType extends UmbTreeAncestorsOfRequestArgs = UmbTreeAncestorsOfRequestArgs> implements UmbTreeDataSource<ClientTreeItemType, TreeRootItemsRequestArgsType, TreeChildrenOfRequestArgsType, TreeAncestorsOfRequestArgsType> {
     #private;
     /**
      * Creates an instance of UmbTreeServerDataSourceBase.
      * @param {UmbControllerHost} host
      * @memberof UmbTreeServerDataSourceBase
      */
-    constructor(host: UmbControllerHost, args: UmbTreeServerDataSourceBaseArgs<ServerTreeItemType, ClientTreeItemType>);
+    constructor(host: UmbControllerHost, args: UmbTreeServerDataSourceBaseArgs<ServerTreeItemType, ClientTreeItemType, TreeRootItemsRequestArgsType, TreeChildrenOfRequestArgsType, TreeAncestorsOfRequestArgsType>);
     /**
      * Fetches the root items for the tree from the server
      * @param {UmbTreeRootItemsRequestArgs} args
      * @return {*}
      * @memberof UmbTreeServerDataSourceBase
      */
-    getRootItems(args: UmbTreeRootItemsRequestArgs): Promise<{
+    getRootItems(args: TreeRootItemsRequestArgsType): Promise<{
         data: {
             total: number;
             items: ClientTreeItemType[];
@@ -49,7 +49,7 @@ export declare abstract class UmbTreeServerDataSourceBase<ServerTreeItemType ext
      * @return {*}
      * @memberof UmbTreeServerDataSourceBase
      */
-    getChildrenOf(args: UmbTreeChildrenOfRequestArgs): Promise<{
+    getChildrenOf(args: TreeChildrenOfRequestArgsType): Promise<{
         data: {
             total: number;
             items: ClientTreeItemType[];
@@ -65,7 +65,7 @@ export declare abstract class UmbTreeServerDataSourceBase<ServerTreeItemType ext
      * @return {*}
      * @memberof UmbTreeServerDataSourceBase
      */
-    getAncestorsOf(args: UmbTreeAncestorsOfRequestArgs): Promise<{
+    getAncestorsOf(args: TreeAncestorsOfRequestArgsType): Promise<{
         data: ClientTreeItemType[];
         error?: undefined;
     } | {

package/dist-cms/packages/core/tree/data/tree-server-data-source-base.js

@@ -44,7 +44,7 @@ export class UmbTreeServerDataSourceBase {
      * @memberof UmbTreeServerDataSourceBase
      */
     async getChildrenOf(args) {
-        if (args.parentUnique === undefined)
+        if (args.parent.unique === undefined)
             throw new Error('Parent unique is missing');
         const { data, error } = await tryExecuteAndNotify(this.#host, this.#getChildrenOf(args));
         if (data) {
@@ -60,7 +60,7 @@ export class UmbTreeServerDataSourceBase {
      * @memberof UmbTreeServerDataSourceBase
      */
     async getAncestorsOf(args) {
-        if (!args.descendantUnique)
+        if (!args.treeItem.entityType)
             throw new Error('Parent unique is missing');
         const { data, error } = await tryExecuteAndNotify(this.#host, this.#getAncestorsOf(args));
         if (data) {

package/dist-cms/packages/core/tree/data/types.d.ts

@@ -1,12 +1,16 @@
+import type { UmbEntityModel } from '../../entity/index.js';
 export interface UmbTreeRootItemsRequestArgs {
-    skip: number;
-    take: number;
+    skip?: number;
+    take?: number;
 }
 export interface UmbTreeChildrenOfRequestArgs {
-    parentUnique: string | null;
-    skip: number;
-    take: number;
+    parent: UmbEntityModel;
+    skip?: number;
+    take?: number;
 }
 export interface UmbTreeAncestorsOfRequestArgs {
-    descendantUnique: string;
+    treeItem: {
+        unique: string;
+        entityType: string;
+    };
 }

package/dist-cms/packages/core/tree/data/unique-tree-store.d.ts

@@ -1,4 +1,4 @@
-import type { UmbUniqueTreeItemModel } from '../types.js';
+import type { UmbTreeItemModel } from '../types.js';
 import type { UmbTreeStore } from './tree-store.interface.js';
 import { UmbStoreBase } from '../../store/index.js';
 import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
@@ -8,25 +8,18 @@ import type { UmbControllerHost } from '../../../../libs/controller-api/index.js
  * @extends {UmbStoreBase}
  * @description - Entity Tree Store
  */
-export declare class UmbUniqueTreeStore extends UmbStoreBase<UmbUniqueTreeItemModel> implements UmbTreeStore<UmbUniqueTreeItemModel> {
+export declare class UmbUniqueTreeStore extends UmbStoreBase<UmbTreeItemModel> implements UmbTreeStore<UmbTreeItemModel> {
     constructor(host: UmbControllerHost, storeAlias: string);
     /**
      * An observable to observe the root items
      * @memberof UmbUniqueTreeStore
      */
-    rootItems: import("rxjs/internal/Observable").Observable<UmbUniqueTreeItemModel[]>;
+    rootItems: import("rxjs/internal/Observable").Observable<UmbTreeItemModel[]>;
     /**
      * Returns an observable to observe the children of a given parent
      * @param {(string | null)} parentUnique
      * @return {*}
      * @memberof UmbUniqueTreeStore
      */
-    childrenOf(parentUnique: string | null): import("rxjs/internal/Observable").Observable<UmbUniqueTreeItemModel[]>;
-    /**
-     * Returns an observable to observe the items with the given uniques
-     * @param {Array<string>} uniques
-     * @return {*}
-     * @memberof UmbUniqueTreeStore
-     */
-    items(uniques: Array<string | null>): import("rxjs/internal/Observable").Observable<UmbUniqueTreeItemModel[]>;
+    childrenOf(parentUnique: string | null): import("rxjs/internal/Observable").Observable<UmbTreeItemModel[]>;
 }

package/dist-cms/packages/core/tree/data/unique-tree-store.js

@@ -14,7 +14,7 @@ export class UmbUniqueTreeStore extends UmbStoreBase {
          * An observable to observe the root items
          * @memberof UmbUniqueTreeStore
          */
-        this.rootItems = this._data.asObservablePart((items) => items.filter((item) => item.parentUnique === null));
+        this.rootItems = this._data.asObservablePart((items) => items.filter((item) => item.parent.unique === null));
     }
     /**
      * Returns an observable to observe the children of a given parent
@@ -23,15 +23,6 @@ export class UmbUniqueTreeStore extends UmbStoreBase {
      * @memberof UmbUniqueTreeStore
      */
     childrenOf(parentUnique) {
-        return this._data.asObservablePart((items) => items.filter((item) => item.parentUnique === parentUnique));
-    }
-    /**
-     * Returns an observable to observe the items with the given uniques
-     * @param {Array<string>} uniques
-     * @return {*}
-     * @memberof UmbUniqueTreeStore
-     */
-    items(uniques) {
-        return this._data.asObservablePart((items) => items.filter((item) => uniques.includes(item.unique)));
+        return this._data.asObservablePart((items) => items.filter((item) => item.parent.unique === parentUnique));
     }
 }

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

@@ -0,0 +1,4 @@
+import type { UmbTreeItemModel, UmbTreeRootModel } from '../types.js';
+import type { UmbDefaultTreeContext } from './default-tree.context.js';
+import { UmbContextToken } from '../../../../libs/context-api/index.js';
+export declare const UMB_TREE_CONTEXT: UmbContextToken<UmbDefaultTreeContext<UmbTreeItemModel, UmbTreeRootModel, import("../index.js").UmbTreeRootItemsRequestArgs>, UmbDefaultTreeContext<UmbTreeItemModel, UmbTreeRootModel, import("../index.js").UmbTreeRootItemsRequestArgs>>;

package/dist-cms/packages/core/tree/default/default-tree.context-token.js

@@ -0,0 +1,2 @@
+import { UmbContextToken } from '../../../../libs/context-api/index.js';
+export const UMB_TREE_CONTEXT = new UmbContextToken('UmbTreeContext');