@umbraco-cms/backoffice 17.2.2 → 17.3.0-rc2

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

@@ -8,7 +8,7 @@ import { appendToFrozenArray, mergeObservables, observeMultiple, UmbArrayState,
 import { firstValueFrom, map } from '../../../../external/rxjs/index.js';
 import { umbOpenModal } from '../../../core/modal/index.js';
 import { UmbContentTypeStructureManager } from '../../content-type/index.js';
-import { UmbDataTypeDetailRepository, UmbDataTypeItemRepositoryManager } from '../../../data-type/index.js';
+import { UmbDataTypeItemRepositoryManager } from '../../../data-type/index.js';
 import { UmbReadOnlyVariantGuardManager } from '../../../core/utils/index.js';
 import { UmbEntityDetailWorkspaceContextBase, UmbWorkspaceSplitViewManager } from '../../../core/workspace/index.js';
 import { UmbEntityUpdatedEvent, UmbRequestReloadChildrenOfEntityEvent, UmbRequestReloadStructureForEntityEvent, } from '../../../core/entity-action/index.js';
@@ -47,6 +47,9 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
     getLanguages() {
         return this.#languages.getValue();
     }
+    async getVariantOptions() {
+        return firstValueFrom(this.variantOptions);
+    }
     #variantValidationContexts;
     getVariantValidationContext(variantId) {
         return this.#variantValidationContexts.find((x) => x.getVariantId()?.compare(variantId));
@@ -269,16 +272,12 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
         else {
             this._segments.setValue([]);
         }
-        const repo = new UmbDataTypeDetailRepository(this);
         const propertyTypes = await this.structure.getContentTypeProperties();
         const contentTypeVariesByCulture = this.structure.getVariesByCulture();
         const contentTypeVariesBySegment = this.structure.getVariesBySegment();
         const valueDefinitions = await Promise.all(propertyTypes.map(async (property) => {
-            const dataType = (await repo.requestByUnique(property.dataType.unique)).data;
-            // This means if its not loaded this will never resolve and the error below will never happen.
-            if (!dataType) {
-                throw new Error(`DataType of "${property.dataType.unique}" not found.`);
-            }
+            // Use the structure manager's bulk-loaded data type details instead of individual requests.
+            const dataType = await this.observe(this.structure.contentTypeDataTypeDetailOf(property.dataType.unique)).asPromise();
             if (!dataType.editorUiAlias) {
                 throw new Error(`DataType of "${property.dataType.unique}" did not have a editorUiAlias.`);
             }
@@ -505,7 +504,7 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
     }
     async #ensureVariantsExistsForProperty(variantId, entry) {
         // TODO: Implement queueing of these operations to ensure this does not execute too often. [NL]
-        const cultureOptions = await firstValueFrom(this.variantOptions);
+        const cultureOptions = await this.getVariantOptions();
         let valueVariantIds = [];
         // Find inner values to determine if any of this holds variants that needs to be created.
         if (variantId.isInvariant() && entry.value) {
@@ -558,7 +557,7 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
         return this._data.getChangedVariants();
     }
     async _determineVariantOptions() {
-        const options = (await firstValueFrom(this.variantOptions)).filter((option) => option.segment === null);
+        const options = (await this.getVariantOptions()).filter((option) => option.segment === null);
         const activeVariants = this.splitView.getActiveVariants();
         const activeVariantIds = activeVariants.map((activeVariant) => UmbVariantId.Create(activeVariant));
         const changedVariantIds = this._data.getChangedVariants();
@@ -702,7 +701,7 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
         await this.runMandatoryValidationForSaveData(saveData, variantIds);
         if (this.#validateOnSubmit) {
             await this.askServerToValidate(saveData, variantIds);
-            const valid = await this._validateAndLog().then(() => true, () => false);
+            const valid = await this._validateVariantsAndLog(variantIds).then(() => true, () => false);
             if (valid || this.#ignoreValidationResultOnSubmit) {
                 await this.performCreateOrUpdate(variantIds, saveData);
             }
@@ -714,6 +713,50 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
             await this.performCreateOrUpdate(variantIds, saveData);
         }
     }
+    validateVariantsAndSubmit(variantIds, onValid, onInvalid) {
+        return this._validateByAndSubmit(() => this._validateVariantsAndLog(variantIds), onValid, onInvalid);
+    }
+    async _validateVariantsAndLog(variantIds) {
+        // Make sure that each variant-id for a given culture, has gotten all the valid segment variant-ids present too. See variant-options for which are available. [NL]
+        if (variantIds && this.getVariesBySegment()) {
+            const variantOptions = await this.getVariantOptions();
+            const expandedVariantIds = [];
+            for (const variantId of variantIds) {
+                // If a culture variant without segment, add all segment variants for that culture:
+                if (variantId.culture !== null && variantId.segment === null) {
+                    for (const option of variantOptions) {
+                        if (option.culture === variantId.culture) {
+                            expandedVariantIds.push(UmbVariantId.Create(option));
+                        }
+                    }
+                }
+                else {
+                    expandedVariantIds.push(variantId);
+                }
+            }
+            variantIds = expandedVariantIds;
+        }
+        await this.#validateByVariantIds(variantIds).catch(async () => {
+            // TODO: Implement developer-mode logging here. [NL]
+            console.warn('Validation failed because of these validation messages still begin present: ', this.validationContext.messages.getMessages());
+            return Promise.reject();
+        });
+    }
+    /**
+     * If a Workspace has multiple validation contexts, then this method can be overwritten to return the correct one.
+     * @param {Array<UmbVariantId> | undefined} variantIds Optional array of variantIds to filter which contexts to validate.
+     * @returns {Promise<Array<void>>} Promise that resolves to void when the validation is complete.
+     */
+    async #validateByVariantIds(variantIds) {
+        // If variantIds are provided, we only validate the contexts matching those variantIds, or those without a variantId.
+        if (variantIds) {
+            if (variantIds.length === 0) {
+                console.warn('Workspace Context: validate called with an empty array of variantIds, only validation-contexts with no variantId will be validated.');
+            }
+            return await this.validationContext.validateByVariantIds(variantIds);
+        }
+        return await super.validate();
+    }
     /**
      * Perform the create or update of the content
      * @param {Array<UmbVariantId>} variantIds - The variant ids to save

package/dist-cms/packages/content/content-type/constants.d.ts

@@ -1,3 +1,4 @@
 export * from './modals/constants.js';
 export * from './workspace/constants.js';
 export * from './conditions/constants.js';
+export * from './entity-content-type/constants.js';

package/dist-cms/packages/content/content-type/constants.js

@@ -1,3 +1,4 @@
 export * from './modals/constants.js';
 export * from './workspace/constants.js';
 export * from './conditions/constants.js';
+export * from './entity-content-type/constants.js';

package/dist-cms/packages/content/content-type/entity-content-type/conditions/constants.d.ts

@@ -0,0 +1 @@
+export * from './unique/constants.js';

package/dist-cms/packages/content/content-type/entity-content-type/conditions/constants.js

@@ -0,0 +1 @@
+export * from './unique/constants.js';

package/dist-cms/packages/content/content-type/entity-content-type/conditions/manifests.d.ts

@@ -0,0 +1 @@
+export declare const manifests: Array<UmbExtensionManifest>;

package/dist-cms/packages/content/content-type/entity-content-type/conditions/manifests.js

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

package/dist-cms/packages/content/content-type/entity-content-type/conditions/types.d.ts

@@ -0,0 +1 @@
+export type * from './unique/types.js';

package/dist-cms/packages/content/content-type/entity-content-type/conditions/unique/constants.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Entity Content Type Unique condition alias
+ */
+export declare const UMB_ENTITY_CONTENT_TYPE_UNIQUE_CONDITION_ALIAS = "Umb.Condition.EntityContentType.Unique";

package/dist-cms/packages/content/content-type/entity-content-type/conditions/unique/constants.js

@@ -0,0 +1,4 @@
+/**
+ * Entity Content Type Unique condition alias
+ */
+export const UMB_ENTITY_CONTENT_TYPE_UNIQUE_CONDITION_ALIAS = 'Umb.Condition.EntityContentType.Unique';

package/dist-cms/packages/content/content-type/entity-content-type/conditions/unique/entity-content-type-unique.condition.d.ts

@@ -0,0 +1,7 @@
+import type { UmbEntityContentTypeUniqueConditionConfig } from './types.js';
+import type { UmbControllerHost } from '../../../../../../libs/controller-api/index.js';
+import type { UmbConditionControllerArguments, UmbExtensionCondition } from '../../../../../../libs/extension-api/index.js';
+import { UmbConditionBase } from '../../../../../core/extension-registry/index.js';
+export declare class UmbEntityContentTypeUniqueCondition extends UmbConditionBase<UmbEntityContentTypeUniqueConditionConfig> implements UmbExtensionCondition {
+    constructor(host: UmbControllerHost, args: UmbConditionControllerArguments<UmbEntityContentTypeUniqueConditionConfig>);
+}

package/dist-cms/packages/content/content-type/entity-content-type/conditions/unique/entity-content-type-unique.condition.js

@@ -0,0 +1,26 @@
+import { UMB_ENTITY_CONTENT_TYPE_ENTITY_CONTEXT } from '../../context/entity-content-type.context-token.js';
+import { UMB_ENTITY_CONTENT_TYPE_UNIQUE_CONDITION_ALIAS } from './constants.js';
+import { UmbConditionBase } from '../../../../../core/extension-registry/index.js';
+const ObserveSymbol = Symbol();
+export class UmbEntityContentTypeUniqueCondition extends UmbConditionBase {
+    constructor(host, args) {
+        super(host, args);
+        let permissionCheck = undefined;
+        if (this.config.match) {
+            permissionCheck = (unique) => unique === this.config.match;
+        }
+        else if (this.config.oneOf) {
+            permissionCheck = (unique) => (unique ? this.config.oneOf.includes(unique) : false);
+        }
+        if (permissionCheck !== undefined) {
+            this.consumeContext(UMB_ENTITY_CONTENT_TYPE_ENTITY_CONTEXT, (context) => {
+                this.observe(context?.unique, (unique) => {
+                    this.permitted = permissionCheck(unique);
+                }, ObserveSymbol);
+            });
+        }
+        else {
+            throw new Error(`Condition [${UMB_ENTITY_CONTENT_TYPE_UNIQUE_CONDITION_ALIAS}] could not be initialized properly. Either "match" or "oneOf" must be defined.`);
+        }
+    }
+}

package/dist-cms/packages/content/content-type/entity-content-type/conditions/unique/manifests.d.ts

@@ -0,0 +1 @@
+export declare const manifests: Array<UmbExtensionManifest>;

package/dist-cms/packages/content/content-type/entity-content-type/conditions/unique/manifests.js

@@ -0,0 +1,10 @@
+import { UMB_ENTITY_CONTENT_TYPE_UNIQUE_CONDITION_ALIAS } from './constants.js';
+import { UmbEntityContentTypeUniqueCondition } from './entity-content-type-unique.condition.js';
+export const manifests = [
+    {
+        type: 'condition',
+        name: 'Entity Content Type Unique Condition',
+        alias: UMB_ENTITY_CONTENT_TYPE_UNIQUE_CONDITION_ALIAS,
+        api: UmbEntityContentTypeUniqueCondition,
+    },
+];

package/dist-cms/packages/content/content-type/entity-content-type/conditions/unique/types.d.ts

@@ -0,0 +1,21 @@
+import type { UMB_ENTITY_CONTENT_TYPE_UNIQUE_CONDITION_ALIAS } from './constants.js';
+import type { UmbConditionConfigBase } from '../../../../../../libs/extension-api/index.js';
+export type UmbEntityContentTypeUniqueConditionConfig = UmbConditionConfigBase<typeof UMB_ENTITY_CONTENT_TYPE_UNIQUE_CONDITION_ALIAS> & {
+    /**
+     * Define the unique (GUID) of the entity content type for which this extension should be available.
+     * @example
+     * "d59be02f-1df9-4228-aa1e-01917d806cda"
+     */
+    match?: string;
+    /**
+     * Define one or more unique (GUIDs) of entity content types for which this extension should be available.
+     * @example
+     * ["d59be02f-1df9-4228-aa1e-01917d806cda", "42d7572e-1ba1-458d-a765-95b60040c3ac"]
+     */
+    oneOf?: Array<string>;
+};
+declare global {
+    interface UmbExtensionConditionConfigMap {
+        umbEntityContentTypeUniqueConditionConfig: UmbEntityContentTypeUniqueConditionConfig;
+    }
+}

package/dist-cms/packages/content/content-type/entity-content-type/constants.d.ts

@@ -0,0 +1 @@
+export * from './conditions/constants.js';

package/dist-cms/packages/content/content-type/entity-content-type/constants.js

@@ -0,0 +1 @@
+export * from './conditions/constants.js';

package/dist-cms/packages/content/content-type/entity-content-type/context/entity-content-type.context-token.d.ts

@@ -0,0 +1,3 @@
+import type { UmbEntityContentTypeEntityContext } from './entity-content-type.context.js';
+import { UmbContextToken } from '../../../../../libs/context-api/index.js';
+export declare const UMB_ENTITY_CONTENT_TYPE_ENTITY_CONTEXT: UmbContextToken<UmbEntityContentTypeEntityContext, UmbEntityContentTypeEntityContext>;

package/dist-cms/packages/content/content-type/entity-content-type/context/entity-content-type.context-token.js

@@ -0,0 +1,2 @@
+import { UmbContextToken } from '../../../../../libs/context-api/index.js';
+export const UMB_ENTITY_CONTENT_TYPE_ENTITY_CONTEXT = new UmbContextToken('UmbEntityContext', 'UmbEntityContentType');

package/dist-cms/packages/content/content-type/entity-content-type/context/entity-content-type.context.d.ts

@@ -0,0 +1,12 @@
+import type { UmbControllerHost } from '../../../../../libs/controller-api/index.js';
+import { UmbContextBase } from '../../../../../libs/class-api/index.js';
+export declare class UmbEntityContentTypeEntityContext extends UmbContextBase {
+    #private;
+    readonly entityType: import("rxjs").Observable<string | undefined>;
+    readonly unique: import("rxjs").Observable<string | undefined>;
+    constructor(host: UmbControllerHost);
+    getEntityType(): string | undefined;
+    setEntityType(entityType: string | undefined): void;
+    getUnique(): string | undefined;
+    setUnique(unique: string | undefined): void;
+}

package/dist-cms/packages/content/content-type/entity-content-type/context/entity-content-type.context.js

@@ -0,0 +1,26 @@
+import { UMB_ENTITY_CONTENT_TYPE_ENTITY_CONTEXT } from './entity-content-type.context-token.js';
+import { UmbContextBase } from '../../../../../libs/class-api/index.js';
+import { UmbStringState } from '../../../../../libs/observable-api/index.js';
+export class UmbEntityContentTypeEntityContext extends UmbContextBase {
+    #entityType;
+    #unique;
+    constructor(host) {
+        super(host, UMB_ENTITY_CONTENT_TYPE_ENTITY_CONTEXT);
+        this.#entityType = new UmbStringState(undefined);
+        this.entityType = this.#entityType.asObservable();
+        this.#unique = new UmbStringState(undefined);
+        this.unique = this.#unique.asObservable();
+    }
+    getEntityType() {
+        return this.#entityType.getValue();
+    }
+    setEntityType(entityType) {
+        this.#entityType.setValue(entityType);
+    }
+    getUnique() {
+        return this.#unique.getValue();
+    }
+    setUnique(unique) {
+        this.#unique.setValue(unique);
+    }
+}

package/dist-cms/packages/content/content-type/entity-content-type/context/index.d.ts

@@ -0,0 +1,2 @@
+export { UMB_ENTITY_CONTENT_TYPE_ENTITY_CONTEXT } from './entity-content-type.context-token.js';
+export { UmbEntityContentTypeEntityContext } from './entity-content-type.context.js';

package/dist-cms/packages/content/content-type/entity-content-type/context/index.js

@@ -0,0 +1,2 @@
+export { UMB_ENTITY_CONTENT_TYPE_ENTITY_CONTEXT } from './entity-content-type.context-token.js';
+export { UmbEntityContentTypeEntityContext } from './entity-content-type.context.js';

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

@@ -0,0 +1,3 @@
+export * from './constants.js';
+export * from './context/index.js';
+export type * from './types.js';

package/dist-cms/packages/content/content-type/entity-content-type/index.js

@@ -0,0 +1,2 @@
+export * from './constants.js';
+export * from './context/index.js';

package/dist-cms/packages/content/content-type/entity-content-type/manifests.d.ts

@@ -0,0 +1 @@
+export declare const manifests: Array<UmbExtensionManifest>;

package/dist-cms/packages/content/content-type/entity-content-type/manifests.js

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

package/dist-cms/packages/content/content-type/entity-content-type/types.d.ts

@@ -0,0 +1 @@
+export type * from './conditions/types.js';

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

@@ -49,6 +49,13 @@ let UmbContentTypeWorkspaceEditorHeaderElement = class UmbContentTypeWorkspaceEd
             }
         });
     }
