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

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

@@ -1,15 +1,3 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var _UmbDataTypeWorkspaceContext_instances, _UmbDataTypeWorkspaceContext_parent, _UmbDataTypeWorkspaceContext_persistedData, _UmbDataTypeWorkspaceContext_currentData, _UmbDataTypeWorkspaceContext_getDataPromise, _UmbDataTypeWorkspaceContext_properties, _UmbDataTypeWorkspaceContext_defaults, _UmbDataTypeWorkspaceContext_propertyEditorSchemaSettingsDefaultData, _UmbDataTypeWorkspaceContext_propertyEditorUISettingsDefaultData, _UmbDataTypeWorkspaceContext_propertyEditorSchemaSettingsProperties, _UmbDataTypeWorkspaceContext_propertyEditorUISettingsProperties, _UmbDataTypeWorkspaceContext_propertyEditorSchemaConfigDefaultUIAlias, _UmbDataTypeWorkspaceContext_settingsDefaultData, _UmbDataTypeWorkspaceContext_propertyEditorUISettingsSchemaAlias, _UmbDataTypeWorkspaceContext_propertyEditorUiIcon, _UmbDataTypeWorkspaceContext_propertyEditorUiName, _UmbDataTypeWorkspaceContext_observePropertyEditorUIAlias, _UmbDataTypeWorkspaceContext_observePropertyEditorSchemaAlias, _UmbDataTypeWorkspaceContext_setPropertyEditorSchemaConfig, _UmbDataTypeWorkspaceContext_setPropertyEditorUIConfig, _UmbDataTypeWorkspaceContext_onStoreChange;
 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';
@@ -17,43 +5,55 @@ 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;
+    #currentData;
+    #getDataPromise;
     isLoaded() {
-        return __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_getDataPromise, "f");
+        return this.#getDataPromise;
     }
+    #properties;
+    #defaults;
+    #propertyEditorSchemaSettingsDefaultData;
+    #propertyEditorUISettingsDefaultData;
+    #propertyEditorSchemaSettingsProperties;
+    #propertyEditorUISettingsProperties;
+    #propertyEditorSchemaConfigDefaultUIAlias;
+    #settingsDefaultData;
+    #propertyEditorUISettingsSchemaAlias;
+    #propertyEditorUiIcon;
+    #propertyEditorUiName;
     constructor(host) {
         super(host, 'Umb.Workspace.DataType');
-        _UmbDataTypeWorkspaceContext_instances.add(this);
         //
         this.repository = new UmbDataTypeDetailRepository(this);
-        _UmbDataTypeWorkspaceContext_parent.set(this, new UmbObjectState(undefined));
-        this.parentUnique = __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_parent, "f").asObservablePart((parent) => (parent ? parent.unique : undefined));
-        _UmbDataTypeWorkspaceContext_persistedData.set(this, new UmbObjectState(undefined));
-        _UmbDataTypeWorkspaceContext_currentData.set(this, new UmbObjectState(undefined));
-        _UmbDataTypeWorkspaceContext_getDataPromise.set(this, void 0);
-        this.name = __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").asObservablePart((data) => data?.name);
-        this.unique = __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").asObservablePart((data) => data?.unique);
-        this.propertyEditorUiAlias = __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").asObservablePart((data) => data?.editorUiAlias);
-        this.propertyEditorSchemaAlias = __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").asObservablePart((data) => data?.editorAlias);
-        _UmbDataTypeWorkspaceContext_properties.set(this, new UmbArrayState([], (x) => x.alias));
-        this.properties = __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_properties, "f").asObservable();
-        _UmbDataTypeWorkspaceContext_defaults.set(this, new UmbArrayState([], (entry) => entry.alias));
-        this.defaults = __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_defaults, "f").asObservable();
-        _UmbDataTypeWorkspaceContext_propertyEditorSchemaSettingsDefaultData.set(this, []);
-        _UmbDataTypeWorkspaceContext_propertyEditorUISettingsDefaultData.set(this, []);
-        _UmbDataTypeWorkspaceContext_propertyEditorSchemaSettingsProperties.set(this, []);
-        _UmbDataTypeWorkspaceContext_propertyEditorUISettingsProperties.set(this, []);
-        _UmbDataTypeWorkspaceContext_propertyEditorSchemaConfigDefaultUIAlias.set(this, null);
-        _UmbDataTypeWorkspaceContext_settingsDefaultData.set(this, void 0);
-        _UmbDataTypeWorkspaceContext_propertyEditorUISettingsSchemaAlias.set(this, void 0);
-        _UmbDataTypeWorkspaceContext_propertyEditorUiIcon.set(this, new UmbStringState(null));
-        this.propertyEditorUiIcon = __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_propertyEditorUiIcon, "f").asObservable();
-        _UmbDataTypeWorkspaceContext_propertyEditorUiName.set(this, new UmbStringState(null));
-        this.propertyEditorUiName = __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_propertyEditorUiName, "f").asObservable();
+        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).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 = [];
+        this.#propertyEditorUISettingsProperties = [];
+        this.#propertyEditorSchemaConfigDefaultUIAlias = null;
+        this.#propertyEditorUiIcon = new UmbStringState(null);
+        this.propertyEditorUiIcon = this.#propertyEditorUiIcon.asObservable();
+        this.#propertyEditorUiName = new UmbStringState(null);
+        this.propertyEditorUiName = this.#propertyEditorUiName.asObservable();
         this.routes = new UmbWorkspaceRouteManager(this);
