@umbraco-cms/backoffice 16.0.0-rc → 16.0.0-rc3

package/dist-cms/packages/content/content/workspace/content-detail-workspace-base.d.ts

@@ -6,7 +6,7 @@ import type { UmbContentValidationRepository } from '../repository/content-valid
 import type { UmbContentWorkspaceContext } from './content-workspace-context.interface.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import type { UmbDetailRepository, UmbDetailRepositoryConstructor } from '@umbraco-cms/backoffice/repository';
-import { UmbEntityDetailWorkspaceContextBase, UmbWorkspaceSplitViewManager, type UmbEntityDetailWorkspaceContextArgs, type UmbEntityDetailWorkspaceContextCreateArgs } from '@umbraco-cms/backoffice/workspace';
+import { UmbEntityDetailWorkspaceContextBase, UmbWorkspaceSplitViewManager, type UmbEntityDetailWorkspaceContextArgs, type UmbEntityDetailWorkspaceContextCreateArgs, type UmbSaveableWorkspaceContext } from '@umbraco-cms/backoffice/workspace';
 import { UmbContentTypeStructureManager, type UmbContentTypeModel, type UmbPropertyTypeModel } from '@umbraco-cms/backoffice/content-type';
 import { UmbVariantId, type UmbEntityVariantModel, type UmbEntityVariantOptionModel } from '@umbraco-cms/backoffice/variant';
 import { UmbReadOnlyVariantGuardManager } from '@umbraco-cms/backoffice/utils';
