@umbraco-cms/backoffice 17.4.0-rc3 → 17.4.1

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

@@ -25,7 +25,6 @@ export declare class UmbContentTypeStructureManager<T extends UmbContentTypeMode
     getOwnerContentTypeCompositions(): Promise<import("../types.js").UmbContentTypeCompositionModel[]>;
     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.
@@ -37,6 +36,8 @@ export declare class UmbContentTypeStructureManager<T extends UmbContentTypeMode
     readonly contentTypeUniques: Observable<string[]>;
     readonly contentTypeAliases: Observable<string[]>;
     readonly contentTypeLoaded: Observable<boolean>;
+    readonly contentTypeDataTypeUniques: Observable<string[]>;
+    getContentTypeDataTypeUniques(): string[];
     readonly variesByCulture: Observable<boolean | undefined>;
     readonly variesBySegment: Observable<boolean | undefined>;
     containerById(id: string): Observable<UmbPropertyTypeContainerModel | undefined>;

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

@@ -54,6 +54,12 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
     contentTypeDataTypeDetailOf(dataTypeUnique) {
         return this.#dataTypeDetails.asObservablePart((details) => details.find((d) => d.unique === dataTypeUnique));
     }
+    getContentTypeDataTypeUniques() {
+        return this.#contentTypes
+            .getValue()
+            .flatMap((x) => x.properties?.map((p) => p.dataType.unique) ?? [])
+            .filter(UmbFilterDuplicateStrings);
+    }
     containerById(id) {
         return createObservablePart(this.#contentTypeContainers, (x) => x.find((y) => y.id === id));
     }
@@ -92,11 +98,6 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         this.contentTypeProperties = this.#contentTypes.asObservablePart((contentTypes) => {
             return contentTypes.flatMap((x) => x.properties ?? []);
         });
-        this.contentTypeDataTypeUniques = this.#contentTypes.asObservablePart((contentTypes) => {
-            return contentTypes
-                .flatMap((x) => x.properties?.map((p) => p.dataType.unique) ?? [])
-                .filter(UmbFilterDuplicateStrings);
-        });
         this.contentTypeHasProperties = this.#contentTypes.asObservablePart((contentTypes) => {
             return contentTypes.some((x) => x.properties.length > 0);
         });
@@ -104,7 +105,16 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         this.contentTypeUniques = this.#contentTypes.asObservablePart((x) => x.map((y) => y.unique));
         this.contentTypeAliases = this.#contentTypes.asObservablePart((x) => x.map((y) => y.alias));
         this.contentTypeLoaded = mergeObservables([this.contentTypeCompositions, this.contentTypeUniques], ([comps, uniques]) => {
-            return comps.every((x) => uniques.includes(x.contentType.unique));
+            return uniques.length > 0 && comps.every((x) => uniques.includes(x.contentType.unique));
+        });
+        // Derived from #contentTypes (single source) and gated on contentTypeLoaded, so property
+        // changes re-emit and properties can't lag behind loaded across separate microtasks. [NL]
+        this.contentTypeDataTypeUniques = mergeObservables([this.contentTypeLoaded, this.contentTypes], ([loaded, contentTypes]) => {
+            if (!loaded)
+                return [];
+            return contentTypes
+                .flatMap((x) => x.properties?.map((p) => p.dataType.unique) ?? [])
+                .filter(UmbFilterDuplicateStrings);
         });
         this.variesByCulture = createObservablePart(this.ownerContentType, (x) => x?.variesByCulture);
         this.variesBySegment = createObservablePart(this.ownerContentType, (x) => x?.variesBySegment);