-        __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_instances, "m", _UmbDataTypeWorkspaceContext_observePropertyEditorUIAlias).call(this);
+        this.#observePropertyEditorUIAlias();
         this.routes.setRoutes([
             {
                 path: 'create/parent/:entityType/:parentUnique',
@@ -77,52 +77,110 @@ export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextB
     }
     resetState() {
         super.resetState();
-        __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_persistedData, "f").setValue(undefined);
-        __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").setValue(undefined);
+        this.#persistedData.setValue(undefined);
+        this.#currentData.setValue(undefined);
+    }
+    #observePropertyEditorUIAlias() {
+        this.observe(this.propertyEditorUiAlias, async (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;
+            // if the property editor ui alias is not set, we use the default alias from the schema
+            if (propertyEditorUiAlias === null) {
+                await this.#observePropertyEditorSchemaAlias();
+                this.setPropertyEditorUiAlias(this.#propertyEditorSchemaConfigDefaultUIAlias);
+            }
+            else {
+                await this.#setPropertyEditorUIConfig(propertyEditorUiAlias);
+                this.setPropertyEditorSchemaAlias(this.#propertyEditorUISettingsSchemaAlias);
+                await this.#observePropertyEditorSchemaAlias();
+            }
+            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);
+        }, 'schemaAlias').asPromise();
+    }
+    #setPropertyEditorSchemaConfig(propertyEditorSchemaAlias) {
+        return this.observe(umbExtensionsRegistry.byTypeAndAlias('propertyEditorSchema', propertyEditorSchemaAlias), (manifest) => {
+            // 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();
+    }
+    #setPropertyEditorUIConfig(propertyEditorUIAlias) {
+        return this.observe(umbExtensionsRegistry.byTypeAndAlias('propertyEditorUi', propertyEditorUIAlias), (manifest) => {
+            this.#propertyEditorUiIcon.setValue(manifest?.meta.icon || null);
+            this.#propertyEditorUiName.setValue(manifest?.name || null);
+            this.#propertyEditorUISettingsSchemaAlias = manifest?.meta.propertyEditorSchemaAlias;
+            // 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();
     }
     _mergeConfigProperties() {
-        if (__classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_propertyEditorSchemaSettingsProperties, "f") && __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_propertyEditorUISettingsProperties, "f")) {
+        if (this.#propertyEditorSchemaSettingsProperties && this.#propertyEditorUISettingsProperties) {
             // Reset the value to this array, and then afterwards append:
-            __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_properties, "f").setValue(__classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_propertyEditorSchemaSettingsProperties, "f"));
+            this.#properties.setValue(this.#propertyEditorSchemaSettingsProperties);
             // Append the UI settings properties to the schema properties, so they can override the schema properties:
-            __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_properties, "f").append(__classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_propertyEditorUISettingsProperties, "f"));
+            this.#properties.append(this.#propertyEditorUISettingsProperties);
         }
     }
     _mergeConfigDefaultData() {
-        if (!__classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_propertyEditorSchemaSettingsDefaultData, "f") || !__classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_propertyEditorUISettingsDefaultData, "f"))
+        if (!this.#propertyEditorSchemaSettingsDefaultData || !this.#propertyEditorUISettingsDefaultData)
             return;
-        __classPrivateFieldSet(this, _UmbDataTypeWorkspaceContext_settingsDefaultData, [
-            ...__classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_propertyEditorSchemaSettingsDefaultData, "f"),
-            ...__classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_propertyEditorUISettingsDefaultData, "f"),
-        ], "f");
-        __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_defaults, "f").setValue(__classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_settingsDefaultData, "f"));
+        this.#settingsDefaultData = [
+            ...this.#propertyEditorSchemaSettingsDefaultData,
+            ...this.#propertyEditorUISettingsDefaultData,
+        ];
+        this.#defaults.setValue(this.#settingsDefaultData);
     }
     getPropertyDefaultValue(alias) {
-        return __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_settingsDefaultData, "f")?.find((x) => x.alias === alias)?.value;
+        return this.#settingsDefaultData?.find((x) => x.alias === alias)?.value;
     }
     createPropertyDatasetContext(host) {
         return new UmbInvariantWorkspacePropertyDatasetContext(host, this);
     }
     async load(unique) {
         this.resetState();
-        __classPrivateFieldSet(this, _UmbDataTypeWorkspaceContext_getDataPromise, this.repository.requestByUnique(unique), "f");
-        const { data, asObservable } = (await __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_getDataPromise, "f"));
+        this.#getDataPromise = this.repository.requestByUnique(unique);
+        const { data, asObservable } = (await this.#getDataPromise);
         if (!data)
             return undefined;
         if (data) {
             this.setIsNew(false);
-            __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_persistedData, "f").setValue(data);
-            __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").setValue(data);
+            this.#persistedData.setValue(data);
+            this.#currentData.setValue(data);
         }
         if (asObservable) {
-            this.observe(asObservable(), (entity) => __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_instances, "m", _UmbDataTypeWorkspaceContext_onStoreChange).call(this, entity), 'umbDataTypeStoreObserver');
+            this.observe(asObservable(), (entity) => this.#onStoreChange(entity), 'umbDataTypeStoreObserver');
+        }
+    }
+    #onStoreChange(entity) {
+        if (!entity) {
+            //TODO: This solution is alright for now. But reconsider when we introduce signal-r
+            history.pushState(null, '', 'section/settings/workspace/data-type-root');
         }
     }
     async create(parent) {
         this.resetState();
-        __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_parent, "f").setValue(parent);
+        this.#parent.setValue(parent);
         const request = this.repository.createScaffold();
