@umbraco-cms/backoffice 17.4.0-rc2 → 18.0.0-beta1

package/dist-cms/packages/block/block-single/components/block-single-entry/block-single-entry.element.js

@@ -5,18 +5,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UmbBlockSingleEntryContext } from '../../context/block-single-entry.context.js';
-import { UMB_BLOCK_SINGLE, UMB_BLOCK_SINGLE_PROPERTY_EDITOR_SCHEMA_ALIAS, UMB_BLOCK_SINGLE_PROPERTY_EDITOR_UI_ALIAS, } from '../../constants.js';
+import { UMB_BLOCK_SINGLE } from '../../constants.js';
 import { css, customElement, html, nothing, property, state } from '../../../../../external/lit/index.js';
 import { UmbLitElement, umbDestroyOnDisconnect } from '../../../../core/lit-element/index.js';
 import { stringOrStringArrayContains } from '../../../../core/utils/index.js';
 import { UmbDataPathBlockElementDataQuery } from '../../../block/index.js';
 import { UmbObserveValidationStateController } from '../../../../core/validation/index.js';
 import { UUIBlinkAnimationValue, UUIBlinkKeyframes } from '../../../../../external/uui/index.js';
-import { UMB_PROPERTY_CONTEXT, UMB_PROPERTY_DATASET_CONTEXT } from '../../../../core/property/index.js';
-import { UMB_CLIPBOARD_PROPERTY_CONTEXT } from '../../../../clipboard/index.js';
 import '../ref-single-block/index.js';
 import '../inline-single-block/index.js';
 import '../unsupported-single-block/index.js';
+import '../../../block/action/block-action-list.element.js';
 /**
  * @element umb-block-single-entry
  */
@@ -50,7 +49,6 @@ let UmbBlockSingleEntryElement = class UmbBlockSingleEntryElement extends UmbLit
         super();
         this.#context = new UmbBlockSingleEntryContext(this);
         this._showContentEdit = false;
-        this._hasSettings = false;
         this._label = '';
         this._blockViewProps = {
             contentKey: undefined,
@@ -105,7 +103,6 @@ let UmbBlockSingleEntryElement = class UmbBlockSingleEntryElement extends UmbLit
             this.#updateBlockViewProps({ config: { ...this._blockViewProps.config, showContentEdit } });
         }, null);
         this.observe(this.#context.settingsElementTypeKey, (key) => {
-            this._hasSettings = !!key;
             this.#updateBlockViewProps({ config: { ...this._blockViewProps.config, showSettingsEdit: !!key } });
         }, null);
         this.observe(this.#context.blockType, (blockType) => {
@@ -131,9 +128,7 @@ let UmbBlockSingleEntryElement = class UmbBlockSingleEntryElement extends UmbLit
             this._unsupported = unsupported;
             this.toggleAttribute('unsupported', unsupported);
         }, null);
-        this.observe(this.#context.actionsVisibility, (showActions) => {
-            this._showActions = showActions;
-        }, null);
+        this.observe(this.#context.actionsVisibility, (showActions) => (this._showActions = showActions), null);
         this.observe(this.#context.inlineEditingMode, (mode) => {
             this._inlineEditingMode = mode;
         }, null);
@@ -153,11 +148,9 @@ let UmbBlockSingleEntryElement = class UmbBlockSingleEntryElement extends UmbLit
             }
         }, null);
         this.observe(this.#context.workspaceEditContentPath, (path) => {
-            this._workspaceEditContentPath = path;
             this.#updateBlockViewProps({ config: { ...this._blockViewProps.config, editContentPath: path } });
         }, null);
         this.observe(this.#context.workspaceEditSettingsPath, (path) => {
-            this._workspaceEditSettingsPath = path;
             this.#updateBlockViewProps({ config: { ...this._blockViewProps.config, editSettingsPath: path } });
         }, null);
         this.observe(this.#context.readOnlyGuard.permitted, (isReadOnly) => {
@@ -192,38 +185,6 @@ let UmbBlockSingleEntryElement = class UmbBlockSingleEntryElement extends UmbLit
         }, 'contentElementTypeName');
     }
     #expose;
