Merge pull request #2040 from umbraco/v14/feature/block-workspace-only-show-settings-when-available

nielslyngsoe · web-flow · commit 4a1e4f82656c · 2024-06-25T09:22:32.000+02:00
Block Editors: only show settings when available in block workspace
diff --git a/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace.context.ts b/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace.context.ts
@@ -69,7 +69,6 @@ export class UmbBlockGridAreaTypeWorkspaceContext
 			if (value) {
 				const blockTypeData = value.find((x: UmbBlockGridTypeAreaType) => x.key === unique);
 				if (blockTypeData) {
-					console.log(blockTypeData);
 					this.#data.setValue(blockTypeData);
 					return;
 				}
diff --git a/src/packages/block/block/conditions/block-workspace-has-settings.condition.ts b/src/packages/block/block/conditions/block-workspace-has-settings.condition.ts
@@ -1,8 +1,8 @@
-import { UMB_BLOCK_WORKSPACE_CONTEXT } from '../workspace/block-workspace.context-token.js';
 import { UmbConditionBase } from '@umbraco-cms/backoffice/extension-registry';
 import type { BlockWorkspaceHasSettingsConditionConfig } from '@umbraco-cms/backoffice/extension-registry';
 import type { UmbConditionControllerArguments, UmbExtensionCondition } from '@umbraco-cms/backoffice/extension-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import { UMB_BLOCK_WORKSPACE_CONTEXT } from '../workspace/block-workspace.context-token.js';
 
 export class UmbBlockWorkspaceHasSettingsCondition
 	extends UmbConditionBase<BlockWorkspaceHasSettingsConditionConfig>
@@ -18,7 +18,7 @@ export class UmbBlockWorkspaceHasSettingsCondition
 			this.observe(
 				context.settings.contentTypeId,
 				(settingsContentTypeId) => {
-					this.permitted = !!settingsContentTypeId;
+					this.permitted = settingsContentTypeId !== undefined;
 				},
 				'observeSettingsElementTypeId',
 			);
diff --git a/src/packages/block/block/context/block-entries.context.ts b/src/packages/block/block/context/block-entries.context.ts
@@ -62,7 +62,6 @@ export abstract class UmbBlockEntriesContext<
 		return this._layoutEntries.setValue(layouts);
 	}
 	setOneLayout(layoutData: BlockLayoutType) {
-		console.log('setOneLayout', layoutData);
 		return this._layoutEntries.appendOne(layoutData);
 	}
 