@@ -44,7 +44,7 @@ export interface UmbContentDetailWorkspaceContextArgs<DetailModelType extends Um
  */
 export declare abstract class UmbContentDetailWorkspaceContextBase<DetailModelType extends UmbContentDetailModel<VariantModelType>, DetailRepositoryType extends UmbDetailRepository<DetailModelType> = UmbDetailRepository<DetailModelType>, ContentTypeDetailModelType extends UmbContentTypeModel = UmbContentTypeModel, VariantModelType extends UmbEntityVariantModel = DetailModelType extends {
     variants: UmbEntityVariantModel[];
-} ? DetailModelType['variants'][0] : never, VariantOptionModelType extends UmbEntityVariantOptionModel = UmbEntityVariantOptionModel<VariantModelType>, CreateArgsType extends UmbEntityDetailWorkspaceContextCreateArgs<DetailModelType> = UmbEntityDetailWorkspaceContextCreateArgs<DetailModelType>> extends UmbEntityDetailWorkspaceContextBase<DetailModelType, DetailRepositoryType, CreateArgsType> implements UmbContentWorkspaceContext<DetailModelType, ContentTypeDetailModelType, VariantModelType> {
+} ? DetailModelType['variants'][0] : never, VariantOptionModelType extends UmbEntityVariantOptionModel = UmbEntityVariantOptionModel<VariantModelType>, CreateArgsType extends UmbEntityDetailWorkspaceContextCreateArgs<DetailModelType> = UmbEntityDetailWorkspaceContextCreateArgs<DetailModelType>> extends UmbEntityDetailWorkspaceContextBase<DetailModelType, DetailRepositoryType, CreateArgsType> implements UmbContentWorkspaceContext<DetailModelType, ContentTypeDetailModelType, VariantModelType>, UmbSaveableWorkspaceContext {
     #private;
     readonly IS_CONTENT_WORKSPACE_CONTEXT: true;
     readonly readOnlyGuard: UmbReadOnlyVariantGuardManager;
@@ -205,6 +205,11 @@ export declare abstract class UmbContentDetailWorkspaceContextBase<DetailModelTy
      */
     requestSubmit(): Promise<void>;
     submit(): Promise<void>;
+    /**
+     * Request a save of the workspace, in the case of Document Workspaces the validation does not need to be valid for this to be saved.
+     * @returns {Promise<void>} a promise which resolves once it has been completed.
+     */
+    requestSave(): Promise<void>;
     /**
      * Get the data to save
      * @param {Array<UmbVariantId>} variantIds - The variant ids to save
@@ -213,6 +218,7 @@ export declare abstract class UmbContentDetailWorkspaceContextBase<DetailModelTy
      */
     constructSaveData(variantIds: Array<UmbVariantId>): Promise<DetailModelType>;
     protected _handleSubmit(): Promise<void>;
+    protected _handleSave(): Promise<void>;
     /**
      * Perform the create or update of the content
      * @deprecated Use the public performCreateOrUpdate instead. Will be removed in v. 17.

package/dist-cms/packages/content/content/workspace/content-detail-workspace-base.js

@@ -512,6 +512,10 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
      */
     async runMandatoryValidationForSaveData(saveData, variantIds = []) {
         // Check that the data is valid before we save it.
+        // If we vary by culture then we do not want to validate the invariant variant.
+        if (this.getVariesByCulture()) {
+            variantIds = variantIds.filter((variant) => !variant.isCultureInvariant());
+        }
         const missingVariants = variantIds.filter((variant) => {
             return !saveData.variants.some((y) => variant.compare(y));
         });
@@ -544,7 +548,7 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
             this.#validationRepository ??= new this.#validationRepositoryClass(this);
             // We ask the server first to get a concatenated set of validation messages. So we see both front-end and back-end validation messages [NL]
             if (this.getIsNew()) {
-                const parent = this.getParent();
+                const parent = this._internal_getCreateUnderParent();
                 if (!parent)
                     throw new Error('Parent is not set');
                 await this.#serverValidation.askServerForValidation(saveData, this.#validationRepository.validateCreate(saveData, parent.unique));
@@ -564,6 +568,13 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
     submit() {
         return this._handleSubmit();
     }
+    /**
+     * Request a save of the workspace, in the case of Document Workspaces the validation does not need to be valid for this to be saved.
+     * @returns {Promise<void>} a promise which resolves once it has been completed.
+     */
+    requestSave() {
+        return this._handleSave();
+    }
     /**
      * Get the data to save
      * @param {Array<UmbVariantId>} variantIds - The variant ids to save
@@ -574,6 +585,10 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
         return this._data.constructData(variantIds);
     }
     async _handleSubmit() {
+        await this._handleSave();
+        this._closeModal();
+    }
+    async _handleSave() {
         const data = this.getData();
         if (!data) {
             throw new Error('Data is missing');
@@ -611,16 +626,10 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
         await this.runMandatoryValidationForSaveData(saveData, variantIds);
         if (this.#validateOnSubmit) {
             await this.askServerToValidate(saveData, variantIds);
-            return this.validateAndSubmit(async () => {
+            const valid = await this._validateAndLog().then(() => true, () => false);
+            if (valid || this.#ignoreValidationResultOnSubmit) {
                 return this.performCreateOrUpdate(variantIds, saveData);
-            }, async (reason) => {
-                if (this.#ignoreValidationResultOnSubmit) {
-                    return this.performCreateOrUpdate(variantIds, saveData);
-                }
-                else {
-                    return this.invalidSubmit(reason);
-                }
-            });
+            }
         }
         else {
             await this.performCreateOrUpdate(variantIds, saveData);
@@ -654,7 +663,7 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
     async #create(variantIds, saveData) {
         if (!this._detailRepository)
             throw new Error('Detail repository is not set');
-        const parent = this.getParent();
+        const parent = this._internal_getCreateUnderParent();
         if (!parent)
             throw new Error('Parent is not set');
         const { data, error } = await this._detailRepository.create(saveData, parent.unique);
@@ -680,7 +689,6 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
         });
         eventContext.dispatchEvent(event);
         this.setIsNew(false);
-        this._closeModal();
     }
     async #update(variantIds, saveData) {
         if (!this._detailRepository)
@@ -712,7 +720,6 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
             eventUnique: this._workspaceEventUnique,
         });
         eventContext.dispatchEvent(updatedEvent);
-        this._closeModal();
     }
     resetState() {
         super.resetState();

package/dist-cms/packages/content/content/workspace/views/edit/content-editor-properties.element.d.ts

@@ -6,7 +6,7 @@ export declare class UmbContentWorkspaceViewEditPropertiesElement extends UmbLit
     #private;
     get containerId(): string | null | undefined;
     set containerId(value: string | null | undefined);
-    _variantId?: UmbVariantId;
+    _datasetVariantId?: UmbVariantId;
     _visibleProperties?: Array<UmbPropertyTypeModel>;
     constructor();
     render(): unknown;

package/dist-cms/packages/content/content/workspace/views/edit/content-editor-properties.element.js

@@ -26,7 +26,7 @@ let UmbContentWorkspaceViewEditPropertiesElement = class UmbContentWorkspaceView
     constructor() {
         super();
         this.consumeContext(UMB_PROPERTY_DATASET_CONTEXT, (datasetContext) => {
-            this._variantId = datasetContext?.getVariantId();
+            this._datasetVariantId = datasetContext?.getVariantId();
             this.#processPropertyStructure();
         });
         this.consumeContext(UMB_CONTENT_WORKSPACE_CONTEXT, (workspaceContext) => {
@@ -41,13 +41,13 @@ let UmbContentWorkspaceViewEditPropertiesElement = class UmbContentWorkspaceView
         });
     }
     #processPropertyStructure() {
-        if (!this.#workspaceContext || !this.#properties || !this.#propertyStructureHelper) {
+        if (!this.#workspaceContext || !this.#properties || !this.#propertyStructureHelper || !this._datasetVariantId) {
             return;
         }
         const propertyViewGuard = this.#workspaceContext.propertyViewGuard;
         this.#properties.forEach((property) => {
-            const propertyVariantId = new UmbVariantId(this._variantId?.culture, this._variantId?.segment);
-            this.observe(propertyViewGuard.isPermittedForVariantAndProperty(propertyVariantId, property), (permitted) => {
+            const propertyVariantId = new UmbVariantId(property.variesByCulture ? this._datasetVariantId?.culture : null, property.variesBySegment ? this._datasetVariantId?.segment : null);
+            this.observe(propertyViewGuard.isPermittedForVariantAndProperty(propertyVariantId, property, this._datasetVariantId), (permitted) => {
                 if (permitted) {
                     this.#visiblePropertiesUniques.push(property.unique);
                     this.#calculateVisibleProperties();
@@ -66,10 +66,10 @@ let UmbContentWorkspaceViewEditPropertiesElement = class UmbContentWorkspaceView
         this._visibleProperties = this.#properties.filter((property) => this.#visiblePropertiesUniques.includes(property.unique));
     }
     render() {
-        return this._variantId && this._visibleProperties
+        return this._datasetVariantId && this._visibleProperties
             ? repeat(this._visibleProperties, (property) => property.alias, (property) => html `<umb-content-workspace-view-edit-property
 							class="property"
-							.variantId=${this._variantId}
+							.variantId=${this._datasetVariantId}
 							.property=${property}></umb-content-workspace-view-edit-property>`)
             : nothing;
     }
@@ -90,7 +90,7 @@ __decorate([
 ], UmbContentWorkspaceViewEditPropertiesElement.prototype, "containerId", null);
 __decorate([
     state()
-], UmbContentWorkspaceViewEditPropertiesElement.prototype, "_variantId", void 0);
+], UmbContentWorkspaceViewEditPropertiesElement.prototype, "_datasetVariantId", void 0);
 __decorate([
     state()
 ], UmbContentWorkspaceViewEditPropertiesElement.prototype, "_visibleProperties", void 0);

package/dist-cms/packages/content/content/workspace/views/edit/content-editor-property.element.js

@@ -26,7 +26,7 @@ let UmbContentWorkspaceViewEditPropertyElement = class UmbContentWorkspaceViewEd
                     culture: propertyVariantId.culture,
                     segment: propertyVariantId.segment,
                 })}].value`;
-                this.observe(this._context.propertyWriteGuard.isPermittedForVariantAndProperty(propertyVariantId, this.property), (write) => {
+                this.observe(this._context.propertyWriteGuard.isPermittedForVariantAndProperty(propertyVariantId, this.property, this.variantId), (write) => {
                     this._writeable = write;
                 }, 'observeView');
             }

package/dist-cms/packages/content/content-type/global-components/content-type-workspace-editor-header.element.js

@@ -102,15 +102,16 @@ let UmbContentTypeWorkspaceEditorHeaderElement = class UmbContentTypeWorkspaceEd
 				display: flex;
 				flex: 1 1 auto;
 				flex-direction: column;
-				gap: var(--uui-size-space-1);
 			}
 
 			#name {
 				width: 100%;
+				z-index: 1;
 			}
 
 			#description {
 				width: 100%;
+				margin-top: 1px;
 				--uui-input-height: var(--uui-size-8);
 				--uui-input-border-color: transparent;
 			}
@@ -123,6 +124,8 @@ let UmbContentTypeWorkspaceEditorHeaderElement = class UmbContentTypeWorkspaceEd
 				font-size: var(--uui-size-8);
 				height: 60px;
 				width: 60px;
+				--uui-button-border-color: transparent;
+				--uui-button-border-color-hover: var(--uui-color-border);
 			}
 		`,
     ]; }

package/dist-cms/packages/content/content-type/modals/composition-picker/composition-picker-modal.element.d.ts

@@ -6,6 +6,7 @@ export declare class UmbCompositionPickerModalElement extends UmbModalBaseElemen
     private _compatibleCompositions?;
     private _selection;
     private _usedForInheritance;
+    private _usedForComposition;
     connectedCallback(): void;
     protected _submitModal(): Promise<void>;
     render(): import("lit-html").TemplateResult<1>;

package/dist-cms/packages/content/content-type/modals/composition-picker/composition-picker-modal.element.js

@@ -15,6 +15,7 @@ let UmbCompositionPickerModalElement = class UmbCompositionPickerModalElement ex
         this._references = [];
         this._selection = [];
         this._usedForInheritance = [];
+        this._usedForComposition = [];
     }
     // TODO: Loosen this from begin specific to Document Types, so we can have a general interface for composition repositories. [NL]
     #compositionRepository;
@@ -33,6 +34,7 @@ let UmbCompositionPickerModalElement = class UmbCompositionPickerModalElement ex
         }
         this._selection = this.data?.selection ?? [];
         this._usedForInheritance = this.data?.usedForInheritance ?? [];
+        this._usedForComposition = this.data?.usedForComposition ?? [];
         this.modalContext?.setValue({ selection: this._selection });
         const isNew = this.data.isNew;
         this.#unique = !isNew ? this.data.unique : null;
@@ -98,7 +100,9 @@ let UmbCompositionPickerModalElement = class UmbCompositionPickerModalElement ex
     render() {
         return html `
 			<umb-body-layout headline="${this.localize.term('contentTypeEditor_compositions')}">
-				${this._references.length ? this.#renderHasReference() : this.#renderAvailableCompositions()}
+				<uui-box>
+					${this._references.length ? this.#renderHasReference() : this.#renderAvailableCompositions()}
+				</uui-box>
 				<div slot="actions">
 					<uui-button label=${this.localize.term('general_close')} @click=${this._rejectModal}></uui-button>
 					${!this._references.length
@@ -166,11 +170,16 @@ let UmbCompositionPickerModalElement = class UmbCompositionPickerModalElement ex
     #renderCompositionsItems(compositionsList) {
         return repeat(compositionsList, (compositions) => compositions.unique, (compositions) => {
             const usedForInheritance = this._usedForInheritance.includes(compositions.unique);
+            const usedForComposition = this._usedForComposition.includes(compositions.unique);
+            /* The server will return isCompatible as false if the Doc Type is currently being used in a composition.
+            Therefore, we need to account for this in the "isDisabled" check to ensure it remains enabled.
+            Otherwise, it would become disabled and couldn't be deselected by the user. */
+            const isDisabled = usedForInheritance || (compositions.isCompatible === false && !usedForComposition);
             return html `
 					<uui-menu-item
 						label=${this.localize.string(compositions.name)}
 						?selectable=${!usedForInheritance}
-						?disabled=${usedForInheritance}
+						?disabled=${isDisabled}
 						@selected=${() => this.#onSelectionAdd(compositions.unique)}
 						@deselected=${() => this.#onSelectionRemove(compositions.unique)}
 						?selected=${this._selection.find((unique) => unique === compositions.unique)}>
@@ -202,6 +211,10 @@ let UmbCompositionPickerModalElement = class UmbCompositionPickerModalElement ex
 				align-items: center;
 				gap: var(--uui-size-3);
 			}
+
+			.compositions-list {
+				margin-block: var(--uui-size-3);
+			}
 		`,
     ]; }
 };
