@umbraco-cms/backoffice 14.0.0-rc4 → 14.0.0

package/dist-cms/packages/core/workspace/section-routes/manifests.js

@@ -0,0 +1,9 @@
+export const manifests = [
+    {
+        type: 'sectionRoute',
+        alias: 'Umb.SectionRoute.Workspace',
+        name: 'Workspace Section Route',
+        element: () => import('../workspace.element.js'),
+        api: () => import('./workspace-section-route.route-entry.js'),
+    },
+];

package/dist-cms/packages/core/workspace/section-routes/workspace-section-route.route-entry.d.ts

@@ -0,0 +1,8 @@
+import type { IRoutingInfo, PageComponent, UmbRouteEntry } from '../../router/index.js';
+import type { UmbApi } from '../../../../libs/extension-api/index.js';
+export declare class UmbWorkspaceSectionRouteEntry implements UmbApi, UmbRouteEntry {
+    getPath(): string;
+    setup(element: PageComponent, info: IRoutingInfo): void;
+    destroy(): void;
+}
+export { UmbWorkspaceSectionRouteEntry as api };

package/dist-cms/packages/core/workspace/section-routes/workspace-section-route.route-entry.js

@@ -0,0 +1,11 @@
+import { UMB_WORKSPACE_PATH_PATTERN } from '../paths.js';
+export class UmbWorkspaceSectionRouteEntry {
+    getPath() {
+        return UMB_WORKSPACE_PATH_PATTERN.toString();
+    }
+    setup(element, info) {
+        element.entityType = info.match.params.entityType;
+    }
+    destroy() { }
+}
+export { UmbWorkspaceSectionRouteEntry as api };

package/dist-cms/packages/core/workspace/workspace.element.d.ts

@@ -4,7 +4,7 @@ export declare class UmbWorkspaceElement extends UmbLitElement {
     entityType: string;
     render(): typeof nothing | import("lit-html").TemplateResult<1>;
 }
