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

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

@@ -1,7 +1,7 @@
 import { UmbTreeItemContextBase } from '../tree-item-base/index.js';
-import type { UmbUniqueTreeItemModel } from '../../types.js';
+import type { UmbTreeItemModel, UmbTreeRootModel } from '../../types.js';
 import type { UmbControllerHost } from '../../../../../libs/controller-api/index.js';
-export declare class UmbDefaultTreeItemContext<TreeItemModelType extends UmbUniqueTreeItemModel> extends UmbTreeItemContextBase<TreeItemModelType> {
+export declare class UmbDefaultTreeItemContext<TreeItemType extends UmbTreeItemModel, TreeRootType extends UmbTreeRootModel> extends UmbTreeItemContextBase<TreeItemType, TreeRootType> {
     constructor(host: UmbControllerHost);
 }
 export default UmbDefaultTreeItemContext;

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

@@ -1,7 +1,7 @@
 import { UmbTreeItemContextBase } from '../tree-item-base/index.js';
 export class UmbDefaultTreeItemContext extends UmbTreeItemContextBase {
     constructor(host) {
-        super(host, (x) => x.unique);
+        super(host);
     }
 }
 export default UmbDefaultTreeItemContext;

package/dist-cms/packages/core/tree/tree-item/tree-item-default/tree-item-default.element.d.ts

@@ -1,6 +1,6 @@
 import { UmbTreeItemElementBase } from '../tree-item-base/index.js';
-import type { UmbUniqueTreeItemModel } from '../../types.js';
-export declare class UmbDefaultTreeItemElement extends UmbTreeItemElementBase<UmbUniqueTreeItemModel> {
+import type { UmbTreeItemModel } from '../../types.js';
+export declare class UmbDefaultTreeItemElement extends UmbTreeItemElementBase<UmbTreeItemModel> {
 }
 export default UmbDefaultTreeItemElement;
 declare global {

package/dist-cms/packages/core/tree/tree-picker/tree-picker-modal.element.js

@@ -83,6 +83,7 @@ let UmbTreePickerModalElement = class UmbTreePickerModalElement extends UmbModal
             selectionConfiguration: this._selectionConfiguration,
             filter: this.data?.filter,
             selectableFilter: this.data?.pickableFilter,
+            startNode: this.data?.startNode,
         }}
 						@selection-change=${this.#onSelectionChange}
 						@selected=${this.#onSelected}

package/dist-cms/packages/core/tree/tree-picker/tree-picker-modal.token.d.ts

@@ -1,3 +1,4 @@
+import type { UmbTreeStartNode } from '../types.js';
 import type { UmbPickerModalData, UmbPickerModalValue, UmbWorkspaceModalData } from '../../modal/index.js';
 import { UmbModalToken } from '../../modal/index.js';
 import type { UmbPathPattern, UmbPathPatternParamsType } from '../../router/index.js';
@@ -9,8 +10,10 @@ export interface UmbTreePickerModalCreateActionData<PathPatternParamsType extend
     extendWithPathParams: PathPatternParamsType;
 }
 export interface UmbTreePickerModalData<TreeItemType, PathPatternParamsType extends UmbPathPatternParamsType = UmbPathPatternParamsType> extends UmbPickerModalData<TreeItemType> {
+    hideTreeRoot?: boolean;
     treeAlias?: string;
     createAction?: UmbTreePickerModalCreateActionData<PathPatternParamsType>;
+    startNode?: UmbTreeStartNode;
 }
 export interface UmbTreePickerModalValue extends UmbPickerModalValue {
 }

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

@@ -1,15 +1,15 @@
-export interface UmbTreeItemModelBase {
+import type { UmbEntityModel } from '../entity/index.js';
+export interface UmbTreeItemModelBase extends UmbEntityModel {
     name: string;
-    entityType: string;
     hasChildren: boolean;
     isFolder: boolean;
     icon?: string | null;
 }
-export interface UmbUniqueTreeItemModel extends UmbTreeItemModelBase {
+export interface UmbTreeItemModel extends UmbTreeItemModelBase {
     unique: string;
-    parentUnique: string | null;
+    parent: UmbEntityModel;
 }
-export interface UmbUniqueTreeRootModel extends UmbTreeItemModelBase {
+export interface UmbTreeRootModel extends UmbTreeItemModelBase {
     unique: null;
 }
 export type UmbTreeSelectionConfiguration = {
@@ -17,3 +17,7 @@ export type UmbTreeSelectionConfiguration = {
     selectable?: boolean;
     selection?: Array<string | null>;
 };
+export interface UmbTreeStartNode {
+    unique: string;
+    entityType: string;
+}

package/dist-cms/packages/core/utils/index.d.ts

@@ -5,10 +5,12 @@ export * from './get-processed-image-url.function.js';
 export * from './math/math.js';
 export * from './object/deep-merge.function.js';
 export * from './pagination-manager/pagination.manager.js';
+export * from './path/ensure-local-path.function.js';
 export * from './path/ensure-path-ends-with-slash.function.js';
 export * from './path/path-decode.function.js';
 export * from './path/path-encode.function.js';
 export * from './path/path-folder-name.function.js';
+export * from './path/stored-path.function.js';
 export * from './path/umbraco-path.function.js';
 export * from './path/url-pattern-to-string.function.js';
 export * from './selection-manager/selection.manager.js';

package/dist-cms/packages/core/utils/index.js

@@ -5,10 +5,12 @@ export * from './get-processed-image-url.function.js';
 export * from './math/math.js';
 export * from './object/deep-merge.function.js';
 export * from './pagination-manager/pagination.manager.js';
+export * from './path/ensure-local-path.function.js';
 export * from './path/ensure-path-ends-with-slash.function.js';
 export * from './path/path-decode.function.js';
 export * from './path/path-encode.function.js';
 export * from './path/path-folder-name.function.js';
+export * from './path/stored-path.function.js';
 export * from './path/umbraco-path.function.js';
 export * from './path/url-pattern-to-string.function.js';
 export * from './selection-manager/selection.manager.js';

package/dist-cms/packages/core/utils/object/deep-merge.function.js

@@ -7,7 +7,7 @@ export function umbDeepMerge(source, fallback) {
     const result = { ...fallback };
     for (const key in source) {
         if (Object.prototype.hasOwnProperty.call(source, key) && source[key] !== undefined) {
-            if (source[key]?.constructor === Object && fallback[key].constructor === Object) {
+            if (source[key]?.constructor === Object && fallback[key]?.constructor === Object) {
                 result[key] = umbDeepMerge(source[key], fallback[key]);
             }
             else {

package/dist-cms/packages/core/utils/pagination-manager/pagination.manager.d.ts

@@ -53,4 +53,9 @@ export declare class UmbPaginationManager extends EventTarget {
      * @memberof UmbPaginationManager
      */
     getSkip(): number;
+    /**
+     * Clears the pagination manager values and resets them to their default values
+     * @memberof UmbPaginationManager
+     */
+    clear(): void;
 }

package/dist-cms/packages/core/utils/pagination-manager/pagination.manager.js

@@ -3,17 +3,23 @@ import { UmbNumberState } from '../../../../libs/observable-api/index.js';
 export class UmbPaginationManager extends EventTarget {
     constructor() {
         super(...arguments);
+        this.#defaultValues = {
+            totalItems: 0,
+            totalPages: 1,
+            currentPage: 1,
+        };
         this.#pageSize = new UmbNumberState(10);
         this.pageSize = this.#pageSize.asObservable();
-        this.#totalItems = new UmbNumberState(0);
+        this.#totalItems = new UmbNumberState(this.#defaultValues.totalItems);
         this.totalItems = this.#totalItems.asObservable();
-        this.#totalPages = new UmbNumberState(1);
+        this.#totalPages = new UmbNumberState(this.#defaultValues.totalPages);
         this.totalPages = this.#totalPages.asObservable();
-        this.#currentPage = new UmbNumberState(1);
+        this.#currentPage = new UmbNumberState(this.#defaultValues.currentPage);
         this.currentPage = this.#currentPage.asObservable();
         this.#skip = new UmbNumberState(0);
         this.skip = this.#skip.asObservable();
     }
+    #defaultValues;
     #pageSize;
     #totalItems;
     #totalPages;
@@ -93,6 +99,16 @@ export class UmbPaginationManager extends EventTarget {
     getSkip() {
         return this.#skip.getValue();
     }
+    /**
+     * Clears the pagination manager values and resets them to their default values
+     * @memberof UmbPaginationManager
+     */
+    clear() {
+        this.#totalItems.setValue(this.#defaultValues.totalItems);
+        this.#totalPages.setValue(this.#defaultValues.totalPages);
+        this.#currentPage.setValue(this.#defaultValues.currentPage);
+        this.#skip.setValue(0);
+    }
     /**
      * Calculates the total number of pages
      * @memberof UmbPaginationManager

package/dist-cms/packages/core/utils/path/ensure-local-path.function.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Ensure that the path is a local path.
+ */
+export declare function ensureLocalPath(path: URL | string, fallbackPath?: URL | string): URL;

package/dist-cms/packages/core/utils/path/ensure-local-path.function.js

@@ -0,0 +1,10 @@
+/**
+ * Ensure that the path is a local path.
+ */
+export function ensureLocalPath(path, fallbackPath) {
+    const url = new URL(path, window.location.origin);
+    if (url.origin === window.location.origin) {
+        return url;
+    }
+    return fallbackPath ? new URL(fallbackPath) : new URL(window.location.origin);
+}

package/dist-cms/packages/core/utils/path/stored-path.function.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Retrieve the stored path from the session storage.
+ * @remark This is used to redirect the user to the correct page after login.
+ */
+export declare function retrieveStoredPath(): URL | null;
+/**
+ * Store the path in the session storage.
+ * @remark This is used to redirect the user to the correct page after login.
+ * @remark The path must be a local path, otherwise it is not stored.
+ */
+export declare function setStoredPath(path: string): void;

package/dist-cms/packages/core/utils/path/stored-path.function.js

@@ -0,0 +1,27 @@
+import { ensureLocalPath } from './ensure-local-path.function.js';
+import { UMB_STORAGE_REDIRECT_URL } from '../../auth/index.js';
+/**
+ * Retrieve the stored path from the session storage.
+ * @remark This is used to redirect the user to the correct page after login.
+ */
+export function retrieveStoredPath() {
+    let currentRoute = '';
+    const savedRoute = sessionStorage.getItem(UMB_STORAGE_REDIRECT_URL);
+    if (savedRoute) {
+        sessionStorage.removeItem(UMB_STORAGE_REDIRECT_URL);
+        currentRoute = savedRoute.endsWith('logout') ? currentRoute : savedRoute;
+    }
+    return currentRoute ? ensureLocalPath(currentRoute) : null;
+}
+/**
+ * Store the path in the session storage.
+ * @remark This is used to redirect the user to the correct page after login.
+ * @remark The path must be a local path, otherwise it is not stored.
+ */
+export function setStoredPath(path) {
+    const url = new URL(path, window.location.origin);
+    if (url.origin !== window.location.origin) {
+        return;
+    }
+    sessionStorage.setItem(UMB_STORAGE_REDIRECT_URL, url.toString());
+}

package/dist-cms/packages/core/workspace/components/workspace-breadcrumb/workspace-menu-breadcrumb/workspace-menu-breadcrumb.element.js

@@ -4,11 +4,11 @@ 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 { html, customElement, state, ifDefined, map } from '../../../../../../external/lit/index.js';
-import { UmbTextStyles } from '../../../../style/index.js';
+import { css, customElement, html, ifDefined, map, state } from '../../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../lit-element/index.js';
-import { UMB_WORKSPACE_CONTEXT } from '../../../index.js';
+import { UmbTextStyles } from '../../../../style/index.js';
 import { UMB_SECTION_CONTEXT } from '../../../../section/index.js';
+import { UMB_WORKSPACE_CONTEXT } from '../../../index.js';
 let UmbWorkspaceBreadcrumbElement = class UmbWorkspaceBreadcrumbElement extends UmbLitElement {
     // TODO: figure out the correct context type
     #workspaceContext;
@@ -63,7 +63,14 @@ let UmbWorkspaceBreadcrumbElement = class UmbWorkspaceBreadcrumbElement extends
 			</uui-breadcrumbs>
 		`;
     }
-    static { this.styles = [UmbTextStyles]; }
+    static { this.styles = [
+        UmbTextStyles,
+        css `
+			:host {
+				margin-left: var(--uui-size-layout-1);
+			}
+		`,
+    ]; }
 };
 __decorate([
     state()

package/dist-cms/packages/core/workspace/components/workspace-breadcrumb/workspace-variant-menu-breadcrumb/workspace-variant-menu-breadcrumb.element.js

@@ -4,13 +4,13 @@ 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 { html, customElement, state, ifDefined } from '../../../../../../external/lit/index.js';
-import { UmbTextStyles } from '../../../../style/index.js';
+import { css, customElement, html, ifDefined, state } from '../../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../lit-element/index.js';
-import { UMB_VARIANT_WORKSPACE_CONTEXT } from '../../../index.js';
+import { UmbTextStyles } from '../../../../style/index.js';
 import { UmbVariantId } from '../../../../variant/index.js';
 import { UMB_APP_LANGUAGE_CONTEXT } from '../../../../../language/index.js';
 import { UMB_SECTION_CONTEXT } from '../../../../section/index.js';
+import { UMB_VARIANT_WORKSPACE_CONTEXT } from '../../../index.js';
 let UmbWorkspaceVariantMenuBreadcrumbElement = class UmbWorkspaceVariantMenuBreadcrumbElement extends UmbLitElement {
     #sectionContext;
     #workspaceContext;
@@ -86,13 +86,24 @@ let UmbWorkspaceVariantMenuBreadcrumbElement = class UmbWorkspaceVariantMenuBrea
         return html `
 			<uui-breadcrumbs>
 				${this._structure.map((structureItem) => html `<uui-breadcrumb-item href="${ifDefined(this.#getHref(structureItem))}"
-							>${this.#getItemVariantName(structureItem)}</uui-breadcrumb-item
+							>${this.localize.string(this.#getItemVariantName(structureItem))}</uui-breadcrumb-item
 						>`)}
 				<uui-breadcrumb-item>${this._name}</uui-breadcrumb-item>
 			</uui-breadcrumbs>
 		`;
     }
-    static { this.styles = [UmbTextStyles]; }
+    static { this.styles = [
+        UmbTextStyles,
+        css `
+			:host {
+				/* TODO: This is a temp solution to handle an issue where long nested breadcrumbs would hide workspace actions */
+				overflow: hidden;
+				display: flex;
+				flex-direction: row-reverse;
+				margin-left: var(--uui-size-layout-1);
+			}
+		`,
+    ]; }
 };
 __decorate([
     state()

package/dist-cms/packages/core/workspace/components/workspace-collection/workspace-view-collection.element.js

@@ -46,7 +46,6 @@ let UmbWorkspaceViewCollectionElement = class UmbWorkspaceViewCollectionElement
             orderBy: config?.getValueByAlias('orderBy') ?? 'updateDate',
             orderDirection: config?.getValueByAlias('orderDirection') ?? 'asc',
             pageSize: Number(config?.getValueByAlias('pageSize')) ?? 50,
-            useInfiniteEditor: config?.getValueByAlias('useInfiniteEditor') ?? false,
             userDefinedProperties: config?.getValueByAlias('includeProperties'),
         };
     }

package/dist-cms/packages/core/workspace/components/workspace-editor/workspace-editor.element.js

@@ -4,11 +4,11 @@ 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 { UmbTextStyles } from '../../../style/index.js';
-import { css, html, nothing, customElement, property, state, repeat } from '../../../../../external/lit/index.js';
+import { css, customElement, html, nothing, property, repeat, state, when } from '../../../../../external/lit/index.js';
+import { createExtensionElement, UmbExtensionsManifestInitializer } from '../../../../../libs/extension-api/index.js';
 import { umbExtensionsRegistry } from '../../../extension-registry/index.js';
-import { UmbExtensionsManifestInitializer, createExtensionElement } from '../../../../../libs/extension-api/index.js';
 import { UmbLitElement } from '../../../lit-element/index.js';
+import { UmbTextStyles } from '../../../style/index.js';
 /**
  * @element umb-workspace-editor
  * @description
@@ -68,14 +68,12 @@ let UmbWorkspaceEditorElement = class UmbWorkspaceEditorElement extends UmbLitEl
 				<slot name="action-menu" slot="action-menu"></slot>
 				${this.#renderRoutes()}
 				<slot></slot>
-				${this.enforceNoFooter
-            ? ''
-            : html `
-							<umb-workspace-footer slot="footer">
-								<slot name="footer-info"></slot>
-								<slot name="actions" slot="actions"></slot>
-							</umb-workspace-footer>
-						`}
+				${when(!this.enforceNoFooter, () => html `
+						<umb-workspace-footer slot="footer">
+							<slot name="footer-info"></slot>
+							<slot name="actions" slot="actions"></slot>
+						</umb-workspace-footer>
+					`)}
 			</umb-body-layout>
 		`;
     }
@@ -86,10 +84,10 @@ let UmbWorkspaceEditorElement = class UmbWorkspaceEditorElement extends UmbLitEl
 						<uui-tab-group slot="navigation">
 							${repeat(this._workspaceViews, (view) => view.alias, (view) => html `
 									<uui-tab
-										.label="${view.meta.label ? this.localize.string(view.meta.label) : view.name}"
 										href="${this._routerPath}/view/${view.meta.pathname}"
-										?active="${'view/' + view.meta.pathname === this._activePath}">
-										<umb-icon slot="icon" name="${view.meta.icon}"></umb-icon>
+										.label="${view.meta.label ? this.localize.string(view.meta.label) : view.name}"
+										?active=${'view/' + view.meta.pathname === this._activePath}>
+										<umb-icon slot="icon" name=${view.meta.icon}></umb-icon>
 										${view.meta.label ? this.localize.string(view.meta.label) : view.name}
 									</uui-tab>
 								`)}
@@ -103,8 +101,8 @@ let UmbWorkspaceEditorElement = class UmbWorkspaceEditorElement extends UmbLitEl
             return nothing;
         return html `
 			<uui-button
-				class="back-button"
 				slot="header"
+				class="back-button"
 				compact
 				href=${this.backPath}
 				label=${this.localize.term('general_back')}>
@@ -113,20 +111,18 @@ let UmbWorkspaceEditorElement = class UmbWorkspaceEditorElement extends UmbLitEl
 		`;
     }
     #renderRoutes() {
+        if (!this._routes || this._routes.length === 0)
+            return nothing;
         return html `
-			${this._routes && this._routes.length > 0
-            ? html `
-						<umb-router-slot
-							id="router-slot"
-							.routes="${this._routes}"
-							@init=${(event) => {
-                this._routerPath = event.target.absoluteRouterPath;
-            }}
-							@change=${(event) => {
-                this._activePath = event.target.localActiveViewPath;
-            }}></umb-router-slot>
-					`
-            : nothing}
+			<umb-router-slot
+				id="router-slot"
+				.routes=${this._routes}
+				@init=${(event) => {
+            this._routerPath = event.target.absoluteRouterPath;
+        }}
+				@change=${(event) => {
+            this._activePath = event.target.localActiveViewPath;
+        }}></umb-router-slot>
 		`;
     }
     static { this.styles = [

package/dist-cms/packages/core/workspace/components/workspace-footer/workspace-footer.element.js

@@ -67,6 +67,11 @@ let UmbWorkspaceFooterLayoutElement = class UmbWorkspaceFooterLayoutElement exte
 				width: 100%;
 			}
 
+			/* prevents text in action buttons from wrapping */
+			umb-extension-with-api-slot {
+				text-wrap: nowrap;
+			}
+
 			umb-extension-slot[slot='actions'] {
 				display: flex;
 				gap: var(--uui-size-space-2);

package/dist-cms/packages/data-type/components/data-type-input/data-type-input.context.d.ts

@@ -1,6 +1,8 @@
 import type { UmbDataTypeItemModel } from '../../repository/item/types.js';
+import type { UmbDataTypePickerModalData } from '../../modals/index.js';
+import type { UmbDataTypeTreeItemModel } from '../../tree/types.js';
 import { UmbPickerInputContext } from '../../../core/picker-input/index.js';
 import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
-export declare class UmbDataTypePickerContext extends UmbPickerInputContext<UmbDataTypeItemModel> {
+export declare class UmbDataTypePickerContext extends UmbPickerInputContext<UmbDataTypeItemModel, UmbDataTypeTreeItemModel, UmbDataTypePickerModalData> {
     constructor(host: UmbControllerHost);
 }

package/dist-cms/packages/data-type/components/data-type-input/data-type-input.context.js

@@ -3,8 +3,6 @@ import { UMB_DATA_TYPE_PICKER_MODAL } from '../../modals/index.js';
 import { UmbPickerInputContext } from '../../../core/picker-input/index.js';
 export class UmbDataTypePickerContext extends UmbPickerInputContext {
     constructor(host) {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
         super(host, UMB_DATA_TYPE_ITEM_REPOSITORY_ALIAS, UMB_DATA_TYPE_PICKER_MODAL);
     }
 }

package/dist-cms/packages/data-type/entity-actions/create/modal/index.d.ts

@@ -1,8 +1,6 @@
+import type { UmbEntityModel } from '../../../../core/entity/index.js';
 import { UmbModalToken } from '../../../../core/modal/index.js';
 export interface UmbDataTypeCreateOptionsModalData {
-    parent: {
-        entityType: string;
-        unique: string | null;
-    };
+    parent: UmbEntityModel;
 }
 export declare const UMB_DATA_TYPE_CREATE_OPTIONS_MODAL: UmbModalToken<UmbDataTypeCreateOptionsModalData, unknown>;

package/dist-cms/packages/data-type/modals/data-type-picker-modal.token.d.ts

@@ -1,5 +1,5 @@
-import { type UmbTreePickerModalValue, type UmbTreePickerModalData, type UmbUniqueTreeItemModel } from '../../core/tree/index.js';
+import { type UmbTreePickerModalValue, type UmbTreePickerModalData, type UmbTreeItemModel } from '../../core/tree/index.js';
 import { UmbModalToken } from '../../core/modal/index.js';
-export type UmbDataTypePickerModalData = UmbTreePickerModalData<UmbUniqueTreeItemModel>;
+export type UmbDataTypePickerModalData = UmbTreePickerModalData<UmbTreeItemModel>;
 export type UmbDataTypePickerModalValue = UmbTreePickerModalValue;
 export declare const UMB_DATA_TYPE_PICKER_MODAL: UmbModalToken<UmbDataTypePickerModalData, UmbTreePickerModalValue>;

package/dist-cms/packages/data-type/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.js

@@ -53,7 +53,7 @@ let UmbPropertyEditorUIPickerModalElement = class UmbPropertyEditorUIPickerModal
     }
     render() {
         return html `
-			<umb-body-layout headline="Select Property Editor UI">
+			<umb-body-layout headline=${this.localize.term('propertyEditorPicker_openPropertyEditorPicker')}>
 				<uui-box> ${this._renderFilter()} ${this._renderGrid()} </uui-box>
 				<div slot="actions">
 					<uui-button label="Close" @click=${this._rejectModal}></uui-button>

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

@@ -1,3 +1,4 @@
+import { UMB_DATA_TYPE_ENTITY_TYPE, UMB_DATA_TYPE_FOLDER_ENTITY_TYPE, UMB_DATA_TYPE_ROOT_ENTITY_TYPE, } from '../entity.js';
 import { UmbTreeServerDataSourceBase } from '../../core/tree/index.js';
 import { DataTypeService } from '../../../external/backend-api/index.js';
 import { umbExtensionsRegistry } from '../../core/extension-registry/index.js';
@@ -34,13 +35,13 @@ const getRootItems = async (args) => {
     return DataTypeService.getTreeDataTypeRoot({ skip: args.skip, take: args.take });
 };
 const getChildrenOf = (args) => {
-    if (args.parentUnique === null) {
+    if (args.parent.unique === null) {
         return getRootItems(args);
     }
     else {
         // eslint-disable-next-line local-rules/no-direct-api-import
         return DataTypeService.getTreeDataTypeChildren({
-            parentId: args.parentUnique,
+            parentId: args.parent.unique,
             skip: args.skip,
             take: args.take,
         });
@@ -49,15 +50,18 @@ const getChildrenOf = (args) => {
 const getAncestorsOf = (args) => 
 // eslint-disable-next-line local-rules/no-direct-api-import
 DataTypeService.getTreeDataTypeAncestors({
-    descendantId: args.descendantUnique,
+    descendantId: args.treeItem.unique,
 });
 const mapper = (item) => {
     return {
         unique: item.id,
-        parentUnique: item.parent?.id || null,
+        parent: {
+            unique: item.parent?.id || null,
+            entityType: item.parent ? UMB_DATA_TYPE_ENTITY_TYPE : UMB_DATA_TYPE_ROOT_ENTITY_TYPE,
+        },
         icon: manifestPropertyEditorUis.find((ui) => ui.alias === item.editorUiAlias)?.meta.icon,
         name: item.name,
-        entityType: item.isFolder ? 'data-type-folder' : 'data-type',
+        entityType: item.isFolder ? UMB_DATA_TYPE_FOLDER_ENTITY_TYPE : UMB_DATA_TYPE_ENTITY_TYPE,
         isFolder: item.isFolder,
         hasChildren: item.hasChildren,
     };

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

@@ -1,8 +1,8 @@
 import type { UmbDataTypeEntityType, UmbDataTypeFolderEntityType, UmbDataTypeRootEntityType } from '../entity.js';
-import type { UmbUniqueTreeItemModel, UmbUniqueTreeRootModel } from '../../core/tree/index.js';
-export interface UmbDataTypeTreeItemModel extends UmbUniqueTreeItemModel {
+import type { UmbTreeItemModel, UmbTreeRootModel } from '../../core/tree/index.js';
+export interface UmbDataTypeTreeItemModel extends UmbTreeItemModel {
     entityType: UmbDataTypeEntityType | UmbDataTypeFolderEntityType;
 }
-export interface UmbDataTypeTreeRootModel extends UmbUniqueTreeRootModel {
+export interface UmbDataTypeTreeRootModel extends UmbTreeRootModel {
     entityType: UmbDataTypeRootEntityType;
 }

package/dist-cms/packages/data-type/workspace/data-type-workspace.context.d.ts

@@ -10,9 +10,11 @@ export declare class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspace
     #private;
     readonly repository: UmbDataTypeDetailRepository;
     readonly parentUnique: import("rxjs/internal/Observable").Observable<string | null | undefined>;
+    readonly parentEntityType: import("rxjs/internal/Observable").Observable<string | undefined>;
     isLoaded(): Promise<any> | undefined;
     readonly name: import("rxjs/internal/Observable").Observable<string | undefined>;
     readonly unique: import("rxjs/internal/Observable").Observable<string | undefined>;
+    readonly entityType: import("rxjs/internal/Observable").Observable<"data-type" | undefined>;
     readonly propertyEditorUiAlias: import("rxjs/internal/Observable").Observable<string | null | undefined>;
     readonly propertyEditorSchemaAlias: import("rxjs/internal/Observable").Observable<string | undefined>;
     readonly properties: import("rxjs/internal/Observable").Observable<PropertyEditorSettingsProperty[]>;

package/dist-cms/packages/data-type/workspace/data-type-workspace.context.js

@@ -5,8 +5,7 @@ import { appendToFrozenArray, mergeObservables, UmbArrayState, UmbObjectState, U
 import { umbExtensionsRegistry } from '../../core/extension-registry/index.js';
 import { UMB_PROPERTY_EDITOR_SCHEMA_ALIAS_DEFAULT } from '../../core/property-editor/index.js';
 import { UMB_ACTION_EVENT_CONTEXT } from '../../core/action/index.js';
-import { UmbRequestReloadTreeItemChildrenEvent } from '../../core/tree/index.js';
-import { UmbRequestReloadStructureForEntityEvent } from '../../core/entity-action/index.js';
+import { UmbRequestReloadChildrenOfEntityEvent, UmbRequestReloadStructureForEntityEvent, } from '../../core/entity-action/index.js';
 export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextBase {
     #parent;
     #persistedData;
@@ -32,13 +31,15 @@ export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextB
         this.repository = new UmbDataTypeDetailRepository(this);
         this.#parent = new UmbObjectState(undefined);
         this.parentUnique = this.#parent.asObservablePart((parent) => (parent ? parent.unique : undefined));
+        this.parentEntityType = this.#parent.asObservablePart((parent) => (parent ? parent.entityType : undefined));
         this.#persistedData = new UmbObjectState(undefined);
         this.#currentData = new UmbObjectState(undefined);
         this.name = this.#currentData.asObservablePart((data) => data?.name);
         this.unique = this.#currentData.asObservablePart((data) => data?.unique);
+        this.entityType = this.#currentData.asObservablePart((data) => data?.entityType);
         this.propertyEditorUiAlias = this.#currentData.asObservablePart((data) => data?.editorUiAlias);
         this.propertyEditorSchemaAlias = this.#currentData.asObservablePart((data) => data?.editorAlias);
-        this.#properties = new UmbArrayState([], (x) => x.alias);
+        this.#properties = new UmbArrayState([], (x) => x.alias).sortBy((a, b) => (a.weight || 0) - (b.weight || 0));
         this.properties = this.#properties.asObservable();
         this.#defaults = new UmbArrayState([], (entry) => entry.alias);
         this.defaults = this.#defaults.asObservable();
@@ -109,7 +110,11 @@ export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextB
     }
     #setPropertyEditorSchemaConfig(propertyEditorSchemaAlias) {
         return this.observe(umbExtensionsRegistry.byTypeAndAlias('propertyEditorSchema', propertyEditorSchemaAlias), (manifest) => {
-            this.#propertyEditorSchemaSettingsProperties = manifest?.meta.settings?.properties || [];
+            // Maps properties to have a weight, so they can be sorted
+            this.#propertyEditorSchemaSettingsProperties = (manifest?.meta.settings?.properties ?? []).map((x, i) => ({
+                ...x,
+                weight: x.weight ?? i,
+            }));
             this.#propertyEditorSchemaSettingsDefaultData = manifest?.meta.settings?.defaultData || [];
             this.#propertyEditorSchemaConfigDefaultUIAlias = manifest?.meta.defaultPropertyEditorUiAlias || null;
         }, 'schema').asPromise();
@@ -119,7 +124,11 @@ export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextB
             this.#propertyEditorUiIcon.setValue(manifest?.meta.icon || null);
             this.#propertyEditorUiName.setValue(manifest?.name || null);
             this.#propertyEditorUISettingsSchemaAlias = manifest?.meta.propertyEditorSchemaAlias;
-            this.#propertyEditorUISettingsProperties = manifest?.meta.settings?.properties || [];
+            // Maps properties to have a weight, so they can be sorted, notice UI properties have a +1000 weight compared to schema properties.
+            this.#propertyEditorUISettingsProperties = (manifest?.meta.settings?.properties ?? []).map((x, i) => ({
+                ...x,
+                weight: x.weight ?? 1000 + i,
+            }));
             this.#propertyEditorUISettingsDefaultData = manifest?.meta.settings?.defaultData || [];
         }, 'editorUi').asPromise();
     }
@@ -245,7 +254,7 @@ export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextB
             }
             // TODO: this might not be the right place to alert the tree, but it works for now
             const eventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
-            const event = new UmbRequestReloadTreeItemChildrenEvent({
+            const event = new UmbRequestReloadChildrenOfEntityEvent({
                 entityType: parent.entityType,
                 unique: parent.unique,
             });

package/dist-cms/packages/dictionary/modals/dictionary-picker-modal.token.d.ts

@@ -1,6 +1,6 @@
-import type { UmbUniqueTreeItemModel } from '../../core/tree/types.js';
+import type { UmbTreeItemModel } from '../../core/tree/types.js';
 import { UmbModalToken } from '../../core/modal/token/modal-token.js';
 import { type UmbTreePickerModalValue, type UmbTreePickerModalData } from '../../core/tree/index.js';
-export type UmbDictionaryPickerModalData = UmbTreePickerModalData<UmbUniqueTreeItemModel>;
+export type UmbDictionaryPickerModalData = UmbTreePickerModalData<UmbTreeItemModel>;
 export type UmbDictionaryPickerModalValue = UmbTreePickerModalValue;
 export declare const UMB_DICTIONARY_PICKER_MODAL: UmbModalToken<UmbDictionaryPickerModalData, UmbTreePickerModalValue>;