@@ -217,6 +230,9 @@ __decorate([
 __decorate([
     state()
 ], UmbCompositionPickerModalElement.prototype, "_usedForInheritance", void 0);
+__decorate([
+    state()
+], UmbCompositionPickerModalElement.prototype, "_usedForComposition", void 0);
 UmbCompositionPickerModalElement = __decorate([
     customElement('umb-composition-picker-modal')
 ], UmbCompositionPickerModalElement);

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

@@ -3,6 +3,7 @@ export interface UmbCompositionPickerModalData {
     compositionRepositoryAlias: string;
     selection: Array<string>;
     usedForInheritance: Array<string>;
+    usedForComposition: Array<string>;
     unique: string | null;
     isElement: boolean;
     currentPropertyAliases: Array<string>;

package/dist-cms/packages/content/content-type/structure/content-type-structure-manager.class.d.ts

@@ -83,31 +83,49 @@ export declare class UmbContentTypeStructureManager<T extends UmbContentTypeMode
     cloneContainerTo(containerId: string, toContentTypeUnique?: string): Promise<UmbPropertyTypeContainerModel | undefined>;
     ensureContainerNames(contentTypeUnique: string | null, type: UmbPropertyContainerTypes, parentId?: string | null): void;
     createContainer(contentTypeUnique: string | null, parentId?: string | null, type?: UmbPropertyContainerTypes, sortOrder?: number): Promise<UmbPropertyTypeContainerModel>;
+    insertContainer(contentTypeUnique: string | null, container: UmbPropertyTypeContainerModel): Promise<{
+        id: string;
+        parent: {
+            id: string;
+        } | null;
+        name: string;
+        type: UmbPropertyContainerTypes;
+        sortOrder: number;
+    }>;
     makeEmptyContainerName(containerId: string, containerType: UmbPropertyContainerTypes, parentId?: string | null): string;
     makeContainerNameUniqueForOwnerContentType(containerId: string, newName: string, containerType: UmbPropertyContainerTypes, parentId?: string | null): string | null;
     updateContainer(contentTypeUnique: string | null, containerId: string, partialUpdate: Partial<UmbPropertyTypeContainerModel>): Promise<void>;
-    removeContainer(contentTypeUnique: string | null, containerId?: string | null): Promise<void>;
+    removeContainer(contentTypeUnique: string | null, containerId?: string | null, args?: {
+        preventRemovingProperties?: boolean;
+    }): Promise<void>;
     insertProperty(contentTypeUnique: string | null, property: UmbPropertyTypeModel): Promise<void>;
     removeProperty(contentTypeUnique: string | null, propertyUnique: string): Promise<void>;
     updateProperty(contentTypeUnique: string | null, propertyUnique: string, partialUpdate: Partial<UmbPropertyTypeModel>): Promise<void>;
     propertyStructureById(propertyUnique: string): Promise<import("rxjs").Observable<UmbPropertyTypeModel | undefined>>;
     propertyStructureByAlias(propertyAlias: string): Promise<import("rxjs").Observable<UmbPropertyTypeModel | undefined>>;
     getPropertyStructureById(propertyUnique: string): Promise<UmbPropertyTypeModel | undefined>;
+    getOwnerPropertyById(propertyUnique: string | null): Promise<UmbPropertyTypeModel | undefined>;
     getPropertyStructureByAlias(propertyAlias: string): Promise<UmbPropertyTypeModel | undefined>;
     hasPropertyStructuresOf(containerId: string | null): import("rxjs").Observable<boolean>;
     rootPropertyStructures(): import("rxjs").Observable<UmbPropertyTypeModel[]>;
     propertyStructuresOf(containerId: string | null): import("rxjs").Observable<UmbPropertyTypeModel[]>;
     rootContainers(containerType: UmbPropertyContainerTypes): import("rxjs").Observable<UmbPropertyTypeContainerModel[]>;
-    getRootContainers(containerType: UmbPropertyContainerTypes): UmbPropertyTypeContainerModel[];
+    getRootContainers(containerType: UmbPropertyContainerTypes): Promise<UmbPropertyTypeContainerModel[]>;
     hasRootContainers(containerType: UmbPropertyContainerTypes): Promise<import("rxjs").Observable<boolean>>;
     ownerContainersOf(containerType: UmbPropertyContainerTypes, parentId: string | null): import("rxjs").Observable<UmbPropertyTypeContainerModel[]>;
-    getOwnerContainers(containerType: UmbPropertyContainerTypes, parentId: string | null): UmbPropertyTypeContainerModel[] | undefined;
+    getOwnerContainerById(id: string | null): UmbPropertyTypeContainerModel | undefined;
+    getOwnerContainers(containerType: UmbPropertyContainerTypes, parentId: string | null): Array<UmbPropertyTypeContainerModel> | undefined;
     isOwnerContainer(containerId: string): UmbPropertyTypeContainerModel[] | undefined;
     containersOfParentId(parentId: string, containerType: UmbPropertyContainerTypes): import("rxjs").Observable<UmbPropertyTypeContainerModel[]>;
     containersByNameAndType(name: string, containerType: UmbPropertyContainerTypes): import("rxjs").Observable<UmbPropertyTypeContainerModel[]>;
     containersByNameAndTypeAndParent(name: string, containerType: UmbPropertyContainerTypes, parentName: string | null, parentType?: UmbPropertyContainerTypes): import("rxjs").Observable<UmbPropertyTypeContainerModel[]>;
     getContentTypeOfContainer(containerId: string): T | undefined;
     contentTypeOfProperty(propertyId: UmbPropertyTypeUnique): import("rxjs").Observable<T | undefined>;
+    /**
+     * Get all property aliases for the content type including inherited and composed content types.
+     * @returns {Promise<Array<string>>} - A promise that will be resolved with the list of all content type property aliases.
+     */
+    getContentTypePropertyAliases(): Promise<string[]>;
     destroy(): void;
 }
 export {};

package/dist-cms/packages/content/content-type/structure/content-type-structure-manager.class.js

@@ -5,6 +5,7 @@ import { incrementString } from '@umbraco-cms/backoffice/utils';
 import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbExtensionApiInitializer } from '@umbraco-cms/backoffice/extension-api';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
+import { firstValueFrom } from '@umbraco-cms/backoffice/external/rxjs';
 const UmbFilterDuplicateStrings = (value, index, array) => array.indexOf(value) === index;
 /**
  * Manages a structure of a Content Type and its properties and containers.
@@ -39,9 +40,8 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
     async getContentTypeProperties() {
         return await this.observe(this.contentTypeProperties).asPromise();
     }
-    #containers;
     containerById(id) {
-        return this.#containers.asObservablePart((x) => x.find((y) => y.id === id));
+        return createObservablePart(this.#contentTypeContainers, (x) => x.find((y) => y.id === id));
     }
     constructor(host, typeRepository) {
         super(host);
@@ -87,7 +87,6 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         this.contentTypeAliases = this.#contentTypes.asObservablePart((x) => x.map((y) => y.alias));
         this.variesByCulture = createObservablePart(this.ownerContentType, (x) => x?.variesByCulture);
         this.variesBySegment = createObservablePart(this.ownerContentType, (x) => x?.variesBySegment);
-        this.#containers = new UmbArrayState([], (x) => x.id);
         if (typeof typeRepository === 'string') {
             this.#observeRepository(typeRepository);
         }
@@ -102,17 +101,22 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
             this.#repoManager = new UmbRepositoryDetailsManager(this, typeRepository);
             this.observe(this.#repoManager.entries, (entries) => {
                 // Prevent updating once that are have edited here.
-                entries = entries.filter((x) => !(this.#editedTypes.getHasOne(x.unique) && this.#contentTypes.getHasOne(x.unique)));
-                this.#contentTypes.append(entries);
+                const entriesToBeUpdated = entries.filter((x) => !(this.#editedTypes.getHasOne(x.unique) && this.#contentTypes.getHasOne(x.unique)));
+                // Remove entries based on no-longer existing uniques:
+                const entriesToBeRemoved = this.#contentTypes
+                    .getValue()
+                    .filter((entry) => !entries.some((x) => x.unique === entry.unique))
+                    .map((x) => x.unique);
+                this.#contentTypes.mute();
+                this.#contentTypes.remove(entriesToBeRemoved);
+                this.#contentTypes.append(entriesToBeUpdated);
+                this.#contentTypes.unmute();
             }, null);
         });
         // Observe all Content Types compositions: [NL]
         this.observe(this.contentTypeCompositions, (contentTypeCompositions) => {
             this.#loadContentTypeCompositions(contentTypeCompositions);
         }, null);
-        this.observe(this.#contentTypeContainers, (contentTypeContainers) => {
-            this.#containers.setValue(contentTypeContainers);
-        }, null);
     }
     /**
      * loadType will load the ContentType and all inherited and composed ContentTypes.
@@ -197,6 +201,8 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         return data;
     }
     async #loadContentTypeCompositions(contentTypeCompositions) {
+        // Important to wait a JS-cycle, cause this is called by an observation of a state and this results in setting the value for the state(potentially in the same JS-cycle) then we need to make sure we don't trigger a new update before the old subscription chain is completed. [NL]
+        await Promise.resolve();
         const ownerUnique = this.getOwnerContentTypeUnique();
         if (!ownerUnique)
             return;
@@ -273,7 +279,7 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         toContentTypeUnique = toContentTypeUnique ?? this.#ownerContentTypeUnique;
         this.#editedTypes.appendOne(toContentTypeUnique);
         // Find container.
-        const container = this.#containers.getValue().find((x) => x.id === containerId);
+        const container = (await firstValueFrom(this.#contentTypeContainers)).find((x) => x.id === containerId);
         if (!container)
             throw new Error('Container to clone was not found');
         const clonedContainer = {
@@ -329,34 +335,29 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
             type: type,
             sortOrder: sortOrder ?? 0,
         };
-        // Ensure
-        this.ensureContainerNames(contentTypeUnique, type, parentId);
-        const contentTypes = this.#contentTypes.getValue();
-        const containers = [...(contentTypes.find((x) => x.unique === contentTypeUnique)?.containers ?? [])];
-        containers.push(container);
-        this.#contentTypes.updateOne(contentTypeUnique, { containers });
-        return container;
+        return this.insertContainer(contentTypeUnique, container);
     }
-    /*async insertContainer(contentTypeUnique: string | null, container: UmbPropertyTypeContainerModel) {
+    async insertContainer(contentTypeUnique, container) {
         await this.#init;
-        contentTypeUnique = contentTypeUnique ?? this.#ownerContentTypeUnique!;
-
+        contentTypeUnique = contentTypeUnique ?? this.#ownerContentTypeUnique;
+        const newContainer = { ...container };
+        const type = newContainer.type;
+        const parentId = newContainer.parent?.id ?? null;
         // If we have a parent, we need to ensure it exists, and then update the parent property with the new container id.
-        if (container.parent) {
-            const parentContainer = await this.ensureContainerOf(container.parent.id, contentTypeUnique);
+        if (newContainer.parent) {
+            const parentContainer = await this.ensureContainerOf(newContainer.parent.id, contentTypeUnique);
             if (!parentContainer) {
                 throw new Error('Container for inserting property could not be found or created');
             }
-            container.parent.id = parentContainer.id;
+            newContainer.parent.id = parentContainer.id;
         }
-
-        const frozenContainers =
-            this.#contentTypes.getValue().find((x) => x.unique === contentTypeUnique)?.containers ?? [];
-
-        const containers = appendToFrozenArray(frozenContainers, container, (x) => x.id === container.id);
-
-        this.#contentTypes.updateOne(contentTypeUnique, { containers } as Partial<T>);
-    }*/
+        // Ensure
+        this.ensureContainerNames(contentTypeUnique, type, parentId);
+        const frozenContainers = this.#contentTypes.getValue().find((x) => x.unique === contentTypeUnique)?.containers ?? [];
+        const containers = appendToFrozenArray(frozenContainers, newContainer, (x) => x.id === newContainer.id);
+        this.#contentTypes.updateOne(contentTypeUnique, { containers });
+        return newContainer;
+    }
     makeEmptyContainerName(containerId, containerType, parentId = null) {
         return (this.makeContainerNameUniqueForOwnerContentType(containerId, 'Unnamed', containerType, parentId) ?? 'Unnamed');
     }