-        __classPrivateFieldSet(this, _UmbDataTypeWorkspaceContext_getDataPromise, request, "f");
+        this.#getDataPromise = request;
         let { data } = await request;
         if (!data)
             return undefined;
@@ -130,12 +188,12 @@ export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextB
             data = { ...data, ...this.modalContext.data.preset };
         }
         this.setIsNew(true);
-        __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_persistedData, "f").setValue(data);
-        __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").setValue(data);
+        this.#persistedData.setValue(data);
+        this.#currentData.setValue(data);
         return data;
     }
     getData() {
-        return __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").getValue();
+        return this.#currentData.getValue();
     }
     getUnique() {
         return this.getData()?.unique || '';
@@ -144,59 +202,59 @@ export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextB
         return 'data-type';
     }
     getName() {
-        return __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").getValue()?.name;
+        return this.#currentData.getValue()?.name;
     }
     setName(name) {
-        __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").update({ name });
+        this.#currentData.update({ name });
     }
     setPropertyEditorSchemaAlias(alias) {
-        __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").update({ editorAlias: alias });
+        this.#currentData.update({ editorAlias: alias });
     }
     setPropertyEditorUiAlias(alias) {
-        __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").update({ editorUiAlias: alias });
+        this.#currentData.update({ editorUiAlias: alias });
     }
     async propertyValueByAlias(propertyAlias) {
-        await __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_getDataPromise, "f");
+        await this.#getDataPromise;
         return mergeObservables([
-            __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").asObservablePart((data) => data?.values?.find((x) => x.alias === propertyAlias)?.value),
-            __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_defaults, "f").asObservablePart((defaults) => defaults?.find((x) => x.alias === propertyAlias)?.value),
+            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;
         });
     }
     getPropertyValue(propertyAlias) {
-        return (__classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").getValue()?.values?.find((x) => x.alias === propertyAlias)?.value ??
+        return (this.#currentData.getValue()?.values?.find((x) => x.alias === propertyAlias)?.value ??
             this.getPropertyDefaultValue(propertyAlias));
     }
     // TODO: its not called a property in the model, but we do consider this way in our front-end
     async setPropertyValue(alias, value) {
-        await __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_getDataPromise, "f");
+        await this.#getDataPromise;
         const entry = { alias: alias, value: value };
-        const currentData = __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").value;
+        const currentData = this.#currentData.value;
         if (currentData) {
             // TODO: make a partial update method for array of data, (idea/concept, use if this case is getting common)
             const newDataSet = appendToFrozenArray(currentData.values || [], entry, (x) => x.alias);
-            __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").update({ values: newDataSet });
+            this.#currentData.update({ values: newDataSet });
         }
     }
     async submit() {
-        if (!__classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").value) {
+        if (!this.#currentData.value) {
             throw new Error('Data is not set');
         }
-        if (!__classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").value.unique) {
+        if (!this.#currentData.value.unique) {
             throw new Error('Unique is not set');
         }
         if (this.getIsNew()) {
-            const parent = __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_parent, "f").getValue();
+            const parent = this.#parent.getValue();
             if (!parent)
                 throw new Error('Parent is not set');
-            const { error, data } = await this.repository.create(__classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").value, parent.unique);
+            const { error, data } = await this.repository.create(this.#currentData.value, parent.unique);
             if (error || !data) {
                 throw error?.message ?? 'Repository did not return data after create.';
             }
             // 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,
             });
@@ -204,7 +262,7 @@ export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextB
             this.setIsNew(false);
         }
         else {
-            const { error, data } = await this.repository.save(__classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").value);
+            const { error, data } = await this.repository.save(this.#currentData.value);
             if (error || !data) {
                 throw error?.message ?? 'Repository did not return data after create.';
             }
@@ -220,60 +278,14 @@ export class UmbDataTypeWorkspaceContext extends UmbSubmittableWorkspaceContextB
         await this.repository.delete(unique);
     }
     destroy() {
-        __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_persistedData, "f").destroy();
-        __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_currentData, "f").destroy();
-        __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_properties, "f").destroy();
-        __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_defaults, "f").destroy();
-        __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_propertyEditorUiIcon, "f").destroy();
-        __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_propertyEditorUiName, "f").destroy();
+        this.#persistedData.destroy();
+        this.#currentData.destroy();
+        this.#properties.destroy();
+        this.#defaults.destroy();
+        this.#propertyEditorUiIcon.destroy();
+        this.#propertyEditorUiName.destroy();
         this.repository.destroy();
         super.destroy();
     }
 }
