Merge branch 'main' into v14/feature/block-custom-views

# Conflicts:
#	src/packages/block/block-type/workspace/block-type-workspace.context.ts

Author: nielslyngsoe

eslint.config.js

@@ -47,6 +47,7 @@ export default [
 		},
 		rules: {
 			semi: ['warn', 'always'],
+			"prettier/prettier": ["warn", {"endOfLine": "auto" }],
 			'no-unused-vars': 'off', //Let '@typescript-eslint/no-unused-vars' catch the errors to allow unused function parameters (ex: in interfaces)
 			'no-var': 'error',
 			'import/no-unresolved': 'off',

package.json

@@ -25,8 +25,8 @@
 		"./code-editor": "./dist-cms/packages/templating/code-editor/index.js",
 		"./collection": "./dist-cms/packages/core/collection/index.js",
 		"./components": "./dist-cms/packages/core/components/index.js",
-		"./content": "./dist-cms/packages/core/content/index.js",
 		"./content-type": "./dist-cms/packages/core/content-type/index.js",
+		"./content": "./dist-cms/packages/core/content/index.js",
 		"./culture": "./dist-cms/packages/core/culture/index.js",
 		"./current-user": "./dist-cms/packages/user/current-user/index.js",
 		"./data-type": "./dist-cms/packages/data-type/index.js",
@@ -35,9 +35,9 @@
 		"./document-blueprint": "./dist-cms/packages/documents/document-blueprints/index.js",
 		"./document-type": "./dist-cms/packages/documents/document-types/index.js",
 		"./document": "./dist-cms/packages/documents/documents/index.js",
-		"./entity": "./dist-cms/packages/core/entity/index.js",
 		"./entity-action": "./dist-cms/packages/core/entity-action/index.js",
 		"./entity-bulk-action": "./dist-cms/packages/core/entity-bulk-action/index.js",
+		"./entity": "./dist-cms/packages/core/entity/index.js",
 		"./event": "./dist-cms/packages/core/event/index.js",
 		"./extension-registry": "./dist-cms/packages/core/extension-registry/index.js",
 		"./icon": "./dist-cms/packages/core/icon-registry/index.js",
@@ -63,6 +63,7 @@
 		"./picker-input": "./dist-cms/packages/core/picker-input/index.js",
 		"./property-action": "./dist-cms/packages/core/property-action/index.js",
 		"./property-editor": "./dist-cms/packages/core/property-editor/index.js",
+		"./property-type": "./dist-cms/packages/core/property-type/index.js",
 		"./property": "./dist-cms/packages/core/property/index.js",
 		"./recycle-bin": "./dist-cms/packages/core/recycle-bin/index.js",
 		"./relation-type": "./dist-cms/packages/relations/relation-types/index.js",
@@ -73,8 +74,8 @@
 		"./script": "./dist-cms/packages/templating/scripts/index.js",
 		"./search": "./dist-cms/packages/search/index.js",
 		"./section": "./dist-cms/packages/core/section/index.js",
-		"./settings": "./dist-cms/packages/settings/index.js",
 		"./server-file-system": "./dist-cms/packages/core/server-file-system/index.js",
+		"./settings": "./dist-cms/packages/settings/index.js",
 		"./sorter": "./dist-cms/packages/core/sorter/index.js",
 		"./static-file": "./dist-cms/packages/static-file/index.js",
 		"./store": "./dist-cms/packages/core/store/index.js",

src/packages/block/block-type/workspace/block-type-workspace.context.ts

@@ -11,13 +11,9 @@ import {
 	UmbInvariantWorkspacePropertyDatasetContext,
 	UmbWorkspaceIsNewRedirectController,
 } from '@umbraco-cms/backoffice/workspace';
-import { UmbArrayState, UmbObjectState, appendToFrozenArray } from '@umbraco-cms/backoffice/observable-api';
+import { UmbObjectState, appendToFrozenArray } from '@umbraco-cms/backoffice/observable-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import type {
-	ManifestWorkspace,
-	PropertyEditorSettingsProperty,
-	UmbBlockTypeBaseModel,
-} from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestWorkspace, UmbBlockTypeBaseModel } from '@umbraco-cms/backoffice/extension-registry';
 
 export class UmbBlockTypeWorkspaceContext<BlockTypeData extends UmbBlockTypeWithGroupKey = UmbBlockTypeWithGroupKey>
 	extends UmbSubmittableWorkspaceContextBase<BlockTypeData>