@@ -397,7 +398,7 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         // TODO: fix TS partial complaint
         this.#contentTypes.updateOne(contentTypeUnique, { containers });
     }
-    async removeContainer(contentTypeUnique, containerId = null) {
+    async removeContainer(contentTypeUnique, containerId = null, args) {
         await this.#init;
         contentTypeUnique = contentTypeUnique ?? this.#ownerContentTypeUnique;
         this.#editedTypes.appendOne(contentTypeUnique);
@@ -410,9 +411,11 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
             .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 ? !removedContainerIds.some((ids) => ids === x.container?.id) : true);
-        this.#contentTypes.updateOne(contentTypeUnique, { containers, properties });
+        const updates = { containers };
+        if (args?.preventRemovingProperties !== true) {
+            updates.properties = contentType.properties.filter((x) => x.container ? !removedContainerIds.some((ids) => ids === x.container?.id) : true);
+        }
+        this.#contentTypes.updateOne(contentTypeUnique, updates);
     }
     async insertProperty(contentTypeUnique, property) {
         await this.#init;
@@ -487,6 +490,10 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         }
         return undefined;
     }
+    async getOwnerPropertyById(propertyUnique) {
+        await this.#init;
+        return this.getOwnerContentType()?.properties?.find((property) => property.unique === propertyUnique);
+    }
     async getPropertyStructureByAlias(propertyAlias) {
         await this.#init;
         for (const docType of this.#contentTypes.getValue()) {
@@ -521,21 +528,24 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         });
     }
     rootContainers(containerType) {
-        return this.#containers.asObservablePart((data) => {
+        return createObservablePart(this.#contentTypeContainers, (data) => {
             return data.filter((x) => x.parent === null && x.type === containerType);
         });
     }