diff --git a/src/packages/block/block/context/block-entry.context.ts b/src/packages/block/block/context/block-entry.context.ts
@@ -334,7 +334,6 @@ export abstract class UmbBlockEntryContext<
 				this.settings,
 				(settings) => {
 					if (settings) {
-						console.log('settings to be set', this.#contentUdi, settings);
 						this._manager?.setOneSettings(settings);
 					}
 				},
diff --git a/src/packages/block/block/manifests.ts b/src/packages/block/block/manifests.ts
@@ -1,6 +1,6 @@
+import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 import { manifests as conditionManifests } from './conditions/manifests.js';
 import { manifests as modalManifests } from './modals/manifests.js';
 import { manifests as workspaceManifests } from './workspace/manifests.js';
-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
 export const manifests: Array<ManifestTypes> = [...modalManifests, ...workspaceManifests, ...conditionManifests];
diff --git a/src/packages/block/block/workspace/block-element-manager.ts b/src/packages/block/block/workspace/block-element-manager.ts
@@ -1,11 +1,11 @@
-import type { UmbBlockDataType } from '../types.js';
-import { UmbBlockElementPropertyDatasetContext } from './block-element-property-dataset.context.js';
 import type { UmbContentTypeModel } from '@umbraco-cms/backoffice/content-type';
 import { UmbContentTypeStructureManager } from '@umbraco-cms/backoffice/content-type';
 import { UmbObjectState } from '@umbraco-cms/backoffice/observable-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbDocumentTypeDetailRepository } from '@umbraco-cms/backoffice/document-type';
+import type { UmbBlockDataType } from '../types.js';
+import { UmbBlockElementPropertyDatasetContext } from './block-element-property-dataset.context.js';
 
 export class UmbBlockElementManager extends UmbControllerBase {
 	//
diff --git a/src/packages/block/block/workspace/block-element-property-dataset.context-token.ts b/src/packages/block/block/workspace/block-element-property-dataset.context-token.ts
@@ -1,5 +1,5 @@
-import type { UmbBlockElementPropertyDatasetContext } from './block-element-property-dataset.context.js';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
+import type { UmbBlockElementPropertyDatasetContext } from './block-element-property-dataset.context.js';
 
 export const UMB_BLOCK_ELEMENT_PROPERTY_DATASET_CONTEXT = new UmbContextToken<UmbBlockElementPropertyDatasetContext>(
 	'UmbPropertyDatasetContext',
diff --git a/src/packages/block/block/workspace/block-element-property-dataset.context.ts b/src/packages/block/block/workspace/block-element-property-dataset.context.ts
@@ -1,11 +1,11 @@
-import type { UmbBlockElementManager } from './block-element-manager.js';
-import { UMB_BLOCK_ELEMENT_PROPERTY_DATASET_CONTEXT } from './block-element-property-dataset.context-token.js';
 import type { UmbPropertyDatasetContext } from '@umbraco-cms/backoffice/property';
 import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbVariantId } from '@umbraco-cms/backoffice/variant';
 import type { Observable } from '@umbraco-cms/backoffice/external/rxjs';
+import { UMB_BLOCK_ELEMENT_PROPERTY_DATASET_CONTEXT } from './block-element-property-dataset.context-token.js';
+import type { UmbBlockElementManager } from './block-element-manager.js';
 
 export class UmbBlockElementPropertyDatasetContext extends UmbControllerBase implements UmbPropertyDatasetContext {
 	#elementManager: UmbBlockElementManager;
diff --git a/src/packages/block/block/workspace/block-workspace.context-token.ts b/src/packages/block/block/workspace/block-workspace.context-token.ts
@@ -1,6 +1,6 @@
-import type { UmbBlockWorkspaceContext } from './block-workspace.context.js';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import type { UmbWorkspaceContext } from '@umbraco-cms/backoffice/workspace';
+import type { UmbBlockWorkspaceContext } from './block-workspace.context.js';
 
 export const UMB_BLOCK_WORKSPACE_CONTEXT = new UmbContextToken<UmbWorkspaceContext, UmbBlockWorkspaceContext>(
 	'UmbWorkspaceContext',
diff --git a/src/packages/block/block/workspace/block-workspace.context.ts b/src/packages/block/block/workspace/block-workspace.context.ts
@@ -1,6 +1,3 @@
-import type { UmbBlockDataType, UmbBlockLayoutBaseModel } from '../types.js';
-import { UmbBlockElementManager } from './block-element-manager.js';
-import { UmbBlockWorkspaceEditorElement } from './block-workspace-editor.element.js';
 import {
 	UmbSubmittableWorkspaceContextBase,
 	type UmbRoutableWorkspaceContext,
@@ -9,13 +6,16 @@ import {
 import { UmbObjectState, UmbStringState } from '@umbraco-cms/backoffice/observable-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import type { ManifestWorkspace } from '@umbraco-cms/backoffice/extension-registry';
+import { UMB_MODAL_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { decodeFilePath } from '@umbraco-cms/backoffice/utils';
+import type { UmbBlockDataType, UmbBlockLayoutBaseModel } from '../types.js';
+import { UmbBlockWorkspaceEditorElement } from './block-workspace-editor.element.js';
+import { UmbBlockElementManager } from './block-element-manager.js';
 import {
 	UMB_BLOCK_ENTRIES_CONTEXT,
 	UMB_BLOCK_MANAGER_CONTEXT,
 	type UmbBlockWorkspaceData,
 } from '@umbraco-cms/backoffice/block';
-import { UMB_MODAL_CONTEXT } from '@umbraco-cms/backoffice/modal';
-import { decodeFilePath } from '@umbraco-cms/backoffice/utils';
 
 export type UmbBlockWorkspaceElementManagerNames = 'content' | 'settings';
 export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseModel = UmbBlockLayoutBaseModel>
diff --git a/src/packages/block/block/workspace/manifests.ts b/src/packages/block/block/workspace/manifests.ts
@@ -1,6 +1,6 @@
-import { UMB_BLOCK_WORKSPACE_ALIAS } from './index.js';
 import { UmbSubmitWorkspaceAction } from '@umbraco-cms/backoffice/workspace';
 import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
+import { UMB_BLOCK_WORKSPACE_ALIAS } from './index.js';
 
 export const manifests: Array<ManifestTypes> = [
 	{
@@ -73,8 +73,6 @@ export const manifests: Array<ManifestTypes> = [
 				alias: 'Umb.Condition.WorkspaceAlias',
 				match: UMB_BLOCK_WORKSPACE_ALIAS,
 			},
-		],
-		TODO_conditions: [
 			{
 				alias: 'Umb.Condition.BlockWorkspaceHasSettings',
 			},
diff --git a/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-properties.element.ts b/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-properties.element.ts
@@ -1,10 +1,10 @@
-import { UMB_BLOCK_WORKSPACE_CONTEXT } from '../../block-workspace.context-token.js';
-import type { UmbBlockWorkspaceElementManagerNames } from '../../block-workspace.context.js';
 import { css, html, customElement, property, state, repeat } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import type { UmbContentTypeModel, UmbPropertyTypeModel } from '@umbraco-cms/backoffice/content-type';
 import { UmbContentTypePropertyStructureHelper } from '@umbraco-cms/backoffice/content-type';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import type { UmbBlockWorkspaceElementManagerNames } from '../../block-workspace.context.js';
+import { UMB_BLOCK_WORKSPACE_CONTEXT } from '../../block-workspace.context-token.js';
 
 @customElement('umb-block-workspace-view-edit-properties')
 export class UmbBlockWorkspaceViewEditPropertiesElement extends UmbLitElement {
diff --git a/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-tab.element.ts b/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-tab.element.ts
@@ -1,9 +1,9 @@
-import { UMB_BLOCK_WORKSPACE_CONTEXT } from '../../block-workspace.context-token.js';
 import { css, html, customElement, property, state, repeat } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import type { UmbContentTypeModel, UmbPropertyTypeContainerModel } from '@umbraco-cms/backoffice/content-type';
 import { UmbContentTypeContainerStructureHelper } from '@umbraco-cms/backoffice/content-type';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UMB_BLOCK_WORKSPACE_CONTEXT } from '../../block-workspace.context-token.js';
 
 import './block-workspace-view-edit-properties.element.js';
 // eslint-disable-next-line import/order
diff --git a/src/packages/block/block/workspace/views/edit/block-workspace-view-edit.element.ts b/src/packages/block/block/workspace/views/edit/block-workspace-view-edit.element.ts
@@ -1,6 +1,3 @@
-import { UMB_BLOCK_WORKSPACE_CONTEXT } from '../../block-workspace.context-token.js';
-import type { UmbBlockWorkspaceElementManagerNames } from '../../block-workspace.context.js';
-import type { UmbBlockWorkspaceViewEditTabElement } from './block-workspace-view-edit-tab.element.js';
 import { css, html, customElement, state, repeat, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import type { UmbContentTypeModel, UmbPropertyTypeContainerModel } from '@umbraco-cms/backoffice/content-type';
@@ -9,6 +6,9 @@ import type { UmbRoute, UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent } from
 import { encodeFolderName } from '@umbraco-cms/backoffice/router';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import type { ManifestWorkspaceView, UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry';
+import type { UmbBlockWorkspaceElementManagerNames } from '../../block-workspace.context.js';
+import { UMB_BLOCK_WORKSPACE_CONTEXT } from '../../block-workspace.context-token.js';
+import type { UmbBlockWorkspaceViewEditTabElement } from './block-workspace-view-edit-tab.element.js';
 
 @customElement('umb-block-workspace-view-edit')
 export class UmbBlockWorkspaceViewEditElement extends UmbLitElement implements UmbWorkspaceViewElement {
diff --git a/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts b/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts
@@ -56,10 +56,10 @@ export class UmbWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	private _createRoutes() {
-		this._routes = [];
+		let newRoutes: UmbRoute[] = [];
 
 		if (this._workspaceViews.length > 0) {
-			this._routes = this._workspaceViews.map((manifest) => {
+			newRoutes = this._workspaceViews.map((manifest) => {
 				return {
 					path: `view/${manifest.meta.pathname}`,
 					component: () => createExtensionElement(manifest),
@@ -72,14 +72,17 @@ export class UmbWorkspaceEditorElement extends UmbLitElement {
 			});
 
 			// If we have a post fix then we need to add a direct from the empty url of the split-view-index:
-			const firstView = this._workspaceViews[0];
-			if (firstView) {
-				this._routes.push({
+			// TODO: This is problematic, cause if a workspaceView appears later, then this takes over. And it is also a problem if it does not use redirect, but just a view defined with and empty path.
+			/*const firstRoute = newRoutes[0];
+			if (firstRoute) {
+				newRoutes.push({
 					path: ``,
-					redirectTo: `view/${firstView.meta.pathname}`,
+					redirectTo: firstRoute.path,
 				});
-			}
+			}*/
 		}
+
+		this._routes = newRoutes;
 	}
 
 	override render() {
diff --git a/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts b/src/packages/data-type/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts
@@ -71,7 +71,6 @@ export class UmbDataTypePickerFlowModalElement extends UmbModalBaseElement<
 	private _createDataType(propertyEditorUiAlias: string) {
 		// TODO: Could be nice with a more pretty way to prepend to the URL:
 		// Open create modal:
-		console.log('_createDataType', propertyEditorUiAlias);
 		this._createDataTypeModal.open(
 			{ uiAlias: propertyEditorUiAlias },
 			`create/parent/${UMB_DATA_TYPE_ENTITY_TYPE}/null`,

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@ export class UmbBlockGridAreaTypeWorkspaceContext`
`69`	`69`	`if (value) {`
`70`	`70`	`const blockTypeData = value.find((x: UmbBlockGridTypeAreaType) => x.key === unique);`
`71`	`71`	`if (blockTypeData) {`
`72`		`- console.log(blockTypeData);`
`73`	`72`	`this.#data.setValue(blockTypeData);`
`74`	`73`	`return;`
`75`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,6 @@ export abstract class UmbBlockEntriesContext<`
`62`	`62`	`return this._layoutEntries.setValue(layouts);`
`63`	`63`	`}`
`64`	`64`	`setOneLayout(layoutData: BlockLayoutType) {`
`65`		`- console.log('setOneLayout', layoutData);`
`66`	`65`	`return this._layoutEntries.appendOne(layoutData);`
`67`	`66`	`}`
`68`	`67`
Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,6 @@ export abstract class UmbBlockEntryContext<`
`334`	`334`	`this.settings,`
`335`	`335`	`(settings) => {`
`336`	`336`	`if (settings) {`
`337`		`- console.log('settings to be set', this.#contentUdi, settings);`
`338`	`337`	`this._manager?.setOneSettings(settings);`
`339`	`338`	`}`
`340`	`339`	`},`