Merge branch 'main' into v15/feature/validate-specific-cultures

Author: madsrasmussen

package-lock.json

@@ -244,7 +244,7 @@
 		"eslint-plugin-wc": "^2.1.1",
 		"glob": "^11.0.0",
 		"globals": "^15.8.0",
-		"lucide-static": "^0.441.0",
+		"lucide-static": "^0.446.0",
 		"madge": "^8.0.0",
 		"msw": "^1.3.2",
 		"playwright-msw": "^3.0.1",

package.json

@@ -35,11 +35,15 @@ export class UmbBlockWorkspaceViewEditPropertiesElement extends UmbLitElement {
 	@state()
 	_dataPaths?: Array<string>;
 
+	@state()
+	private _ownerEntityType?: string;
+
 	constructor() {
 		super();
 
 		this.consumeContext(UMB_BLOCK_WORKSPACE_CONTEXT, (workspaceContext) => {
 			this.#blockWorkspace = workspaceContext;
+			this._ownerEntityType = this.#blockWorkspace.getEntityType();
 			this.#setStructureManager();
 		});
 	}
@@ -70,6 +74,7 @@ export class UmbBlockWorkspaceViewEditPropertiesElement extends UmbLitElement {
 				html`<umb-property-type-based-property
 					class="property"
 					data-path=${this._dataPaths![index]}
+					.ownerEntityType=${this._ownerEntityType}
 					.property=${property}
 					${umbDestroyOnDisconnect()}></umb-property-type-based-property>`,
 		);

src/packages/block/block/workspace/views/edit/block-workspace-view-edit-properties.element.ts

@@ -8,6 +8,7 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import type { UmbDataTypeDetailModel } from '@umbraco-cms/backoffice/data-type';
 import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-api';
+import { UMB_UNSUPPORTED_EDITOR_SCHEMA_ALIASES } from '@umbraco-cms/backoffice/property';
 
 @customElement('umb-property-type-based-property')
 export class UmbPropertyTypeBasedPropertyElement extends UmbLitElement {
@@ -27,9 +28,26 @@ export class UmbPropertyTypeBasedPropertyElement extends UmbLitElement {
 	@property({ type: String, attribute: 'data-path' })
 	public dataPath?: string;
 
+	@property({ type: String })
+	public get ownerEntityType(): string | undefined {
+		return this._ownerEntityType;
+	}
+	public set ownerEntityType(value: string | undefined) {
+		// Change this to ownerSchemaEditorAlias and retrieve the correct information.
+		this._ownerEntityType = value;
+	}
+
+	private _ownerEntityType?: string;
+
 	@state()
 	private _propertyEditorUiAlias?: string;
 
+	@state()
+	private _propertyEditorSchemaAlias?: string;
+
+	@state()
+	private _isUnsupported?: boolean;
+
 	@state()
 	private _dataTypeData?: UmbPropertyEditorConfig;
 
@@ -38,6 +56,16 @@ export class UmbPropertyTypeBasedPropertyElement extends UmbLitElement {
 
 	#contentPropertyContext = new UmbContentPropertyContext(this);
 
+	private async _checkSchemaSupport() {
+		if (!this._ownerEntityType || !this._propertyEditorSchemaAlias) return;
+
+		if (this._ownerEntityType in UMB_UNSUPPORTED_EDITOR_SCHEMA_ALIASES) {
+			this._isUnsupported = UMB_UNSUPPORTED_EDITOR_SCHEMA_ALIASES[this._ownerEntityType].includes(
+				this._propertyEditorSchemaAlias,
+			);
+		}
+	}
+
 	private async _observeDataType(dataTypeUnique?: string) {
 		this._dataTypeObserver?.destroy();
 		if (dataTypeUnique) {
@@ -51,6 +79,9 @@ export class UmbPropertyTypeBasedPropertyElement extends UmbLitElement {
 
 					this._dataTypeData = dataType?.values;
 					this._propertyEditorUiAlias = dataType?.editorUiAlias || undefined;
+					this._propertyEditorSchemaAlias = dataType?.editorAlias || undefined;
+					this._checkSchemaSupport();
+
 					// If there is no UI, we will look up the Property editor model to find the default UI alias:
 					if (!this._propertyEditorUiAlias && dataType?.editorAlias) {
 						//use 'dataType.editorAlias' to look up the extension in the registry:
@@ -75,6 +106,12 @@ export class UmbPropertyTypeBasedPropertyElement extends UmbLitElement {
 
 	override render() {
 		if (!this._propertyEditorUiAlias || !this._property?.alias) return;
+		if (this._isUnsupported) {
+			return html`<umb-unsupported-property
+				.alias=${this._property.alias}
+				.ownerEntityType=${this._ownerEntityType}
+				.schema=${this._propertyEditorSchemaAlias!}></umb-unsupported-property>`;
+		}
 		return html`
 			<umb-property
 				.dataPath=${this.dataPath}

src/packages/core/content-type/components/property-type-based-property/property-type-based-property.element.ts

@@ -1,4 +1,4 @@
-export default `<!-- @license lucide-static v0.441.0 - ISC -->
+export default `<!-- @license lucide-static v0.446.0 - ISC -->
 <svg
   class="lucide lucide-activity"
   xmlns="http://www.w3.org/2000/svg"

src/packages/core/icon-registry/icons/icon-activity.ts

@@ -1,4 +1,4 @@
-export default `<!-- @license lucide-static v0.441.0 - ISC -->
+export default `<!-- @license lucide-static v0.446.0 - ISC -->
 <svg
   class="lucide lucide-plus"
   xmlns="http://www.w3.org/2000/svg"

src/packages/core/icon-registry/icons/icon-add.ts

@@ -1,4 +1,4 @@
-export default `<!-- @license lucide-static v0.441.0 - ISC -->
+export default `<!-- @license lucide-static v0.446.0 - ISC -->
 <svg
   class="lucide lucide-book-user"
   xmlns="http://www.w3.org/2000/svg"

src/packages/core/icon-registry/icons/icon-addressbook.ts

@@ -1,4 +1,4 @@
-export default `<!-- @license lucide-static v0.441.0 - ISC -->
+export default `<!-- @license lucide-static v0.446.0 - ISC -->
 <svg
   class="lucide lucide-alarm-clock"
   xmlns="http://www.w3.org/2000/svg"

src/packages/core/icon-registry/icons/icon-alarm-clock.ts

@@ -1,4 +1,4 @@
-export default `<!-- @license lucide-static v0.441.0 - ISC -->
+export default `<!-- @license lucide-static v0.446.0 - ISC -->
 <svg
   class="lucide lucide-triangle-alert"
   xmlns="http://www.w3.org/2000/svg"

src/packages/core/icon-registry/icons/icon-alert-alt.ts

@@ -1,4 +1,4 @@
-export default `<!-- @license lucide-static v0.441.0 - ISC -->
+export default `<!-- @license lucide-static v0.446.0 - ISC -->
 <svg
   class="lucide lucide-triangle-alert"
   xmlns="http://www.w3.org/2000/svg"