-    getRootContainers(containerType) {
-        return this.#containers.getValue().filter((x) => x.parent === null && x.type === containerType);
+    async getRootContainers(containerType) {
+        return (await firstValueFrom(this.#contentTypeContainers)).filter((x) => x.parent === null && x.type === containerType);
     }
     async hasRootContainers(containerType) {
-        return this.#containers.asObservablePart((data) => {
+        return createObservablePart(this.#contentTypeContainers, (data) => {
             return data.filter((x) => x.parent === null && x.type === containerType).length > 0;
         });
     }
     ownerContainersOf(containerType, parentId) {
         return this.ownerContentTypeObservablePart((x) => x?.containers?.filter((x) => (parentId ? x.parent?.id === parentId : x.parent === null) && x.type === containerType) ?? []);
     }
+    getOwnerContainerById(id) {
+        return this.getOwnerContentType()?.containers?.find((x) => x.id === id);
+    }
     getOwnerContainers(containerType, parentId) {
         return this.getOwnerContentType()?.containers?.filter((x) => (parentId ? x.parent?.id === parentId : x.parent === null) && x.type === containerType);
     }
@@ -543,18 +553,18 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         return this.getOwnerContentType()?.containers?.filter((x) => x.id === containerId);
     }
     containersOfParentId(parentId, containerType) {
-        return this.#containers.asObservablePart((data) => {
+        return createObservablePart(this.#contentTypeContainers, (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 this.#containers.asObservablePart((data) => {
+        return createObservablePart(this.#contentTypeContainers, (data) => {
             return data.filter((x) => x.name === name && x.type === containerType);
         });
     }
     containersByNameAndTypeAndParent(name, containerType, parentName, parentType) {
-        return this.#containers.asObservablePart((data) => {
+        return createObservablePart(this.#contentTypeContainers, (data) => {
             return data.filter((x) => 
             // Match name and type:
             x.name === name &&
@@ -587,16 +597,25 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
             }
         });
     }