@@ -184,8 +194,15 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         // Uses nested observation: outer watches which data types are needed,
         // inner subscribes to the store-backed observable for reactivity.
         this.observe(this.contentTypeDataTypeUniques, async (dataTypeUniques) => {
-            if (dataTypeUniques.length > 0) {
+            if (dataTypeUniques && dataTypeUniques.length > 0) {
                 const { asObservable } = await this.#dataTypeDetailRepository.requestByUniques(dataTypeUniques);
+                // TODO: We should avoid this check, but architecturally, we currently lack a way to cancel previous requests. [NL]
+                // This is unlikely to happen, but we keep this check to avoid potential race conditions. [NL]
+                const currentDataTypeUniques = this.getContentTypeDataTypeUniques();
+                if (dataTypeUniques.length !== currentDataTypeUniques.length ||
+                    !dataTypeUniques.every((unique) => currentDataTypeUniques.includes(unique))) {
+                    return;
+                }
                 if (asObservable) {
                     this.observe(asObservable(), (dataTypeDetails) => {
                         this.#dataTypeDetails.setValue(dataTypeDetails ?? []);

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

@@ -186,6 +186,15 @@ export class UmbDataTypeWorkspaceContext extends UmbEntityNamedDetailWorkspaceCo
             this.#propertyEditorDataSourceSettingsProperties,
         ].filter((x) => Array.isArray(x) && x.length > 0);
         const mergedSettings = settings.flat();
+        // check if there is alias duplicates:
+        const aliasSet = new Set();
+        for (const setting of mergedSettings) {
+            if (aliasSet.has(setting.alias)) {
+                console.error(`There is a duplicate alias "${setting.alias}" in the Property Editor configuration.`);
+                continue;
+            }
+            aliasSet.add(setting.alias);
+        }
         if (mergedSettings) {
             this.#properties.setValue(mergedSettings);
             // If new or if the alias was changed then set default values. This 'complexity' to prevent setting default data when initialized [NL]
@@ -215,16 +224,15 @@ export class UmbDataTypeWorkspaceContext extends UmbEntityNamedDetailWorkspaceCo
         ];
         const values = [];
         // We want to keep the existing data, if it is not in the default data, and if it is in the default data, then we want to keep the default data.
-        for (const defaultDataItem of this.#properties.getValue()) {
+        for (const property of this.#properties.getValue()) {
             // We are matching on the alias, as we assume that the alias is unique for the data type.
-            // TODO: Consider if we should also match on the editorAlias just to be on the safe side [JOV]
-            const existingData = data.values?.find((x) => x.alias === defaultDataItem.alias);
+            const existingData = data.values?.find((x) => x.alias === property.alias);
             if (existingData) {
                 values.push(existingData);
                 continue;
             }
             // If the data is not in the existing data, then we want to add the default data if it exists.
-            const existingDefaultData = this.#settingsDefaultData.find((x) => x.alias === defaultDataItem.alias);
+            const existingDefaultData = this.#settingsDefaultData.find((x) => x.alias === property.alias);
             if (existingDefaultData) {
                 values.push(existingDefaultData);
             }

package/dist-cms/packages/property-editors/slider/Umbraco.Slider.js

@@ -23,7 +23,7 @@ export const manifest = {
                 {
                     alias: 'minimumRange',
                     label: 'Minimum range',
-                    description: '',
+                    description: 'Minimum difference between the low and high values when range is enabled. Set to 0 to allow equal values.',
                     propertyEditorUiAlias: 'Umb.PropertyEditorUi.Decimal',
                     config: [{ alias: 'step', value: '0.00001' }],
                 },

package/dist-cms/packages/property-editors/slider/manifests.js

@@ -47,13 +47,6 @@ export const manifests = [
                         propertyEditorUiAlias: 'Umb.PropertyEditorUi.Decimal',
                         config: [{ alias: 'step', value: '0.00001' }],
                     },
-                    {
-                        alias: 'minimumRange',
-                        label: 'Minimum range',
-                        description: 'Minimum difference between the low and high values when range is enabled. Set to 0 to allow equal values.',
-                        propertyEditorUiAlias: 'Umb.PropertyEditorUi.Decimal',
-                        config: [{ alias: 'step', value: '0.00001' }],
-                    },
                 ],
                 defaultData: [
                     {
@@ -68,10 +61,6 @@ export const manifests = [
                         alias: 'step',
                         value: 1.0,
                     },
-                    {
-                        alias: 'minimumRange',
-                        value: 0.0,
-                    },
                 ],
             },
         },