-    async #copyToClipboard() {
-        const propertyDatasetContext = await this.getContext(UMB_PROPERTY_DATASET_CONTEXT);
-        const propertyContext = await this.getContext(UMB_PROPERTY_CONTEXT);
-        const clipboardContext = await this.getContext(UMB_CLIPBOARD_PROPERTY_CONTEXT);
-        if (!propertyDatasetContext || !propertyContext || !clipboardContext) {
-            throw new Error('Could not get required contexts to copy.');
-        }
-        const workspaceName = this.localize.string(propertyDatasetContext?.getName());
-        const propertyLabel = this.localize.string(propertyContext?.getLabel());
-        const blockLabel = this.#context.getName();
-        const entryName = workspaceName
-            ? `${workspaceName} - ${propertyLabel} - ${blockLabel}`
-            : `${propertyLabel} - ${blockLabel}`;
-        const content = this.#context.getContent();
-        const layout = this.#context.getLayout();
-        const settings = this.#context.getSettings();
-        const expose = this.#context.getExpose();
-        const propertyValue = {
-            contentData: content ? [structuredClone(content)] : [],
-            layout: {
-                [UMB_BLOCK_SINGLE_PROPERTY_EDITOR_SCHEMA_ALIAS]: layout ? [structuredClone(layout)] : undefined,
-            },
-            settingsData: settings ? [structuredClone(settings)] : [],
-            expose: expose ? [structuredClone(expose)] : [],
-        };
-        clipboardContext.write({
-            icon: this._icon,
-            name: entryName,
-            propertyValue,
-            propertyEditorUiAlias: UMB_BLOCK_SINGLE_PROPERTY_EDITOR_UI_ALIAS,
-        });
-    }
     #extensionSlotFilterMethod;
     #extensionSlotRenderMethod;
     #renderRefBlock() {
@@ -275,66 +236,9 @@ let UmbBlockSingleEntryElement = class UmbBlockSingleEntryElement extends UmbLit
             : nothing;
     }
     #renderActionBar() {
-        return this._showActions
-            ? html `<uui-action-bar>
-					${this.#renderEditContentAction()} ${this.#renderEditSettingsAction()} ${this.#renderCopyToClipboardAction()}
-					${this.#renderDeleteAction()}
-				</uui-action-bar>`
-            : nothing;
-    }
-    #renderEditContentAction() {
-        return this._showContentEdit && this._workspaceEditContentPath
-            ? html `<uui-button
-					label="edit"
-					look="secondary"
-					color=${this._contentInvalid ? 'invalid' : ''}
-					href=${this._workspaceEditContentPath}>
-					<uui-icon name=${this._exposed === false && this._isReadOnly === false ? 'icon-add' : 'icon-edit'}></uui-icon>
-					${this._contentInvalid
-                ? html `<uui-badge attention color="invalid" label="Invalid content">!</uui-badge>`
-                : nothing}
-				</uui-button>`
-            : this._showContentEdit === false && this._exposed === false
-                ? html `<uui-button
-						@click=${this.#expose}
-						label=${this.localize.term('blockEditor_createThisFor', this._contentTypeName)}
-						look="secondary"
-						><uui-icon name="icon-add"></uui-icon
-					></uui-button>`
-                : nothing;
-    }
-    #renderEditSettingsAction() {
-        return html `
-			${this._hasSettings && this._workspaceEditSettingsPath
-            ? html `<uui-button
-						label="Edit settings"
-						look="secondary"
-						color=${this._settingsInvalid ? 'invalid' : ''}
-						href=${this._workspaceEditSettingsPath}>
-						<uui-icon name="icon-settings"></uui-icon>
-						${this._settingsInvalid
-                ? html `<uui-badge attention color="invalid" label="Invalid settings">!</uui-badge>`
-                : nothing}
-					</uui-button>`
-            : nothing}
-		`;
-    }
-    #renderDeleteAction() {
-        if (this._isReadOnly)
+        if (!this._showActions)
             return nothing;