+    get #iconAlias() {
+        return this._icon?.replace('icon-', '').replace('color-', '')?.split(' ')[0];
+    }
+    get #iconTitle() {
+        const alias = this.#iconAlias;
+        return alias ? this.localize.term('settings_changeIcon') + ': ' + alias : undefined;
+    }
     #onNameAndAliasChange(event) {
         this.#workspaceContext?.setName(event.target.value ?? '');
         this.#workspaceContext?.setAlias(event.target.alias ?? '');
@@ -59,8 +66,8 @@ let UmbContentTypeWorkspaceEditorHeaderElement = class UmbContentTypeWorkspaceEd
     render() {
         return html `
 			<div id="header">
-				<uui-button id="icon" compact label="icon" look="outline" @click=${this._handleIconClick}>
-					<umb-icon name=${ifDefined(this._icon)}></umb-icon>
+				<uui-button id="icon" compact label=${this.#iconTitle ?? 'icon'} look="outline" title=${ifDefined(this.#iconTitle)} @click=${this._handleIconClick}>
+					<umb-icon aria-hidden="true" name=${ifDefined(this._icon)}></umb-icon>
 				</uui-button>
 
 				<div id="editors">

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

@@ -1,5 +1,6 @@
 export * from './constants.js';
 export * from './contexts/index.js';
+export * from './entity-content-type/index.js';
 export * from './global-components/index.js';
 export * from './repository/index.js';
 export * from './structure/index.js';

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

@@ -1,5 +1,6 @@
 export * from './constants.js';
 export * from './contexts/index.js';
+export * from './entity-content-type/index.js';
 export * from './global-components/index.js';
 export * from './repository/index.js';
 export * from './structure/index.js';

package/dist-cms/packages/content/content-type/manifests.js

@@ -1,4 +1,10 @@
+import { manifests as entityContentTypeManifests } from './entity-content-type/manifests.js';
 import { manifests as conditionManifests } from './conditions/manifests.js';
 import { manifests as modalManifests } from './modals/manifests.js';
 import { manifests as workspaceManifests } from './workspace/manifests.js';
-export const manifests = [...workspaceManifests, ...modalManifests, ...conditionManifests];
+export const manifests = [
+    ...workspaceManifests,
+    ...modalManifests,
+    ...conditionManifests,
+    ...entityContentTypeManifests,
+];

package/dist-cms/packages/content/content-type/repository/structure/content-type-structure-data-source.interface.d.ts

@@ -1,8 +1,10 @@
 import type { UmbControllerHost } from '../../../../../libs/controller-api/index.js';
+import type { UmbEntityModel } from '../../../../core/entity/index.js';
 import type { UmbDataSourceResponse, UmbPagedModel } from '../../../../core/repository/index.js';
 export interface UmbContentTypeStructureDataSourceConstructor<ItemType> {
     new (host: UmbControllerHost): UmbContentTypeStructureDataSource<ItemType>;
 }
 export interface UmbContentTypeStructureDataSource<ItemType> {
     getAllowedChildrenOf(unique: string | null, parentContentUnique: string | null): Promise<UmbDataSourceResponse<UmbPagedModel<ItemType>>>;
+    getAllowedParentsOf?(unique: string): Promise<UmbDataSourceResponse<Array<UmbEntityModel>>>;
 }

package/dist-cms/packages/content/content-type/repository/structure/content-type-structure-repository-base.d.ts

@@ -1,9 +1,9 @@
 import type { UmbContentTypeStructureRepository } from './content-type-structure-repository.interface.js';
-import type { UmbContentTypeStructureDataSourceConstructor } from './content-type-structure-data-source.interface.js';
+import type { UmbContentTypeStructureDataSource, UmbContentTypeStructureDataSourceConstructor } from './content-type-structure-data-source.interface.js';
 import { UmbRepositoryBase } from '../../../../core/repository/index.js';
 import type { UmbControllerHost } from '../../../../../libs/controller-api/index.js';
 export declare abstract class UmbContentTypeStructureRepositoryBase<ItemType> extends UmbRepositoryBase implements UmbContentTypeStructureRepository<ItemType> {
-    #private;
+    protected _dataSource: UmbContentTypeStructureDataSource<ItemType>;
     constructor(host: UmbControllerHost, structureSource: UmbContentTypeStructureDataSourceConstructor<ItemType>);
     /**
      * Returns a promise with the allowed children of a content type

package/dist-cms/packages/content/content-type/repository/structure/content-type-structure-repository-base.js

@@ -1,9 +1,8 @@
 import { UmbRepositoryBase } from '../../../../core/repository/index.js';
 export class UmbContentTypeStructureRepositoryBase extends UmbRepositoryBase {
-    #structureSource;
     constructor(host, structureSource) {
         super(host);
-        this.#structureSource = new structureSource(host);
+        this._dataSource = new structureSource(host);
     }
     /**
      * Returns a promise with the allowed children of a content type
@@ -13,6 +12,6 @@ export class UmbContentTypeStructureRepositoryBase extends UmbRepositoryBase {
      * @memberof UmbContentTypeStructureRepositoryBase
      */
     requestAllowedChildrenOf(unique, parentContentUnique) {
-        return this.#structureSource.getAllowedChildrenOf(unique, parentContentUnique);
+        return this._dataSource.getAllowedChildrenOf(unique, parentContentUnique);
     }
 }

package/dist-cms/packages/content/content-type/repository/structure/content-type-structure-repository.interface.d.ts

@@ -1,4 +1,6 @@
 import type { UmbDataSourceResponse, UmbPagedModel } from '../../../../core/repository/index.js';
+import type { UmbEntityModel } from '../../../../core/entity/index.js';
 export interface UmbContentTypeStructureRepository<ItemType> {
     requestAllowedChildrenOf(unique: string, parentContentUnique: string | null): Promise<UmbDataSourceResponse<UmbPagedModel<ItemType>>>;
+    requestAllowedParentsOf?(unique: string): Promise<UmbDataSourceResponse<Array<UmbEntityModel>>>;
 }

package/dist-cms/packages/content/content-type/structure/content-type-move-root-containers-into-first-tab-helper.class.d.ts

@@ -3,7 +3,7 @@ import type { UmbContentTypeStructureManager } from './content-type-structure-ma
 import { UmbControllerBase } from '../../../../libs/class-api/index.js';
 import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
 /**
- * This class is a helper class that specifically takes care of moving owner root containers into the first created tab.
+ * This class is a helper class that specifically takes care of moving owner root containers and properties into the first created tab.
  * This will give the user the experience of the first tab becoming the 'main' tab.
  */
 export declare class UmbContentTypeMoveRootGroupsIntoFirstTabHelper<T extends UmbContentTypeModel> extends UmbControllerBase {

package/dist-cms/packages/content/content-type/structure/content-type-move-root-containers-into-first-tab-helper.class.js

@@ -1,7 +1,7 @@
 import { UmbControllerBase } from '../../../../libs/class-api/index.js';
 const MoveRootContainersIntoFirstTabHelperControllerAlias = Symbol('moveRootContainersHelper');
 /**
- * This class is a helper class that specifically takes care of moving owner root containers into the first created tab.
+ * This class is a helper class that specifically takes care of moving owner root containers and properties into the first created tab.
  * This will give the user the experience of the first tab becoming the 'main' tab.
  */
 export class UmbContentTypeMoveRootGroupsIntoFirstTabHelper extends UmbControllerBase {
@@ -14,18 +14,28 @@ export class UmbContentTypeMoveRootGroupsIntoFirstTabHelper extends UmbControlle
     async #observeContainers() {
         if (!this.#structure)
             return;
-        await this.observe(this.#structure.ownerContainersOf('Tab', null), (tabContainers) => {
+        await this.observe(this.#structure.ownerContainersOf('Tab', null), async (tabContainers) => {
+            if (!tabContainers)
+                return;
             // If the amount of containers now became 1, we should move all root containers into this tab:
             if (tabContainers?.length === 1) {
                 const firstTabId = tabContainers[0].id;
-                const rootContainers = this.#structure?.getOwnerContainers('Group', null);
+                const structure = this.#structure; // This may be destroyed before the async operations are done, so lets keep a copy reference.
+                if (!structure)
+                    return;
+                // Move root Properties into the first Tab:
+                const rootProperties = await structure.getOwnerPropertiesOf(null);
+                rootProperties?.forEach((property) => {
+                    structure.updateProperty(null, property.unique, { container: { id: firstTabId } });
+                });
+                // Move root Groups into the first Tab:
+                const rootContainers = structure.getOwnerContainers('Group', null);
                 rootContainers?.forEach((groupContainer) => {
-                    this.#structure?.updateContainer(null, groupContainer.id, { parent: { id: firstTabId } });
+                    structure.updateContainer(null, groupContainer.id, { parent: { id: firstTabId } });
                 });
-                this.destroy();
             }
+            this.destroy();
         }, '_observeMainContainer').asPromise();
-        this.destroy();
     }
     destroy() {
         super.destroy();

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

@@ -1,5 +1,6 @@
 import type { UmbContentTypeModel, UmbPropertyContainerTypes, UmbPropertyTypeContainerMergedModel, UmbPropertyTypeContainerModel, UmbPropertyTypeModel } from '../types.js';
 import { type UmbDetailRepository, type UmbRepositoryResponse, type UmbRepositoryResponseWithAsObservable } from '../../../core/repository/index.js';
+import { type UmbDataTypeDetailModel } from '../../../data-type/index.js';
 import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
 import type { MappingFunction, Observable } from '../../../../libs/observable-api/index.js';
 import { UmbControllerBase } from '../../../../libs/class-api/index.js';
@@ -25,6 +26,12 @@ export declare class UmbContentTypeStructureManager<T extends UmbContentTypeMode
     readonly contentTypeProperties: Observable<UmbPropertyTypeModel[]>;
     getContentTypeProperties(): Promise<UmbPropertyTypeModel[]>;
     readonly contentTypeDataTypeUniques: Observable<string[]>;
+    /**
+     * Get an observable for the data type detail of a data type that is in use by this content type structure.
+     * @param {string} dataTypeUnique - The unique identifier of the data type.
+     * @returns {Observable<UmbDataTypeDetailModel | undefined>} An observable that emits the data type detail or undefined.
+     */
+    contentTypeDataTypeDetailOf(dataTypeUnique: string): Observable<UmbDataTypeDetailModel | undefined>;
     readonly contentTypeHasProperties: Observable<boolean>;
     readonly contentTypePropertyAliases: Observable<string[]>;
     readonly contentTypeUniques: Observable<string[]>;
@@ -41,6 +48,13 @@ export declare class UmbContentTypeStructureManager<T extends UmbContentTypeMode
      * @returns {Promise} - Promise resolved
      */
     loadType(unique: string): Promise<UmbRepositoryResponseWithAsObservable<T | undefined>>;
+    /**
+     * setType will set the ContentType from already-fetched data and load all inherited and composed ContentTypes.
+     * This is useful when the content type has already been fetched (e.g., via bulk fetch) and you want to avoid re-fetching.
+     * @param {T} contentType - The ContentType to set.
+     * @returns {Promise} - Promise resolved when the content type and all compositions are loaded.
+     */
+    setType(contentType: T): Promise<UmbRepositoryResponseWithAsObservable<T | undefined>>;
     createScaffold(preset?: Partial<T>): Promise<UmbRepositoryResponse<T>>;
     /**
      * Save the owner content type. Notice this is for a Content Type that is already stored on the server.
@@ -63,6 +77,12 @@ export declare class UmbContentTypeStructureManager<T extends UmbContentTypeMode
     getOwnerContentType(): T | undefined;
     getOwnerContentTypeName(): string | undefined;
     getOwnerContentTypeUnique(): string | undefined;
+    /**
+     * Sets the owner content type unique identifier without loading data.
+     * This is useful when you need to register the structure synchronously before async initialization.
+     * @param {string} unique - The unique identifier to set.
+     */
+    setOwnerContentTypeUnique(unique: string): void;
     getVariesByCulture(): boolean | undefined;
     getVariesBySegment(): boolean | undefined;
     /**
@@ -118,6 +138,7 @@ export declare class UmbContentTypeStructureManager<T extends UmbContentTypeMode
     propertyStructureByAlias(propertyAlias: string): Promise<Observable<UmbPropertyTypeModel | undefined>>;
     getPropertyStructureById(propertyUnique: string): Promise<UmbPropertyTypeModel | undefined>;
     getOwnerPropertyById(propertyUnique: string | null): Promise<UmbPropertyTypeModel | undefined>;
+    getOwnerPropertiesOf(containerId: string | null): Promise<Array<UmbPropertyTypeModel> | undefined>;
     getPropertyStructureByAlias(propertyAlias: string): Promise<UmbPropertyTypeModel | undefined>;
     hasPropertyStructuresOf(containerId: string | null): Observable<boolean>;
     rootPropertyStructures(): Observable<UmbPropertyTypeModel[]>;