@@ -34,9 +30,6 @@ export class UmbBlockTypeWorkspaceContext<BlockTypeData extends UmbBlockTypeWith
 	readonly name = this.#data.asObservablePart(() => 'block');
 	readonly unique = this.#data.asObservablePart((data) => data?.contentElementTypeKey);
 
-	#properties = new UmbArrayState<PropertyEditorSettingsProperty>([], (x) => x.alias);
-	readonly properties = this.#properties.asObservable();
-
 	constructor(host: UmbControllerHost, args: { manifest: ManifestWorkspace }) {
 		super(host, args.manifest.alias);
 		const manifest = args.manifest;
@@ -77,7 +70,7 @@ export class UmbBlockTypeWorkspaceContext<BlockTypeData extends UmbBlockTypeWith
 	protected override resetState() {
 		super.resetState();
 		this.#data.setValue(undefined);
-		this.#properties.setValue([]);
+		this.removeUmbControllerByAlias('isNewRedirectController');
 	}
 
 	createPropertyDatasetContext(host: UmbControllerHost): UmbPropertyDatasetContext {
@@ -175,7 +168,6 @@ export class UmbBlockTypeWorkspaceContext<BlockTypeData extends UmbBlockTypeWith
 
 	public override destroy(): void {
 		this.#data.destroy();
-		this.#properties.destroy();
 		super.destroy();
 	}
 }

src/packages/block/block/workspace/block-element-manager.ts

@@ -31,6 +31,10 @@ export class UmbBlockElementManager extends UmbControllerBase {
 		this.observe(this.contentTypeId, (id) => this.structure.loadType(id));
 	}
 
+	reset() {
+		this.#data.setValue(undefined);
+	}
+
 	setData(data: UmbBlockDataType | undefined) {
 		this.#data.setValue(data);
 		this.#getDataResolver();

src/packages/block/block/workspace/block-workspace.context.ts

@@ -112,13 +112,24 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
 		]);
 	}
 
+	protected override resetState() {
+		super.resetState();
+		this.#label.setValue(undefined);
+		this.#layout.setValue(undefined);
+		this.#initialLayout = undefined;
+		this.#initialContent = undefined;
+		this.#initialSettings = undefined;
+		this.content.reset();
+		this.settings.reset();
+		this.removeUmbControllerByAlias('isNewRedirectController');
+	}
+
 	async load(unique: string) {
 		await this.#retrieveBlockManager;
 		await this.#retrieveBlockEntries;
 		await this.#editorConfigPromise;
 		if (!this.#blockManager || !this.#blockEntries) {
 			throw new Error('Block manager not found');
-			return;
 		}
 
 		this.observe(

src/packages/core/content-type/modals/index.ts

@@ -1,3 +1 @@
 export * from './composition-picker/composition-picker-modal.token.js';
-export * from './property-type-settings/property-type-settings-modal.token.js';
-export * from './property-type-settings/property-type-settings-modal.context-token.js';

src/packages/core/content-type/modals/manifests.ts

@@ -7,12 +7,6 @@ const modals: Array<ManifestModal> = [
 		name: 'ContentType Composition Picker Modal',
 		element: () => import('./composition-picker/composition-picker-modal.element.js'),
 	},
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.PropertyTypeSettings',
-		name: 'Property Type Settings Modal',
-		element: () => import('./property-type-settings/property-type-settings-modal.element.js'),
-	},
 ];
 
 export const manifests = modals;

src/packages/core/content-type/modals/property-type-settings/property-type-settings-modal.context.ts

@@ -181,23 +181,6 @@ export class UmbContentTypePropertyStructureHelper<T extends UmbContentTypeModel
 	// TODO: consider moving this to another class, to separate 'viewer' from 'manipulator':
 	/** Manipulate methods: */
 
-	async createPropertyScaffold(ownerId?: string | null) {
-		await this.#init;
-		if (!this.#structure) return;
-
-		return await this.#structure.createPropertyScaffold(ownerId);
-	}
-	/*
-		Only used by legacy implementation:
-		@deprecated
-	*/
-	async addProperty(containerId?: string, sortOrder?: number) {
-		await this.#init;
-		if (!this.#structure) return;
-
-		return await this.#structure.createProperty(null, containerId, sortOrder);
-	}
-
 	async insertProperty(property: UmbPropertyTypeModel, sortOrder?: number) {
 		await this.#init;
 		if (!this.#structure) return false;