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

package/dist-cms/packages/core/content-type/structure/content-type-structure-manager.class.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 _UmbContentTypeStructureManager_init, _UmbContentTypeStructureManager_repository, _UmbContentTypeStructureManager_ownerContentTypeUnique, _UmbContentTypeStructureManager_contentTypeObservers, _UmbContentTypeStructureManager_contentTypes, _UmbContentTypeStructureManager_containers;
 import { UmbId } from '../../id/index.js';
 import { UmbArrayState, partialUpdateFrozenArray, appendToFrozenArray, filterFrozenArray, createObservablePart, } from '../../../../libs/observable-api/index.js';
 import { incrementString } from '../../utils/index.js';
@@ -22,28 +10,31 @@ import { UmbControllerBase } from '../../../../libs/class-api/index.js';
  * - {@link UmbContentTypeContainerStructureHelper} for managing the structure of containers, optional of another container or root.
  */
 export class UmbContentTypeStructureManager extends UmbControllerBase {
+    #init;
+    #repository;
+    #ownerContentTypeUnique;
+    #contentTypeObservers;
+    #contentTypes;
+    #containers;
     containerById(id) {
-        return __classPrivateFieldGet(this, _UmbContentTypeStructureManager_containers, "f").asObservablePart((x) => x.find((y) => y.id === id));
+        return this.#containers.asObservablePart((x) => x.find((y) => y.id === id));
     }
     constructor(host, typeRepository) {
         super(host);
-        _UmbContentTypeStructureManager_init.set(this, void 0);
-        _UmbContentTypeStructureManager_repository.set(this, void 0);
-        _UmbContentTypeStructureManager_ownerContentTypeUnique.set(this, void 0);
-        _UmbContentTypeStructureManager_contentTypeObservers.set(this, new Array());
-        _UmbContentTypeStructureManager_contentTypes.set(this, new UmbArrayState([], (x) => x.unique));
-        this.contentTypes = __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").asObservable();
-        this.ownerContentType = __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").asObservablePart((x) => x.find((y) => y.unique === __classPrivateFieldGet(this, _UmbContentTypeStructureManager_ownerContentTypeUnique, "f")));
-        this._contentTypeContainers = __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").asObservablePart((x) => x.flatMap((x) => x.containers ?? []));
-        _UmbContentTypeStructureManager_containers.set(this, new UmbArrayState([], (x) => x.id));
-        __classPrivateFieldSet(this, _UmbContentTypeStructureManager_repository, typeRepository, "f");
+        this.#contentTypeObservers = new Array();
+        this.#contentTypes = new UmbArrayState([], (x) => x.unique);
+        this.contentTypes = this.#contentTypes.asObservable();
+        this.ownerContentType = this.#contentTypes.asObservablePart((x) => x.find((y) => y.unique === this.#ownerContentTypeUnique));
+        this._contentTypeContainers = this.#contentTypes.asObservablePart((x) => x.flatMap((x) => x.containers ?? []));
+        this.#containers = new UmbArrayState([], (x) => x.id);
+        this.#repository = typeRepository;
         this.observe(this.contentTypes, (contentTypes) => {
             contentTypes.forEach((contentType) => {
                 this._loadContentTypeCompositions(contentType);
             });
         });
         this.observe(this._contentTypeContainers, (contentTypeContainers) => {
-            __classPrivateFieldGet(this, _UmbContentTypeStructureManager_containers, "f").setValue(contentTypeContainers);
+            this.#containers.setValue(contentTypeContainers);
         });
     }
     /**
@@ -52,20 +43,20 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
      */
     async loadType(unique) {
         this._reset();
-        __classPrivateFieldSet(this, _UmbContentTypeStructureManager_ownerContentTypeUnique, unique, "f");
+        this.#ownerContentTypeUnique = unique;
         const promise = this._loadType(unique);
-        __classPrivateFieldSet(this, _UmbContentTypeStructureManager_init, promise, "f");
-        await __classPrivateFieldGet(this, _UmbContentTypeStructureManager_init, "f");
+        this.#init = promise;
+        await this.#init;
         return promise;
     }
     async createScaffold() {
         this._reset();
-        const { data } = await __classPrivateFieldGet(this, _UmbContentTypeStructureManager_repository, "f").createScaffold();
+        const { data } = await this.#repository.createScaffold();
         if (!data)
             return {};
-        __classPrivateFieldSet(this, _UmbContentTypeStructureManager_ownerContentTypeUnique, data.unique, "f");
+        this.#ownerContentTypeUnique = data.unique;
         // Add the new content type to the list of content types, this holds our draft state of this scaffold.
-        __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").appendOne(data);
+        this.#contentTypes.appendOne(data);
         return { data };
     }
     /**
@@ -76,11 +67,11 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         const contentType = this.getOwnerContentType();
         if (!contentType || !contentType.unique)
             throw new Error('Could not find the Content Type to save');
-        const { error, data } = await __classPrivateFieldGet(this, _UmbContentTypeStructureManager_repository, "f").save(contentType);
+        const { error, data } = await this.#repository.save(contentType);
         if (error || !data)
             return { error, data };
         // Update state with latest version:
-        __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").updateOne(contentType.unique, data);
+        this.#contentTypes.updateOne(contentType.unique, data);
         return { error, data };
     }
     /**
@@ -89,16 +80,16 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
      */
     async create(parentUnique) {
         const contentType = this.getOwnerContentType();
-        if (!contentType || !contentType.unique)
-            return false;
-        const { data } = await __classPrivateFieldGet(this, _UmbContentTypeStructureManager_repository, "f").create(contentType, parentUnique);
+        if (!contentType || !contentType.unique) {
+            throw new Error('Could not find the Content Type to create');
+        }
+        const { data } = await this.#repository.create(contentType, parentUnique);
         if (!data)
-            return false;
+            return Promise.reject();
         // Update state with latest version:
-        __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").updateOne(contentType.unique, data);
+        this.#contentTypes.updateOne(contentType.unique, data);
         // Start observe the new content type in the store, as we did not do that when it was a scaffold/local-version.
         this._observeContentType(data);
-        return true;
     }
     async _loadContentTypeCompositions(contentType) {
         contentType.compositions?.forEach((composition) => {
@@ -108,7 +99,7 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
     async _ensureType(unique) {
         if (!unique)
             return;
-        if (__classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").getValue().find((x) => x.unique === unique))
+        if (this.#contentTypes.getValue().find((x) => x.unique === unique))
             return;
         await this._loadType(unique);
     }
@@ -116,7 +107,7 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         if (!unique)
             return {};
         // Lets initiate the content type:
-        const { data, asObservable } = await __classPrivateFieldGet(this, _UmbContentTypeStructureManager_repository, "f").requestByUnique(unique);
+        const { data, asObservable } = await this.#repository.requestByUnique(unique);
         if (!data)
             return {};
         await this._observeContentType(data);
@@ -130,33 +121,33 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         //this._loadContentTypeCompositions(data);// Should not be necessary as this will be done when appended to the contentTypes state. [NL]
         const ctrl = this.observe(
         // Then lets start observation of the content type:
-        await __classPrivateFieldGet(this, _UmbContentTypeStructureManager_repository, "f").byUnique(data.unique), (docType) => {
+        await this.#repository.byUnique(data.unique), (docType) => {
             if (docType) {
                 // TODO: Handle if there was changes made to the owner document type in this context. [NL]
                 /*
                 possible easy solutions could be to notify user wether they want to update(Discard the changes to accept the new ones). [NL]
                  */
-                __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").appendOne(docType);
+                this.#contentTypes.appendOne(docType);
             }
             // TODO: Do we need to handle the undefined case? [NL]
         }, 'observeContentType_' + data.unique);
-        __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypeObservers, "f").push(ctrl);
+        this.#contentTypeObservers.push(ctrl);
     }
     /** Public methods for consuming structure: */
     ownerContentTypePart(mappingFunction) {
         return createObservablePart(this.ownerContentType, mappingFunction);
     }
     getOwnerContentType() {
-        return __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").getValue().find((y) => y.unique === __classPrivateFieldGet(this, _UmbContentTypeStructureManager_ownerContentTypeUnique, "f"));
+        return this.#contentTypes.getValue().find((y) => y.unique === this.#ownerContentTypeUnique);
     }
     getOwnerContentTypeUnique() {
-        return __classPrivateFieldGet(this, _UmbContentTypeStructureManager_ownerContentTypeUnique, "f");
+        return this.#ownerContentTypeUnique;
     }
     updateOwnerContentType(entry) {
-        __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").updateOne(__classPrivateFieldGet(this, _UmbContentTypeStructureManager_ownerContentTypeUnique, "f"), entry);
+        this.#contentTypes.updateOne(this.#ownerContentTypeUnique, entry);
     }
     getContentTypes() {
-        return __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").getValue();
+        return this.#contentTypes.getValue();
     }
     // TODO: We could move the actions to another class?
     /**
@@ -166,8 +157,8 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
      * @returns Promise<UmbPropertyTypeContainerModel | undefined>
      */
     async ensureContainerOf(containerId, contentTypeUnique) {
-        await __classPrivateFieldGet(this, _UmbContentTypeStructureManager_init, "f");
-        const contentType = __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").getValue().find((x) => x.unique === contentTypeUnique);
+        await this.#init;
+        const contentType = this.#contentTypes.getValue().find((x) => x.unique === contentTypeUnique);
         if (!contentType) {
             throw new Error('Could not find the Content Type to ensure containers for');
         }
@@ -185,10 +176,10 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
      * @returns Promise<UmbPropertyTypeContainerModel | undefined>
      */
     async cloneContainerTo(containerId, toContentTypeUnique) {
-        await __classPrivateFieldGet(this, _UmbContentTypeStructureManager_init, "f");
-        toContentTypeUnique = toContentTypeUnique ?? __classPrivateFieldGet(this, _UmbContentTypeStructureManager_ownerContentTypeUnique, "f");
+        await this.#init;
+        toContentTypeUnique = toContentTypeUnique ?? this.#ownerContentTypeUnique;
         // Find container.
-        const container = __classPrivateFieldGet(this, _UmbContentTypeStructureManager_containers, "f").getValue().find((x) => x.id === containerId);
+        const container = this.#containers.getValue().find((x) => x.id === containerId);
         if (!container)
             throw new Error('Container to clone was not found');
         const clonedContainer = {
@@ -208,18 +199,18 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         // Correction the spread is removed now, cause we do a filter: [NL]
         // And then we remove the existing one, to have the more local one replacing it. [NL]
         const containers = [
-            ...(__classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").getValue().find((x) => x.unique === toContentTypeUnique)?.containers ?? []),
+            ...(this.#contentTypes.getValue().find((x) => x.unique === toContentTypeUnique)?.containers ?? []),
         ];
         //.filter((x) => x.name !== clonedContainer.name && x.type === clonedContainer.type);
         containers.push(clonedContainer);
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         // TODO: fix TS partial complaint [NL]
-        __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").updateOne(toContentTypeUnique, { containers });
+        this.#contentTypes.updateOne(toContentTypeUnique, { containers });
         return clonedContainer;
     }
     ensureContainerNames(contentTypeUnique, type, parentId = null) {
-        contentTypeUnique = contentTypeUnique ?? __classPrivateFieldGet(this, _UmbContentTypeStructureManager_ownerContentTypeUnique, "f");
+        contentTypeUnique = contentTypeUnique ?? this.#ownerContentTypeUnique;
         this.getOwnerContainers(type, parentId)?.forEach((container) => {
             if (container.name === '') {
                 const newName = 'Unnamed';
@@ -230,8 +221,8 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         });
     }
     async createContainer(contentTypeUnique, parentId = null, type = 'Group', sortOrder) {
-        await __classPrivateFieldGet(this, _UmbContentTypeStructureManager_init, "f");
-        contentTypeUnique = contentTypeUnique ?? __classPrivateFieldGet(this, _UmbContentTypeStructureManager_ownerContentTypeUnique, "f");
+        await this.#init;
+        contentTypeUnique = contentTypeUnique ?? this.#ownerContentTypeUnique;
         const container = {
             id: UmbId.new(),
             parent: parentId ? { id: parentId } : null,
@@ -241,13 +232,13 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         };
         // Ensure
         this.ensureContainerNames(contentTypeUnique, type, parentId);
-        const contentTypes = __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").getValue();
+        const contentTypes = this.#contentTypes.getValue();
         const containers = [...(contentTypes.find((x) => x.unique === contentTypeUnique)?.containers ?? [])];
         containers.push(container);
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         // TODO: fix TS partial complaint
-        __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").updateOne(contentTypeUnique, { containers });
+        this.#contentTypes.updateOne(contentTypeUnique, { containers });
         return container;
     }
     /*async insertContainer(contentTypeUnique: string | null, container: UmbPropertyTypeContainerModel) {
@@ -288,8 +279,8 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         return changedName === newName ? null : changedName;
     }
     async updateContainer(contentTypeUnique, containerId, partialUpdate) {
-        await __classPrivateFieldGet(this, _UmbContentTypeStructureManager_init, "f");
-        contentTypeUnique = contentTypeUnique ?? __classPrivateFieldGet(this, _UmbContentTypeStructureManager_ownerContentTypeUnique, "f");
+        await this.#init;
+        contentTypeUnique = contentTypeUnique ?? this.#ownerContentTypeUnique;
         /*
         // If we have a container, we need to ensure it exists, and then update the container with the new parent id.
         if (containerId) {
@@ -301,7 +292,7 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
             containerId = container.id;
         }
         */
-        const frozenContainers = __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").getValue().find((x) => x.unique === contentTypeUnique)?.containers ?? [];
+        const frozenContainers = this.#contentTypes.getValue().find((x) => x.unique === contentTypeUnique)?.containers ?? [];
         const ownerContainer = frozenContainers.find((x) => x.id === containerId);
         if (!ownerContainer) {
             console.error('We do not have this container on the requested id, we should clone the container and append the change to it. [NL]');
@@ -310,23 +301,26 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         // TODO: fix TS partial complaint
-        __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").updateOne(contentTypeUnique, { containers });
+        this.#contentTypes.updateOne(contentTypeUnique, { containers });
     }
     async removeContainer(contentTypeUnique, containerId = null) {
-        await __classPrivateFieldGet(this, _UmbContentTypeStructureManager_init, "f");
-        contentTypeUnique = contentTypeUnique ?? __classPrivateFieldGet(this, _UmbContentTypeStructureManager_ownerContentTypeUnique, "f");
-        const contentType = __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").getValue().find((x) => x.unique === contentTypeUnique);
+        await this.#init;
+        contentTypeUnique = contentTypeUnique ?? this.#ownerContentTypeUnique;
+        const contentType = this.#contentTypes.getValue().find((x) => x.unique === contentTypeUnique);
         if (!contentType) {
             throw new Error('Could not find the Content Type to remove container from');
         }
         const frozenContainers = contentType.containers ?? [];
+        const removedContainerIds = frozenContainers
+            .filter((x) => x.id === containerId || x.parent?.id === containerId)
+            .map((x) => x.id);
         const containers = frozenContainers.filter((x) => x.id !== containerId && x.parent?.id !== containerId);
-        const frozenProperties = contentType.properties ?? [];
-        const properties = frozenProperties.filter((x) => x.container?.id !== containerId);
+        const frozenProperties = contentType.properties;
+        const properties = frozenProperties.filter((x) => x.container ? !removedContainerIds.some((ids) => ids === x.container?.id) : true);
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         // TODO: fix TS partial complaint
-        __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").updateOne(contentTypeUnique, { containers, properties });
+        this.#contentTypes.updateOne(contentTypeUnique, { containers, properties });
     }
     createPropertyScaffold(containerId = null) {
         const property = {
@@ -351,8 +345,8 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         return property;
     }
     async createProperty(contentTypeUnique, containerId = null, sortOrder) {
-        await __classPrivateFieldGet(this, _UmbContentTypeStructureManager_init, "f");
-        contentTypeUnique = contentTypeUnique ?? __classPrivateFieldGet(this, _UmbContentTypeStructureManager_ownerContentTypeUnique, "f");
+        await this.#init;
+        contentTypeUnique = contentTypeUnique ?? this.#ownerContentTypeUnique;
         // If we have a container, we need to ensure it exists, and then update the container with the new parent id. [NL]
         if (containerId) {
             const container = await this.ensureContainerOf(containerId, contentTypeUnique);
@@ -365,18 +359,18 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         const property = this.createPropertyScaffold(containerId);
         property.sortOrder = sortOrder ?? 0;
         const properties = [
-            ...(__classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").getValue().find((x) => x.unique === contentTypeUnique)?.properties ?? []),
+            ...(this.#contentTypes.getValue().find((x) => x.unique === contentTypeUnique)?.properties ?? []),
         ];
         properties.push(property);
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         // TODO: fix TS partial complaint
-        __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").updateOne(contentTypeUnique, { properties });
+        this.#contentTypes.updateOne(contentTypeUnique, { properties });
         return property;
     }
     async insertProperty(contentTypeUnique, property) {
-        await __classPrivateFieldGet(this, _UmbContentTypeStructureManager_init, "f");
-        contentTypeUnique = contentTypeUnique ?? __classPrivateFieldGet(this, _UmbContentTypeStructureManager_ownerContentTypeUnique, "f");
+        await this.#init;
+        contentTypeUnique = contentTypeUnique ?? this.#ownerContentTypeUnique;
         // If we have a container, we need to ensure it exists, and then update the container with the new parent id. [NL]
         if (property.container) {
             const container = await this.ensureContainerOf(property.container.id, contentTypeUnique);
@@ -386,37 +380,37 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
             // Unfreeze object, while settings container.id
             property = { ...property, container: { id: container.id } };
         }
-        const frozenProperties = __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").getValue().find((x) => x.unique === contentTypeUnique)?.properties ?? [];
+        const frozenProperties = this.#contentTypes.getValue().find((x) => x.unique === contentTypeUnique)?.properties ?? [];
         const properties = appendToFrozenArray(frozenProperties, property, (x) => x.id === property.id);
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         // TODO: fix TS partial complaint
-        __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").updateOne(contentTypeUnique, { properties });
+        this.#contentTypes.updateOne(contentTypeUnique, { properties });
     }
     async removeProperty(contentTypeUnique, propertyId) {
-        await __classPrivateFieldGet(this, _UmbContentTypeStructureManager_init, "f");
-        contentTypeUnique = contentTypeUnique ?? __classPrivateFieldGet(this, _UmbContentTypeStructureManager_ownerContentTypeUnique, "f");
-        const frozenProperties = __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").getValue().find((x) => x.unique === contentTypeUnique)?.properties ?? [];
+        await this.#init;
+        contentTypeUnique = contentTypeUnique ?? this.#ownerContentTypeUnique;
+        const frozenProperties = this.#contentTypes.getValue().find((x) => x.unique === contentTypeUnique)?.properties ?? [];
         const properties = filterFrozenArray(frozenProperties, (x) => x.id !== propertyId);
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         // TODO: fix TS partial complaint
-        __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").updateOne(contentTypeUnique, { properties });
+        this.#contentTypes.updateOne(contentTypeUnique, { properties });
     }
     async updateProperty(contentTypeUnique, propertyId, partialUpdate) {
-        await __classPrivateFieldGet(this, _UmbContentTypeStructureManager_init, "f");
-        contentTypeUnique = contentTypeUnique ?? __classPrivateFieldGet(this, _UmbContentTypeStructureManager_ownerContentTypeUnique, "f");
-        const frozenProperties = __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").getValue().find((x) => x.unique === contentTypeUnique)?.properties ?? [];
+        await this.#init;
+        contentTypeUnique = contentTypeUnique ?? this.#ownerContentTypeUnique;
+        const frozenProperties = this.#contentTypes.getValue().find((x) => x.unique === contentTypeUnique)?.properties ?? [];
         const properties = partialUpdateFrozenArray(frozenProperties, partialUpdate, (x) => x.id === propertyId);
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         // TODO: fix TS partial complaint
-        __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").updateOne(contentTypeUnique, { properties });
+        this.#contentTypes.updateOne(contentTypeUnique, { properties });
     }
     // TODO: Refactor: These property methods, should maybe be named without structure in their name.
     async propertyStructureById(propertyId) {
-        await __classPrivateFieldGet(this, _UmbContentTypeStructureManager_init, "f");
-        return __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").asObservablePart((docTypes) => {
+        await this.#init;
+        return this.#contentTypes.asObservablePart((docTypes) => {
             for (const docType of docTypes) {
                 const foundProp = docType.properties?.find((property) => property.id === propertyId);
                 if (foundProp) {
@@ -427,8 +421,8 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         });
     }
     async propertyStructureByAlias(propertyAlias) {
-        await __classPrivateFieldGet(this, _UmbContentTypeStructureManager_init, "f");
-        return __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").asObservablePart((docTypes) => {
+        await this.#init;
+        return this.#contentTypes.asObservablePart((docTypes) => {
             for (const docType of docTypes) {
                 const foundProp = docType.properties?.find((property) => property.alias === propertyAlias);
                 if (foundProp) {
@@ -439,8 +433,8 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         });
     }
     async getPropertyStructureById(propertyId) {
-        await __classPrivateFieldGet(this, _UmbContentTypeStructureManager_init, "f");
-        for (const docType of __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").getValue()) {
+        await this.#init;
+        for (const docType of this.#contentTypes.getValue()) {
             const foundProp = docType.properties?.find((property) => property.id === propertyId);
             if (foundProp) {
                 return foundProp;
@@ -449,8 +443,8 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         return undefined;
     }
     async getPropertyStructureByAlias(propertyAlias) {
-        await __classPrivateFieldGet(this, _UmbContentTypeStructureManager_init, "f");
-        for (const docType of __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").getValue()) {
+        await this.#init;
+        for (const docType of this.#contentTypes.getValue()) {
             const foundProp = docType.properties?.find((property) => property.alias === propertyAlias);
             if (foundProp) {
                 return foundProp;
@@ -459,13 +453,13 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         return undefined;
     }
     ownerContentTypeObservablePart(mappingFunction) {
-        return __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").asObservablePart((docTypes) => {
-            const docType = docTypes.find((x) => x.unique === __classPrivateFieldGet(this, _UmbContentTypeStructureManager_ownerContentTypeUnique, "f"));
+        return this.#contentTypes.asObservablePart((docTypes) => {
+            const docType = docTypes.find((x) => x.unique === this.#ownerContentTypeUnique);
             return docType ? mappingFunction(docType) : undefined;
         });
     }
     hasPropertyStructuresOf(containerId) {
-        return __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").asObservablePart((docTypes) => {
+        return this.#contentTypes.asObservablePart((docTypes) => {
             return (docTypes.find((docType) => {
                 return docType.properties?.find((property) => property.container?.id === containerId);
             }) !== undefined);
@@ -475,7 +469,7 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         return this.propertyStructuresOf(null);
     }
     propertyStructuresOf(containerId) {
-        return __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").asObservablePart((docTypes) => {
+        return this.#contentTypes.asObservablePart((docTypes) => {
             const props = [];
             docTypes.forEach((docType) => {
                 docType.properties?.forEach((property) => {
@@ -488,15 +482,15 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         });
     }
     rootContainers(containerType) {
-        return __classPrivateFieldGet(this, _UmbContentTypeStructureManager_containers, "f").asObservablePart((data) => {
+        return this.#containers.asObservablePart((data) => {
             return data.filter((x) => x.parent === null && x.type === containerType);
         });
     }
     getRootContainers(containerType) {
-        return __classPrivateFieldGet(this, _UmbContentTypeStructureManager_containers, "f").getValue().filter((x) => x.parent === null && x.type === containerType);
+        return this.#containers.getValue().filter((x) => x.parent === null && x.type === containerType);
     }
     hasRootContainers(containerType) {
-        return __classPrivateFieldGet(this, _UmbContentTypeStructureManager_containers, "f").asObservablePart((data) => {
+        return this.#containers.asObservablePart((data) => {
             return data.filter((x) => x.parent === null && x.type === containerType).length > 0;
         });
     }
@@ -510,18 +504,18 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         return this.getOwnerContentType()?.containers?.filter((x) => x.id === containerId);
     }
     containersOfParentId(parentId, containerType) {
-        return __classPrivateFieldGet(this, _UmbContentTypeStructureManager_containers, "f").asObservablePart((data) => {
+        return this.#containers.asObservablePart((data) => {
             return data.filter((x) => x.parent?.id === parentId && x.type === containerType);
         });
     }
     // In future this might need to take parentName(parentId lookup) into account as well? otherwise containers that share same name and type will always be merged, but their position might be different and they should not be merged. [NL]
     containersByNameAndType(name, containerType) {
-        return __classPrivateFieldGet(this, _UmbContentTypeStructureManager_containers, "f").asObservablePart((data) => {
+        return this.#containers.asObservablePart((data) => {
             return data.filter((x) => x.name === name && x.type === containerType);
         });
     }
     containersByNameAndTypeAndParent(name, containerType, parentName, parentType) {
-        return __classPrivateFieldGet(this, _UmbContentTypeStructureManager_containers, "f").asObservablePart((data) => {
+        return this.#containers.asObservablePart((data) => {
             return data.filter((x) => 
             // Match name and type:
             x.name === name &&
@@ -536,19 +530,23 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
                         x.parent === null));
         });
     }
+    getContentTypeOfContainer(containerId) {
+        return this.#contentTypes
+            .getValue()
+            .find((contentType) => contentType.containers.some((c) => c.id === containerId));
+    }
     contentTypeOfProperty(propertyId) {
-        return __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").asObservablePart((contentTypes) => contentTypes.find((contentType) => contentType.properties.some((p) => p.id === propertyId)));
+        return this.#contentTypes.asObservablePart((contentTypes) => contentTypes.find((contentType) => contentType.properties.some((p) => p.id === propertyId)));
     }
     _reset() {
-        __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypeObservers, "f").forEach((observer) => observer.destroy());
-        __classPrivateFieldSet(this, _UmbContentTypeStructureManager_contentTypeObservers, [], "f");
-        __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").setValue([]);
-        __classPrivateFieldGet(this, _UmbContentTypeStructureManager_containers, "f").setValue([]);
+        this.#contentTypeObservers.forEach((observer) => observer.destroy());
+        this.#contentTypeObservers = [];
+        this.#contentTypes.setValue([]);
+        this.#containers.setValue([]);
     }
     destroy() {
-        __classPrivateFieldGet(this, _UmbContentTypeStructureManager_contentTypes, "f").destroy();
-        __classPrivateFieldGet(this, _UmbContentTypeStructureManager_containers, "f").destroy();
+        this.#contentTypes.destroy();
+        this.#containers.destroy();
         super.destroy();
     }
 }
-_UmbContentTypeStructureManager_init = new WeakMap(), _UmbContentTypeStructureManager_repository = new WeakMap(), _UmbContentTypeStructureManager_ownerContentTypeUnique = new WeakMap(), _UmbContentTypeStructureManager_contentTypeObservers = new WeakMap(), _UmbContentTypeStructureManager_contentTypes = new WeakMap(), _UmbContentTypeStructureManager_containers = new WeakMap();

package/dist-cms/packages/core/content-type/workspace/content-type-workspace-context.interface.d.ts

@@ -5,6 +5,7 @@ import type { UmbSubmittableWorkspaceContext } from '../../workspace/index.js';
 export interface UmbContentTypeWorkspaceContext<ContentTypeType extends UmbContentTypeModel = UmbContentTypeModel> extends UmbSubmittableWorkspaceContext {
     readonly IS_CONTENT_TYPE_WORKSPACE_CONTEXT: true;
     readonly name: Observable<string | undefined>;
+    getName(): string | undefined;
     readonly alias: Observable<string | undefined>;
     readonly description: Observable<string | undefined>;
     readonly icon: Observable<string | undefined>;

package/dist-cms/packages/core/content-type/workspace/index.d.ts

@@ -1,2 +1,3 @@
 export type * from './content-type-workspace-context.interface.js';
 export * from './content-type-workspace.context-token.js';
+export * from './views/design/content-type-design-editor-property.context-token.js';

package/dist-cms/packages/core/content-type/workspace/index.js

@@ -1 +1,2 @@
 export * from './content-type-workspace.context-token.js';
+export * from './views/design/content-type-design-editor-property.context-token.js';

package/dist-cms/packages/core/content-type/workspace/views/design/content-type-design-editor-group.element.d.ts

@@ -10,9 +10,11 @@ export declare class UmbContentTypeWorkspaceViewEditGroupElement extends UmbLitE
     get groupStructureHelper(): UmbContentTypeContainerStructureHelper<UmbContentTypeModel> | undefined;
     private _groupStructureHelper?;
     sortModeActive: boolean;
+    editContentTypePath?: string;
     _groupId?: string;
     _hasOwnerContainer?: boolean;
     _inherited?: boolean;
+    _inheritedFrom?: Array<UmbContentTypeModel>;
     _singleValueUpdate(propertyName: string, value: string | number | boolean | null | undefined): void;
     render(): "" | import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];