@umbraco-cms/backoffice 16.1.0 → 16.2.0-rc

package/dist-cms/packages/block/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.d.ts

@@ -24,7 +24,7 @@ export declare class UmbPropertyEditorUIBlockListElement extends UmbPropertyEdit
     private _blocks?;
     private _layouts;
     private _catalogueRouteBuilder?;
-    _notSupportedVariantSetting?: boolean;
+    private _notSupportedVariantSetting?;
     constructor();
     protected getFormElement(): undefined;
     render(): typeof nothing | import("lit-html").TemplateResult<1>;

package/dist-cms/packages/block/block-list/property-editors/block-list-type-configuration/property-editor-ui-block-list-type-configuration.element.d.ts

@@ -1,7 +1,7 @@
-import '../../../block-type/components/input-block-type/index.js';
 import type { UmbBlockTypeBaseModel } from '@umbraco-cms/backoffice/block-type';
 import type { UmbPropertyEditorUiElement, UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import '@umbraco-cms/backoffice/block-type';
 /**
  * @element umb-property-editor-ui-block-list-type-configuration
  */

package/dist-cms/packages/block/block-list/property-editors/block-list-type-configuration/property-editor-ui-block-list-type-configuration.element.js

@@ -4,13 +4,14 @@ 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 '../../../block-type/components/input-block-type/index.js';
 import { UMB_BLOCK_LIST_TYPE } from '../../constants.js';
 import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
+// TODO: This is across packages, how should we go about getting just a single element from another package? like here we just need the `umb-input-block-type` element.
+import '@umbraco-cms/backoffice/block-type';
 /**
  * @element umb-property-editor-ui-block-list-type-configuration
  */

package/dist-cms/packages/block/block-rte/components/block-rte-entry/block-rte-entry.element.d.ts

@@ -1,8 +1,6 @@
-import type { UmbBlockRteLayoutModel } from '../../types.js';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { nothing } from '@umbraco-cms/backoffice/external/lit';
 import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/property-editor';
-import type { UmbBlockEditorCustomViewProperties } from '@umbraco-cms/backoffice/block-custom-view';
 import '../ref-rte-block/index.js';
 /**
  * @class UmbBlockRteEntryElement
@@ -12,17 +10,17 @@ export declare class UmbBlockRteEntryElement extends UmbLitElement implements Um
     get contentKey(): string | undefined;
     set contentKey(value: string | undefined);
     private _contentKey?;
-    _showContentEdit: boolean;
-    _hasSettings: boolean;
-    _label: string;
-    _icon?: string;
-    _exposed?: boolean;
-    _showActions?: boolean;
-    _workspaceEditContentPath?: string;
-    _workspaceEditSettingsPath?: string;
-    _contentTypeAlias?: string;
-    _contentTypeName?: string;
-    _blockViewProps: UmbBlockEditorCustomViewProperties<UmbBlockRteLayoutModel>;
+    private _showContentEdit;
+    private _hasSettings;
+    private _label;
+    private _icon?;
+    private _exposed?;
+    private _showActions?;
+    private _workspaceEditContentPath?;
+    private _workspaceEditSettingsPath?;
+    private _contentTypeAlias?;
+    private _contentTypeName?;
+    private _blockViewProps;
     _contentInvalid?: boolean;
     _settingsInvalid?: boolean;
     constructor();

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

@@ -174,7 +174,8 @@ let UmbBlockRteEntryElement = class UmbBlockRteEntryElement extends UmbLitElemen
 			.icon=${this._icon}
 			.unpublished=${!this._exposed}
 			.content=${this._blockViewProps.content}
-			.settings=${this._blockViewProps.settings}></umb-ref-rte-block>`;
+			.settings=${this._blockViewProps.settings}
+			.config=${this._blockViewProps.config}></umb-ref-rte-block>`;
     }
     #renderEditAction() {
         return this._showContentEdit && this._workspaceEditContentPath
@@ -222,13 +223,14 @@ let UmbBlockRteEntryElement = class UmbBlockRteEntryElement extends UmbLitElemen
 			:host {
 				position: relative;
 				display: block;
-				user-select: none;
+				user-select: all;
 				user-drag: auto;
 				white-space: nowrap;
 			}
+
 			:host(.ProseMirror-selectednode) {
 				umb-ref-rte-block {
-					cursor: not-allowed;
+					--uui-color-default-contrast: initial;
 					outline: 3px solid var(--uui-color-focus);
 				}
 			}
@@ -288,9 +290,11 @@ __decorate([
 ], UmbBlockRteEntryElement.prototype, "_blockViewProps", void 0);
 __decorate([
     property({ type: Boolean, attribute: 'content-invalid', reflect: true })
+    // eslint-disable-next-line @typescript-eslint/naming-convention
 ], UmbBlockRteEntryElement.prototype, "_contentInvalid", void 0);
 __decorate([
     property({ type: Boolean, attribute: 'settings-invalid', reflect: true })
+    // eslint-disable-next-line @typescript-eslint/naming-convention
 ], UmbBlockRteEntryElement.prototype, "_settingsInvalid", void 0);
 UmbBlockRteEntryElement = __decorate([
     customElement('umb-rte-block')

package/dist-cms/packages/block/block-rte/components/ref-rte-block/ref-rte-block.element.d.ts

@@ -1,5 +1,6 @@
-import { type UmbBlockDataType } from '@umbraco-cms/backoffice/block';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import type { UmbBlockDataType } from '@umbraco-cms/backoffice/block';
+import type { UmbBlockEditorCustomViewConfiguration } from '@umbraco-cms/backoffice/block-custom-view';
 /**
  * @element umb-ref-rte-block
  */
@@ -8,7 +9,9 @@ export declare class UmbRefRteBlockElement extends UmbLitElement {
     icon?: string;
     unpublished?: boolean;
     content?: UmbBlockDataType;
-    _workspaceEditPath?: string;
+    settings?: UmbBlockDataType;
+    private _workspaceEditPath?;
+    config?: UmbBlockEditorCustomViewConfiguration;
     constructor();
     render(): import("lit-html").TemplateResult<1>;
     static readonly styles: import("lit").CSSResult[];

package/dist-cms/packages/block/block-rte/components/ref-rte-block/ref-rte-block.element.js

@@ -4,9 +4,9 @@ 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_BLOCK_ENTRY_CONTEXT } from '@umbraco-cms/backoffice/block';
 import { css, customElement, html, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UMB_BLOCK_ENTRY_CONTEXT } from '@umbraco-cms/backoffice/block';
 /**
  * @element umb-ref-rte-block
  */
@@ -20,10 +20,12 @@ let UmbRefRteBlockElement = class UmbRefRteBlockElement extends UmbLitElement {
         });
     }
     render() {
+        const blockValue = { ...this.content, $settings: this.settings };
         return html `
-			<uui-ref-node standalone href=${this._workspaceEditPath ?? '#'}>
+			<uui-ref-node standalone href=${(this.config?.showContentEdit ? this._workspaceEditPath : undefined) ?? ''}>
+				<div class="selection-background" aria-hidden="true">&emsp;</div>
 				<umb-icon slot="icon" .name=${this.icon}></umb-icon>
-				<umb-ufm-render slot="name" inline .markdown=${this.label} .value=${this.content}></umb-ufm-render>
+				<umb-ufm-render slot="name" inline .markdown=${this.label} .value=${blockValue}></umb-ufm-render>
 			</uui-ref-node>
 		`;
     }