-export default UmbWorkspaceElement;
+export { UmbWorkspaceElement as element };
 declare global {
     interface HTMLElementTagNameMap {
         'umb-workspace': UmbWorkspaceElement;

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

@@ -31,4 +31,4 @@ UmbWorkspaceElement = __decorate([
     customElement('umb-workspace')
 ], UmbWorkspaceElement);
 export { UmbWorkspaceElement };
-export default UmbWorkspaceElement;
+export { UmbWorkspaceElement as element };

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

@@ -1,5 +1,5 @@
 import { UmbLitElement } from '../../../core/lit-element/index.js';
-declare const UmbInputDataTypeElement_base: (new (...args: any[]) => import("../../../../external/uui/index.js").UUIFormControlMixinInterface<FormDataEntryValue | FormData, string>) & typeof UmbLitElement;
+declare const UmbInputDataTypeElement_base: (new (...args: any[]) => import("../../../../external/uui/index.js").UUIFormControlMixinElement<FormDataEntryValue | FormData>) & typeof UmbLitElement;
 /**
  * Form control for picking or creating a data type.
  * @element umb-data-type-flow-input

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

@@ -9,7 +9,7 @@ import { UMB_DATA_TYPE_PICKER_FLOW_MODAL } from '../../modals/index.js';
 import { css, html, customElement, property, state } from '../../../../external/lit/index.js';
 import { UUIFormControlMixin } from '../../../../external/uui/index.js';
 import { UmbLitElement } from '../../../core/lit-element/index.js';
-import { UmbModalRouteRegistrationController } from '../../../core/modal/index.js';
+import { UmbModalRouteRegistrationController } from '../../../core/router/index.js';
 import { UmbChangeEvent } from '../../../core/event/index.js';
 // Note: Does only support picking a single data type. But this could be developed later into this same component. To follow other picker input components.
 /**

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

@@ -1,5 +1,5 @@
 import { UmbLitElement } from '../../../core/lit-element/index.js';
-declare const UmbDataTypeInputElement_base: (new (...args: any[]) => import("../../../../external/uui/index.js").UUIFormControlMixinInterface<FormDataEntryValue | FormData, string>) & typeof UmbLitElement;
+declare const UmbDataTypeInputElement_base: (new (...args: any[]) => import("../../../../external/uui/index.js").UUIFormControlMixinElement<FormDataEntryValue | FormData>) & typeof UmbLitElement;
 export declare class UmbDataTypeInputElement extends UmbDataTypeInputElement_base {
     #private;
     /**

package/dist-cms/packages/data-type/entity-actions/duplicate/repository/data-type-duplicate.repository.d.ts

@@ -1,4 +1,4 @@
-import type { UmbDuplicateToRepository, UmbDuplicateToRequestArgs } from '../../../../core/entity-action/index.js';
+import type { UmbDuplicateToRepository, UmbDuplicateToRequestArgs } from '../../../../core/tree/index.js';
 import { UmbRepositoryBase } from '../../../../core/repository/index.js';
 export declare class UmbDuplicateDataTypeRepository extends UmbRepositoryBase implements UmbDuplicateToRepository {
     #private;

package/dist-cms/packages/data-type/entity-actions/duplicate/repository/data-type-duplicate.server.data-source.d.ts

@@ -1,5 +1,5 @@
 import type { UmbControllerHost } from '../../../../../libs/controller-api/index.js';
-import type { UmbDuplicateToDataSource, UmbDuplicateToRequestArgs } from '../../../../core/entity-action/index.js';
+import type { UmbDuplicateToDataSource, UmbDuplicateToRequestArgs } from '../../../../core/tree/index.js';
 /**
  * Duplicate Document Server Data Source
  * @export

package/dist-cms/packages/data-type/entity-actions/move-to/repository/data-type-move.repository.d.ts

@@ -1,4 +1,4 @@
-import type { UmbMoveRepository, UmbMoveToRequestArgs } from '../../../../core/entity-action/index.js';
+import type { UmbMoveRepository, UmbMoveToRequestArgs } from '../../../../core/tree/index.js';
 import { UmbRepositoryBase } from '../../../../core/repository/index.js';
 export declare class UmbMoveDataTypeRepository extends UmbRepositoryBase implements UmbMoveRepository {
     #private;

package/dist-cms/packages/data-type/entity-actions/move-to/repository/data-type-move.server.data-source.d.ts

@@ -1,5 +1,5 @@
 import type { UmbControllerHost } from '../../../../../libs/controller-api/index.js';
-import type { UmbMoveDataSource, UmbMoveToRequestArgs } from '../../../../core/entity-action/index.js';
+import type { UmbMoveDataSource, UmbMoveToRequestArgs } from '../../../../core/tree/index.js';
 /**
  * Move Data Type Server Data Source
  * @export

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

@@ -1,18 +1,20 @@
 import type { UmbDataTypePickerFlowModalData, UmbDataTypePickerFlowModalValue } from './data-type-picker-flow-modal.token.js';
 import { UmbModalBaseElement } from '../../../core/modal/index.js';
+import { UmbPaginationManager } from '../../../core/utils/index.js';
 export declare class UmbDataTypePickerFlowModalElement extends UmbModalBaseElement<UmbDataTypePickerFlowModalData, UmbDataTypePickerFlowModalValue> {
     #private;
     set data(value: UmbDataTypePickerFlowModalData);
     private _groupedDataTypes?;
     private _groupedPropertyEditorUIs;
     private _submitLabel;
+    private _currentPage;
     private _dataTypePickerModalRouteBuilder?;
+    pagination: UmbPaginationManager;
     private _createDataTypeModal;
     constructor();
     private _createDataType;
     private _handleDataTypeClick;
     private _select;
-    private _handleFilterInput;
     private _performFiltering;
     render(): import("lit-html").TemplateResult<1>;
     private _renderGrid;

package/dist-cms/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.js

@@ -10,10 +10,12 @@ import { UmbDataTypeCollectionRepository } from '../../collection/index.js';
 import { UMB_DATA_TYPE_PICKER_FLOW_DATA_TYPE_PICKER_MODAL } from './data-type-picker-flow-data-type-picker-modal.token.js';
 import { css, html, repeat, customElement, state, when, nothing } from '../../../../external/lit/index.js';
 import { umbExtensionsRegistry } from '../../../core/extension-registry/index.js';
-import { UmbModalBaseElement, UmbModalRouteRegistrationController } from '../../../core/modal/index.js';
+import { UmbModalBaseElement } from '../../../core/modal/index.js';
+import { UmbModalRouteRegistrationController } from '../../../core/router/index.js';
 import { UmbTextStyles } from '../../../core/style/index.js';
 import { umbFocus } from '../../../core/lit-element/index.js';
 import { UMB_CONTENT_TYPE_WORKSPACE_CONTEXT, UMB_PROPERTY_TYPE_WORKSPACE_CONTEXT, } from '../../../core/content-type/index.js';
+import { UmbPaginationManager, debounce } from '../../../core/utils/index.js';
 let UmbDataTypePickerFlowModalElement = class UmbDataTypePickerFlowModalElement extends UmbModalBaseElement {
     #initPromise;
     set data(value) {
@@ -28,9 +30,15 @@ let UmbDataTypePickerFlowModalElement = class UmbDataTypePickerFlowModalElement
         super();
         this._groupedPropertyEditorUIs = {};
         this._submitLabel = 'Select';
+        this._currentPage = 1;
+        this.pagination = new UmbPaginationManager();
         this.#dataTypes = [];
         this.#propertyEditorUIs = [];
         this.#currentFilterQuery = '';
+        this.#debouncedFilterInput = debounce(() => {
+            this._currentPage = 1;
+            this.#handleFiltering();
+        }, 250);
         this.#collectionRepository = new UmbDataTypeCollectionRepository(this);
         this.#init();
     }
@@ -41,11 +49,9 @@ let UmbDataTypePickerFlowModalElement = class UmbDataTypePickerFlowModalElement
         this._createDataTypeModal.open({ uiAlias: propertyEditorUiAlias }, `create/parent/${UMB_DATA_TYPE_ENTITY_TYPE}/null`);
     }
     async #init() {
+        this.pagination.setCurrentPageNumber(1);
+        this.pagination.setPageSize(100);
         this.#initPromise = Promise.all([
-            this.observe((await this.#collectionRepository.requestCollection({ skip: 0, take: 100 })).asObservable(), (dataTypes) => {
-                this.#dataTypes = dataTypes;
-                this._performFiltering();
-            }, '_repositoryItemsObserver').asPromise(),
             this.observe(umbExtensionsRegistry.byType('propertyEditorUi'), (propertyEditorUIs) => {
                 // Only include Property Editor UIs which has Property Editor Schema Alias
                 this.#propertyEditorUIs = propertyEditorUIs.filter((propertyEditorUi) => !!propertyEditorUi.meta.propertyEditorSchemaAlias);
@@ -103,6 +109,21 @@ let UmbDataTypePickerFlowModalElement = class UmbDataTypePickerFlowModalElement
             this._submitModal();
         });
     }
+    async #getDataTypes() {
+        this.pagination.setCurrentPageNumber(this._currentPage);
+        const { data } = await this.#collectionRepository.requestCollection({
+            skip: this.pagination.getSkip(),
+            take: this.pagination.getPageSize(),
+            name: this.#currentFilterQuery,
+        });
+        this.pagination.setTotalItems(data?.total ?? 0);
+        if (this.pagination.getCurrentPageNumber() > 1) {
+            this.#dataTypes = [...this.#dataTypes, ...(data?.items ?? [])];
+        }
+        else {
+            this.#dataTypes = data?.items ?? [];
+        }
+    }
     _handleDataTypeClick(dataType) {
         if (dataType.unique) {
             this._select(dataType.unique);
@@ -112,9 +133,17 @@ let UmbDataTypePickerFlowModalElement = class UmbDataTypePickerFlowModalElement
     _select(unique) {
         this.value = { selection: unique ? [unique] : [] };
     }
-    _handleFilterInput(event) {
-        const query = event.target.value || '';
-        this.#currentFilterQuery = query.toLowerCase();
+    async #onLoadMore() {
+        this._currentPage = this._currentPage + 1;
+        this.#handleFiltering();
+    }
+    #onFilterInput(event) {
+        this.#currentFilterQuery = event.target.value.toLocaleLowerCase();
+        this.#debouncedFilterInput();
+    }
+    #debouncedFilterInput;
+    async #handleFiltering() {
+        await this.#getDataTypes();
         this._performFiltering();
     }
     _performFiltering() {
@@ -158,7 +187,7 @@ let UmbDataTypePickerFlowModalElement = class UmbDataTypePickerFlowModalElement
         return html ` <uui-input
 			type="search"
 			id="filter"
-			@input="${this._handleFilterInput}"
+			@input="${this.#onFilterInput}"
 			placeholder="Type to filter..."
 			label="Type to filter icons"
 			${umbFocus()}>
@@ -177,11 +206,16 @@ let UmbDataTypePickerFlowModalElement = class UmbDataTypePickerFlowModalElement
         }
         return html `
 			${when(dataTypesEntries.length > 0, () => html ` <h5 class="choice-type-headline">Available configurations</h5>
-						${this._renderDataTypes()}`)}
+						${this._renderDataTypes()}${this.#renderLoadMore()}`)}
 			${when(editorUIEntries.length > 0, () => html ` <h5 class="choice-type-headline">Create a new configuration</h5>
 						${this._renderUIs()}`)}
 		`;
     }
+    #renderLoadMore() {
+        if (this._currentPage >= this.pagination.getTotalPages())
+            return;
+        return html `<uui-button @click=${this.#onLoadMore} look="secondary" label="Load more"></uui-button>`;
+    }
     _renderDataTypes() {
         if (!this._groupedDataTypes)
             return nothing;
@@ -313,6 +347,9 @@ __decorate([
 __decorate([
     state()
 ], UmbDataTypePickerFlowModalElement.prototype, "_submitLabel", void 0);
+__decorate([
+    state()
+], UmbDataTypePickerFlowModalElement.prototype, "_currentPage", void 0);
 __decorate([
     state()
 ], UmbDataTypePickerFlowModalElement.prototype, "_dataTypePickerModalRouteBuilder", void 0);

package/dist-cms/packages/data-type/reference/index.d.ts

@@ -0,0 +1 @@
+export * from './repository/index.js';

package/dist-cms/packages/data-type/reference/index.js

@@ -0,0 +1 @@
+export * from './repository/index.js';

package/dist-cms/packages/data-type/reference/manifests.js

@@ -0,0 +1,2 @@
+import { manifests as repositoryManifests } from './repository/manifests.js';
+export const manifests = [...repositoryManifests];

package/dist-cms/packages/data-type/reference/repository/data-type-reference.repository.d.ts

@@ -0,0 +1,18 @@
+import { UmbControllerBase } from '../../../../libs/class-api/index.js';
+import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
+export type UmbDataTypeReferenceModel = {
+    unique: string;
+    entityType: string | null;
+    name: string | null;
+    icon: string | null;
+    properties: Array<{
+        name: string;
+        alias: string;
+    }>;
+};
+export declare class UmbDataTypeReferenceRepository extends UmbControllerBase {
+    #private;
+    constructor(host: UmbControllerHost);
+    requestReferencedBy(unique: string): Promise<UmbDataTypeReferenceModel[] | undefined>;
+}
+export default UmbDataTypeReferenceRepository;

package/dist-cms/packages/data-type/reference/repository/data-type-reference.repository.js

@@ -0,0 +1,27 @@
+import { UmbDataTypeReferenceServerDataSource } from './data-type-reference.server.data.js';
+import { UmbControllerBase } from '../../../../libs/class-api/index.js';
+export class UmbDataTypeReferenceRepository extends UmbControllerBase {
+    #referenceSource;
+    constructor(host) {
+        super(host);
+        this.#referenceSource = new UmbDataTypeReferenceServerDataSource(this);
+    }
+    async requestReferencedBy(unique) {
+        if (!unique)
+            throw new Error(`unique is required`);
+        const { data } = await this.#referenceSource.getReferencedBy(unique);
+        if (!data)
+            return;
+        return data.map(mapper);
+    }
+}
+const mapper = (item) => {
+    return {
+        unique: item.contentType.id,
+        entityType: item.contentType.type,
+        name: item.contentType.name,
+        icon: item.contentType.icon,
+        properties: item.properties,
+    };
+};
+export default UmbDataTypeReferenceRepository;

package/dist-cms/packages/data-type/reference/repository/data-type-reference.server.data.d.ts

@@ -0,0 +1,22 @@
+import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
+/**
+ * @export
+ * @class UmbDataTypeReferenceServerDataSource
+ * @implements {RepositoryDetailDataSource}
+ */
+export declare class UmbDataTypeReferenceServerDataSource {
+    #private;
+    /**
+     * Creates an instance of UmbDataTypeReferenceServerDataSource.
+     * @param {UmbControllerHost} host
+     * @memberof UmbDataTypeReferenceServerDataSource
+     */
+    constructor(host: UmbControllerHost);
+    /**
+     * Fetches the item for the given unique from the server
+     * @param {string} id
+     * @return {*}
+     * @memberof UmbDataTypeReferenceServerDataSource
+     */
+    getReferencedBy(id: string): Promise<import("../../../core/repository/index.js").UmbDataSourceResponse<import("../../../../external/backend-api/index.js").DataTypeReferenceResponseModel[]>>;
+}

package/dist-cms/packages/data-type/reference/repository/data-type-reference.server.data.js

@@ -0,0 +1,27 @@
+import { tryExecuteAndNotify } from '../../../core/resources/index.js';
+import { DataTypeService } from '../../../../external/backend-api/index.js';
+/**
+ * @export
+ * @class UmbDataTypeReferenceServerDataSource
+ * @implements {RepositoryDetailDataSource}
+ */
+export class UmbDataTypeReferenceServerDataSource {
+    #host;
+    /**
+     * Creates an instance of UmbDataTypeReferenceServerDataSource.
+     * @param {UmbControllerHost} host
+     * @memberof UmbDataTypeReferenceServerDataSource
+     */
+    constructor(host) {
+        this.#host = host;
+    }
+    /**
+     * Fetches the item for the given unique from the server
+     * @param {string} id
+     * @return {*}
+     * @memberof UmbDataTypeReferenceServerDataSource
+     */
+    async getReferencedBy(id) {
+        return await tryExecuteAndNotify(this.#host, DataTypeService.getDataTypeByIdReferences({ id }));
+    }
+}

package/dist-cms/packages/data-type/reference/repository/index.d.ts

@@ -0,0 +1 @@
+export * from './data-type-reference.repository.js';

package/dist-cms/packages/data-type/reference/repository/index.js

@@ -0,0 +1 @@
+export * from './data-type-reference.repository.js';

package/dist-cms/packages/data-type/reference/repository/manifests.d.ts

@@ -0,0 +1,3 @@
+import type { ManifestTypes } from '../../../core/extension-registry/index.js';
+export declare const UMB_DATA_TYPE_REFERENCE_REPOSITORY_ALIAS = "Umb.Repository.DataType.Reference";
+export declare const manifests: Array<ManifestTypes>;

package/dist-cms/packages/data-type/reference/repository/manifests.js

@@ -0,0 +1,8 @@
+export const UMB_DATA_TYPE_REFERENCE_REPOSITORY_ALIAS = 'Umb.Repository.DataType.Reference';
+const repository = {
+    type: 'repository',
+    alias: UMB_DATA_TYPE_REFERENCE_REPOSITORY_ALIAS,
+    name: 'Data Type Reference Repository',
+    api: () => import('./data-type-reference.repository.js'),
+};
+export const manifests = [repository];

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

@@ -4,7 +4,7 @@ import type { UmbPropertyDatasetContext } from '../../core/property/index.js';
 import type { UmbInvariantDatasetWorkspaceContext, UmbRoutableWorkspaceContext } from '../../core/workspace/index.js';
 import { UmbSubmittableWorkspaceContextBase, UmbWorkspaceRouteManager } from '../../core/workspace/index.js';
 import type { UmbControllerHost } from '../../../libs/controller-api/index.js';
-import type { PropertyEditorSettingsDefaultData, PropertyEditorSettingsProperty } from '../../core/extension-registry/index.js';
+import type { PropertyEditorSettingsProperty } from '../../core/extension-registry/index.js';
 type EntityType = UmbDataTypeDetailModel;
 export declare class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextBase<EntityType> implements UmbInvariantDatasetWorkspaceContext, UmbRoutableWorkspaceContext {
     #private;
@@ -18,14 +18,12 @@ export declare class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspace
     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[]>;
-    readonly defaults: import("rxjs/internal/Observable").Observable<PropertyEditorSettingsDefaultData[]>;
     readonly propertyEditorUiIcon: import("rxjs/internal/Observable").Observable<string | null>;
     readonly propertyEditorUiName: import("rxjs/internal/Observable").Observable<string | null>;
     readonly routes: UmbWorkspaceRouteManager;
     constructor(host: UmbControllerHost);
     resetState(): void;
     private _mergeConfigProperties;
-    private _mergeConfigDefaultData;
     getPropertyDefaultValue(alias: string): unknown;
     createPropertyDatasetContext(host: UmbControllerHost): UmbPropertyDatasetContext;
     load(unique: string): Promise<undefined>;

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

@@ -1,9 +1,8 @@
 import { UmbDataTypeDetailRepository } from '../repository/detail/data-type-detail.repository.js';
 import { UmbDataTypeWorkspaceEditorElement } from './data-type-workspace-editor.element.js';
 import { UmbSubmittableWorkspaceContextBase, UmbInvariantWorkspacePropertyDatasetContext, UmbWorkspaceIsNewRedirectController, UmbWorkspaceRouteManager, } from '../../core/workspace/index.js';
-import { appendToFrozenArray, mergeObservables, UmbArrayState, UmbObjectState, UmbStringState, } from '../../../libs/observable-api/index.js';
+import { appendToFrozenArray, UmbArrayState, UmbObjectState, UmbStringState, } from '../../../libs/observable-api/index.js';
 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 { UmbRequestReloadChildrenOfEntityEvent, UmbRequestReloadStructureForEntityEvent, } from '../../core/entity-action/index.js';
 export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextBase {
@@ -15,7 +14,6 @@ export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextB
         return this.#getDataPromise;
     }
     #properties;
-    #defaults;
     #propertyEditorSchemaSettingsDefaultData;
     #propertyEditorUISettingsDefaultData;
     #propertyEditorSchemaSettingsProperties;
@@ -41,8 +39,6 @@ export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextB
         this.propertyEditorSchemaAlias = this.#currentData.asObservablePart((data) => data?.editorAlias);
         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();
         this.#propertyEditorSchemaSettingsDefaultData = [];
         this.#propertyEditorUISettingsDefaultData = [];
         this.#propertyEditorSchemaSettingsProperties = [];
@@ -79,9 +75,19 @@ export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextB
         super.resetState();
         this.#persistedData.setValue(undefined);
         this.#currentData.setValue(undefined);
+        this.#propertyEditorSchemaSettingsProperties = [];
+        this.#propertyEditorUISettingsProperties = [];
+        this.#propertyEditorSchemaSettingsDefaultData = [];
+        this.#propertyEditorUISettingsDefaultData = [];
+        this.#settingsDefaultData = undefined;
+        this._mergeConfigProperties();
     }
+    // Hold the last set property editor ui alias, so we know when it changes, so we can reset values. [NL]
+    #lastPropertyEditorUIAlias;
     #observePropertyEditorUIAlias() {
         this.observe(this.propertyEditorUiAlias, async (propertyEditorUiAlias) => {
+            const previousPropertyEditorUIAlias = this.#lastPropertyEditorUIAlias;
+            this.#lastPropertyEditorUIAlias = propertyEditorUiAlias;
             // we only want to react on the change if the alias is set or null. When it is undefined something is still loading
             if (propertyEditorUiAlias === undefined)
                 return;
@@ -95,21 +101,22 @@ export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextB
                 this.setPropertyEditorSchemaAlias(this.#propertyEditorUISettingsSchemaAlias);
                 await this.#observePropertyEditorSchemaAlias();
             }
+            if (this.getIsNew() ||
+                (previousPropertyEditorUIAlias && previousPropertyEditorUIAlias !== propertyEditorUiAlias)) {
+                this.#transferConfigDefaultData();
+            }
             this._mergeConfigProperties();
-            this._mergeConfigDefaultData();
         }, 'editorUiAlias');
     }
     #observePropertyEditorSchemaAlias() {
-        return this.observe(this.propertyEditorSchemaAlias, async (propertyEditorSchemaAlias) => {
-            if (!propertyEditorSchemaAlias) {
-                this.setPropertyEditorSchemaAlias(UMB_PROPERTY_EDITOR_SCHEMA_ALIAS_DEFAULT);
-                return;
-            }
-            await this.#setPropertyEditorSchemaConfig(propertyEditorSchemaAlias);
+        return this.observe(this.propertyEditorSchemaAlias, (propertyEditorSchemaAlias) => {
+            this.#setPropertyEditorSchemaConfig(propertyEditorSchemaAlias);
         }, 'schemaAlias').asPromise();
     }
     #setPropertyEditorSchemaConfig(propertyEditorSchemaAlias) {
-        return this.observe(umbExtensionsRegistry.byTypeAndAlias('propertyEditorSchema', propertyEditorSchemaAlias), (manifest) => {
+        this.observe(propertyEditorSchemaAlias
+            ? umbExtensionsRegistry.byTypeAndAlias('propertyEditorSchema', propertyEditorSchemaAlias)
+            : undefined, (manifest) => {
             // Maps properties to have a weight, so they can be sorted
             this.#propertyEditorSchemaSettingsProperties = (manifest?.meta.settings?.properties ?? []).map((x, i) => ({
                 ...x,
@@ -117,7 +124,7 @@ export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextB
             }));
             this.#propertyEditorSchemaSettingsDefaultData = manifest?.meta.settings?.defaultData || [];
             this.#propertyEditorSchemaConfigDefaultUIAlias = manifest?.meta.defaultPropertyEditorUiAlias || null;
-        }, 'schema').asPromise();
+        }, 'schema');
     }
     #setPropertyEditorUIConfig(propertyEditorUIAlias) {
         return this.observe(umbExtensionsRegistry.byTypeAndAlias('propertyEditorUi', propertyEditorUIAlias), (manifest) => {
@@ -140,14 +147,19 @@ export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextB
             this.#properties.append(this.#propertyEditorUISettingsProperties);
         }
     }
