@umbraco-cms/backoffice 14.0.0--preview005-88d5dedc → 14.0.0--preview005-afb72093

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/core/content-type/content-type-property-structure-helper.class.d.ts

@@ -8,7 +8,7 @@ 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?: UmbPropertyContainerTypes): void;
     getContainerType(): UmbPropertyContainerTypes | undefined;
@@ -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,4 +1,4 @@
-import type { UmbContentTypeModel, UmbPropertyContainerTypes, UmbPropertyTypeContainerModel, UmbPropertyTypeModel } from './types.js';
+import type { UmbContentTypeModel, UmbPropertyContainerTypes, UmbPropertyTypeContainerModel, UmbPropertyTypeModel, UmbPropertyTypeScaffoldModel } from './types.js';
 import type { UmbDetailRepository } from '../repository/index.js';
 import type { UmbControllerHost } from '../../../libs/controller-api/index.js';
 import type { MappingFunction } from '../../../libs/observable-api/index.js';
@@ -45,8 +45,8 @@ export declare class UmbContentTypePropertyStructureManager<T extends UmbContent
     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>;

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

@@ -203,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: {
@@ -220,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

@@ -23,6 +23,9 @@ export interface UmbContentTypeModel {
     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

@@ -18,7 +18,6 @@ export declare class UmbDocumentTypeWorkspaceViewEditPropertiesElement extends U
     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/media/media-types/workspace/views/design/media-type-workspace-view-edit-properties.element.d.ts

@@ -18,7 +18,6 @@ export declare class UmbMediaTypeWorkspaceViewEditPropertiesElement extends UmbL
     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')}

package/dist-cms/packages/templating/templates/modals/query-builder/query-builder.element.js

@@ -139,12 +139,13 @@ let UmbChooseInsertTypeModalElement = class UmbChooseInsertTypeModalElement exte
 								  </uui-button>`
             : ''}
 						</div>
-						<div class="row">
+						<div class="row query-results">
 							<span id="results-count">
 								${this._templateQuery?.resultCount ?? 0}
 								<umb-localize key="template_itemsReturned">items returned, in</umb-localize>
 								${this._templateQuery?.executionTime ?? 0} ms
 							</span>
+							${this._templateQuery?.sampleResults.map((sample) => html `<span><uui-icon name=${sample.icon}></uui-icon>${sample.name}</span>`) ?? ''}
 						</div>
 						<umb-code-block language="C#" copy>${this._templateQuery?.queryExpression ?? ''}</umb-code-block>
 					</uui-box>
@@ -279,6 +280,16 @@ UmbChooseInsertTypeModalElement.styles = [
 			#results-count {
 				font-weight: bold;
 			}
+			.query-results {
+				flex-direction: column;
+				align-items: flex-start;
+				gap: 0;
+			}
+			.query-results span {
+				display: flex;
+				align-items: center;
+				gap: var(--uui-size-1);
+			}
 		`,
 ];
 __decorate([