-_UmbDataTypeWorkspaceContext_parent = new WeakMap(), _UmbDataTypeWorkspaceContext_persistedData = new WeakMap(), _UmbDataTypeWorkspaceContext_currentData = new WeakMap(), _UmbDataTypeWorkspaceContext_getDataPromise = new WeakMap(), _UmbDataTypeWorkspaceContext_properties = new WeakMap(), _UmbDataTypeWorkspaceContext_defaults = new WeakMap(), _UmbDataTypeWorkspaceContext_propertyEditorSchemaSettingsDefaultData = new WeakMap(), _UmbDataTypeWorkspaceContext_propertyEditorUISettingsDefaultData = new WeakMap(), _UmbDataTypeWorkspaceContext_propertyEditorSchemaSettingsProperties = new WeakMap(), _UmbDataTypeWorkspaceContext_propertyEditorUISettingsProperties = new WeakMap(), _UmbDataTypeWorkspaceContext_propertyEditorSchemaConfigDefaultUIAlias = new WeakMap(), _UmbDataTypeWorkspaceContext_settingsDefaultData = new WeakMap(), _UmbDataTypeWorkspaceContext_propertyEditorUISettingsSchemaAlias = new WeakMap(), _UmbDataTypeWorkspaceContext_propertyEditorUiIcon = new WeakMap(), _UmbDataTypeWorkspaceContext_propertyEditorUiName = new WeakMap(), _UmbDataTypeWorkspaceContext_instances = new WeakSet(), _UmbDataTypeWorkspaceContext_observePropertyEditorUIAlias = function _UmbDataTypeWorkspaceContext_observePropertyEditorUIAlias() {
-    this.observe(this.propertyEditorUiAlias, async (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;
-        // if the property editor ui alias is not set, we use the default alias from the schema
-        if (propertyEditorUiAlias === null) {
-            await __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_instances, "m", _UmbDataTypeWorkspaceContext_observePropertyEditorSchemaAlias).call(this);
-            this.setPropertyEditorUiAlias(__classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_propertyEditorSchemaConfigDefaultUIAlias, "f"));
-        }
-        else {
-            await __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_instances, "m", _UmbDataTypeWorkspaceContext_setPropertyEditorUIConfig).call(this, propertyEditorUiAlias);
-            this.setPropertyEditorSchemaAlias(__classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_propertyEditorUISettingsSchemaAlias, "f"));
-            await __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_instances, "m", _UmbDataTypeWorkspaceContext_observePropertyEditorSchemaAlias).call(this);
-        }
-        this._mergeConfigProperties();
-        this._mergeConfigDefaultData();
-    }, 'editorUiAlias');
-}, _UmbDataTypeWorkspaceContext_observePropertyEditorSchemaAlias = function _UmbDataTypeWorkspaceContext_observePropertyEditorSchemaAlias() {
-    return this.observe(this.propertyEditorSchemaAlias, async (propertyEditorSchemaAlias) => {
-        if (!propertyEditorSchemaAlias) {
-            this.setPropertyEditorSchemaAlias(UMB_PROPERTY_EDITOR_SCHEMA_ALIAS_DEFAULT);
-            return;
-        }
-        await __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_instances, "m", _UmbDataTypeWorkspaceContext_setPropertyEditorSchemaConfig).call(this, propertyEditorSchemaAlias);
-    }, 'schemaAlias').asPromise();
-}, _UmbDataTypeWorkspaceContext_setPropertyEditorSchemaConfig = function _UmbDataTypeWorkspaceContext_setPropertyEditorSchemaConfig(propertyEditorSchemaAlias) {
-    return this.observe(umbExtensionsRegistry.byTypeAndAlias('propertyEditorSchema', propertyEditorSchemaAlias), (manifest) => {
-        __classPrivateFieldSet(this, _UmbDataTypeWorkspaceContext_propertyEditorSchemaSettingsProperties, manifest?.meta.settings?.properties || [], "f");
-        __classPrivateFieldSet(this, _UmbDataTypeWorkspaceContext_propertyEditorSchemaSettingsDefaultData, manifest?.meta.settings?.defaultData || [], "f");
-        __classPrivateFieldSet(this, _UmbDataTypeWorkspaceContext_propertyEditorSchemaConfigDefaultUIAlias, manifest?.meta.defaultPropertyEditorUiAlias || null, "f");
-    }, 'schema').asPromise();
-}, _UmbDataTypeWorkspaceContext_setPropertyEditorUIConfig = function _UmbDataTypeWorkspaceContext_setPropertyEditorUIConfig(propertyEditorUIAlias) {
-    return this.observe(umbExtensionsRegistry.byTypeAndAlias('propertyEditorUi', propertyEditorUIAlias), (manifest) => {
-        __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_propertyEditorUiIcon, "f").setValue(manifest?.meta.icon || null);
-        __classPrivateFieldGet(this, _UmbDataTypeWorkspaceContext_propertyEditorUiName, "f").setValue(manifest?.name || null);
-        __classPrivateFieldSet(this, _UmbDataTypeWorkspaceContext_propertyEditorUISettingsSchemaAlias, manifest?.meta.propertyEditorSchemaAlias, "f");
-        __classPrivateFieldSet(this, _UmbDataTypeWorkspaceContext_propertyEditorUISettingsProperties, manifest?.meta.settings?.properties || [], "f");
-        __classPrivateFieldSet(this, _UmbDataTypeWorkspaceContext_propertyEditorUISettingsDefaultData, manifest?.meta.settings?.defaultData || [], "f");
-    }, 'editorUi').asPromise();
-}, _UmbDataTypeWorkspaceContext_onStoreChange = function _UmbDataTypeWorkspaceContext_onStoreChange(entity) {
-    if (!entity) {
-        //TODO: This solution is alright for now. But reconsider when we introduce signal-r
-        history.pushState(null, '', 'section/settings/workspace/data-type-root');
-    }
-};
 export { UmbDataTypeWorkspaceContext as api };

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