-    _mergeConfigDefaultData() {
+    #transferConfigDefaultData() {
         if (!this.#propertyEditorSchemaSettingsDefaultData || !this.#propertyEditorUISettingsDefaultData)
             return;
+        const data = this.#currentData.getValue();
+        if (!data)
+            return;
         this.#settingsDefaultData = [
             ...this.#propertyEditorSchemaSettingsDefaultData,
             ...this.#propertyEditorUISettingsDefaultData,
         ];
-        this.#defaults.setValue(this.#settingsDefaultData);
+        // We check for satisfied type, because we will be directly transferring them to become value. Future note, if they are not satisfied, we need to transfer alias and value. [NL]
+        this.#persistedData.update({ values: this.#settingsDefaultData });
+        this.#currentData.update({ values: this.#settingsDefaultData });
     }
     getPropertyDefaultValue(alias) {
         return this.#settingsDefaultData?.find((x) => x.alias === alias)?.value;
@@ -215,12 +227,7 @@ export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextB
     }
     async propertyValueByAlias(propertyAlias) {
         await this.#getDataPromise;
-        return mergeObservables([
-            this.#currentData.asObservablePart((data) => data?.values?.find((x) => x.alias === propertyAlias)?.value),
-            this.#defaults.asObservablePart((defaults) => defaults?.find((x) => x.alias === propertyAlias)?.value),
-        ], ([value, defaultValue]) => {
-            return value ?? defaultValue;
-        });
+        return this.#currentData.asObservablePart((data) => data?.values?.find((x) => x.alias === propertyAlias)?.value);
     }
     getPropertyValue(propertyAlias) {
         return (this.#currentData.getValue()?.values?.find((x) => x.alias === propertyAlias)?.value ??
@@ -281,7 +288,6 @@ export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextB
         this.#persistedData.destroy();
         this.#currentData.destroy();
         this.#properties.destroy();
-        this.#defaults.destroy();
         this.#propertyEditorUiIcon.destroy();
         this.#propertyEditorUiName.destroy();
         this.repository.destroy();

package/dist-cms/packages/data-type/workspace/views/details/data-type-details-workspace-view.element.js

@@ -62,6 +62,13 @@ let UmbDataTypeDetailsWorkspaceViewEditElement = class UmbDataTypeDetailsWorkspa
             : this.#renderChooseButton()}
 				</umb-property-layout>
 			</uui-box>
+			${this.#renderSettings()}
+		`;
+    }
+    #renderSettings() {
+        if (!this._propertyEditorUiAlias || !this._propertyEditorSchemaAlias)
+            return nothing;
+        return html `
 			<uui-box headline=${this.localize.term('general_settings')}>
 				<umb-property-editor-config></umb-property-editor-config>
 			</uui-box>

package/dist-cms/packages/data-type/workspace/views/info/data-type-workspace-view-info-reference.element.d.ts

@@ -0,0 +1,18 @@
+import { UmbLitElement } from '../../../../core/lit-element/index.js';
+declare const elementName = "umb-data-type-workspace-view-info-reference";
+export declare class UmbDataTypeWorkspaceViewInfoReferenceElement extends UmbLitElement {
+    #private;
+    dataTypeUnique: string;
+    private _loading;
+    private _items?;
+    constructor();
+    protected firstUpdated(): void;
+    render(): import("lit-html").TemplateResult<1>;
+    static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
+}
+export { UmbDataTypeWorkspaceViewInfoReferenceElement as element };
+declare global {
+    interface HTMLElementTagNameMap {
+        [elementName]: UmbDataTypeWorkspaceViewInfoReferenceElement;
+    }
+}