@umbraco-cms/backoffice 18.2.1 → 18.3.0-rc

package/dist-cms/packages/content/content/collection/configuration/content-collection-configuration.context.js

@@ -0,0 +1,141 @@
+import { umbMapDataTypeToCollectionConfiguration } from './map-data-type-to-collection-configuration.function.js';
+import { UMB_CONTENT_COLLECTION_CONFIGURATION_CONTEXT } from './content-collection-configuration.context-token.js';
+import { UmbContextBase } from '../../../../../libs/class-api/index.js';
+import { UmbBasicState, UmbObjectState, UmbStringState, mergeObservables, } from '../../../../../libs/observable-api/index.js';
+import { UmbDataTypeDetailRepository } from '../../../../data-type/index.js';
+const DATA_TYPE_OBSERVER_ALIAS = Symbol();
+/**
+ * Resolves the configuration of a content collection, for any host that can say which collection it renders, which
+ * data type configures it and which entity it is scoped to.
+ */
+export class UmbContentCollectionConfigurationContext extends UmbContextBase {
+    #collectionAlias;
+    #dataTypeUnique;
+    #unique;
+    #dataType;
+    #dataTypeDetailRepository;
+    /**
+     * @param {UmbControllerHost} host - The controller host providing this context.
+     */
+    constructor(host) {
+        super(host, UMB_CONTENT_COLLECTION_CONFIGURATION_CONTEXT);
+        this.#collectionAlias = new UmbStringState(undefined);
+        /**
+         * The alias of the collection to render, e.g. `Umb.Collection.Document`.
+         * Undefined means the host has no collection concept at all.
+         */
+        this.collectionAlias = this.#collectionAlias.asObservable();
+        this.#dataTypeUnique = new UmbStringState(undefined);
+        /**
+         * The data type configuring the collection, taken from the content type's collection reference.
+         * Undefined means no collection is configured.
+         */
+        this.dataTypeUnique = this.#dataTypeUnique.asObservable();
+        this.#unique = new UmbBasicState(undefined);
+        /**
+         * The entity the collection is scoped to. `null` is the root; undefined means there is no subject at all, which is
+         * the case for a content type without a hierarchy.
+         */
+        this.unique = this.#unique.asObservable();
+        this.#dataType = new UmbObjectState(undefined);
+        /**
+         * The resolved configuration data type. Exposed so hosts can derive presentation of their own from it — a workspace
+         * view reads its icon and label from here — without that presentation concern moving into this context.
+         */
+        this.dataType = this.#dataType.asObservable();
+        /**
+         * Whether a collection should be rendered at all. True only once both a collection alias and a configuring data type
+         * are known.
+         */
+        this.hasCollection = mergeObservables([this.collectionAlias, this.dataTypeUnique], ([collectionAlias, dataTypeUnique]) => !!collectionAlias && !!dataTypeUnique);
+        /**
+         * The resolved collection configuration, or undefined while it is loading and when no collection is configured.
+         */
+        this.collectionConfig = mergeObservables([this.dataType, this.unique], ([dataType, unique]) => dataType ? { ...umbMapDataTypeToCollectionConfiguration(dataType), unique } : undefined);
+        this.#dataTypeDetailRepository = new UmbDataTypeDetailRepository(this);
+        this.observe(this.hasCollection, (hasCollection) => this.#observeDataType(hasCollection ? this.getDataTypeUnique() : undefined), null);
+    }
+    /**
+     * Sets the alias of the collection to render.
+     * @param {string | undefined} collectionAlias - The collection extension alias, or undefined when the host has no
+     * collection concept.
+     * @memberof UmbContentCollectionConfigurationContext
+     */
+    setCollectionAlias(collectionAlias) {
+        this.#collectionAlias.setValue(collectionAlias);
+    }
+    /**
+     * Returns the alias of the collection to render.
+     * @returns {string | undefined} The collection extension alias.
+     * @memberof UmbContentCollectionConfigurationContext
+     */
+    getCollectionAlias() {
+        return this.#collectionAlias.getValue();
+    }
+    /**
+     * Sets the data type configuring the collection.
+     * @param {string | undefined} dataTypeUnique - The unique of the configuring data type, or undefined when no
+     * collection is configured.
+     * @memberof UmbContentCollectionConfigurationContext
+     */
+    setDataTypeUnique(dataTypeUnique) {
+        this.#dataTypeUnique.setValue(dataTypeUnique);
+    }
+    /**
+     * Returns the data type configuring the collection.
+     * @returns {string | undefined} The unique of the configuring data type.
+     * @memberof UmbContentCollectionConfigurationContext
+     */
+    getDataTypeUnique() {
+        return this.#dataTypeUnique.getValue();
+    }
+    /**
+     * Sets the entity the collection is scoped to.
+     * @param {UmbEntityUnique | undefined} unique - The unique of the entity, `null` for the root, or undefined when
+     * there is no subject.
+     * @memberof UmbContentCollectionConfigurationContext
+     */
+    setUnique(unique) {
+        this.#unique.setValue(unique);
+    }
+    /**
+     * Returns the entity the collection is scoped to.
+     * @returns {UmbEntityUnique | undefined} The unique of the entity, `null` for the root, or undefined when there is
+     * no subject.
+     * @memberof UmbContentCollectionConfigurationContext
+     */
+    getUnique() {
+        return this.#unique.getValue();
+    }
+    /**
+     * Returns whether a collection should be rendered at all.
+     * @returns {boolean} True when both a collection alias and a configuring data type are known.
+     * @memberof UmbContentCollectionConfigurationContext
+     */
+    getHasCollection() {
+        return !!this.getCollectionAlias() && !!this.getDataTypeUnique();
+    }
+    /**
+     * Returns the resolved configuration data type.
+     * @returns {UmbDataTypeDetailModel | undefined} The data type, or undefined while it is loading and when no
+     * collection is configured.
+     * @memberof UmbContentCollectionConfigurationContext
+     */
+    getDataType() {
+        return this.#dataType.getValue();
+    }
+    async #observeDataType(unique) {
+        if (!unique) {
+            this.removeUmbControllerByAlias(DATA_TYPE_OBSERVER_ALIAS);
+            this.#dataType.setValue(undefined);
+            return;
+        }
+        this.#dataTypeDetailRepository.requestByUnique(unique);
+        const observable = await this.#dataTypeDetailRepository.byUnique(unique);
+        // The host can re-point this context while the repository resolves, so a superseded request must not install its
+        // observer over the current one.
+        if (this.getDataTypeUnique() !== unique)
+            return;
+        this.observe(observable, (dataType) => this.#dataType.setValue(dataType), DATA_TYPE_OBSERVER_ALIAS);
+    }
+}

package/dist-cms/packages/content/content/collection/configuration/index.d.ts

@@ -0,0 +1,3 @@
+export * from './content-collection-configuration.context.js';
+export * from './content-collection-configuration.context-token.js';
+export * from './map-data-type-to-collection-configuration.function.js';

package/dist-cms/packages/content/content/collection/configuration/index.js

@@ -0,0 +1,3 @@
+export * from './content-collection-configuration.context.js';
+export * from './content-collection-configuration.context-token.js';
+export * from './map-data-type-to-collection-configuration.function.js';

package/dist-cms/packages/content/content/collection/configuration/map-data-type-to-collection-configuration.function.d.ts

@@ -0,0 +1,15 @@
+import type { UmbCollectionConfiguration } from '../../../../core/collection/index.js';
+import type { UmbDataTypeDetailModel } from '../../../../data-type/index.js';
+/**
+ * Maps the configuration of a collection data type onto the configuration of a collection.
+ *
+ * Only the parts the data type describes are returned. The entity the collection is scoped to is the host's to supply,
+ * as a data type says nothing about what is being browsed.
+ *
+ * `dataTypeId` is deliberately never set. It reaches the server as `dataTypeKey`, which resolves a collection
+ * configured as a *property* of a content type; supplying it for a collection configured on the content type itself
+ * makes the request fail.
+ * @param {UmbDataTypeDetailModel} dataType - The data type holding the collection configuration.
+ * @returns {UmbCollectionConfiguration} The collection configuration described by the data type.
+ */
+export declare function umbMapDataTypeToCollectionConfiguration(dataType: UmbDataTypeDetailModel): UmbCollectionConfiguration;

package/dist-cms/packages/content/content/collection/configuration/map-data-type-to-collection-configuration.function.js

@@ -0,0 +1,24 @@
+import { UmbPropertyEditorConfigCollection } from '../../../../core/property-editor/index.js';
+/**
+ * Maps the configuration of a collection data type onto the configuration of a collection.
+ *
+ * Only the parts the data type describes are returned. The entity the collection is scoped to is the host's to supply,
+ * as a data type says nothing about what is being browsed.
+ *
+ * `dataTypeId` is deliberately never set. It reaches the server as `dataTypeKey`, which resolves a collection
+ * configured as a *property* of a content type; supplying it for a collection configured on the content type itself
+ * makes the request fail.
+ * @param {UmbDataTypeDetailModel} dataType - The data type holding the collection configuration.
+ * @returns {UmbCollectionConfiguration} The collection configuration described by the data type.
+ */
+export function umbMapDataTypeToCollectionConfiguration(dataType) {
+    const config = new UmbPropertyEditorConfigCollection(dataType.values);
+    const pageSize = Number(config.getValueByAlias('pageSize'));
+    return {
+        layouts: config.getValueByAlias('layouts'),
+        orderBy: config.getValueByAlias('orderBy') ?? 'updateDate',
+        orderDirection: config.getValueByAlias('orderDirection') ?? 'asc',
+        pageSize: isNaN(pageSize) ? 50 : pageSize,
+        userDefinedProperties: config.getValueByAlias('includeProperties'),
+    };
+}

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

@@ -1,6 +1,11 @@
 import type { UmbContentCollectionManager } from './manager/content-collection-manager.controller.js';
 import type { UmbContentTypeModel, UmbContentTypeStructureManager } from '../../content-type/index.js';
 import type { UmbEntityWorkspaceContext } from '../../../core/workspace/index.js';
+/**
+ * @deprecated Deprecated since v18. Consume `UMB_CONTENT_COLLECTION_CONFIGURATION_CONTEXT` for the collection
+ * configuration instead, which is answered by any host rather than only a workspace. Scheduled for removal in
+ * Umbraco 20.
+ */
 export interface UmbContentCollectionWorkspaceContext<T extends UmbContentTypeModel> extends UmbEntityWorkspaceContext {
     collection: UmbContentCollectionManager;
     structure: UmbContentTypeStructureManager<T>;

package/dist-cms/packages/content/content/collection/content-collection-workspace-view.element.js

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { UMB_CONTENT_COLLECTION_WORKSPACE_CONTEXT } from './content-collection-workspace.context-token.js';
+import { UMB_CONTENT_COLLECTION_CONFIGURATION_CONTEXT } from './configuration/content-collection-configuration.context-token.js';
 import { customElement, html, nothing, property, state } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../core/lit-element/index.js';
 import { UmbCollectionWorkspaceViewInteractionMemoryController } from '../../../core/collection/index.js';
@@ -14,10 +14,12 @@ let UmbContentCollectionWorkspaceViewElement = class UmbContentCollectionWorkspa
         super();
         this._loading = true;
         this.#workspaceViewInteractionMemory = new UmbCollectionWorkspaceViewInteractionMemoryController(this);
-        this.consumeContext(UMB_CONTENT_COLLECTION_WORKSPACE_CONTEXT, (workspaceContext) => {
-            this._collectionAlias = workspaceContext?.collection.getCollectionAlias();
-            this.#workspaceViewInteractionMemory.setCollectionAlias(this._collectionAlias);
-            this.observe(workspaceContext?.collection.collectionConfig, (config) => {
+        this.consumeContext(UMB_CONTENT_COLLECTION_CONFIGURATION_CONTEXT, (configurationContext) => {
+            this.observe(configurationContext?.collectionAlias, (collectionAlias) => {
+                this._collectionAlias = collectionAlias;
+                this.#workspaceViewInteractionMemory.setCollectionAlias(collectionAlias);
+            }, '_observeCollectionAlias');
+            this.observe(configurationContext?.collectionConfig, (config) => {
                 if (config) {
                     this._config = config;
                     this._loading = false;

package/dist-cms/packages/content/content/collection/content-collection-workspace.context-token.d.ts

@@ -2,4 +2,8 @@ import type { UmbContentCollectionWorkspaceContext } from './content-collection-
 import { UmbContextToken } from '../../../../libs/context-api/index.js';
 import type { UmbContentTypeModel } from '../../content-type/index.js';
 import type { UmbWorkspaceContext } from '../../../core/workspace/index.js';
+/**
+ * @deprecated Deprecated since v18. Use `UMB_CONTENT_COLLECTION_CONFIGURATION_CONTEXT` instead, which answers the
+ * collection configuration from any host rather than only a workspace. Scheduled for removal in Umbraco 20.
+ */
 export declare const UMB_CONTENT_COLLECTION_WORKSPACE_CONTEXT: UmbContextToken<UmbWorkspaceContext, UmbContentCollectionWorkspaceContext<UmbContentTypeModel>>;

package/dist-cms/packages/content/content/collection/content-collection-workspace.context-token.js

@@ -1,2 +1,6 @@
 import { UmbContextToken } from '../../../../libs/context-api/index.js';
+/**
+ * @deprecated Deprecated since v18. Use `UMB_CONTENT_COLLECTION_CONFIGURATION_CONTEXT` instead, which answers the
+ * collection configuration from any host rather than only a workspace. Scheduled for removal in Umbraco 20.
+ */
 export const UMB_CONTENT_COLLECTION_WORKSPACE_CONTEXT = new UmbContextToken('UmbWorkspaceContext', undefined, (context) => context.collection?.hasCollection !== undefined);

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

@@ -1,3 +1,4 @@
+export * from './configuration/index.js';
 export type * from './content-collection-workspace-context.interface.js';
 export * from './content-collection-workspace.context-token.js';
 export * from './manager/content-collection-manager.controller.js';

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

@@ -1,2 +1,3 @@
+export * from './configuration/index.js';
 export * from './content-collection-workspace.context-token.js';
 export * from './manager/content-collection-manager.controller.js';

package/dist-cms/packages/content/content/collection/manager/content-collection-manager.controller.d.ts

@@ -6,12 +6,28 @@ import type { UmbControllerHost } from '../../../../../libs/controller-api/index
 type partialManifestWorkspaceView = Omit<Partial<ManifestWorkspaceView>, 'meta'> & {
     meta: Partial<ManifestWorkspaceView['meta']>;
 };
+/**
+ * @deprecated Deprecated since v18. Use `UmbContentCollectionConfigurationContext` instead, which resolves the same
+ * configuration for any host rather than only a workspace. Scheduled for removal in Umbraco 20.
+ */
 export declare class UmbContentCollectionManager<ContentTypeDetailModelType extends UmbContentTypeModel = UmbContentTypeModel> extends UmbControllerBase {
     #private;
-    readonly collectionConfig: import("rxjs").Observable<UmbCollectionConfiguration | undefined>;
+    /**
+     * The resolved collection configuration.
+     * @returns {Observable<UmbCollectionConfiguration | undefined>} The resolved collection configuration.
+     * @deprecated Deprecated since v18. Observe `collectionConfig` on
+     * `UMB_CONTENT_COLLECTION_CONFIGURATION_CONTEXT` instead. Scheduled for removal in Umbraco 20.
+     */
+    get collectionConfig(): import("rxjs").Observable<UmbCollectionConfiguration | undefined>;
     readonly manifestOverrides: import("rxjs").Observable<partialManifestWorkspaceView | undefined>;
     readonly hasCollection: import("rxjs").Observable<boolean>;
-    constructor(host: UmbEntityWorkspaceContext & UmbControllerHost, structureManager: UmbContentTypeStructureManager<ContentTypeDetailModelType>, collectionAlias?: string);
+    /**
+     * @param {UmbControllerHost} host - The workspace this manager is bound to.
+     * @param {UmbContentTypeStructureManager} _structureManager - Retained for backwards compatibility. The collection
+     * configuration is now resolved by `UmbContentCollectionConfigurationContext`, which the workspace feeds.
+     * @param {string} [collectionAlias] - The alias of the collection to render.
+     */
+    constructor(host: UmbEntityWorkspaceContext & UmbControllerHost, _structureManager: UmbContentTypeStructureManager<ContentTypeDetailModelType>, collectionAlias?: string);
     getCollectionAlias(): string | undefined;
 }
 export {};

package/dist-cms/packages/content/content/collection/manager/content-collection-manager.controller.js

@@ -1,75 +1,75 @@
+import { UMB_CONTENT_COLLECTION_CONFIGURATION_CONTEXT } from '../configuration/content-collection-configuration.context-token.js';
 import { UmbBooleanState, UmbObjectState } from '../../../../../libs/observable-api/index.js';
 import { UmbControllerBase } from '../../../../../libs/class-api/index.js';
-import { UmbDataTypeDetailRepository } from '../../../../data-type/index.js';
 import { UmbPropertyEditorConfigCollection } from '../../../../core/property-editor/index.js';
+import { UmbDeprecation } from '../../../../core/utils/index.js';
+/**
+ * @deprecated Deprecated since v18. Use `UmbContentCollectionConfigurationContext` instead, which resolves the same
+ * configuration for any host rather than only a workspace. Scheduled for removal in Umbraco 20.
+ */
 export class UmbContentCollectionManager extends UmbControllerBase {
-    #host;
     #collectionAlias;
     #collectionConfig;
+    /**
+     * The resolved collection configuration.
+     * @returns {Observable<UmbCollectionConfiguration | undefined>} The resolved collection configuration.
+     * @deprecated Deprecated since v18. Observe `collectionConfig` on
+     * `UMB_CONTENT_COLLECTION_CONFIGURATION_CONTEXT` instead. Scheduled for removal in Umbraco 20.
+     */
+    get collectionConfig() {
+        new UmbDeprecation({
+            removeInVersion: '20.0.0',
+            deprecated: 'UmbContentCollectionManager.collectionConfig',
+            solution: 'Observe `collectionConfig` on UMB_CONTENT_COLLECTION_CONFIGURATION_CONTEXT instead.',
+        }).warn();
+        return this.#collectionConfig.asObservable();
+    }
     #manifestOverrides;
     #hasCollection;
-    #dataTypeDetailRepository;
-    constructor(host, structureManager, collectionAlias) {
+    /**
+     * @param {UmbControllerHost} host - The workspace this manager is bound to.
+     * @param {UmbContentTypeStructureManager} _structureManager - Retained for backwards compatibility. The collection
+     * configuration is now resolved by `UmbContentCollectionConfigurationContext`, which the workspace feeds.
+     * @param {string} [collectionAlias] - The alias of the collection to render.
+     */
+    constructor(host, _structureManager, collectionAlias) {
         super(host);
         this.#collectionConfig = new UmbObjectState(undefined);
-        this.collectionConfig = this.#collectionConfig.asObservable();
         this.#manifestOverrides = new UmbObjectState(undefined);
         this.manifestOverrides = this.#manifestOverrides.asObservable();
         this.#hasCollection = new UmbBooleanState(false);
         this.hasCollection = this.#hasCollection.asObservable();
-        this.#dataTypeDetailRepository = new UmbDataTypeDetailRepository(this);
-        this.#host = host;
         this.#collectionAlias = collectionAlias;
-        this.observe(collectionAlias ? structureManager.ownerContentType : undefined, async (contentType) => {
-            this.#hasCollection.setValue(!!contentType?.collection);
-            const dataTypeUnique = contentType?.collection?.unique;
-            if (dataTypeUnique) {
-                this.#dataTypeDetailRepository.requestByUnique(dataTypeUnique);
-                this.observe(await this.#dataTypeDetailRepository.byUnique(dataTypeUnique), (dataType) => {
-                    this.#gotDataType(dataType);
-                }, '_observeConfigDataType');
-            }
-        }, null);
+        this.consumeContext(UMB_CONTENT_COLLECTION_CONFIGURATION_CONTEXT, (context) => {
+            this.observe(context?.collectionConfig, (config) => this.#collectionConfig.setValue(config), null);
+            this.observe(context?.hasCollection, (hasCollection) => this.#hasCollection.setValue(!!hasCollection), null);
+            // The manifest override is a workspace-view concern, so it is derived here from what the context resolved
+            // rather than inside a context that knows nothing about workspace views.
+            this.observe(context?.dataType, (dataType) => this.#setManifestOverrides(dataType), null);
+        });
     }
     getCollectionAlias() {
         return this.#collectionAlias;
     }
-    #gotDataType(dataType) {
+    #setManifestOverrides(dataType) {
         if (!dataType) {
-            this.#collectionConfig.setValue(undefined);
             this.#manifestOverrides.setValue(undefined);
-            this.removeUmbControllerByAlias('_observeHostUnique');
             return;
         }
         const config = new UmbPropertyEditorConfigCollection(dataType.values);
-        const pageSize = Number(config.getValueByAlias('pageSize'));
-        this.#collectionConfig.setValue({
-            unique: this.#host.getUnique(),
-            layouts: config?.getValueByAlias('layouts'),
-            orderBy: config?.getValueByAlias('orderBy') ?? 'updateDate',
-            orderDirection: config?.getValueByAlias('orderDirection') ?? 'asc',
-            pageSize: isNaN(pageSize) ? 50 : pageSize,
-            userDefinedProperties: config?.getValueByAlias('includeProperties'),
-        });
-        // Observe the workspace unique so the collection config stays in sync
-        // when unique is set after initial config creation (e.g. during createScaffold).
-        // Only observing when a config is set.
-        this.observe(this.#host.unique, (unique) => {
-            this.#collectionConfig.update({ unique });
-        }, '_observeHostUnique');
         const overrides = {
             alias: 'Umb.WorkspaceView.Content.Collection',
             meta: {},
         };
-        const overrideIcon = config?.getValueByAlias('icon');
+        const overrideIcon = config.getValueByAlias('icon');
         if (overrideIcon && overrideIcon !== '') {
             overrides.meta.icon = overrideIcon;
         }
-        const overrideLabel = config?.getValueByAlias('tabName');
+        const overrideLabel = config.getValueByAlias('tabName');
         if (overrideLabel && overrideLabel !== '') {
             overrides.meta.label = overrideLabel;
         }
-        const showFirst = config?.getValueByAlias('showContentFirst');
+        const showFirst = config.getValueByAlias('showContentFirst');
         if (showFirst === true) {
             overrides.weight = 150;
         }

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

@@ -13,7 +13,7 @@ export const manifests = [
             element: () => import('./content-collection-workspace-view.element.js'),
             weight: 300,
             meta: {
-                label: 'Collection',
+                label: '#contentTypeEditor_collection',
                 pathname: 'collection',
                 icon: 'icon-grid',
             },
@@ -26,7 +26,7 @@ export const manifests = [
         name: 'Content Workspace Collection View',
         weight: 1000,
         meta: {
-            label: 'Child items',
+            label: '#content_childItems',
             pathname: 'collection',
             icon: 'icon-grid',
         },

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

@@ -8,6 +8,7 @@ export * from './manager/index.js';
 export * from './property-dataset-context/index.js';
 export * from './publishing/index.js';
 export * from './rollback/index.js';
+export * from './tree/index.js';
 export * from './workspace/index.js';
 export type * from './configuration/index.js';
 export type * from './repository/index.js';

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

@@ -8,4 +8,5 @@ export * from './manager/index.js';
 export * from './property-dataset-context/index.js';
 export * from './publishing/index.js';
 export * from './rollback/index.js';
+export * from './tree/index.js';
 export * from './workspace/index.js';

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

@@ -0,0 +1,3 @@
+export { UmbSortChildrenOfContentEntityAction } from './sort-children-of-content/sort-children-of-content.action.js';
+export { UmbSortChildrenOfContentModalElement } from './sort-children-of-content/modal/sort-children-of-content-modal.element.js';
+export type { UmbSortChildrenOfContentModalData } from './sort-children-of-content/modal/sort-children-of-content-modal.token.js';

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

@@ -0,0 +1,2 @@
+export { UmbSortChildrenOfContentEntityAction } from './sort-children-of-content/sort-children-of-content.action.js';
+export { UmbSortChildrenOfContentModalElement } from './sort-children-of-content/modal/sort-children-of-content-modal.element.js';

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

@@ -1,4 +1,4 @@
-import { UmbContentCollectionManager } from '../collection/index.js';
+import { UmbContentCollectionConfigurationContext, UmbContentCollectionManager } from '../collection/index.js';
 import { UmbContentWorkspaceDataManager } from '../manager/index.js';
 import { UmbMergeContentVariantDataController } from '../controller/merge-content-variant-data.controller.js';
 import { UmbContentDetailValidationPathTranslator } from './content-detail-validation-path-translator.js';
@@ -16,7 +16,7 @@ import { UMB_APP_LANGUAGE_CONTEXT } from '../../../language/index.js';
 import { UmbPropertyValueFlatMapperController, UmbPropertyValuePresetVariantBuilderController, UmbVariantPropertyGuardManager, } from '../../../core/property/index.js';
 import { UmbVariantId } from '../../../core/variant/index.js';
 import { UMB_ACTION_EVENT_CONTEXT } from '../../../core/action/index.js';
-import { UMB_VALIDATION_CONTEXT, UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, UmbDataPathVariantQuery, UmbServerModelValidatorContext, UmbValidationController, } from '../../../core/validation/index.js';
+import { UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, UmbDataPathVariantQuery, UmbServerModelValidatorContext, UmbValidationCleanUpByUniqueManager, UmbValidationController, } from '../../../core/validation/index.js';
 /**
  * The base class for a content detail workspace context.
  * @exports
@@ -40,6 +40,7 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
     #varies;
     #variesByCulture;
     #variesBySegment;
+    #collectionConfiguration;
     /* Variant Options */
     #languages;
     getLanguages() {
@@ -78,6 +79,7 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
         this.#dataTypeItemManager = new UmbDataTypeItemRepositoryManager(this);
         /* Split View */
         this.splitView = new UmbWorkspaceSplitViewManager();
+        this.#collectionConfiguration = new UmbContentCollectionConfigurationContext(this);
         /* Variant Options */
         this.#languages = new UmbArrayState([], (x) => x.unique);
         /**
@@ -111,6 +113,9 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
         this.variesByCulture = this.structure.ownerContentTypeObservablePart((x) => x?.variesByCulture);
         this.variesBySegment = this.structure.ownerContentTypeObservablePart((x) => x?.variesBySegment);
         this.varies = this.structure.ownerContentTypeObservablePart((x) => x ? x.variesByCulture || x.variesBySegment : undefined);
+        this.#collectionConfiguration.setCollectionAlias(args.collectionAlias);
+        this.observe(this.structure.ownerContentTypeObservablePart((x) => x?.collection?.unique), (dataTypeUnique) => this.#collectionConfiguration.setDataTypeUnique(dataTypeUnique ?? undefined), null);
+        this.observe(this.unique, (unique) => this.#collectionConfiguration.setUnique(unique ?? null), null);
         this.collection = new UmbContentCollectionManager(this, this.structure, args.collectionAlias);
         new UmbContentValidationToHintsManager(this, this.structure, this.validationContext, this.view.hints);
         new UmbContentDetailWorkspaceTypeTransformController(this, this._data);
@@ -210,6 +215,17 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
                 }
             });
         }, null);
+        // Clean up validation messages of properties that are no longer part of the content type structure
+        // (e.g. a composition removed, or the document type edited via infinite editing while this document is
+        // open) — messages for a property that no longer resolves have no UI left to fix them otherwise.
+        // Matches on alias only: removing a property clears its messages across every variant. Deliberately does
+        // not depend on variantOptions — a property's existence is a content-type concern, not a variant one,
+        // and enumerating every (property, variant) combination doesn't scale with variant-option count. [NL]
+        new UmbValidationCleanUpByUniqueManager(this, this.validationContext, '$.values', mergeObservables([this.structure.contentTypeLoaded, this.structure.contentTypePropertyAliases], ([loaded, aliases]) => {
+            if (!loaded || aliases.length === 0)
+                return undefined;
+            return aliases;
+        }), (queryParams) => queryParams.alias);
         this.observe(observeMultiple([this.splitView.activeVariantByIndex(0), this.variants]), ([activeVariant, variants]) => {
             const variantName = variants.find((v) => v.culture === activeVariant?.culture && v.segment === activeVariant?.segment)?.name;
             this.view.setTitle(variantName);
@@ -603,12 +619,8 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
         // Check variants have a name:
         const variantsWithoutAName = saveData.variants.filter((x) => !x.name);
         if (variantsWithoutAName.length > 0) {
-            const validationContext = await this.getContext(UMB_VALIDATION_CONTEXT);
-            if (!validationContext) {
-                throw new Error('Validation context is missing');
-            }
             variantsWithoutAName.forEach((variant) => {
-                validationContext.messages.addMessage('client', `$.variants[${UmbDataPathVariantQuery(variant)}].name`, UMB_VALIDATION_EMPTY_LOCALIZATION_KEY);
+                this.validationContext.messages.addMessage('client', `$.variants[${UmbDataPathVariantQuery(variant)}].name`, UMB_VALIDATION_EMPTY_LOCALIZATION_KEY);
             });
             throw new Error('All variants must have a name, these variants are missing a name: ' +
                 variantsWithoutAName.map((x) => (x.culture ?? 'invariant') + '_' + (x.segment ?? '')).join(', '));
@@ -711,6 +723,7 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
             const valid = await this._validateVariantsAndLog(variantIds).then(() => true, () => false);
             if (valid || this.#ignoreValidationResultOnSubmit) {
                 await this.performCreateOrUpdate(variantIds, saveData);
+                this.evaluateValidationMode();
             }
             else {
                 return Promise.reject('Validation issues prevent saving');
@@ -786,6 +799,11 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
         const persisted = overwriteCreate
             ? await overwriteCreate(saveData, variantIds, parent)
             : await this.#defaultCreatePersistence(saveData, parent.unique);
+        // The server may have assigned a different unique than the one this workspace scaffolded with
+        // (e.g. a Saving notification handler assigning its own key), so re-sync before anything reads it.
+        if (persisted?.unique) {
+            this.setUnique(persisted.unique);
+        }
         // Set persisted AND current before flipping isNew: the flip triggers the new->edit redirect,
         // whose navigation guard compares the two states with an order-sensitive comparison.
         await this.#applyPersistedData(persisted, variantIds);

package/dist-cms/packages/content/content/workspace/content-validation-to-hints.manager.js

@@ -1,5 +1,5 @@
 import { UmbControllerBase } from '../../../../libs/class-api/index.js';
-import { extractJsonQueryProps } from '../../../core/validation/index.js';
+import { extractFirstJsonQueryContaining, extractJsonQueryProps, umbGetFirstJsonPathBracket, } from '../../../core/validation/index.js';
 import { UmbVariantId } from '../../../core/variant/index.js';
 /*
  * @internal
@@ -33,12 +33,19 @@ export class UmbContentValidationToHintsManager extends UmbControllerBase {
                 if (this.#hintedMsgs.has(message.key))
                     return;
                 // Get the value between [ and ] of message.path:
-                const query = getValueBetweenBrackets(message.path);
+                const query = umbGetFirstJsonPathBracket(message.path);
                 if (!query)
                     return;
                 const queryProps = extractJsonQueryProps(query);
                 const alias = queryProps.alias;
-                const variantId = UmbVariantId.CreateFromPartial(queryProps);
+                // Find the first query of this path that contains a culture or segment property, notice this can be several joints into the json path:
+                const queryWithCulture = extractFirstJsonQueryContaining(message.path, (props) => props.culture !== undefined);
+                const queryWithSegment = extractFirstJsonQueryContaining(message.path, (props) => props.segment !== undefined);
+                // If no specific culture or segment are found, we will use null for both culture and segment, which will be treated as invariant:
+                const variantId = UmbVariantId.CreateFromPartial({
+                    culture: queryWithCulture?.culture ?? null,
+                    segment: queryWithSegment?.segment ?? null,
+                });
                 structure.getPropertyStructureByAlias(alias).then((property) => {
                     if (!property)
                         return;
@@ -64,26 +71,14 @@ export class UmbContentValidationToHintsManager extends UmbControllerBase {
                     this.#hintedMsgs.add(message.key);
                 });
             });
+            const removeKeys = [];
             this.#hintedMsgs.forEach((key) => {
                 if (!messages.some((msg) => msg.key === key)) {
                     this.#hintedMsgs.delete(key);
-                    hints.removeOne(key);
+                    removeKeys.push(key);
                 }
             });
+            hints.remove(removeKeys);
         }, null);
     }
 }
-/**
- * Extracts the value between the first pair of square brackets in a path string.
- * @param {string} path - The path string to extract the value from.
- * @returns {string | null} The extracted value, or null if no brackets are found.
- */
-function getValueBetweenBrackets(path) {
-    const start = path.indexOf('[');
-    if (start === -1)
-        return null;
-    const end = path.indexOf(']', start + 1);
-    if (end === -1)
-        return null;
-    return path.substring(start + 1, end);
-}

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

@@ -5,8 +5,8 @@ export declare class UmbContentWorkspaceViewEditTabElement extends UmbLitElement
     get containerId(): string | null | undefined;
     set containerId(value: string | null | undefined);
     private _containerId?;
-    private _groups;
-    private _hasProperties;
+    private _groups?;
+    private _hasProperties?;
     constructor();
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult[];