@umbraco-cms/backoffice 14.0.0--preview005-c7e32bb7 → 14.0.0--preview005-cfee2c6f

package/dist-cms/custom-elements.json

@@ -6134,7 +6134,7 @@
         {
           "name": "property",
           "description": "Property, the data object for the property.",
-          "type": "UmbPropertyTypeModel",
+          "type": "UmbPropertyTypeModel | UmbPropertyTypeScaffoldModel | undefined",
           "default": "\"undefined\""
         },
         {
@@ -6166,7 +6166,7 @@
           "name": "property",
           "attribute": "property",
           "description": "Property, the data object for the property.",
-          "type": "UmbPropertyTypeModel",
+          "type": "UmbPropertyTypeModel | UmbPropertyTypeScaffoldModel | undefined",
           "default": "\"undefined\""
         },
         {

package/dist-cms/packages/block/block/workspace/views/edit/block-workspace-view-edit-properties.element.d.ts

@@ -1,5 +1,5 @@
 import type { UmbBlockWorkspaceElementManagerNames } from '../../block-workspace.context.js';
-import type { PropertyContainerTypes, UmbPropertyTypeModel } from '../../../../../core/content-type/index.js';
+import type { UmbPropertyContainerTypes, UmbPropertyTypeModel } from '../../../../../core/content-type/index.js';
 import { UmbLitElement } from '../../../../../../shared/lit-element/index.js';
 export declare class UmbBlockWorkspaceViewEditPropertiesElement extends UmbLitElement {
     #private;
@@ -7,8 +7,8 @@ export declare class UmbBlockWorkspaceViewEditPropertiesElement extends UmbLitEl
     set managerName(value: UmbBlockWorkspaceElementManagerNames | undefined);
     get containerName(): string | undefined;
     set containerName(value: string | undefined);
-    get containerType(): PropertyContainerTypes | undefined;
-    set containerType(value: PropertyContainerTypes | undefined);
+    get containerType(): UmbPropertyContainerTypes | undefined;
+    set containerType(value: UmbPropertyContainerTypes | undefined);
     _propertyStructure: Array<UmbPropertyTypeModel>;
     constructor();
     render(): unknown;

package/dist-cms/packages/core/content-type/content-type-container-structure-helper.class.d.ts

@@ -1,6 +1,5 @@
-import type { PropertyContainerTypes, UmbContentTypePropertyStructureManager } from './content-type-structure-manager.class.js';
-import type { UmbContentTypeModel } from './types.js';
-import type { PropertyTypeContainerModelBaseModel } from '../../../external/backend-api/index.js';
+import type { UmbContentTypePropertyStructureManager } from './content-type-structure-manager.class.js';
+import type { UmbContentTypeModel, UmbPropertyContainerTypes, UmbPropertyTypeContainerModel } from './types.js';
 import type { UmbControllerHostElement } from '../../../libs/controller-api/index.js';
 export declare class UmbContentTypeContainerStructureHelper<T extends UmbContentTypeModel> {
     #private;
@@ -15,14 +14,14 @@ export declare class UmbContentTypeContainerStructureHelper<T extends UmbContent
     private _ownerName?;
     private _ownerAlikeContainers;
     private _ownerContainers;
-    readonly containers: import("rxjs").Observable<PropertyTypeContainerModelBaseModel[]>;
+    readonly containers: import("rxjs").Observable<UmbPropertyTypeContainerModel[]>;
     readonly hasProperties: import("rxjs").Observable<boolean>;
     constructor(host: UmbControllerHostElement);
     setStructureManager(structure: UmbContentTypePropertyStructureManager<T>): void;
-    setType(value?: PropertyContainerTypes): void;
-    getType(): PropertyContainerTypes | undefined;
-    setContainerChildType(value?: PropertyContainerTypes): void;
-    getContainerChildType(): PropertyContainerTypes | undefined;
+    setType(value?: UmbPropertyContainerTypes): void;
+    getType(): UmbPropertyContainerTypes | undefined;
+    setContainerChildType(value?: UmbPropertyContainerTypes): void;
+    getContainerChildType(): UmbPropertyContainerTypes | undefined;
     setName(value?: string): void;
     getName(): string | undefined;
     setIsRoot(value: boolean): void;
@@ -43,9 +42,9 @@ export declare class UmbContentTypeContainerStructureHelper<T extends UmbContent
      */
     isOwnerChildContainer(containerId?: string): boolean | undefined;
     /** Manipulate methods: */
-    insertContainer(container: PropertyTypeContainerModelBaseModel, sortOrder?: number): Promise<boolean>;
+    insertContainer(container: UmbPropertyTypeContainerModel, sortOrder?: number): Promise<boolean>;
     addContainer(parentContainerId?: string | null, sortOrder?: number): Promise<void>;
     removeContainer(groupId: string): Promise<boolean>;
-    partialUpdateContainer(containerId: string, partialUpdate: Partial<PropertyTypeContainerModelBaseModel>): Promise<void>;
+    partialUpdateContainer(containerId: string, partialUpdate: Partial<UmbPropertyTypeContainerModel>): Promise<void>;
     updateContainerName(containerId: string, containerParentId: string | null, name: string): Promise<void>;
 }

package/dist-cms/packages/core/content-type/content-type-property-structure-helper.class.d.ts

@@ -1,5 +1,5 @@
-import type { PropertyContainerTypes, UmbContentTypePropertyStructureManager } from './content-type-structure-manager.class.js';
-import type { UmbContentTypeModel, UmbPropertyTypeModel } from './types.js';
+import type { UmbContentTypePropertyStructureManager } from './content-type-structure-manager.class.js';
+import type { UmbContentTypeModel, UmbPropertyContainerTypes, UmbPropertyTypeModel } from './types.js';
 import type { UmbControllerHostElement } from '../../../libs/controller-api/index.js';
 export declare class UmbContentTypePropertyStructureHelper<T extends UmbContentTypeModel> {
     #private;
@@ -8,10 +8,10 @@ export declare class UmbContentTypePropertyStructureHelper<T extends UmbContentT
     private _containerName?;
     readonly propertyStructure: import("rxjs").Observable<UmbPropertyTypeModel[]>;
     constructor(host: UmbControllerHostElement);
-    get ownerDocumentTypes(): import("rxjs").Observable<T[]> | undefined;
+    ownerDocumentTypes(): Promise<import("rxjs").Observable<T[]> | undefined>;
     setStructureManager(structure: UmbContentTypePropertyStructureManager<T>): void;
-    setContainerType(value?: PropertyContainerTypes): void;
-    getContainerType(): PropertyContainerTypes | undefined;
+    setContainerType(value?: UmbPropertyContainerTypes): void;
+    getContainerType(): UmbPropertyContainerTypes | undefined;
     setContainerName(value?: string): void;
     getContainerName(): string | undefined;
     setIsRoot(value: boolean): void;
@@ -19,8 +19,8 @@ export declare class UmbContentTypePropertyStructureHelper<T extends UmbContentT
     private _observeGroupContainers;
     private _observePropertyStructureOf;
     /** Manipulate methods: */
-    createPropertyScaffold(ownerId?: string, sortOrder?: number): Promise<UmbPropertyTypeModel | undefined>;
-    addProperty(ownerId?: string, sortOrder?: number): Promise<UmbPropertyTypeModel | undefined>;
+    createPropertyScaffold(ownerId?: string, sortOrder?: number): Promise<import("./types.js").UmbPropertyTypeScaffoldModel | undefined>;
+    addProperty(ownerId?: string, sortOrder?: number): Promise<import("./types.js").UmbPropertyTypeScaffoldModel | undefined>;
     insertProperty(property: UmbPropertyTypeModel, sortOrder?: number): Promise<boolean>;
     removeProperty(propertyId: string): Promise<boolean>;
     partialUpdateProperty(propertyKey?: string, partialUpdate?: Partial<UmbPropertyTypeModel>): Promise<void>;

package/dist-cms/packages/core/content-type/content-type-property-structure-helper.class.js

@@ -26,8 +26,11 @@ export class UmbContentTypePropertyStructureHelper {
         // TODO: Remove as any when sortOrder is implemented:
         __classPrivateFieldGet(this, _UmbContentTypePropertyStructureHelper_propertyStructure, "f").sortBy((a, b) => (a.sortOrder ?? 0) - (b.sortOrder ?? 0));
     }
-    get ownerDocumentTypes() {
-        return __classPrivateFieldGet(this, _UmbContentTypePropertyStructureHelper_structure, "f")?.contentTypes;
+    async ownerDocumentTypes() {
+        await __classPrivateFieldGet(this, _UmbContentTypePropertyStructureHelper_init, "f");
+        if (!__classPrivateFieldGet(this, _UmbContentTypePropertyStructureHelper_structure, "f"))
+            return;
+        return __classPrivateFieldGet(this, _UmbContentTypePropertyStructureHelper_structure, "f").contentTypes;
     }
     setStructureManager(structure) {
         __classPrivateFieldSet(this, _UmbContentTypePropertyStructureHelper_structure, structure, "f");

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

@@ -1,10 +1,8 @@
-import type { UmbContentTypeModel, UmbPropertyTypeModel } from './types.js';
+import type { UmbContentTypeModel, UmbPropertyContainerTypes, UmbPropertyTypeContainerModel, UmbPropertyTypeModel, UmbPropertyTypeScaffoldModel } from './types.js';
 import type { UmbDetailRepository } from '../repository/index.js';
-import type { PropertyTypeContainerModelBaseModel } from '../../../external/backend-api/index.js';
 import type { UmbControllerHost } from '../../../libs/controller-api/index.js';
 import type { MappingFunction } from '../../../libs/observable-api/index.js';
 import { UmbBaseController } from '../../../libs/class-api/index.js';
-export type PropertyContainerTypes = 'Group' | 'Tab';
 export declare class UmbContentTypePropertyStructureManager<T extends UmbContentTypeModel> extends UmbBaseController {
     #private;
     readonly contentTypes: import("rxjs").Observable<T[]>;
@@ -42,13 +40,13 @@ export declare class UmbContentTypePropertyStructureManager<T extends UmbContent
     ownerContentType(): import("rxjs").Observable<T | undefined>;
     getOwnerContentType(): T | undefined;
     updateOwnerContentType(entry: Partial<T>): void;
-    createContainer(contentTypeUnique: string | null, parentId?: string | null, type?: PropertyContainerTypes, sortOrder?: number): Promise<PropertyTypeContainerModelBaseModel>;
-    insertContainer(contentTypeUnique: string | null, container: PropertyTypeContainerModelBaseModel): Promise<void>;
-    makeContainerNameUniqueForOwnerContentType(newName: string, containerType?: PropertyContainerTypes, parentId?: string | null): string | null;
-    updateContainer(contentTypeUnique: string | null, containerId: string, partialUpdate: Partial<PropertyTypeContainerModelBaseModel>): Promise<void>;
+    createContainer(contentTypeUnique: string | null, parentId?: string | null, type?: UmbPropertyContainerTypes, sortOrder?: number): Promise<UmbPropertyTypeContainerModel>;
+    insertContainer(contentTypeUnique: string | null, container: UmbPropertyTypeContainerModel): Promise<void>;
+    makeContainerNameUniqueForOwnerContentType(newName: string, containerType?: UmbPropertyContainerTypes, parentId?: string | null): string | null;
+    updateContainer(contentTypeUnique: string | null, containerId: string, partialUpdate: Partial<UmbPropertyTypeContainerModel>): Promise<void>;
     removeContainer(contentTypeUnique: string | null, containerId?: string | null): Promise<void>;
-    createPropertyScaffold(containerId?: string | null, sortOrder?: number): UmbPropertyTypeModel;
-    createProperty(contentTypeUnique: string | null, containerId?: string | null, sortOrder?: number): Promise<UmbPropertyTypeModel>;
+    createPropertyScaffold(containerId?: string | null, sortOrder?: number): UmbPropertyTypeScaffoldModel;
+    createProperty(contentTypeUnique: string | null, containerId?: string | null, sortOrder?: number): Promise<UmbPropertyTypeScaffoldModel>;
     insertProperty(contentTypeUnique: string | null, property: UmbPropertyTypeModel): Promise<void>;
     removeProperty(contentTypeUnique: string | null, propertyId: string): Promise<void>;
     updateProperty(contentTypeUnique: string | null, propertyId: string, partialUpdate: Partial<UmbPropertyTypeModel>): Promise<void>;
@@ -60,14 +58,14 @@ export declare class UmbContentTypePropertyStructureManager<T extends UmbContent
     hasPropertyStructuresOf(containerId: string | null): import("rxjs").Observable<boolean>;
     rootPropertyStructures(): import("rxjs").Observable<UmbPropertyTypeModel[]>;
     propertyStructuresOf(containerId: string | null): import("rxjs").Observable<UmbPropertyTypeModel[]>;
-    rootContainers(containerType: PropertyContainerTypes): import("rxjs").Observable<PropertyTypeContainerModelBaseModel[]>;
-    getRootContainers(containerType: PropertyContainerTypes): PropertyTypeContainerModelBaseModel[];
-    hasRootContainers(containerType: PropertyContainerTypes): import("rxjs").Observable<boolean>;
-    ownerContainersOf(containerType: PropertyContainerTypes): import("rxjs").Observable<PropertyTypeContainerModelBaseModel[] | undefined>;
-    getOwnerContainers(containerType: PropertyContainerTypes, parentId?: string | null): PropertyTypeContainerModelBaseModel[] | undefined;
-    isOwnerContainer(containerId: string): PropertyTypeContainerModelBaseModel[] | undefined;
-    containersOfParentKey(parentId: string, containerType: PropertyContainerTypes): import("rxjs").Observable<PropertyTypeContainerModelBaseModel[]>;
-    containersByNameAndType(name: string, containerType: PropertyContainerTypes): import("rxjs").Observable<PropertyTypeContainerModelBaseModel[]>;
+    rootContainers(containerType: UmbPropertyContainerTypes): import("rxjs").Observable<UmbPropertyTypeContainerModel[]>;
+    getRootContainers(containerType: UmbPropertyContainerTypes): UmbPropertyTypeContainerModel[];
+    hasRootContainers(containerType: UmbPropertyContainerTypes): import("rxjs").Observable<boolean>;
+    ownerContainersOf(containerType: UmbPropertyContainerTypes): import("rxjs").Observable<UmbPropertyTypeContainerModel[] | undefined>;
+    getOwnerContainers(containerType: UmbPropertyContainerTypes, parentId?: string | null): UmbPropertyTypeContainerModel[] | undefined;
+    isOwnerContainer(containerId: string): UmbPropertyTypeContainerModel[] | undefined;
+    containersOfParentKey(parentId: string, containerType: UmbPropertyContainerTypes): import("rxjs").Observable<UmbPropertyTypeContainerModel[]>;
+    containersByNameAndType(name: string, containerType: UmbPropertyContainerTypes): import("rxjs").Observable<UmbPropertyTypeContainerModel[]>;
     private _reset;
     destroy(): void;
 }

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

@@ -14,8 +14,6 @@ import { UmbId } from '../id/index.js';
 import { UmbArrayState, partialUpdateFrozenArray, appendToFrozenArray, filterFrozenArray, } from '../../../libs/observable-api/index.js';
 import { incrementString } from '../../../shared/utils/index.js';
 import { UmbBaseController } from '../../../libs/class-api/index.js';
-// TODO: get this type from the repository, or use some generic type.
-// TODO: Make this a controller on its own:
 export class UmbContentTypePropertyStructureManager extends UmbBaseController {
     constructor(host, typeRepository) {
         super(host);
@@ -205,11 +203,10 @@ export class UmbContentTypePropertyStructureManager extends UmbBaseController {
     createPropertyScaffold(containerId = null, sortOrder) {
         const property = {
             id: UmbId.new(),
-            containerId: containerId,
+            container: containerId ? { id: containerId } : null,
             alias: '',
             name: '',
             description: '',
-            dataTypeId: '',
             variesByCulture: false,
             variesBySegment: false,
             validation: {
@@ -222,7 +219,7 @@ export class UmbContentTypePropertyStructureManager extends UmbBaseController {
                 labelOnTop: false,
             },
             sortOrder: sortOrder ?? 0,
-        }; // Sort order was not allowed when this was written.
+        };
         return property;
     }
     async createProperty(contentTypeUnique, containerId = null, sortOrder) {

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

@@ -1,4 +1,12 @@
-import type { PropertyTypeContainerModelBaseModel, CompositionTypeModel, PropertyTypeModelBaseModel } from '../../../external/backend-api/index.js';
+import type { CompositionTypeModel, PropertyTypeModelBaseModel, ReferenceByIdModel } from '../../../external/backend-api/index.js';
+export type UmbPropertyContainerTypes = 'Group' | 'Tab';
+export interface UmbPropertyTypeContainerModel {
+    id: string;
+    parent?: ReferenceByIdModel | null;
+    name?: string | null;
+    type: UmbPropertyContainerTypes;
+    sortOrder: number;
+}
 export interface UmbContentTypeModel {
     unique: string;
     parentUnique: string | null;
@@ -11,10 +19,13 @@ export interface UmbContentTypeModel {
     variesBySegment: boolean;
     isElement: boolean;
     properties: Array<UmbPropertyTypeModel>;
-    containers: Array<PropertyTypeContainerModelBaseModel>;
+    containers: Array<UmbPropertyTypeContainerModel>;
     allowedContentTypes: Array<UmbContentTypeSortModel>;
     compositions: Array<UmbContentTypeCompositionModel>;
 }
+export interface UmbPropertyTypeScaffoldModel extends Omit<UmbPropertyTypeModel, 'dataType'> {
+    dataType?: UmbPropertyTypeModel['dataType'];
+}
 export interface UmbPropertyTypeModel extends Omit<PropertyTypeModelBaseModel, 'dataType'> {
     dataType: {
         unique: string;

package/dist-cms/packages/core/data-type/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.js

@@ -8,7 +8,7 @@ import { UmbDataTypeDetailRepository } from '../../repository/detail/data-type-d
 import { UmbDataTypeTreeRepository } from '../../tree/data-type-tree.repository.js';
 import { css, html, customElement, state, repeat, when } from '../../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../../../shared/style/index.js';
-import { UmbModalBaseElement, } from '../../../modal/index.js';
+import { UmbModalBaseElement } from '../../../modal/index.js';
 let UmbDataTypePickerFlowDataTypePickerModalElement = class UmbDataTypePickerFlowDataTypePickerModalElement extends UmbModalBaseElement {
     connectedCallback() {
         super.connectedCallback();

package/dist-cms/packages/core/modal/common/property-settings/property-settings-modal.element.js

@@ -135,7 +135,7 @@ let UmbPropertySettingsModalElement = class UmbPropertySettingsModalElement exte
 										.value=${this.value.description}></uui-textarea>
 								</div>
 								<umb-data-type-flow-input
-									.value=${this.value.dataType.unique}
+									.value=${this.value.dataType?.unique}
 									@change=${__classPrivateFieldGet(this, _UmbPropertySettingsModalElement_instances, "m", _UmbPropertySettingsModalElement_onDataTypeIdChange)}></umb-data-type-flow-input>
 								<hr />
 								<div class="container">

package/dist-cms/packages/core/modal/token/property-settings-modal.token.d.ts

@@ -1,7 +1,7 @@
-import type { UmbPropertyTypeModel } from '../../content-type/index.js';
+import type { UmbPropertyTypeModel, UmbPropertyTypeScaffoldModel } from '../../content-type/index.js';
 import { UmbModalToken } from '../index.js';
 export type UmbPropertySettingsModalData = {
     documentTypeId: string;
 };
-export type UmbPropertySettingsModalValue = UmbPropertyTypeModel;
-export declare const UMB_PROPERTY_SETTINGS_MODAL: UmbModalToken<UmbPropertySettingsModalData, UmbPropertyTypeModel>;
+export type UmbPropertySettingsModalValue = UmbPropertyTypeModel | UmbPropertyTypeScaffoldModel;
+export declare const UMB_PROPERTY_SETTINGS_MODAL: UmbModalToken<UmbPropertySettingsModalData, UmbPropertySettingsModalValue>;

package/dist-cms/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-properties.element.d.ts

@@ -1,6 +1,6 @@
 import './document-type-workspace-view-edit-property.element.js';
 import type { UmbDocumentTypeDetailModel } from '../../../types.js';
-import type { PropertyContainerTypes, UmbPropertyTypeModel } from '../../../../../core/content-type/index.js';
+import type { UmbPropertyContainerTypes, UmbPropertyTypeModel } from '../../../../../core/content-type/index.js';
 import { UmbContentTypePropertyStructureHelper } from '../../../../../core/content-type/index.js';
 import { UmbLitElement } from '../../../../../../shared/lit-element/index.js';
 export declare class UmbDocumentTypeWorkspaceViewEditPropertiesElement extends UmbLitElement {
@@ -10,15 +10,14 @@ export declare class UmbDocumentTypeWorkspaceViewEditPropertiesElement extends U
     set containerId(value: string | undefined);
     get containerName(): string | undefined;
     set containerName(value: string | undefined);
-    get containerType(): PropertyContainerTypes | undefined;
-    set containerType(value: PropertyContainerTypes | undefined);
+    get containerType(): UmbPropertyContainerTypes | undefined;
+    set containerType(value: UmbPropertyContainerTypes | undefined);
     _propertyStructureHelper: UmbContentTypePropertyStructureHelper<UmbDocumentTypeDetailModel>;
     _propertyStructure: Array<UmbPropertyTypeModel>;
     _ownerDocumentTypes?: UmbDocumentTypeDetailModel[];
     protected _modalRouteNewProperty?: string;
     _sortModeActive?: boolean;
     constructor();
-    connectedCallback(): void;
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("../../../../../../external/lit/index.js").CSSResult[];
 }

package/dist-cms/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-properties.element.js

@@ -91,12 +91,18 @@ let UmbDocumentTypeWorkspaceViewEditPropertiesElement = class UmbDocumentTypeWor
         }));
         this._propertyStructureHelper = new UmbContentTypePropertyStructureHelper(this);
         this._propertyStructure = [];
-        this.consumeContext(UMB_WORKSPACE_CONTEXT, (workspaceContext) => {
+        this.consumeContext(UMB_WORKSPACE_CONTEXT, async (workspaceContext) => {
             this._propertyStructureHelper.setStructureManager(workspaceContext.structure);
             this.observe(workspaceContext.isSorting, (isSorting) => {
                 this._sortModeActive = isSorting;
                 __classPrivateFieldGet(this, _UmbDocumentTypeWorkspaceViewEditPropertiesElement_instances, "m", _UmbDocumentTypeWorkspaceViewEditPropertiesElement_setModel).call(this, isSorting);
             }, '_observeIsSorting');
+            const docTypesObservable = await this._propertyStructureHelper.ownerDocumentTypes();
+            if (!docTypesObservable)
+                return;
+            this.observe(docTypesObservable, (documents) => {
+                this._ownerDocumentTypes = documents;
+            }, 'observeOwnerDocumentTypes');
         });
         this.observe(this._propertyStructureHelper.propertyStructure, (propertyStructure) => {
             this._propertyStructure = propertyStructure;
@@ -114,28 +120,22 @@ let UmbDocumentTypeWorkspaceViewEditPropertiesElement = class UmbDocumentTypeWor
             return { data: { documentTypeId }, value: propertyData };
         })
             .onSubmit((value) => {
+            if (!value.dataType) {
+                throw new Error('No data type selected');
+            }
             __classPrivateFieldGet(this, _UmbDocumentTypeWorkspaceViewEditPropertiesElement_instances, "m", _UmbDocumentTypeWorkspaceViewEditPropertiesElement_addProperty).call(this, value);
         })
             .observeRouteBuilder((routeBuilder) => {
             this._modalRouteNewProperty = routeBuilder(null);
         });
     }
-    connectedCallback() {
-        super.connectedCallback();
-        const doctypes = this._propertyStructureHelper.ownerDocumentTypes;
-        if (!doctypes)
-            return;
-        this.observe(doctypes, (documents) => {
-            this._ownerDocumentTypes = documents;
-        }, 'observeOwnerDocumentTypes');
-    }
     render() {
         return html `<div id="property-list">
 				${repeat(this._propertyStructure, (property) => property.id ?? '' + property.container?.id ?? '' + property.sortOrder ?? '', (property) => {
             // Note: This piece might be moved into the property component
             const inheritedFromDocument = this._ownerDocumentTypes?.find((types) => types.containers?.find((containers) => containers.id === property.container?.id));
             return html `<umb-document-type-workspace-view-edit-property
-							data-umb-property-id=${ifDefined(property.id)}
+							data-umb-property-id=${property.id}
 							owner-document-type-id=${ifDefined(inheritedFromDocument?.unique)}
 							owner-document-type-name=${ifDefined(inheritedFromDocument?.name)}
 							?inherited=${property.container?.id !== this.containerId}

package/dist-cms/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-property.element.d.ts

@@ -1,6 +1,6 @@
 import { nothing } from '../../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../../../shared/lit-element/index.js';
-import type { UmbPropertyTypeModel } from '../../../../../core/content-type/index.js';
+import type { UmbPropertyTypeModel, UmbPropertyTypeScaffoldModel } from '../../../../../core/content-type/index.js';
 /**
  *  @element umb-document-type-workspace-view-edit-property
  *  @description - Element for displaying a property in an workspace.
@@ -11,12 +11,12 @@ export declare class UmbDocumentTypeWorkspacePropertyElement extends UmbLitEleme
     private _property?;
     /**
      * Property, the data object for the property.
-     * @type {UmbPropertyTypeModel}
+     * @type {UmbPropertyTypeModel | UmbPropertyTypeScaffoldModel | undefined}
      * @attr
      * @default undefined
      */
-    get property(): UmbPropertyTypeModel | undefined;
-    set property(value: UmbPropertyTypeModel | undefined);
+    get property(): UmbPropertyTypeModel | UmbPropertyTypeScaffoldModel | undefined;
+    set property(value: UmbPropertyTypeModel | UmbPropertyTypeScaffoldModel | undefined);
     /**
      * Inherited, Determines if the property is part of the main document type thats being edited.
      * If true, then the property is inherited from another document type, not a part of the main document type.

package/dist-cms/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-property.element.js

@@ -31,7 +31,7 @@ import { UmbTextStyles } from '../../../../../../shared/style/index.js';
 let UmbDocumentTypeWorkspacePropertyElement = class UmbDocumentTypeWorkspacePropertyElement extends UmbLitElement {
     /**
      * Property, the data object for the property.
-     * @type {UmbPropertyTypeModel}
+     * @type {UmbPropertyTypeModel | UmbPropertyTypeScaffoldModel | undefined}
      * @attr
      * @default undefined
      */
@@ -42,7 +42,7 @@ let UmbDocumentTypeWorkspacePropertyElement = class UmbDocumentTypeWorkspaceProp
         const oldValue = this._property;
         this._property = value;
         __classPrivateFieldGet(this, _UmbDocumentTypeWorkspacePropertyElement_modalRegistration, "f").setUniquePathValue('propertyId', value?.id?.toString());
-        this.setDataType(this._property?.dataType.unique);
+        this.setDataType(this._property?.dataType?.unique);
         this.requestUpdate('property', oldValue);
     }
     get modalRoute() {
@@ -72,6 +72,9 @@ let UmbDocumentTypeWorkspacePropertyElement = class UmbDocumentTypeWorkspaceProp
             return { data: { documentTypeId }, value: propertyData };
         })
             .onSubmit((result) => {
+            if (!result.dataType) {
+                throw new Error('No dataType found on property');
+            }
             this._partialUpdate(result);
         })
             .observeRouteBuilder((routeBuilder) => {
@@ -209,7 +212,7 @@ let UmbDocumentTypeWorkspacePropertyElement = class UmbDocumentTypeWorkspaceProp
     renderPropertyTags() {
         return this.property
             ? html `<div class="types">
-					${this.property.dataType.unique ? html `<uui-tag look="default">${this._dataTypeName}</uui-tag>` : nothing}
+					${this.property.dataType?.unique ? html `<uui-tag look="default">${this._dataTypeName}</uui-tag>` : nothing}
 					${this.property.variesByCulture
                 ? html `<uui-tag look="default">
 								<uui-icon name="icon-shuffle"></uui-icon> ${this.localize.term('contentTypeEditor_cultureVariantLabel')}

package/dist-cms/packages/documents/documents/workspace/views/edit/document-workspace-view-edit-properties.element.d.ts

@@ -1,11 +1,11 @@
-import type { PropertyContainerTypes, UmbPropertyTypeModel } from '../../../../../core/content-type/index.js';
+import type { UmbPropertyContainerTypes, UmbPropertyTypeModel } from '../../../../../core/content-type/index.js';
 import { UmbContentTypePropertyStructureHelper } from '../../../../../core/content-type/index.js';
 import { UmbLitElement } from '../../../../../../shared/lit-element/index.js';
 export declare class UmbDocumentWorkspaceViewEditPropertiesElement extends UmbLitElement {
     get containerName(): string | undefined;
     set containerName(value: string | undefined);
-    get containerType(): PropertyContainerTypes | undefined;
-    set containerType(value: PropertyContainerTypes | undefined);
+    get containerType(): UmbPropertyContainerTypes | undefined;
+    set containerType(value: UmbPropertyContainerTypes | undefined);
     _propertyStructureHelper: UmbContentTypePropertyStructureHelper<any>;
     _propertyStructure: Array<UmbPropertyTypeModel>;
     constructor();

package/dist-cms/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-properties.element.d.ts

@@ -1,6 +1,6 @@
 import './media-type-workspace-view-edit-property.element.js';
 import type { UmbMediaTypeDetailModel } from '../../../types.js';
-import type { PropertyContainerTypes, UmbPropertyTypeModel } from '../../../../../core/content-type/index.js';
+import type { UmbPropertyContainerTypes, UmbPropertyTypeModel } from '../../../../../core/content-type/index.js';
 import { UmbContentTypePropertyStructureHelper } from '../../../../../core/content-type/index.js';
 import { UmbLitElement } from '../../../../../../shared/lit-element/index.js';
 export declare class UmbMediaTypeWorkspaceViewEditPropertiesElement extends UmbLitElement {
@@ -10,15 +10,14 @@ export declare class UmbMediaTypeWorkspaceViewEditPropertiesElement extends UmbL
     set containerId(value: string | undefined);
     get containerName(): string | undefined;
     set containerName(value: string | undefined);
-    get containerType(): PropertyContainerTypes | undefined;
-    set containerType(value: PropertyContainerTypes | undefined);
+    get containerType(): UmbPropertyContainerTypes | undefined;
+    set containerType(value: UmbPropertyContainerTypes | undefined);
     _propertyStructureHelper: UmbContentTypePropertyStructureHelper<UmbMediaTypeDetailModel>;
     _propertyStructure: Array<UmbPropertyTypeModel>;
     _ownerMediaTypes?: UmbMediaTypeDetailModel[];
     protected _modalRouteNewProperty?: string;
     _sortModeActive?: boolean;
     constructor();
-    connectedCallback(): void;
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("../../../../../../external/lit/index.js").CSSResult[];
 }

package/dist-cms/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-properties.element.js

@@ -91,12 +91,18 @@ let UmbMediaTypeWorkspaceViewEditPropertiesElement = class UmbMediaTypeWorkspace
         }));
         this._propertyStructureHelper = new UmbContentTypePropertyStructureHelper(this);
         this._propertyStructure = [];
-        this.consumeContext(UMB_WORKSPACE_CONTEXT, (workspaceContext) => {
+        this.consumeContext(UMB_WORKSPACE_CONTEXT, async (workspaceContext) => {
             this._propertyStructureHelper.setStructureManager(workspaceContext.structure);
             this.observe(workspaceContext.isSorting, (isSorting) => {
                 this._sortModeActive = isSorting;
                 __classPrivateFieldGet(this, _UmbMediaTypeWorkspaceViewEditPropertiesElement_instances, "m", _UmbMediaTypeWorkspaceViewEditPropertiesElement_setModel).call(this, isSorting);
             }, '_observeIsSorting');
+            const mediaTypesObservable = await this._propertyStructureHelper.ownerDocumentTypes();
+            if (!mediaTypesObservable)
+                return;
+            this.observe(mediaTypesObservable, (medias) => {
+                this._ownerMediaTypes = medias;
+            }, 'observeOwnerMediaTypes');
         });
         this.observe(this._propertyStructureHelper.propertyStructure, (propertyStructure) => {
             this._propertyStructure = propertyStructure;
@@ -114,21 +120,15 @@ let UmbMediaTypeWorkspaceViewEditPropertiesElement = class UmbMediaTypeWorkspace
             return { data: { documentTypeId: mediaTypeId }, value: propertyData }; //TODO: Should we have a separate modal for mediaTypes?
         })
             .onSubmit((value) => {
+            if (!value.dataType) {
+                throw new Error('No data type selected');
+            }
             __classPrivateFieldGet(this, _UmbMediaTypeWorkspaceViewEditPropertiesElement_instances, "m", _UmbMediaTypeWorkspaceViewEditPropertiesElement_addProperty).call(this, value);
         })
             .observeRouteBuilder((routeBuilder) => {
             this._modalRouteNewProperty = routeBuilder(null);
         });
     }
-    connectedCallback() {
-        super.connectedCallback();
-        const mediaTypes = this._propertyStructureHelper.ownerDocumentTypes; //TODO: Should we have a separate propertyStructureHelper for mediaTypes?
-        if (!mediaTypes)
-            return;
-        this.observe(mediaTypes, (medias) => {
-            this._ownerMediaTypes = medias;
-        }, 'observeOwnerMediaTypes');
-    }
     render() {
         return html `<div id="property-list">
 				${repeat(this._propertyStructure, (property) => property.id ?? '' + property.container?.id ?? '' + property.sortOrder ?? '', (property) => {

package/dist-cms/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-property.element.js

@@ -72,6 +72,9 @@ let UmbMediaTypeWorkspacePropertyElement = class UmbMediaTypeWorkspacePropertyEl
             return { data: { documentTypeId: mediaTypeId }, value: propertyData }; //TODO: Should we have a separate modal for mediaTypes?
         })
             .onSubmit((result) => {
+            if (!result.dataType) {
+                throw new Error('No dataType found on property');
+            }
             this._partialUpdate(result);
         })
             .observeRouteBuilder((routeBuilder) => {
@@ -209,7 +212,7 @@ let UmbMediaTypeWorkspacePropertyElement = class UmbMediaTypeWorkspacePropertyEl
     renderPropertyTags() {
         return this.property
             ? html `<div class="types">
-					${this.property.dataType.unique ? html `<uui-tag look="default">${this._dataTypeName}</uui-tag>` : nothing}
+					${this.property.dataType?.unique ? html `<uui-tag look="default">${this._dataTypeName}</uui-tag>` : nothing}
 					${this.property.variesByCulture
                 ? html `<uui-tag look="default">
 								<uui-icon name="icon-shuffle"></uui-icon> ${this.localize.term('contentTypeEditor_cultureVariantLabel')}