@@ -1,4 +1,4 @@
 import type { UmbDataTypeDetailModel } from '../types.js';
-import type { UmbWorkspaceData, UmbWorkspaceValue } from '../../core/modal/index.js';
+import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '../../core/modal/index.js';
 import { UmbModalToken } from '../../core/modal/index.js';
-export declare const UMB_DATATYPE_WORKSPACE_MODAL: UmbModalToken<Omit<UmbWorkspaceData<UmbDataTypeDetailModel>, "entityType">, UmbWorkspaceValue>;
+export declare const UMB_DATATYPE_WORKSPACE_MODAL: UmbModalToken<Omit<UmbWorkspaceModalData<UmbDataTypeDetailModel>, "entityType">, UmbWorkspaceModalValue>;

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

@@ -6,9 +6,7 @@ export declare class UmbDataTypeDetailsWorkspaceViewEditElement extends UmbLitEl
     private _propertyEditorUiName?;
     private _propertyEditorUiAlias?;
     private _propertyEditorSchemaAlias?;
-    private _workspaceContext?;
     constructor();
-    private _observeDataType;
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
 }

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

@@ -4,105 +4,105 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _UmbDataTypeDetailsWorkspaceViewEditElement_instances, _UmbDataTypeDetailsWorkspaceViewEditElement_openPropertyEditorUIPicker, _UmbDataTypeDetailsWorkspaceViewEditElement_renderPropertyEditorReference, _UmbDataTypeDetailsWorkspaceViewEditElement_renderPropertyEditorConfig;
 import { UMB_DATA_TYPE_WORKSPACE_CONTEXT } from '../../data-type-workspace.context-token.js';
