@umbraco-cms/backoffice 16.0.0-rc3 → 16.0.0-rc5

package/dist-cms/libs/context-api/consume/context-consumer.js

@@ -188,8 +188,7 @@ export class UmbContextConsumer {
             cancelAnimationFrame(this.#raf);
             this.#raf = undefined;
         }
-        this.#instance = undefined;
-        this.#callback?.(undefined);
+        this.#unprovide();
         if (this.#promiseRejecter) {
             const hostElement = this._retrieveHost();
             this.#promiseRejecter(`Context request was cancelled, host was disconnected. (Context Alias: ${this.#contextAlias} with API Alias: ${this.#apiAlias}). Controller is hosted on ${hostElement?.parentNode?.nodeName ?? 'Not attached node'} > ${hostElement?.nodeName}`);

package/dist-cms/libs/controller-api/controller-host.mixin.js

@@ -43,8 +43,8 @@ export const UmbControllerHostMixin = (superClass) => {
             if (this.#attached) {
                 // If a controller is created on a already attached element, then it will be added directly. This might not be optimal. As the controller it self has not finished its constructor method jet. therefor i postpone the call: [NL]
                 Promise.resolve().then(() => {
-                    // Extra check to see if we are still attached at this point:
-                    if (this.#attached) {
+                    // Extra check to see if we are still attached and still added at this point:
+                    if (this.#attached && this.#controllers.includes(ctrl)) {
                         ctrl.hostConnected();
                     }
                 });

package/dist-cms/libs/extension-api/controller/server-extension-registrator.controller.js

@@ -27,7 +27,9 @@ export class UmbServerExtensionRegistrator extends UmbControllerBase {
      * @remark Users must have the BACKOFFICE_ACCESS permission to access this method.
      */
     async registerPrivateExtensions() {
-        const { data: packages } = await tryExecute(this, ManifestService.getManifestManifestPrivate());
+        const { data: packages } = await tryExecute(this, ManifestService.getManifestManifestPrivate(), {
+            disableNotifications: true,
+        });
         if (packages) {
             await this.#loadServerPackages(packages);
         }
@@ -38,7 +40,9 @@ export class UmbServerExtensionRegistrator extends UmbControllerBase {
      * @remark Any user can access this method without any permissions.
      */
     async registerPublicExtensions() {
-        const { data: packages } = await tryExecute(this, ManifestService.getManifestManifestPublic());
+        const { data: packages } = await tryExecute(this, ManifestService.getManifestManifestPublic(), {
+            disableNotifications: true,
+        });
         if (packages) {
             await this.#loadServerPackages(packages);
         }

package/dist-cms/packages/block/block/context/block-entry.context.js

@@ -384,17 +384,24 @@ export class UmbBlockEntryContext extends UmbContextBase {
         }, 'observeSettingsKey');
     }
     async #observeVariantId() {
-        if (!this._manager)
+        if (!this._manager) {
+            this.removeUmbControllerByAlias('observeVariantId');
             return;
+        }
         await this.#contentStructurePromise;
         if (!this.#contentStructure) {
             throw new Error('No contentStructure found');
         }
+        if (!this._manager) {
+            // The manager maybe got removed while we awaited the promise above.
+            this.removeUmbControllerByAlias('observeVariantId');
+            return;
+        }
         // observe variantId:
         this.observe(observeMultiple([
             this._manager.variantId,
-            this.#contentStructure?.ownerContentTypeObservablePart((x) => x?.variesByCulture),
-            this.#contentStructure?.ownerContentTypeObservablePart((x) => x?.variesBySegment),
+            this.#contentStructure.ownerContentTypeObservablePart((x) => x?.variesByCulture),
+            this.#contentStructure.ownerContentTypeObservablePart((x) => x?.variesBySegment),
         ]), ([variantId, variesByCulture, variesBySegment]) => {
             if (!variantId || variesByCulture === undefined || variesBySegment === undefined)
                 return;

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

@@ -88,6 +88,7 @@ let UmbBlockWorkspaceViewEditElement = class UmbBlockWorkspaceViewEditElement ex
             if (!this._hasRootGroups) {
                 routes.push({
                     path: '',
+                    pathMatch: 'full',
                     redirectTo: routes[0]?.path,
                 });
             }

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

@@ -11,7 +11,7 @@ import { html, css, customElement, property, state, nothing } from '@umbraco-cms
 import { stringOrStringArrayContains } from '@umbraco-cms/backoffice/utils';
 import { UmbObserveValidationStateController } from '@umbraco-cms/backoffice/validation';
 import { UmbDataPathBlockElementDataQuery } from '@umbraco-cms/backoffice/block';
-import { UUIBlinkAnimationValue } from '@umbraco-cms/backoffice/external/uui';
+import { UUIBlinkAnimationValue, UUIBlinkKeyframes } from '@umbraco-cms/backoffice/external/uui';
 import { UMB_PROPERTY_CONTEXT, UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
 import { UMB_CLIPBOARD_PROPERTY_CONTEXT } from '@umbraco-cms/backoffice/clipboard';
 import '../ref-list-block/index.js';
@@ -324,6 +324,7 @@ let UmbBlockListEntryElement = class UmbBlockListEntryElement extends UmbLitElem
         return this.#renderBlock();
     }
     static { this.styles = [
+        UUIBlinkKeyframes,
         css `
 			:host {
 				position: relative;

package/dist-cms/packages/content/content/components/property-type-based-property/index.d.ts

@@ -1 +1,3 @@
 export * from './property-type-based-property.element.js';
+export * from './property-type-based-property.context-token.js';
+export * from './property-type-based-property.context.js';

package/dist-cms/packages/content/content/components/property-type-based-property/index.js

@@ -1 +1,3 @@
 export * from './property-type-based-property.element.js';
+export * from './property-type-based-property.context-token.js';
+export * from './property-type-based-property.context.js';

package/dist-cms/packages/content/content/components/property-type-based-property/property-type-based-property.context-token.d.ts

@@ -0,0 +1,8 @@
+import type { UmbPropertyTypeBasedPropertyContext } from './property-type-based-property.context.js';
+import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
+export declare const UMB_PROPERTY_TYPE_BASED_PROPERTY_CONTEXT: UmbContextToken<UmbPropertyTypeBasedPropertyContext, UmbPropertyTypeBasedPropertyContext>;
+/**
+ * @deprecated Use `UMB_PROPERTY_TYPE_BASED_PROPERTY_CONTEXT` instead.
+ * This will be removed in v.18
+ */
+export declare const UMB_CONTENT_PROPERTY_CONTEXT: UmbContextToken<UmbPropertyTypeBasedPropertyContext, UmbPropertyTypeBasedPropertyContext>;

package/dist-cms/packages/content/content/components/property-type-based-property/property-type-based-property.context-token.js

@@ -0,0 +1,7 @@
+import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
+export const UMB_PROPERTY_TYPE_BASED_PROPERTY_CONTEXT = new UmbContextToken('UmbPropertyTypeBasedPropertyContext');
+/**
+ * @deprecated Use `UMB_PROPERTY_TYPE_BASED_PROPERTY_CONTEXT` instead.
+ * This will be removed in v.18
+ */
+export const UMB_CONTENT_PROPERTY_CONTEXT = new UmbContextToken('UmbPropertyTypeBasedPropertyContext');

package/dist-cms/packages/content/content/{content-property.context.d.ts → components/property-type-based-property/property-type-based-property.context.d.ts}

@@ -1,7 +1,7 @@
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
 import type { UmbPropertyTypeModel } from '@umbraco-cms/backoffice/content-type';
-export declare class UmbContentPropertyContext extends UmbContextBase {
+export declare class UmbPropertyTypeBasedPropertyContext extends UmbContextBase {
     #private;
     dataType: import("rxjs").Observable<{
         unique: string;
@@ -9,3 +9,8 @@ export declare class UmbContentPropertyContext extends UmbContextBase {
     constructor(host: UmbControllerHost);
     setDataType(dataType: UmbPropertyTypeModel['dataType'] | undefined): void;
 }
+/**
+ * @deprecated Use `UmbPropertyTypeBasedPropertyContext` instead.
+ * This will be removed in v.18
+ */
+export { UmbPropertyTypeBasedPropertyContext as UmbContentPropertyContext };

package/dist-cms/packages/content/content/components/property-type-based-property/property-type-based-property.context.js

@@ -0,0 +1,19 @@
+import { UMB_PROPERTY_TYPE_BASED_PROPERTY_CONTEXT } from './property-type-based-property.context-token.js';
+import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
+import { UmbObjectState } from '@umbraco-cms/backoffice/observable-api';
+export class UmbPropertyTypeBasedPropertyContext extends UmbContextBase {
+    #dataType;
+    constructor(host) {
+        super(host, UMB_PROPERTY_TYPE_BASED_PROPERTY_CONTEXT);
+        this.#dataType = new UmbObjectState(undefined);
+        this.dataType = this.#dataType.asObservable();
+    }
+    setDataType(dataType) {
+        this.#dataType.setValue(dataType);
+    }
+}
+/**
+ * @deprecated Use `UmbPropertyTypeBasedPropertyContext` instead.
+ * This will be removed in v.18
+ */
+export { UmbPropertyTypeBasedPropertyContext as UmbContentPropertyContext };

package/dist-cms/packages/content/content/components/property-type-based-property/property-type-based-property.element.d.ts

@@ -18,7 +18,7 @@ export declare class UmbPropertyTypeBasedPropertyElement extends UmbLitElement {
     private _propertyEditorUiAlias?;
     private _propertyEditorSchemaAlias?;
     private _isUnsupported?;
-    private _dataTypeData?;
+    private _dataTypeValues?;
     private _dataTypeDetailRepository;
     private _dataTypeObserver?;
     private _checkSchemaSupport;

package/dist-cms/packages/content/content/components/property-type-based-property/property-type-based-property.element.js

@@ -4,7 +4,7 @@ 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 { UmbContentPropertyContext } from '../../content-property.context.js';
+import { UmbPropertyTypeBasedPropertyContext } from './property-type-based-property.context.js';
 import { css, customElement, html, ifDefined, property, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbDataTypeDetailRepository } from '@umbraco-cms/backoffice/data-type';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
@@ -21,7 +21,7 @@ let UmbPropertyTypeBasedPropertyElement = class UmbPropertyTypeBasedPropertyElem
          */
         this.readonly = false;
         this._dataTypeDetailRepository = new UmbDataTypeDetailRepository(this);
-        this.#contentPropertyContext = new UmbContentPropertyContext(this);
+        this.#context = new UmbPropertyTypeBasedPropertyContext(this);
     }
     set property(value) {
         const oldProperty = this._property;
@@ -40,11 +40,12 @@ let UmbPropertyTypeBasedPropertyElement = class UmbPropertyTypeBasedPropertyElem
         // Change this to ownerSchemaEditorAlias and retrieve the correct information.
         this._ownerEntityType = value;
     }
-    #contentPropertyContext;
+    #context;
     async _checkSchemaSupport() {
         if (!this._ownerEntityType || !this._propertyEditorSchemaAlias)
             return;
         if (this._ownerEntityType in UMB_UNSUPPORTED_EDITOR_SCHEMA_ALIASES) {
+            // TODO: We should get rid of this system, f your reading this please dont rely on this, we will get rid of it in the future. [NL]
             this._isUnsupported = UMB_UNSUPPORTED_EDITOR_SCHEMA_ALIASES[this._ownerEntityType].includes(this._propertyEditorSchemaAlias);
         }
     }
@@ -55,8 +56,8 @@ let UmbPropertyTypeBasedPropertyElement = class UmbPropertyTypeBasedPropertyElem
             await this._dataTypeDetailRepository.requestByUnique(dataTypeUnique);
             this._dataTypeObserver = this.observe(await this._dataTypeDetailRepository.byUnique(dataTypeUnique), (dataType) => {
                 const contextValue = dataType ? { unique: dataType.unique } : undefined;
-                this.#contentPropertyContext.setDataType(contextValue);
-                this._dataTypeData = dataType?.values;
+                this.#context.setDataType(contextValue);
+                this._dataTypeValues = dataType?.values;
                 this._propertyEditorUiAlias = dataType?.editorUiAlias || undefined;
                 this._propertyEditorSchemaAlias = dataType?.editorAlias || undefined;
                 this._checkSchemaSupport();
@@ -93,7 +94,7 @@ let UmbPropertyTypeBasedPropertyElement = class UmbPropertyTypeBasedPropertyElem
 				.description=${this._property.description ?? undefined}
 				.appearance=${this._property.appearance}
 				property-editor-ui-alias=${ifDefined(this._propertyEditorUiAlias)}
-				.config=${this._dataTypeData}
+				.config=${this._dataTypeValues}
 				.validation=${this._property.validation}
 				?readonly=${this.readonly}>
 			</umb-property>
@@ -131,7 +132,7 @@ __decorate([
 ], UmbPropertyTypeBasedPropertyElement.prototype, "_isUnsupported", void 0);
 __decorate([
     state()
-], UmbPropertyTypeBasedPropertyElement.prototype, "_dataTypeData", void 0);
+], UmbPropertyTypeBasedPropertyElement.prototype, "_dataTypeValues", void 0);
 UmbPropertyTypeBasedPropertyElement = __decorate([
     customElement('umb-property-type-based-property')
 ], UmbPropertyTypeBasedPropertyElement);

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

@@ -0,0 +1,26 @@
+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;
+    constructor();
+    willUpdate(changedProperties: Map<string, any>): void;
+    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+}
+export default UmbContentWorkspacePropertyElement;
+declare global {
+    interface HTMLElementTagNameMap {
+        'umb-content-workspace-property': UmbContentWorkspacePropertyElement;
+    }
+}

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

@@ -0,0 +1,104 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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_CONTENT_WORKSPACE_CONTEXT } from '../constants.js';
+import { html, customElement, property, state, nothing } from '@umbraco-cms/backoffice/external/lit';
+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';
+let UmbContentWorkspacePropertyElement = class UmbContentWorkspacePropertyElement extends UmbLitElement {
+    get alias() {
+        return this._alias;
+    }
+    set alias(value) {
+        this._alias = value;
+        this.#observePropertyType();
+    }
+    constructor() {
+        super();
+        // 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();
+        });
+        // The Content Workspace Context is used to retrieve the property type we like to observe.
+        // This gives us the configuration from the property type as part of the data type.
+        this.consumeContext(UMB_CONTENT_WORKSPACE_CONTEXT, async (workspaceContext) => {
+            this._workspaceContext = workspaceContext;
+            this.#observePropertyType();
+        });
+    }
+    async #observePropertyType() {
+        if (!this._alias || !this._workspaceContext)
+            return;
+        this.observe(await this._workspaceContext?.structure.propertyStructureByAlias(this._alias), (propertyType) => {
+            this._propertyType = propertyType;
+            this.#checkViewGuard();
+        });
+    }
+    #checkViewGuard() {
+        if (!this._workspaceContext || !this._propertyType || !this._datasetVariantId)
+            return;
+        const propertyVariantId = new UmbVariantId(this._propertyType.variesByCulture ? this._datasetVariantId.culture : null, this._propertyType.variesBySegment ? this._datasetVariantId.segment : null);
+        this.observe(this._workspaceContext.propertyViewGuard.isPermittedForVariantAndProperty(propertyVariantId, this._propertyType, this._datasetVariantId), (permitted) => {
+            this._viewable = permitted;
+        }, `umbObservePropertyViewGuard`);
+    }
+    willUpdate(changedProperties) {
+        super.willUpdate(changedProperties);
+        if (changedProperties.has('_propertyType') ||
+            changedProperties.has('_datasetVariantId') ||
+            changedProperties.has('_workspaceContext')) {
+            if (this._datasetVariantId && this._propertyType && this._workspaceContext) {
+                const propertyVariantId = new UmbVariantId(this._propertyType.variesByCulture ? this._datasetVariantId.culture : null, this._propertyType.variesBySegment ? this._datasetVariantId.segment : null);
+                this._dataPath = `$.values[${UmbDataPathPropertyValueQuery({
+                    alias: this._propertyType.alias,
+                    culture: propertyVariantId.culture,
+                    segment: propertyVariantId.segment,
+                })}].value`;
+                this.observe(this._workspaceContext.propertyWriteGuard.isPermittedForVariantAndProperty(propertyVariantId, this._propertyType, propertyVariantId), (write) => {
+                    this._writeable = write;
+                }, 'observeView');
+            }
+        }
+    }
+    render() {
+        if (!this._viewable)
+            return nothing;
+        if (!this._dataPath || this._writeable === undefined)
+            return nothing;
+        return html `<umb-property-type-based-property
+			data-path=${this._dataPath}
+			.property=${this._propertyType}
+			?readonly=${!this._writeable}></umb-property-type-based-property>`;
+    }
+};
+__decorate([
+    property({ type: String, attribute: 'alias' })
+], UmbContentWorkspacePropertyElement.prototype, "alias", null);
+__decorate([
+    state()
+], UmbContentWorkspacePropertyElement.prototype, "_datasetVariantId", void 0);
+__decorate([
+    state()
+], UmbContentWorkspacePropertyElement.prototype, "_dataPath", void 0);
+__decorate([
+    state()
+], UmbContentWorkspacePropertyElement.prototype, "_viewable", void 0);
+__decorate([
+    state()
+], UmbContentWorkspacePropertyElement.prototype, "_writeable", void 0);
+__decorate([
+    state()
+], UmbContentWorkspacePropertyElement.prototype, "_workspaceContext", void 0);
+__decorate([
+    state()
+], UmbContentWorkspacePropertyElement.prototype, "_propertyType", void 0);
+UmbContentWorkspacePropertyElement = __decorate([
+    customElement('umb-content-workspace-property')
+], UmbContentWorkspacePropertyElement);
+export { UmbContentWorkspacePropertyElement };
+export default UmbContentWorkspacePropertyElement;

package/dist-cms/packages/content/content/global-components/index.d.ts

@@ -0,0 +1 @@
+export * from './content-workspace-property.element.js';

package/dist-cms/packages/content/content/global-components/index.js

@@ -0,0 +1 @@
+export * from './content-workspace-property.element.js';

package/dist-cms/packages/content/content/index.d.ts

@@ -1,9 +1,8 @@
-export { UMB_CONTENT_PROPERTY_CONTEXT } from './content-property.context-token.js';
-export { UmbContentPropertyContext } from './content-property.context.js';
 export * from './collection/index.js';
 export * from './components/index.js';
 export * from './constants.js';
 export * from './controller/merge-content-variant-data.controller.js';
+export * from './global-components/index.js';
 export * from './manager/index.js';
 export * from './property-dataset-context/index.js';
 export * from './workspace/index.js';

package/dist-cms/packages/content/content/index.js

@@ -1,9 +1,8 @@
-export { UMB_CONTENT_PROPERTY_CONTEXT } from './content-property.context-token.js';
-export { UmbContentPropertyContext } from './content-property.context.js';
 export * from './collection/index.js';
 export * from './components/index.js';
 export * from './constants.js';
 export * from './controller/merge-content-variant-data.controller.js';
+export * from './global-components/index.js';
 export * from './manager/index.js';
 export * from './property-dataset-context/index.js';
 export * from './workspace/index.js';

package/dist-cms/packages/content/content/workspace/content-detail-workspace-base.js

@@ -679,6 +679,7 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
         const currentData = this._data.getCurrent();
         const newCurrentData = await new UmbMergeContentVariantDataController(this).process(currentData, data, variantIds, variantIdsIncludingInvariant);
         this._data.setCurrent(newCurrentData);
+        this.setIsNew(false);
         const eventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
         if (!eventContext) {
             throw new Error('Event context is missing');
@@ -688,7 +689,6 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
             unique: parent.unique,
         });
         eventContext.dispatchEvent(event);
-        this.setIsNew(false);
     }
     async #update(variantIds, saveData) {
         if (!this._detailRepository)
@@ -723,6 +723,7 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
     }
     resetState() {
         super.resetState();
+        this.structure.clear();
         this.readOnlyGuard.clearRules();
         this.propertyViewGuard.clearRules();
         this.propertyWriteGuard.clearRules();

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

@@ -1,12 +1,10 @@
 import type { UmbPropertyTypeModel } from '@umbraco-cms/backoffice/content-type';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import { UmbVariantId } from '@umbraco-cms/backoffice/variant';
-import './content-editor-property.element.js';
 export declare class UmbContentWorkspaceViewEditPropertiesElement extends UmbLitElement {
     #private;
     get containerId(): string | null | undefined;
     set containerId(value: string | null | undefined);
-    _datasetVariantId?: UmbVariantId;
+    _properties: Array<string>;
     _visibleProperties?: Array<UmbPropertyTypeModel>;
     constructor();
     render(): unknown;

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

@@ -5,18 +5,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UMB_CONTENT_WORKSPACE_CONTEXT } from '../../content-workspace.context-token.js';
-import { css, html, customElement, property, state, repeat, nothing } from '@umbraco-cms/backoffice/external/lit';
+import { css, html, customElement, property, state, repeat } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UmbContentTypePropertyStructureHelper } from '@umbraco-cms/backoffice/content-type';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import { UmbVariantId } from '@umbraco-cms/backoffice/variant';
-import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
-import './content-editor-property.element.js';
 let UmbContentWorkspaceViewEditPropertiesElement = class UmbContentWorkspaceViewEditPropertiesElement extends UmbLitElement {
-    #workspaceContext;
-    #propertyStructureHelper = new UmbContentTypePropertyStructureHelper(this);
-    #properties;
-    #visiblePropertiesUniques = [];
+    #propertyStructureHelper;
     get containerId() {
         return this.#propertyStructureHelper.getContainerId();
     }
@@ -25,53 +19,19 @@ let UmbContentWorkspaceViewEditPropertiesElement = class UmbContentWorkspaceView
     }
     constructor() {
         super();
-        this.consumeContext(UMB_PROPERTY_DATASET_CONTEXT, (datasetContext) => {
-            this._datasetVariantId = datasetContext?.getVariantId();
-            this.#processPropertyStructure();
-        });
+        this.#propertyStructureHelper = new UmbContentTypePropertyStructureHelper(this);
+        this._properties = [];
         this.consumeContext(UMB_CONTENT_WORKSPACE_CONTEXT, (workspaceContext) => {
-            this.#workspaceContext = workspaceContext;
             this.#propertyStructureHelper.setStructureManager(
             // Assuming its the same content model type that we are working with here... [NL]
             workspaceContext?.structure);
-            this.observe(this.#propertyStructureHelper.propertyStructure, (properties) => {
-                this.#properties = properties;
-                this.#processPropertyStructure();
+            this.observe(this.#propertyStructureHelper.propertyAliases, (properties) => {
+                this._properties = properties;
             }, 'observePropertyStructure');
         });
     }
-    #processPropertyStructure() {
-        if (!this.#workspaceContext || !this.#properties || !this.#propertyStructureHelper || !this._datasetVariantId) {
-            return;
-        }
-        const propertyViewGuard = this.#workspaceContext.propertyViewGuard;
-        this.#properties.forEach((property) => {
-            const propertyVariantId = new UmbVariantId(property.variesByCulture ? this._datasetVariantId?.culture : null, property.variesBySegment ? this._datasetVariantId?.segment : null);
-            this.observe(propertyViewGuard.isPermittedForVariantAndProperty(propertyVariantId, property, this._datasetVariantId), (permitted) => {
-                if (permitted) {
-                    this.#visiblePropertiesUniques.push(property.unique);
-                    this.#calculateVisibleProperties();
-                }
-                else {
-                    const index = this.#visiblePropertiesUniques.indexOf(property.unique);
-                    if (index !== -1) {
-                        this.#visiblePropertiesUniques.splice(index, 1);
-                        this.#calculateVisibleProperties();
-                    }
-                }
-            }, `propertyViewGuard-permittedForVariantAndProperty-${property.unique}`);
-        });
-    }
-    #calculateVisibleProperties() {
-        this._visibleProperties = this.#properties.filter((property) => this.#visiblePropertiesUniques.includes(property.unique));
-    }
     render() {
-        return this._datasetVariantId && this._visibleProperties
-            ? repeat(this._visibleProperties, (property) => property.alias, (property) => html `<umb-content-workspace-view-edit-property
-							class="property"
-							.variantId=${this._datasetVariantId}
-							.property=${property}></umb-content-workspace-view-edit-property>`)
-            : nothing;
+        return repeat(this._properties, (property) => property, (property) => html `<umb-content-workspace-property class="property" alias=${property}></umb-content-workspace-property>`);
     }
     static { this.styles = [
         UmbTextStyles,
@@ -90,7 +50,7 @@ __decorate([
 ], UmbContentWorkspaceViewEditPropertiesElement.prototype, "containerId", null);
 __decorate([
     state()
-], UmbContentWorkspaceViewEditPropertiesElement.prototype, "_datasetVariantId", void 0);
+], UmbContentWorkspaceViewEditPropertiesElement.prototype, "_properties", void 0);
 __decorate([
     state()
 ], UmbContentWorkspaceViewEditPropertiesElement.prototype, "_visibleProperties", void 0);

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

@@ -72,6 +72,7 @@ let UmbContentWorkspaceViewEditElement = class UmbContentWorkspaceViewEditElemen
         if (routes.length !== 0) {
             routes.push({
                 path: '',
+                pathMatch: 'full',
                 redirectTo: routes[0].path,
             });
             routes.push({

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

@@ -10,6 +10,7 @@ type UmbPropertyTypeUnique = UmbPropertyTypeModel['unique'];
 export declare class UmbContentTypePropertyStructureHelper<T extends UmbContentTypeModel> extends UmbControllerBase {
     #private;
     readonly propertyStructure: import("rxjs").Observable<UmbPropertyTypeModel[]>;
+    readonly propertyAliases: import("rxjs").Observable<string[]>;
     constructor(host: UmbControllerHost);
     contentTypes(): Promise<import("rxjs").Observable<T[]> | undefined>;
     setStructureManager(structure: UmbContentTypeStructureManager<T>): void;

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

@@ -16,6 +16,7 @@ export class UmbContentTypePropertyStructureHelper extends UmbControllerBase {
         // State which holds all the properties of the current container, this is a composition of all properties from the containers that matches our target [NL]
         this.#propertyStructure = new UmbArrayState([], (x) => x.unique);
         this.propertyStructure = this.#propertyStructure.asObservable();
+        this.propertyAliases = this.#propertyStructure.asObservablePart((x) => x.map((e) => e.alias));
         this.#init = new Promise((resolve) => {
             this.#initResolver = resolve;
         });

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

@@ -126,6 +126,7 @@ export declare class UmbContentTypeStructureManager<T extends UmbContentTypeMode
      * @returns {Promise<Array<string>>} - A promise that will be resolved with the list of all content type property aliases.
      */
     getContentTypePropertyAliases(): Promise<string[]>;
+    clear(): void;
     destroy(): void;
 }
 export {};

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

@@ -131,7 +131,7 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
             return { data: this.getOwnerContentType(), asObservable: () => this.ownerContentType };
         }
         await this.#initRepository;
-        this.#clear();
+        this.clear();
         this.#ownerContentTypeUnique = unique;
         if (!unique) {
             this.#initRejection?.(`Content Type structure manager could not load: ${unique}`);
@@ -145,7 +145,7 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
     }
     async createScaffold(preset) {
         await this.#initRepository;
-        this.#clear();
+        this.clear();
         const repsonse = await this.#repository.createScaffold(preset);
         const { data } = repsonse;
         if (!data) {
@@ -607,7 +607,7 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
             .flatMap((x) => x.properties?.map((y) => y.alias) ?? [])
             .filter(UmbFilterDuplicateStrings);
     }
-    #clear() {
+    clear() {
         this.#contentTypeObservers.forEach((observer) => observer.destroy());
         this.#contentTypeObservers = [];
         this.#repoManager?.clear();

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

@@ -147,6 +147,7 @@ let UmbContentTypeDesignEditorElement = class UmbContentTypeDesignEditorElement
             });
             routes.push({
                 path: '',
+                pathMatch: 'full',
                 redirectTo: 'root',
                 guards: [() => this.#processingTabId === undefined],
             });
@@ -154,6 +155,7 @@ let UmbContentTypeDesignEditorElement = class UmbContentTypeDesignEditorElement
         else {
             routes.push({
                 path: '',
+                pathMatch: 'full',
                 redirectTo: routes[0]?.path,
                 guards: [() => this.#processingTabId === undefined],
             });
@@ -168,13 +170,15 @@ let UmbContentTypeDesignEditorElement = class UmbContentTypeDesignEditorElement
                 },
             });
         }
-        routes.push({
-            path: `**`,
-            component: async () => (await import('@umbraco-cms/backoffice/router')).UmbRouteNotFoundElement,
-            setup: () => {
-                this.#currentTabComponent = undefined;
-            },
-        });
+        else {
+            routes.push({
+                path: `**`,
+                component: async () => (await import('@umbraco-cms/backoffice/router')).UmbRouteNotFoundElement,
+                setup: () => {
+                    this.#currentTabComponent = undefined;
+                },
+            });
+        }
         this._routes = routes;
         // If we have a active tab, then we want to make sure its up to date with latest tab id, as an already active route is not getting its setup method triggered again [NL]
         if (this._activePath && this.#currentTabComponent) {