Merge pull request #2273 from umbraco/v14/feature/property_dataset_properties_observable

V14/feature: Content Type Structure Manager properties observable

Author: nielslyngsoe

src/packages/core/content-type/structure/content-type-structure-manager.class.ts

@@ -46,8 +46,20 @@ export class UmbContentTypeStructureManager<
 		(x) => x.find((y) => y.unique === this.#ownerContentTypeUnique)?.compositions,
 	);
 
-	readonly #contentTypeContainers = this.#contentTypes.asObservablePart(() => {
-		return this.#contentTypes.getValue().flatMap((x) => x.containers ?? []);
+	readonly #contentTypeContainers = this.#contentTypes.asObservablePart((contentTypes) => {
+		// Notice this may need to use getValue to avoid resetting it self. [NL]
+		return contentTypes.flatMap((x) => x.containers ?? []);
+	});
+	readonly contentTypeProperties = this.#contentTypes.asObservablePart((contentTypes) => {
+		// Notice this may need to use getValue to avoid resetting it self. [NL]
+		return contentTypes.flatMap((x) => x.properties ?? []);
+	});
+	readonly contentTypeHasProperties = this.#contentTypes.asObservablePart((contentTypes) => {
+		// Notice this may need to use getValue to avoid resetting it self. [NL]
+		return contentTypes.some((x) => x.properties.length > 0);
+	});
+	readonly contentTypePropertyAliases = this.#contentTypes.asObservablePart((contentTypes) => {
+		return contentTypes.flatMap((x) => x.properties ?? []).map((x) => x.alias);
 	});
 	readonly contentTypeUniques = this.#contentTypes.asObservablePart((x) => x.map((y) => y.unique));
 	readonly contentTypeAliases = this.#contentTypes.asObservablePart((x) => x.map((y) => y.alias));
@@ -77,7 +89,8 @@ export class UmbContentTypeStructureManager<
 	/**
 	 * loadType will load the ContentType and all inherited and composed ContentTypes.
 	 * This will give us all the structure for properties and containers.
-	 * @param unique
+	 * @param {string} unique - The unique of the ContentType to load.
+	 * @returns {Promise} - Promise resolved
 	 */
 	public async loadType(unique?: string) {
 		this._reset();
@@ -219,6 +232,14 @@ export class UmbContentTypeStructureManager<
 		return this.#ownerContentTypeUnique;
 	}
 
+	/**
+	 * Figure out if any of the Content Types has a Property.
+	 * @returns {boolean} - true if any of the Content Type in this composition has a Property.
+	 */
+	getHasProperties() {
+		return this.#contentTypes.getValue().some((y) => y.properties.length > 0);
+	}
+
 	updateOwnerContentType(entry: Partial<T>) {
 		this.#contentTypes.updateOne(this.#ownerContentTypeUnique, entry);
 	}

src/packages/core/content/workspace/views/edit/conditions/has-properties/content-has-properties.condition.ts

@@ -16,12 +16,11 @@ export class UmbContentHasPropertiesWorkspaceCondition
 
 		this.consumeContext(UMB_CONTENT_WORKSPACE_CONTEXT, (context) => {
 			this.observe(
-				context.structure.contentTypes,
-				(contentTypes) => {
-					const hasProperties = contentTypes.some((contentType) => contentType.properties.length > 0);
+				context.structure.contentTypeHasProperties,
+				(hasProperties) => {
 					this.permitted = hasProperties;
 				},
-				'contentTypesObserver',
+				'hasPropertiesObserver',
 			);
 		});
 	}

src/packages/core/property/property-dataset/property-dataset.element.ts

@@ -16,10 +16,10 @@ export class UmbPropertyDatasetElement extends UmbLitElement {
 
 	public readonly context: UmbPropertyDatasetContextBase;
 
+	@property({ attribute: false })
 	/**
 	 * The value of the dataset.
-	 * @returns {Array<UmbPropertyValueData>}
-	 * @memberof UmbBasicVariantElement
+	 * @returns {Array<UmbPropertyValueData>} - The value of the dataset
 	 * @example
 	 * ```ts
 	 * const dataSet = [
@@ -46,7 +46,6 @@ export class UmbPropertyDatasetElement extends UmbLitElement {
 	 * `
 	 * ```
 	 */
-	@property({ attribute: false })
 	public set value(value: Array<UmbPropertyValueData>) {
 		this.#allowChangeEvent = false;
 		this.context.setValues(value);
@@ -57,11 +56,12 @@ export class UmbPropertyDatasetElement extends UmbLitElement {
 		return this.context.getValues();
 	}
 
+	@property({ attribute: false })
 	/**
 	 * The name of the dataset, this name varies depending on the use-case. But this is either
+	 * @property name
 	 * @type {string}
 	 * @returns {string}
-	 * @memberof UmbBasicVariantElement
 	 * @example
 	 * ```ts
 	 * html`
@@ -70,7 +70,6 @@ export class UmbPropertyDatasetElement extends UmbLitElement {
 	 * </umb-property-dataset>
 	 * `
 	 */
-	@property({ attribute: false })
 	public set name(value: string | undefined) {
 		this.#allowChangeEvent = false;
 		this.context.setName(value);

src/packages/documents/documents/workspace/document-workspace.context.ts

@@ -25,7 +25,7 @@ import {
 } from '../paths.js';
 import { UMB_DOCUMENTS_SECTION_PATH } from '../../section/paths.js';
 import { UmbDocumentPreviewRepository } from '../repository/preview/index.js';
-
+import { sortVariants } from '../utils.js';
 import { UMB_DOCUMENT_WORKSPACE_ALIAS } from './manifests.js';
 import { UmbEntityContext } from '@umbraco-cms/backoffice/entity';
 import { UMB_INVARIANT_CULTURE, UmbVariantId } from '@umbraco-cms/backoffice/variant';
@@ -68,7 +68,6 @@ import type { UmbContentWorkspaceContext } from '@umbraco-cms/backoffice/content
 import type { UmbDocumentTypeDetailModel } from '@umbraco-cms/backoffice/document-type';
 import { UmbIsTrashedEntityContext } from '@umbraco-cms/backoffice/recycle-bin';
 import { UmbReadOnlyVariantStateManager } from '@umbraco-cms/backoffice/utils';
-import { sortVariants } from '../utils.js';
 
 type EntityType = UmbDocumentDetailModel;
 export class UmbDocumentWorkspaceContext