+import { css, customElement, html, nothing, state } from '../../../../../external/lit/index.js';
+import { UmbLitElement } from '../../../../core/lit-element/index.js';
 import { UmbTextStyles } from '../../../../core/style/index.js';
-import { css, html, customElement, state } from '../../../../../external/lit/index.js';
 import { UMB_MODAL_MANAGER_CONTEXT, UMB_PROPERTY_EDITOR_UI_PICKER_MODAL } from '../../../../core/modal/index.js';
-import { UmbLitElement } from '../../../../core/lit-element/index.js';
 let UmbDataTypeDetailsWorkspaceViewEditElement = class UmbDataTypeDetailsWorkspaceViewEditElement extends UmbLitElement {
+    #workspaceContext;
     constructor() {
         super();
-        _UmbDataTypeDetailsWorkspaceViewEditElement_instances.add(this);
         this._propertyEditorUiIcon = null;
         this._propertyEditorUiName = null;
         this._propertyEditorUiAlias = null;
         this._propertyEditorSchemaAlias = null;
-        this.consumeContext(UMB_DATA_TYPE_WORKSPACE_CONTEXT, (_instance) => {
-            this._workspaceContext = _instance;
-            this._observeDataType();
+        this.consumeContext(UMB_DATA_TYPE_WORKSPACE_CONTEXT, (workspaceContext) => {
+            this.#workspaceContext = workspaceContext;
+            this.#observeDataType();
         });
     }
-    _observeDataType() {
-        if (!this._workspaceContext) {
+    #observeDataType() {
+        if (!this.#workspaceContext) {
             return;
         }
-        this.observe(this._workspaceContext.propertyEditorUiAlias, (value) => {
+        this.observe(this.#workspaceContext.propertyEditorUiAlias, (value) => {
             this._propertyEditorUiAlias = value;
         });
-        this.observe(this._workspaceContext.propertyEditorSchemaAlias, (value) => {
+        this.observe(this.#workspaceContext.propertyEditorSchemaAlias, (value) => {
             this._propertyEditorSchemaAlias = value;
         });
-        this.observe(this._workspaceContext.propertyEditorUiName, (value) => {
+        this.observe(this.#workspaceContext.propertyEditorUiName, (value) => {
             this._propertyEditorUiName = value;
         });
-        this.observe(this._workspaceContext.propertyEditorUiIcon, (value) => {
+        this.observe(this.#workspaceContext.propertyEditorUiIcon, (value) => {
             this._propertyEditorUiIcon = value;
         });
     }
+    async #openPropertyEditorUIPicker() {
+        const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
+        const value = await modalManager
+            .open(this, UMB_PROPERTY_EDITOR_UI_PICKER_MODAL, {
+            value: {
+                selection: this._propertyEditorUiAlias ? [this._propertyEditorUiAlias] : [],
+            },
+        })
+            .onSubmit()
+            .catch(() => undefined);
+        if (value) {
+            this.#workspaceContext?.setPropertyEditorUiAlias(value.selection[0]);
+        }
+    }
     render() {
         return html `
-			<uui-box> ${__classPrivateFieldGet(this, _UmbDataTypeDetailsWorkspaceViewEditElement_instances, "m", _UmbDataTypeDetailsWorkspaceViewEditElement_renderPropertyEditorReference).call(this)} </uui-box>
-			${__classPrivateFieldGet(this, _UmbDataTypeDetailsWorkspaceViewEditElement_instances, "m", _UmbDataTypeDetailsWorkspaceViewEditElement_renderPropertyEditorConfig).call(this)} </uui-box>
+			<uui-box>
+				<umb-property-layout label="Property Editor" description=${this.localize.term('propertyEditorPicker_title')}>
+					${this._propertyEditorUiAlias && this._propertyEditorSchemaAlias
+            ? this.#renderPropertyEditorReference()
+            : this.#renderChooseButton()}
+				</umb-property-layout>
+			</uui-box>
+			<uui-box headline=${this.localize.term('general_settings')}>
+				<umb-property-editor-config></umb-property-editor-config>
+			</uui-box>
 		`;
     }
-};
-_UmbDataTypeDetailsWorkspaceViewEditElement_instances = new WeakSet();
-_UmbDataTypeDetailsWorkspaceViewEditElement_openPropertyEditorUIPicker = async function _UmbDataTypeDetailsWorkspaceViewEditElement_openPropertyEditorUIPicker() {
-    const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
-    const value = await modalManager
-        .open(this, UMB_PROPERTY_EDITOR_UI_PICKER_MODAL, {
-        value: {
-            selection: this._propertyEditorUiAlias ? [this._propertyEditorUiAlias] : [],
-        },
-    })
-        .onSubmit()
-        .catch(() => undefined);
-    this._workspaceContext?.setPropertyEditorUiAlias(value?.selection[0]);
-};
-_UmbDataTypeDetailsWorkspaceViewEditElement_renderPropertyEditorReference = function _UmbDataTypeDetailsWorkspaceViewEditElement_renderPropertyEditorReference() {
-    return html `
-			<umb-property-layout label="Property Editor" description="Select a property editor">
-				${this._propertyEditorUiAlias && this._propertyEditorSchemaAlias
-        ? html `
-							<umb-ref-property-editor-ui
-								slot="editor"
-								name=${this._propertyEditorUiName ?? ''}
-								alias=${this._propertyEditorUiAlias}
-								property-editor-schema-alias=${this._propertyEditorSchemaAlias}
-								standalone>
-								${this._propertyEditorUiIcon
-            ? html ` <umb-icon name="${this._propertyEditorUiIcon}" slot="icon"></umb-icon> `
-            : ''}
-								<uui-action-bar slot="actions">
-									<uui-button label="Change" @click=${__classPrivateFieldGet(this, _UmbDataTypeDetailsWorkspaceViewEditElement_instances, "m", _UmbDataTypeDetailsWorkspaceViewEditElement_openPropertyEditorUIPicker)}></uui-button>
-								</uui-action-bar>
-							</umb-ref-property-editor-ui>
-						`
-        : html `
-							<uui-button
-								slot="editor"
-								label="Select Property Editor"
-								look="placeholder"
-								color="default"
-								@click=${__classPrivateFieldGet(this, _UmbDataTypeDetailsWorkspaceViewEditElement_instances, "m", _UmbDataTypeDetailsWorkspaceViewEditElement_openPropertyEditorUIPicker)}></uui-button>
-						`}
-			</umb-property-layout>
+    #renderChooseButton() {
+        return html `
+			<uui-button
+				slot="editor"
+				id="btn-add"
+				label=${this.localize.term('propertyEditorPicker_title')}
+				look="placeholder"
+				color="default"
+				@click=${this.#openPropertyEditorUIPicker}></uui-button>
 		`;
-};
-_UmbDataTypeDetailsWorkspaceViewEditElement_renderPropertyEditorConfig = function _UmbDataTypeDetailsWorkspaceViewEditElement_renderPropertyEditorConfig() {
-    return html `<uui-box headline="Settings">
-			<umb-property-editor-config></umb-property-editor-config>
-		</uui-box> `;
-};
-UmbDataTypeDetailsWorkspaceViewEditElement.styles = [
-    UmbTextStyles,
-    css `
+    }
+    #renderPropertyEditorReference() {
+        if (!this._propertyEditorUiAlias || !this._propertyEditorSchemaAlias)
+            return nothing;
+        return html `
+			<umb-ref-property-editor-ui
+				slot="editor"
+				name=${this._propertyEditorUiName ?? ''}
+				alias=${this._propertyEditorUiAlias}
+				property-editor-schema-alias=${this._propertyEditorSchemaAlias}
+				standalone
+				@open=${this.#openPropertyEditorUIPicker}>
+				${this._propertyEditorUiIcon
+            ? html `<umb-icon name=${this._propertyEditorUiIcon} slot="icon"></umb-icon>`
+            : nothing}
+				<uui-action-bar slot="actions">
+					<uui-button
+						label=${this.localize.term('general_change')}
+						@click=${this.#openPropertyEditorUIPicker}></uui-button>
+				</uui-action-bar>
+			</umb-ref-property-editor-ui>
+		`;
+    }
+    static { this.styles = [
+        UmbTextStyles,
+        css `
 			:host {
 				display: block;
 				margin: var(--uui-size-layout-1);
@@ -112,8 +112,13 @@ UmbDataTypeDetailsWorkspaceViewEditElement.styles = [
 			uui-box {
 				margin-top: var(--uui-size-layout-1);
 			}
+
+			#btn-add {
+				display: block;
+			}
 		`,
-];
+    ]; }
+};
 __decorate([
     state()
 ], UmbDataTypeDetailsWorkspaceViewEditElement.prototype, "_propertyEditorUiIcon", void 0);