@@ -32,13 +34,34 @@ let UmbRefRteBlockElement = class UmbRefRteBlockElement extends UmbLitElement {
 			:host {
 				display: block;
 			}
+
 			uui-ref-node {
 				min-height: var(--uui-size-16);
 			}
+
 			:host([unpublished]) umb-icon,
 			:host([unpublished]) umb-ufm-render {
 				opacity: 0.6;
 			}
+
+			/* HACK: Stretches a space character (&emsp;) to be full-width to make the RTE block appear text-selectable. [LK,NL] */
+			.selection-background {
+				position: absolute;
+				pointer-events: none;
+				font-size: 100vw;
+				inset: 0;
+				overflow: hidden;
+				z-index: 0;
+			}
+
+			umb-icon,
+			umb-ufm-render {
+				z-index: 1;
+
+				&::selection {
+					color: var(--uui-color-default-contrast);
+				}
+			}
 		`,
     ]; }
 };
@@ -54,9 +77,15 @@ __decorate([
 __decorate([
     property({ attribute: false })
 ], UmbRefRteBlockElement.prototype, "content", void 0);
+__decorate([
+    property({ attribute: false })
+], UmbRefRteBlockElement.prototype, "settings", void 0);
 __decorate([
     state()
 ], UmbRefRteBlockElement.prototype, "_workspaceEditPath", void 0);
+__decorate([
+    property({ attribute: false })
+], UmbRefRteBlockElement.prototype, "config", void 0);
 UmbRefRteBlockElement = __decorate([
     customElement('umb-ref-rte-block')
 ], UmbRefRteBlockElement);

package/dist-cms/packages/block/block-rte/context/block-rte-entries.context.js

@@ -94,7 +94,7 @@ export class UmbBlockRteEntriesContext extends UmbBlockEntriesContext {
         }
         await Promise.all(layoutEntries.map(async (layoutEntry) => {
             this._insertBlockFromPropertyValue(layoutEntry, value, originData);
-            // TODO: Missing some way to insert a Block HTML Element into the RTE at the current cursor point. (hopefully the responsibilit can be avoided here, but there is some connection missing at this point) [NL]
+            // TODO: Missing some way to insert a Block HTML Element into the RTE at the current cursor point. (hopefully the responsibility can be avoided here, but there is some connection missing at this point) [NL]
         }));
         return originData;
     }

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

@@ -9,7 +9,7 @@ export declare class UmbBlockRteEntryContext extends UmbBlockEntryContext<typeof
     readonly forceHideContentEditorInOverlay: import("rxjs").Observable<boolean | undefined>;
     readonly showContentEdit: import("rxjs").Observable<boolean>;
     constructor(host: UmbControllerHost);
-    _gotManager(): void;
-    _gotEntries(): void;
-    _gotContentType(): void;
+    protected _gotManager(): void;
+    protected _gotEntries(): void;
+    protected _gotContentType(): void;
 }

package/dist-cms/packages/block/block-rte/workspace/views/block-rte-type-workspace-view.element.js

@@ -78,6 +78,13 @@ let UmbBlockRteTypeWorkspaceViewSettingsElement = class UmbBlockRteTypeWorkspace
             },
         ]}></umb-property>
 			</uui-box>
+			<uui-box headline=${this.localize.term('blockEditor_headlineAdvanced')}>
+				<umb-property
+					label=${this.localize.term('blockEditor_forceHideContentEditor')}
+					alias="forceHideContentEditorInOverlay"
+					description=${this.localize.term('blockEditor_forceHideContentEditorHelp')}
+					property-editor-ui-alias="Umb.PropertyEditorUi.Toggle"></umb-property>
+			</uui-box>
 		`;
     }
     static { this.styles = [

package/dist-cms/packages/block/block-type/components/block-type-card/block-type-card.element.d.ts

@@ -10,9 +10,9 @@ export declare class UmbBlockTypeCardElement extends UmbLitElement {
     set contentElementTypeKey(value: string | undefined);
     get contentElementTypeKey(): string | undefined;
     private _elementTypeKey?;
-    _name: string;
-    _description?: string;
-    _fallbackIcon?: string | null;
+    private _name;
+    private _description?;
+    private _fallbackIcon?;
     constructor();
     render(): import("lit-html").TemplateResult<1>;
 }

package/dist-cms/packages/block/block-type/workspace/block-type-workspace-editor.element.d.ts

@@ -1,7 +1,7 @@
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 export declare class UmbBlockTypeWorkspaceEditorElement extends UmbLitElement {
     #private;
-    _name?: string;
+    private _name?;
     constructor();
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult[];

package/dist-cms/packages/code-editor/code-editor-modal/code-editor-modal.element.d.ts

@@ -1,9 +1,8 @@
-import type { UmbCodeEditorElement } from '../components/code-editor.element.js';
 import type { UmbCodeEditorModalData, UmbCodeEditorModalValue } from './code-editor-modal.token.js';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 export declare class UmbCodeEditorModalElement extends UmbModalBaseElement<UmbCodeEditorModalData, UmbCodeEditorModalValue> {
     #private;
-    _codeEditor?: UmbCodeEditorElement;
+    private _codeEditor?;
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult[];
 }

package/dist-cms/packages/code-editor/components/code-editor.element.d.ts

@@ -17,7 +17,6 @@ declare const elementName = "umb-code-editor";
  */
 export declare class UmbCodeEditorElement extends UmbLitElement implements UmbCodeEditorHost {
     #private;
-    private containerRef;
     get container(): HTMLElement;
     get editor(): UmbCodeEditorController | undefined;
     /**

package/dist-cms/packages/code-editor/components/code-editor.element.js

@@ -22,10 +22,11 @@ const elementName = 'umb-code-editor';
  * @fires loaded - Fired when the editor is loaded and ready to use.
  */
 let UmbCodeEditorElement = class UmbCodeEditorElement extends UmbLitElement {
+    #containerRef;
     get container() {
-        if (!this.containerRef?.value)
+        if (!this.#containerRef?.value)
             throw new Error('Container not found');
-        return this.containerRef.value;
+        return this.#containerRef.value;
     }
     #editor;
     get editor() {
@@ -51,7 +52,7 @@ let UmbCodeEditorElement = class UmbCodeEditorElement extends UmbLitElement {
     }
     constructor() {
         super();
-        this.containerRef = createRef();
+        this.#containerRef = createRef();
         /**
          * Theme of the editor. Default is light. Element will listen to the theme context and update the theme accordingly.
          * @type {CodeEditorTheme}
@@ -167,7 +168,7 @@ let UmbCodeEditorElement = class UmbCodeEditorElement extends UmbLitElement {
         return html `
 			${this.#renderStyles()}
 			${when(this._loading, () => html `<div id="loader-container"><uui-loader></uui-loader></div>`)}
-			<div id="editor-container" ${ref(this.containerRef)}></div>
+			<div id="editor-container" ${ref(this.#containerRef)}></div>
 		`;
     }
     #renderStyles() {

package/dist-cms/packages/code-editor/models/code-editor.model.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line @typescript-eslint/naming-convention
 export var CodeEditorTheme;
 (function (CodeEditorTheme) {
     CodeEditorTheme["Light"] = "umb-light";

package/dist-cms/packages/code-editor/property-editor/property-editor-ui-code-editor.element.js

@@ -24,7 +24,8 @@ let UmbPropertyEditorUICodeEditorElement = class UmbPropertyEditorUICodeEditorEl
     set config(config) {
         if (!config)
             return;
-        this._language = config?.getValueByAlias('language') ?? this.#defaultLanguage;
+        const language = config?.getValueByAlias('language');
+        this._language = Array.isArray(language) ? language[0] : language;
         this._height = Number(config?.getValueByAlias('height')) || 400;
         this._lineNumbers = config?.getValueByAlias('lineNumbers') ?? false;
         this._minimap = config?.getValueByAlias('minimap') ?? false;

package/dist-cms/packages/content/content/global-components/content-workspace-property.element.d.ts

@@ -1,19 +1,17 @@
-import { UMB_CONTENT_WORKSPACE_CONTEXT } from '../constants.js';
 import { nothing } from '@umbraco-cms/backoffice/external/lit';
-import type { UmbPropertyTypeModel } from '@umbraco-cms/backoffice/content-type';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import { UmbVariantId } from '@umbraco-cms/backoffice/variant';
 export declare class UmbContentWorkspacePropertyElement extends UmbLitElement {
     #private;
     private _alias?;
     get alias(): string | undefined;
     set alias(value: string | undefined);
-    _datasetVariantId?: UmbVariantId;
-    _dataPath?: string;
-    _viewable?: boolean;
-    _writeable?: boolean;
-    _workspaceContext?: typeof UMB_CONTENT_WORKSPACE_CONTEXT.TYPE;
-    _propertyType?: UmbPropertyTypeModel;
+    private _datasetVariantId?;
+    private _dataPath?;
+    private _viewable?;
+    private _writeable?;
+    private _workspaceContext?;
+    private _propertyType?;
+    private _hasAccessToSensitiveData;
     constructor();
     willUpdate(changedProperties: Map<string, any>): void;
     render(): typeof nothing | import("lit-html").TemplateResult<1>;

package/dist-cms/packages/content/content/global-components/content-workspace-property.element.js

@@ -10,6 +10,7 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
 import { UmbVariantId } from '@umbraco-cms/backoffice/variant';
 import { UmbDataPathPropertyValueQuery } from '@umbraco-cms/backoffice/validation';
+import { UMB_CURRENT_USER_CONTEXT } from '@umbraco-cms/backoffice/current-user';
 let UmbContentWorkspacePropertyElement = class UmbContentWorkspacePropertyElement extends UmbLitElement {
     get alias() {
         return this._alias;
@@ -20,6 +21,7 @@ let UmbContentWorkspacePropertyElement = class UmbContentWorkspacePropertyElemen
     }
     constructor() {
         super();
+        this._hasAccessToSensitiveData = false;
         // The Property Dataset is local to the active variant, we use this to retrieve the variant we like to gather the value from.
         this.consumeContext(UMB_PROPERTY_DATASET_CONTEXT, (datasetContext) => {
             this._datasetVariantId = datasetContext?.getVariantId();
@@ -30,6 +32,11 @@ let UmbContentWorkspacePropertyElement = class UmbContentWorkspacePropertyElemen
             this._workspaceContext = workspaceContext;
             this.#observePropertyType();
         });
+        this.consumeContext(UMB_CURRENT_USER_CONTEXT, (context) => {
+            this.observe(context?.hasAccessToSensitiveData, (hasAccessToSensitiveData) => {
+                this._hasAccessToSensitiveData = hasAccessToSensitiveData === true;
+            });
+        });
     }
     async #observePropertyType() {
         if (!this._alias || !this._workspaceContext)
@@ -70,6 +77,8 @@ let UmbContentWorkspacePropertyElement = class UmbContentWorkspacePropertyElemen
             return nothing;
         if (!this._dataPath || this._writeable === undefined)
             return nothing;
+        if (!this._hasAccessToSensitiveData && this._propertyType?.isSensitive)
+            return nothing;
         return html `<umb-property-type-based-property
 			data-path=${this._dataPath}
 			.property=${this._propertyType}
@@ -97,6 +106,9 @@ __decorate([
 __decorate([
     state()
 ], UmbContentWorkspacePropertyElement.prototype, "_propertyType", void 0);
+__decorate([
+    state()
+], UmbContentWorkspacePropertyElement.prototype, "_hasAccessToSensitiveData", void 0);
 UmbContentWorkspacePropertyElement = __decorate([
     customElement('umb-content-workspace-property')
 ], UmbContentWorkspacePropertyElement);

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

@@ -1,11 +1,10 @@
-import type { UmbPropertyTypeModel } from '@umbraco-cms/backoffice/content-type';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 export declare class UmbContentWorkspaceViewEditPropertiesElement extends UmbLitElement {
     #private;
     get containerId(): string | null | undefined;
     set containerId(value: string | null | undefined);
-    _properties: Array<string>;
-    _visibleProperties?: Array<UmbPropertyTypeModel>;
+    private _properties;
+    private _visibleProperties?;
     constructor();
     render(): unknown;
     static styles: import("lit").CSSResult[];

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

@@ -1,4 +1,3 @@
-import type { UmbPropertyTypeContainerModel } from '@umbraco-cms/backoffice/content-type';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import './content-editor-properties.element.js';
 export declare class UmbContentWorkspaceViewEditTabElement extends UmbLitElement {
@@ -6,8 +5,8 @@ export declare class UmbContentWorkspaceViewEditTabElement extends UmbLitElement
     get containerId(): string | null | undefined;
     set containerId(value: string | null | undefined);
     private _containerId?;
-    _groups: Array<UmbPropertyTypeContainerModel>;
-    _hasProperties: boolean;
+    private _groups;
+    private _hasProperties;
     constructor();
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult[];

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

@@ -92,19 +92,19 @@ let UmbContentWorkspaceViewEditElement = class UmbContentWorkspaceViewEditElemen
 							${this._hasRootGroups && this._tabs.length > 0
                 ? html `
 										<uui-tab
-											.label=${this.localize.term('general_generic')}
+											label=${this.localize.term('general_generic')}
 											.active=${this._routerPath + '/root' === this._activePath ||
                     this._routerPath + '/' === this._activePath}
-											.href=${this._routerPath + '/root'}></uui-tab>
+											href=${this._routerPath + '/root'}></uui-tab>
 									`
                 : ''}
 							${repeat(this._tabs, (tab) => tab.name, (tab, index) => {
                 const path = this._routerPath + '/tab/' + encodeFolderName(tab.name || '');
                 return html `<uui-tab
-										.label=${this.localize.string(tab.name ?? '#general_unnamed')}
+										label=${this.localize.string(tab.name ?? '#general_unnamed')}
 										.active=${path === this._activePath ||
                     (!this._hasRootGroups && index === 0 && this._routerPath + '/' === this._activePath)}
-										.href=${path}></uui-tab>`;
+										href=${path}></uui-tab>`;
             })}
 						</uui-tab-group>`
             : ''}

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

@@ -29,6 +29,7 @@ export declare class UmbContentTypeStructureManager<T extends UmbContentTypeMode
     readonly contentTypePropertyAliases: import("rxjs").Observable<string[]>;
     readonly contentTypeUniques: import("rxjs").Observable<string[]>;
     readonly contentTypeAliases: import("rxjs").Observable<string[]>;
+    readonly contentTypeLoaded: import("rxjs").Observable<boolean>;
     readonly variesByCulture: import("rxjs").Observable<boolean | undefined>;
     readonly variesBySegment: import("rxjs").Observable<boolean | undefined>;
     containerById(id: string): import("rxjs").Observable<UmbPropertyTypeContainerModel | undefined>;

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

@@ -1,11 +1,12 @@
 import { UmbRepositoryDetailsManager, } from '@umbraco-cms/backoffice/repository';
 import { UmbId } from '@umbraco-cms/backoffice/id';
-import { UmbArrayState, partialUpdateFrozenArray, appendToFrozenArray, filterFrozenArray, createObservablePart, } from '@umbraco-cms/backoffice/observable-api';
+import { UmbArrayState, partialUpdateFrozenArray, appendToFrozenArray, filterFrozenArray, createObservablePart, observationAsPromise, mergeObservables, } from '@umbraco-cms/backoffice/observable-api';
 import { incrementString } from '@umbraco-cms/backoffice/utils';
 import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbExtensionApiInitializer } from '@umbraco-cms/backoffice/extension-api';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { firstValueFrom } from '@umbraco-cms/backoffice/external/rxjs';
+import { UmbError } from '@umbraco-cms/backoffice/resources';
 const UmbFilterDuplicateStrings = (value, index, array) => array.indexOf(value) === index;
 /**
  * Manages a structure of a Content Type and its properties and containers.
@@ -85,6 +86,9 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         this.contentTypePropertyAliases = createObservablePart(this.contentTypeProperties, (properties) => properties.map((x) => x.alias));
         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));
+        });
         this.variesByCulture = createObservablePart(this.ownerContentType, (x) => x?.variesByCulture);
         this.variesBySegment = createObservablePart(this.ownerContentType, (x) => x?.variesBySegment);
         if (typeof typeRepository === 'string') {
@@ -138,9 +142,24 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
             return Promise.reject(new Error('The unique identifier is missing. A valid unique identifier is required to load the content type.'));
         }
         this.#repoManager.setUniques([unique]);
-        const result = await this.observe(this.#repoManager.entryByUnique(unique)).asPromise();
+        const observable = this.#repoManager.entryByUnique(unique);
+        const result = await this.observe(observable).asPromise();
+        if (!result) {
+            this.#initRejection?.(`Content Type structure manager could not load: ${unique}`);
+            return {
+                error: new UmbError(`Content Type structure manager could not load: ${unique}`),
+                asObservable: () => observable,
+            };
+        }
+        // Awaits that everything is loaded:
+        await observationAsPromise(this.contentTypeLoaded, async (loaded) => {
+            return loaded === true;
+        }).catch(() => {
+            const msg = `Content Type structure manager could not load: ${unique}. Not all Content Types loaded successfully.`;
+            this.#initRejection?.(msg);
+            return Promise.reject(new UmbError(msg));
+        });
         this.#initResolver?.(result);
-        await this.#init;
         return { data: result, asObservable: () => this.ownerContentType };
     }
     async createScaffold(preset) {

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

@@ -1,12 +1,13 @@
-import type { UmbContentTypeCompositionModel, UmbContentTypeDetailModel, UmbContentTypeSortModel } from '../types.js';
 import { UmbContentTypeStructureManager } from '../structure/index.js';
+import type { UmbContentTypeCompositionModel, UmbContentTypeDetailModel, UmbContentTypeSortModel } from '../types.js';
 import type { UmbContentTypeWorkspaceContext } from './content-type-workspace-context.interface.js';
+import { UmbEntityDetailWorkspaceContextBase } from '@umbraco-cms/backoffice/workspace';
+import type { Observable } from '@umbraco-cms/backoffice/observable-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
 import type { UmbDetailRepository, UmbRepositoryResponse, UmbRepositoryResponseWithAsObservable } from '@umbraco-cms/backoffice/repository';
-import { UmbEntityDetailWorkspaceContextBase, type UmbEntityDetailWorkspaceContextArgs, type UmbEntityDetailWorkspaceContextCreateArgs, type UmbRoutableWorkspaceContext } from '@umbraco-cms/backoffice/workspace';
+import type { UmbEntityDetailWorkspaceContextArgs, UmbEntityDetailWorkspaceContextCreateArgs, UmbRoutableWorkspaceContext } from '@umbraco-cms/backoffice/workspace';
 import type { UmbReferenceByUnique } from '@umbraco-cms/backoffice/models';
-import type { Observable } from '@umbraco-cms/backoffice/observable-api';
-import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
 export interface UmbContentTypeWorkspaceContextArgs extends UmbEntityDetailWorkspaceContextArgs {
 }
 export declare abstract class UmbContentTypeWorkspaceContextBase<DetailModelType extends UmbContentTypeDetailModel = UmbContentTypeDetailModel, DetailRepositoryType extends UmbDetailRepository<DetailModelType> = UmbDetailRepository<DetailModelType>> extends UmbEntityDetailWorkspaceContextBase<DetailModelType, DetailRepositoryType> implements UmbContentTypeWorkspaceContext<DetailModelType>, UmbRoutableWorkspaceContext {
@@ -43,12 +44,12 @@ export declare abstract class UmbContentTypeWorkspaceContextBase<DetailModelType
      * @param { UmbEntityModel } parent The parent entity
      * @memberof UmbContentTypeWorkspaceContextBase
      */
-    _create(currentData: DetailModelType, parent: UmbEntityModel): Promise<void>;
+    protected _create(currentData: DetailModelType, parent: UmbEntityModel): Promise<void>;
     /**
      * Updates the content type for the workspace
      * @memberof UmbContentTypeWorkspaceContextBase
      */
-    _update(): Promise<void>;
+    protected _update(): Promise<void>;
     /**
      * Gets the name of the content type
      * @returns { string | undefined } The name of the content type

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

@@ -1,7 +1,7 @@
 import { UmbContentTypeStructureManager } from '../structure/index.js';
-import { UmbEntityDetailWorkspaceContextBase, } from '@umbraco-cms/backoffice/workspace';
+import { UmbEntityDetailWorkspaceContextBase } from '@umbraco-cms/backoffice/workspace';
+import { UmbEntityUpdatedEvent, UmbRequestReloadChildrenOfEntityEvent, UmbRequestReloadStructureForEntityEvent, } from '@umbraco-cms/backoffice/entity-action';
 import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
-import { UmbRequestReloadChildrenOfEntityEvent, UmbRequestReloadStructureForEntityEvent, } from '@umbraco-cms/backoffice/entity-action';
 const LOADING_STATE_UNIQUE = 'umbLoadingContentTypeDetail';
 export class UmbContentTypeWorkspaceContextBase extends UmbEntityDetailWorkspaceContextBase {
     constructor(host, args) {
@@ -108,15 +108,23 @@ export class UmbContentTypeWorkspaceContextBase extends UmbEntityDetailWorkspace
         try {
             await this.structure.save();
             this._data.setPersisted(this.structure.getOwnerContentType());
-            const actionEventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
-            if (!actionEventContext) {
+            const eventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
+            if (!eventContext) {
                 throw new Error('Could not get the action event context');
             }
-            const event = new UmbRequestReloadStructureForEntityEvent({
-                unique: this.getUnique(),
-                entityType: this.getEntityType(),
+            const unique = this.getUnique();
+            const entityType = this.getEntityType();
+            const reloadStructureEvent = new UmbRequestReloadStructureForEntityEvent({
+                unique,
+                entityType,
+            });
+            eventContext.dispatchEvent(reloadStructureEvent);
+            const updatedEvent = new UmbEntityUpdatedEvent({
+                unique,
+                entityType,
+                eventUnique: this._workspaceEventUnique,
             });
-            actionEventContext.dispatchEvent(event);
+            eventContext.dispatchEvent(updatedEvent);
         }
         catch (error) {
             console.error(error);

package/dist-cms/packages/content/content-type/workspace/views/design/content-type-design-editor-group.element.d.ts

@@ -13,11 +13,10 @@ export declare class UmbContentTypeWorkspaceViewEditGroupElement extends UmbLitE
     private _groupStructureHelper?;
     sortModeActive: boolean;
     editContentTypePath?: string;
-    _groupId?: string;
-    _hasOwnerContainer?: boolean;
-    _inherited?: boolean;
-    _inheritedFrom?: Array<UmbContentTypeModel>;
-    _singleValueUpdate(propertyName: string, value: string | number | boolean | null | undefined): void;
+    private _groupId?;
+    private _hasOwnerContainer?;
+    private _inherited?;
+    private _inheritedFrom?;
     render(): typeof nothing | import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult[];
 }