-        return html ` <uui-button label="delete" look="secondary" @click=${() => this.#context.requestDelete()}>
-			<uui-icon name="icon-remove"></uui-icon>
-		</uui-button>`;
-    }
-    #renderCopyToClipboardAction() {
-        return html `
-			<uui-button
-				label=${this.localize.term('clipboard_labelForCopyToClipboard')}
-				look="secondary"
-				@click=${() => this.#copyToClipboard()}>
-				<uui-icon name="icon-clipboard-copy"></uui-icon>
-			</uui-button>
-		`;
+        return html `<umb-block-action-list id="actions" block-editor=${UMB_BLOCK_SINGLE}></umb-block-action-list>`;
     }
     render() {
         return this.#renderBlock();
@@ -377,12 +281,13 @@ let UmbBlockSingleEntryElement = class UmbBlockSingleEntryElement extends UmbLit
 				z-index: 0;
 			}
 
-			uui-action-bar {
+			#actions {
 				position: absolute;
 				top: var(--uui-size-2);
 				right: var(--uui-size-2);
 				opacity: var(--umb-block-single-entry-actions-opacity, 0);
 				transition: opacity 120ms;
+				z-index: 1;
 			}
 
 			uui-badge {
@@ -445,9 +350,6 @@ __decorate([
 __decorate([
     state()
 ], UmbBlockSingleEntryElement.prototype, "_showContentEdit", void 0);
-__decorate([
-    state()
-], UmbBlockSingleEntryElement.prototype, "_hasSettings", void 0);
 __decorate([
     state()
 ], UmbBlockSingleEntryElement.prototype, "_label", void 0);
@@ -463,12 +365,6 @@ __decorate([
 __decorate([
     state()
 ], UmbBlockSingleEntryElement.prototype, "_showActions", void 0);
-__decorate([
-    state()
-], UmbBlockSingleEntryElement.prototype, "_workspaceEditContentPath", void 0);
-__decorate([
-    state()
-], UmbBlockSingleEntryElement.prototype, "_workspaceEditSettingsPath", void 0);
 __decorate([
     state()
 ], UmbBlockSingleEntryElement.prototype, "_inlineEditingMode", void 0);

package/dist-cms/packages/block/block-single/context/block-single-entry.context.d.ts

@@ -11,4 +11,5 @@ export declare class UmbBlockSingleEntryContext extends UmbBlockEntryContext<typ
     protected _gotManager(): void;
     protected _gotEntries(): void;
     protected _gotContentType(): void;
+    copyToClipboard(): Promise<void>;
 }

package/dist-cms/packages/block/block-single/context/block-single-entry.context.js

@@ -1,7 +1,10 @@
+import { UMB_BLOCK_SINGLE_PROPERTY_EDITOR_SCHEMA_ALIAS, UMB_BLOCK_SINGLE_PROPERTY_EDITOR_UI_ALIAS, } from '../constants.js';
 import { UMB_BLOCK_SINGLE_MANAGER_CONTEXT } from './block-single-manager.context-token.js';
 import { UMB_BLOCK_SINGLE_ENTRIES_CONTEXT } from './block-single-entries.context-token.js';
 import { UmbBlockEntryContext } from '../../block/index.js';
+import { UMB_CLIPBOARD_PROPERTY_CONTEXT } from '../../../clipboard/index.js';
 import { UmbBooleanState, mergeObservables } from '../../../../libs/observable-api/index.js';
+import { UMB_PROPERTY_CONTEXT, UMB_PROPERTY_DATASET_CONTEXT } from '../../../core/property/index.js';
 export class UmbBlockSingleEntryContext extends UmbBlockEntryContext {
     #inlineEditingMode;
     constructor(host) {
@@ -20,4 +23,39 @@ export class UmbBlockSingleEntryContext extends UmbBlockEntryContext {
     }
     _gotEntries() { }
     _gotContentType() { }
+    async copyToClipboard() {
+        const propertyDatasetContext = await this.getContext(UMB_PROPERTY_DATASET_CONTEXT);
+        if (!propertyDatasetContext)
+            throw new Error('Could not get property dataset context to copy.');
+        const propertyContext = await this.getContext(UMB_PROPERTY_CONTEXT);
+        if (!propertyContext)
+            throw new Error('Could not get property context to copy.');
+        const clipboardContext = await this.getContext(UMB_CLIPBOARD_PROPERTY_CONTEXT);
+        if (!clipboardContext)
+            throw new Error('Could not get clipboard context to copy.');
+        const workspaceName = this.localize.string(propertyDatasetContext.getName());
+        const propertyLabel = this.localize.string(propertyContext.getLabel());
+        const blockLabel = this.getName();
+        const entryName = [workspaceName, propertyLabel, blockLabel].filter(Boolean).join(' - ');
+        clipboardContext.write({
+            icon: this.getContentElementTypeIcon(),
+            name: entryName,
+            propertyValue: this.#buildPropertyValue(),
+            propertyEditorUiAlias: UMB_BLOCK_SINGLE_PROPERTY_EDITOR_UI_ALIAS,
+        });
+    }
+    #buildPropertyValue() {
+        const content = this.getContent();
+        const layout = this.getLayout();
+        const settings = this.getSettings();
+        const expose = this.getExpose();
+        return {
+            contentData: content ? [structuredClone(content)] : [],
+            layout: {
+                [UMB_BLOCK_SINGLE_PROPERTY_EDITOR_SCHEMA_ALIAS]: layout ? [structuredClone(layout)] : undefined,
+            },
+            settingsData: settings ? [structuredClone(settings)] : [],
+            expose: expose ? [structuredClone(expose)] : [],
+        };
+    }
 }

package/dist-cms/packages/block/block-single/property-editors/block-single-editor/manifests.js

@@ -12,6 +12,7 @@ export const manifests = [
             propertyEditorSchemaAlias: UMB_BLOCK_SINGLE_PROPERTY_EDITOR_SCHEMA_ALIAS,
             icon: 'icon-shape-square',
             group: 'richContent',
+            keywords: ['component', 'widget', 'banner', 'hero', 'cta', 'promo', 'cta', 'callout', 'spotlight', 'feature'],
             supportsReadOnly: true,
             settings: {
                 properties: [

package/dist-cms/packages/code-editor/property-editor/manifests.js

@@ -8,6 +8,20 @@ export const manifest = {
         propertyEditorSchemaAlias: 'Umbraco.Plain.String',
         icon: 'icon-brackets',
         group: 'richContent',
+        keywords: [
+            'code',
+            'script',
+            'embed',
+            'snippet',
+            'json',
+            'html',
+            'css',
+            'javascript',
+            'js',
+            'xml',
+            'yaml',
+            'markup',
+        ],
         settings: {
             properties: [
                 {

package/dist-cms/packages/content/content/manager/element-data-manager.js

@@ -44,7 +44,7 @@ export class UmbElementWorkspaceDataManager extends UmbEntityWorkspaceDataManage
     }
     #triggerPropertyValueChanges() {
         if (this.#updateLock === 0) {
-            this._current.unmute();
+            this._current?.unmute();
         }
     }
     setVariesByCulture(vary) {

package/dist-cms/packages/content/content/rollback/entity-action/content-rollback.action.js

@@ -1,8 +1,8 @@
 import { UMB_CONTENT_ROLLBACK_MODAL } from '../modal/constants.js';
-import { UmbEntityActionBase } from '../../../../core/entity-action/index.js';
 import { umbOpenModal } from '../../../../core/modal/index.js';
-import { UMB_NOTIFICATION_CONTEXT } from '../../../../core/notification/index.js';
+import { UmbEntityActionBase } from '../../../../core/entity-action/index.js';
 import { UmbLocalizationController } from '../../../../../libs/localization-api/index.js';
+import { UMB_NOTIFICATION_CONTEXT } from '../../../../core/notification/index.js';
 export class UmbContentRollbackEntityAction extends UmbEntityActionBase {
     #localize = new UmbLocalizationController(this);
     async execute() {
@@ -14,13 +14,10 @@ export class UmbContentRollbackEntityAction extends UmbEntityActionBase {
         }).catch(() => undefined);
         if (!result)
             return;
+        const localizationKey = this.args.meta.rollbackNotificationMessage || '#rollback_contentRolledBack';
+        const message = this.#localize.string(localizationKey);
         const notificationContext = await this.getContext(UMB_NOTIFICATION_CONTEXT);
-        if (!notificationContext) {
-            throw new Error('Notification context not found');
-        }
-        notificationContext.peek('positive', {
-            data: { message: this.#localize.term('rollback_documentRolledBack') },
-        });
+        notificationContext?.peek('positive', { data: { message } });
     }
 }
 export { UmbContentRollbackEntityAction as api };

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

@@ -4,6 +4,7 @@ export interface ManifestEntityActionContentRollbackKind extends ManifestEntityA
     kind: 'contentRollback';
 }
 export interface MetaEntityActionContentRollbackKind extends MetaEntityActionDefaultKind {
+    rollbackNotificationMessage?: string;
     rollbackRepositoryAlias: string;
     detailRepositoryAlias: string;
 }

package/dist-cms/packages/content/content/rollback/modal/content-rollback-modal.element.js

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { diffWords } from '../../../../core/utils/index.js';
-import { css, customElement, html, nothing, repeat, state, unsafeHTML } from '../../../../../external/lit/index.js';
+import { css, customElement, html, nothing, repeat, state } from '../../../../../external/lit/index.js';
 import { UmbModalBaseElement } from '../../../../core/modal/index.js';
 import { UmbTextStyles } from '../../../../core/style/index.js';
 import { UmbUserItemRepository } from '../../../../user/user/index.js';
@@ -299,7 +299,7 @@ let UmbContentRollbackModalElement = class UmbContentRollbackModalElement extend
 					label=${this.localize.term('rollback_showDiff')}
 					@change=${this.#onToggleDiff}
 					.checked=${this._showDiff}></uui-toggle>
-				${this._showDiff ? html `<p>${unsafeHTML(this.localize.term('rollback_diffHelp'))}</p>` : nothing}
+				${this._showDiff ? html `<p>${this.localize.htmlString('#rollback_diffHelp')}</p>` : nothing}
 				<uui-table>
 					<uui-table-column style="width: 0"></uui-table-column>
 					<uui-table-column></uui-table-column>

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

@@ -10,11 +10,6 @@ export interface UmbElementDetailModel {
 export interface UmbElementValueModel<ValueType = unknown> extends UmbPropertyValueData<ValueType> {
     culture: string | null;
     editorAlias: string;
-    /**
-     * @deprecated, we do not use entityType on values anymore. To be removed in Umbraco v.18.
-     * Just remove the property.
-     */
-    entityType?: string;
     segment: string | null;
 }
 export interface UmbContentValueModel<ValueType = unknown> extends UmbElementValueModel<ValueType> {

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

@@ -83,11 +83,6 @@ export declare abstract class UmbContentDetailWorkspaceContextBase<DetailModelTy
     getVariantValidationContext(variantId: UmbVariantId): UmbValidationController | undefined;
     constructor(host: UmbControllerHost, args: UmbContentDetailWorkspaceContextArgs<DetailModelType, ContentTypeDetailModelType, VariantModelType, VariantOptionModelType>);
     loadLanguages(): Promise<void>;
-    /**
-     * @deprecated Call `_loadSegmentsFor` instead. `loadSegments` will be removed in v.18.
-     * (note this was introduced in v.17, and deprecated in v.17.0.1)
-     */
-    protected loadSegments(): Promise<void>;
     protected _loadSegmentsFor(unique: string): Promise<void>;
     protected _processIncomingData(data: DetailModelType): Promise<DetailModelType>;
     /**

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

@@ -240,19 +240,6 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
         const { data } = await this.#languageRepository.requestCollection({});
         this.#languages.setValue(data?.items ?? []);
     }
-    /**
-     * @deprecated Call `_loadSegmentsFor` instead. `loadSegments` will be removed in v.18.
-     * (note this was introduced in v.17, and deprecated in v.17.0.1)
-     */
-    async loadSegments() {
-        console.warn('Stop using loadSegments, call _loadSegmentsFor instead. loadSegments will be removed in v.18.');
-        const unique = await firstValueFrom(this.unique);
-        if (!unique) {
-            this._segments.setValue([]);
-            return;
-        }
-        this._loadSegmentsFor(unique);
-    }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async _loadSegmentsFor(unique) {
         console.warn(`UmbContentDetailWorkspaceContextBase: Segments are not implemented in the workspace context for "${this.getEntityType()}" types.`);
@@ -448,8 +435,9 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
      * @description Get an Observable for the value of this property.
      */
     async propertyValueByAlias(propertyAlias, variantId) {
-        return this._data.createObservablePartOfCurrent((data) => data?.values?.find((x) => x?.alias === propertyAlias && (variantId ? variantId.compare(x) : true))
-            ?.value);
+        return this._data.createObservablePartOfCurrent((data) => data?.values?.find(
+        // No variantId means invariant: match only entries with culture === null and segment === null.
+        (x) => x?.alias === propertyAlias && (variantId ?? UmbVariantId.CreateInvariant()).compare(x))?.value);
     }
     /**
      * Get the current value of the property with the given alias and variantId.
@@ -460,7 +448,8 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
     getPropertyValue(alias, variantId) {
         const currentData = this._data.getCurrent();
         if (currentData) {
-            const newDataSet = currentData.values?.find((x) => x.alias === alias && (variantId ? variantId.compare(x) : true));
+            // No variantId means invariant: match only entries with culture === null and segment === null.
+            const newDataSet = currentData.values?.find((x) => x.alias === alias && (variantId ?? UmbVariantId.CreateInvariant()).compare(x));
             return newDataSet?.value;
         }
         return undefined;
@@ -474,33 +463,41 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
      * @memberof UmbContentDetailWorkspaceContextBase
      */
     async setPropertyValue(alias, value, variantId) {
-        this.initiatePropertyValueChange();
-        variantId ??= UmbVariantId.CreateInvariant();
-        const property = await this.structure.getPropertyStructureByAlias(alias);
-        if (!property) {
-            throw new Error(`Property alias "${alias}" not found.`);
-        }
-        // the getItemByUnique is a async method that first resolves once the item is loaded.
-        const editorAlias = (await this.#dataTypeItemManager.getItemByUnique(property.dataType.unique))
-            .propertyEditorSchemaAlias;
-        // This means if its not loaded this will never resolve and the error below will never happen.
-        if (!editorAlias) {
-            throw new Error(`Editor Alias of "${property.dataType.unique}" not found.`);
-        }
-        // Notice the order of the properties is important for our JSON String Compare function. [NL]
-        const entry = {
-            editorAlias,
-            ...variantId.toObject(),
-            alias,
-            value,
-        };
-        const currentData = this.getData();
-        if (currentData) {
-            const values = appendToFrozenArray(currentData.values ?? [], entry, (x) => x.alias === alias && variantId.compare(x));
-            this.#ensureVariantsExistsForProperty(variantId, entry);
-            this._data.updateCurrent({ values });
+        try {
+            this.initiatePropertyValueChange();
+            variantId ??= UmbVariantId.CreateInvariant();
+            const property = await this.structure.getPropertyStructureByAlias(alias);
+            if (!property) {
+                throw new Error(`Property alias "${alias}" not found.`);
+            }
+            if ((property.variesByCulture && variantId.isCultureInvariant()) ||
+                (property.variesBySegment && variantId.isSegmentInvariant())) {
+                throw new Error(`Property alias "${alias}" requires a variantId.`);
+            }
+            // the getItemByUnique is a async method that first resolves once the item is loaded.
+            const editorAlias = (await this.#dataTypeItemManager.getItemByUnique(property.dataType.unique))
+                .propertyEditorSchemaAlias;
+            // This means if its not loaded this will never resolve and the error below will never happen.
+            if (!editorAlias) {
+                throw new Error(`Editor Alias of "${property.dataType.unique}" not found.`);
+            }
+            // Notice the order of the properties is important for our JSON String Compare function. [NL]
+            const entry = {
+                editorAlias,
+                ...variantId.toObject(),
+                alias,
+                value,
+            };
+            const currentData = this.getData();
+            if (currentData) {
+                const values = appendToFrozenArray(currentData.values ?? [], entry, (x) => x.alias === alias && variantId.compare(x));
+                this.#ensureVariantsExistsForProperty(variantId, entry);
+                this._data.updateCurrent({ values });
+            }
+        }
+        finally {
+            this.finishPropertyValueChange();
         }
-        this.finishPropertyValueChange();
     }
     async #ensureVariantsExistsForProperty(variantId, entry) {
         // TODO: Implement queueing of these operations to ensure this does not execute too often. [NL]

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

@@ -91,12 +91,10 @@ let UmbCompositionPickerModalElement = class UmbCompositionPickerModalElement ex
             this._loading = false;
             return;
         }
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-expect-error
         const grouped = Object.groupBy(data, (item) => '/' + item.folderPath.join('/'));
-        this._compatibleCompositions = Object.keys(grouped)
-            .sort((a, b) => a.localeCompare(b))
-            .map((key) => ({ path: key, compositions: grouped[key] }));
+        this._compatibleCompositions = Object.entries(grouped)
+            .sort(([a], [b]) => a.localeCompare(b))
+            .map(([path, compositions]) => ({ path, compositions: compositions ?? [] }));
         this._loading = false;
     }
     #onSelectionAdd(unique) {

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

@@ -35,7 +35,7 @@ export declare abstract class UmbContentTypeStructureServerDataSourceBase<Server
         };
         error?: undefined;
     } | {
-        error: ((Error | import("../../../../core/resources/index.js").UmbApiError | import("../../../../core/resources/index.js").UmbCancelError | import("../../../../core/resources/index.js").UmbError) & (import("../../../../core/resources/index.js").UmbApiError | import("../../../../core/resources/index.js").UmbCancelError)) | undefined;
+        error: ((Error | import("../../../../core/resources/index.js").UmbError | import("../../../../core/resources/index.js").UmbCancelError | import("../../../../core/resources/index.js").UmbApiError) & (import("../../../../core/resources/index.js").UmbCancelError | import("../../../../core/resources/index.js").UmbApiError)) | undefined;
         data?: undefined;
     }>;
 }

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

@@ -37,7 +37,7 @@ export class UmbContentTypeWorkspaceContextBase extends UmbEntityDetailWorkspace
         this._getDataPromise = request;
         let { data } = await request;
         if (data) {
-            data = await this._scaffoldProcessData(data);
+            data = await this._processIncomingData(data);
             if (this.modalContext) {
                 // Notice if the preset comes with values, they will overwrite the scaffolded values... [NL]
                 data = { ...data, ...this.modalContext.data.preset };

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

@@ -192,7 +192,10 @@ let UmbContentTypeDesignEditorPropertyElement = class UmbContentTypeDesignEditor
                 UMB_EDIT_PROPERTY_TYPE_WORKSPACE_PATH_PATTERN.generateLocal({ unique: this.property.unique })}>
 					${this.#renderPropertyName()} ${this.#renderPropertyTags()}
 					<uui-action-bar>
-						<uui-button label="${this.localize.term('actions_delete')}" data-mark="action:delete" @click="${this.#requestRemove}">
+						<uui-button
+							label="${this.localize.term('actions_delete')}"
+							data-mark="action:delete"
+							@click="${this.#requestRemove}">
 							<uui-icon name="delete"></uui-icon>
 						</uui-button>
 					</uui-action-bar>

package/dist-cms/packages/content/property-type/workspace/views/settings/property-workspace-view-settings.element.js

@@ -163,6 +163,7 @@ let UmbPropertyTypeWorkspaceViewSettingsElement = class UmbPropertyTypeWorkspace
 					<uui-textarea
 						id="description-input"
 						data-mark="input:entity-description"
+						label="${this.localize.term('general_description')}"
 						slot="editor"
 						name="description"
 						@input=${this.#onDescriptionChange}
@@ -174,7 +175,9 @@ let UmbPropertyTypeWorkspaceViewSettingsElement = class UmbPropertyTypeWorkspace
 					<umb-data-type-flow-input
 						slot="editor"
 						id="data-type-input"
+						label="${this.localize.term('general_propertyEditor')}"
 						.value=${this._data?.dataType?.unique ?? ''}
+						.suggestionQuery=${this._data?.name}
 						@change=${this.#onDataTypeIdChange}
 						required
 						${umbBindToValidation(this, '$.dataType.unique')}></umb-data-type-flow-input>
@@ -283,6 +286,7 @@ let UmbPropertyTypeWorkspaceViewSettingsElement = class UmbPropertyTypeWorkspace
 					id="mandatory"
 					.checked=${this._data?.validation?.mandatory ?? false}
 					slot="editor"
+					label=${this.localize.term('validation_fieldIsMandatory')}
 					><umb-localize key="validation_fieldIsMandatory">Field is mandatory</umb-localize></uui-toggle
 				></umb-property-layout
 			>
@@ -305,6 +309,7 @@ let UmbPropertyTypeWorkspaceViewSettingsElement = class UmbPropertyTypeWorkspace
         return html `<umb-property-layout orientation="vertical" label=${this.localize.term('validation_customValidation')}
 				><uui-select
 					slot="editor"
+					label=${this.localize.term('validation_customValidation')}
 					@change=${this.#onCustomValidationChange}
 					.options=${this._customValidationOptions}></uui-select
 			></umb-property-layout>

package/dist-cms/packages/core/auth/auth.context.d.ts

@@ -5,7 +5,7 @@ import type { UmbControllerHost } from '../../../libs/controller-api/index.js';
 import { UmbContextBase } from '../../../libs/class-api/index.js';
 import type { Observable } from '../../../external/rxjs/index.js';
 import type { UmbBackofficeExtensionRegistry } from '../extension-registry/index.js';
-import type { umbHttpClient } from '../http-client/index.js';
+import type { UmbApiClient } from '../http-client/index.js';
 export interface UmbAuthSession {
     /** When the access token expires (issuedAt + expiresIn). Used to decide when to refresh. */
     accessTokenExpiresAt: number;
@@ -81,7 +81,6 @@ export declare class UmbAuthContext extends UmbContextBase {
      *   const token = await authContext.getLatestToken();
      *   const result = await fetch('https://my-api.com', { headers: { Authorization: `Bearer ${token}` } });
      * ```
-     * @deprecated Use {@link configureClient} for `@hey-api/openapi-ts` clients or {@link getOpenApiConfiguration} for manual fetch calls. With cookie-based auth this always returns `'[redacted]'`. Scheduled for removal in Umbraco 19.
      * @see {@link configureClient} for automatic token handling with `@hey-api/openapi-ts` clients.
      * @see {@link getOpenApiConfiguration} for manual fetch calls with cookie-based auth.
      * @memberof UmbAuthContext
@@ -159,18 +158,28 @@ export declare class UmbAuthContext extends UmbContextBase {
      */
     getOpenApiConfiguration(): UmbOpenApiConfiguration;
     /**
-     * Configures a `@hey-api/openapi-ts` client for authenticated API calls.
-     * Sets baseUrl, credentials, auth header, and binds the default response
-     * interceptors (401 retry, error handling, notifications).
+     * Configures a `@hey-api/openapi-ts` generated client for authenticated API calls.
+     *
+     * Sets `baseUrl`, `credentials`, and the `auth` callback (cookie-based with
+     * automatic token refresh via {@link getLatestToken}), and binds the default
+     * response interceptors (401 retry, problem-details error notifications, etc.)
+     * to the client.
+     *
+     * The same auth context owns a single {@link UmbApiInterceptorController} for
+     * the lifetime of the host (`<umb-app>`), so it's safe to call this method for
+     * multiple clients (the core's {@link umbHttpClient} *and* an extension's own
+     * generated client) without registering duplicate auth-signaler contexts.
+     *
      * @example
      * ```js
      * const authContext = await this.getContext(UMB_AUTH_CONTEXT);
      * authContext.configureClient(myClient);
      * // Now myClient automatically includes auth headers and interceptors
      * ```
-     * @param client A `@hey-api/openapi-ts` client instance.
+     * @param client A `@hey-api/openapi-ts` client instance — either {@link umbHttpClient}
+     * or one regenerated by an extension package against its own OpenAPI document.
      */
-    configureClient(client: typeof umbHttpClient): void;
+    configureClient(client: UmbApiClient): void;
     /**
      * Sets the auth context as initialized, which means that the auth context is ready to be used.
      * @remark This is used to let the app context know that the core module is ready, which means that the core auth providers are available.