+    /**
+     * Get all property aliases for the content type including inherited and composed content types.
+     * @returns {Promise<Array<string>>} - A promise that will be resolved with the list of all content type property aliases.
+     */
+    async getContentTypePropertyAliases() {
+        return this.#contentTypes
+            .getValue()
+            .flatMap((x) => x.properties?.map((y) => y.alias) ?? [])
+            .filter(UmbFilterDuplicateStrings);
+    }
     #clear() {
         this.#contentTypeObservers.forEach((observer) => observer.destroy());
         this.#contentTypeObservers = [];
-        this.#containers.setValue([]);
         this.#repoManager?.clear();
         this.#contentTypes.setValue([]);
+        this.#ownerContentTypeUnique = undefined;
     }
     destroy() {
         this.#contentTypes.destroy();
-        this.#containers.destroy();
         super.destroy();
     }
 }

package/dist-cms/packages/content/content-type/workspace/content-type-workspace-context-base.js

@@ -30,7 +30,7 @@ export class UmbContentTypeWorkspaceContextBase extends UmbEntityDetailWorkspace
     async createScaffold(args) {
         this.resetState();
         this.loading.addState({ unique: LOADING_STATE_UNIQUE, message: `Creating ${this.getEntityType()} scaffold` });
-        this.setParent(args.parent);
+        this._internal_setCreateUnderParent(args.parent);
         const request = this.structure.createScaffold(args.preset);
         this._getDataPromise = request;
         let { data } = await request;