From 373d992eba5b08a756d726a4ba2a889e3e614ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 21 Dec 2023 11:34:56 +0100 Subject: [PATCH] restructure + data binding --- .../workspace/block-type-workspace.context.ts | 16 ++++++++++------ .../src/packages/block/block/manifests.ts | 3 +++ .../config/block-configuration/manifests.ts | 0 ...-ui-block-grid-block-configuration.element.ts | 11 ++++++++--- ...-ui-block-grid-block-configuration.stories.ts | 0 ...tor-ui-block-grid-block-configuration.test.ts | 0 .../config/group-configuration/manifests.ts | 0 ...-ui-block-grid-group-configuration.element.ts | 0 ...-ui-block-grid-group-configuration.stories.ts | 0 ...tor-ui-block-grid-group-configuration.test.ts | 0 .../config/stylesheet-picker/manifests.ts | 0 ...or-ui-block-grid-stylesheet-picker.element.ts | 0 ...or-ui-block-grid-stylesheet-picker.stories.ts | 0 ...ditor-ui-block-grid-stylesheet-picker.test.ts | 0 .../property-editors}/block-grid/manifests.ts | 0 ...ty-editor-ui-block-grid-inner-test.element.ts | 0 .../property-editor-ui-block-grid.element.ts | 0 .../property-editor-ui-block-grid.stories.ts | 0 .../property-editor-ui-block-grid.test.ts | 0 .../config/block-configuration/manifests.ts | 0 ...r-ui-block-list-type-configuration.element.ts | 4 ++-- ...r-ui-block-list-type-configuration.stories.ts | 0 ...itor-ui-block-list-type-configuration.test.ts | 0 .../property-editors}/block-list/manifests.ts | 0 .../property-editor-ui-block-list.element.ts | 4 ++-- .../property-editor-ui-block-list.stories.ts | 0 .../property-editor-ui-block-list.test.ts | 0 .../block/block/property-editors/manifests.ts | 4 ++++ .../src/packages/block/manifests.ts | 3 ++- .../core/property-editor/uis/manifests.ts | 4 ---- 30 files changed, 31 insertions(+), 18 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/block/block/manifests.ts rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-grid/config/block-configuration/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.element.ts (75%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.stories.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.test.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-grid/config/group-configuration/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.stories.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.test.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-grid/config/stylesheet-picker/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.stories.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.test.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-grid/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-grid/property-editor-ui-block-grid-inner-test.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-grid/property-editor-ui-block-grid.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-grid/property-editor-ui-block-grid.stories.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-grid/property-editor-ui-block-grid.test.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-list/config/block-configuration/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-list/config/block-configuration/property-editor-ui-block-list-type-configuration.element.ts (88%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-list/config/block-configuration/property-editor-ui-block-list-type-configuration.stories.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-list/config/block-configuration/property-editor-ui-block-list-type-configuration.test.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-list/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-list/property-editor-ui-block-list.element.ts (81%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-list/property-editor-ui-block-list.stories.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/property-editor/uis => block/block/property-editors}/block-list/property-editor-ui-block-list.test.ts (100%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace.context.ts index 4b9bd720da..4ee7c0e793 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace.context.ts @@ -26,7 +26,7 @@ export default class UmbBlockTypeWorkspaceContext { this.observe(context.value, (value) => { - console.log('Got value from prop', value); + if (value) { + const blockTypeData = value.find((x: UmbBlockTypeBase) => x.contentElementTypeKey === unique); + if (blockTypeData) { + this.#data.next(blockTypeData); + return; + } + } + // Fallback to undefined: + this.#data.next(undefined); }); }); } @@ -91,8 +97,6 @@ export default class UmbBlockTypeWorkspaceContext { // TODO: We should most likely consume already, in this way I avoid having the reset this consumption. context.setValue( diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/manifests.ts new file mode 100644 index 0000000000..55b5b3f263 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/manifests.ts @@ -0,0 +1,3 @@ +import { manifests as propertyEditorManifests } from './property-editors/manifests.js'; + +export const manifests = [...propertyEditorManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/block-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/block-configuration/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/block-configuration/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/block-configuration/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.element.ts similarity index 75% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.element.ts index 6f652c38b3..5f26bdb473 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.element.ts @@ -1,3 +1,4 @@ +import type { UmbBlockTypeBase, UmbInputBlockTypeElement } from '../../../../../block-type/index.js'; import { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; @@ -12,14 +13,18 @@ export class UmbPropertyEditorUIBlockGridBlockConfigurationElement extends UmbLitElement implements UmbPropertyEditorUiElement { - @property() - value = ''; + @property({ attribute: false }) + value: UmbBlockTypeBase[] = []; @property({ type: Object, attribute: false }) public config?: UmbPropertyEditorConfigCollection; render() { - return html`
umb-property-editor-ui-block-grid-block-configuration
`; + return html` { + this.value = (e.target as UmbInputBlockTypeElement).value; + }}>`; } static styles = [UmbTextStyles]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/block-configuration/property-editor-ui-block-grid-block-configuration.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/group-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/group-configuration/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/group-configuration/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/group-configuration/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/group-configuration/property-editor-ui-block-grid-group-configuration.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/stylesheet-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/stylesheet-picker/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/stylesheet-picker/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/stylesheet-picker/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.test.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/config/stylesheet-picker/property-editor-ui-block-grid-stylesheet-picker.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/property-editor-ui-block-grid-inner-test.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/property-editor-ui-block-grid-inner-test.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/property-editor-ui-block-grid-inner-test.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/property-editor-ui-block-grid-inner-test.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/property-editor-ui-block-grid.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/property-editor-ui-block-grid.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/property-editor-ui-block-grid.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/property-editor-ui-block-grid.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/property-editor-ui-block-grid.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/property-editor-ui-block-grid.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/property-editor-ui-block-grid.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/property-editor-ui-block-grid.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/property-editor-ui-block-grid.test.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/property-editor-ui-block-grid.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-grid/property-editor-ui-block-grid.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-grid/property-editor-ui-block-grid.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/config/block-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-list/config/block-configuration/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/config/block-configuration/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-list/config/block-configuration/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/config/block-configuration/property-editor-ui-block-list-type-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-list/config/block-configuration/property-editor-ui-block-list-type-configuration.element.ts similarity index 88% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/config/block-configuration/property-editor-ui-block-list-type-configuration.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-list/config/block-configuration/property-editor-ui-block-list-type-configuration.element.ts index 79a9d5116c..9402510512 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/config/block-configuration/property-editor-ui-block-list-type-configuration.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-list/config/block-configuration/property-editor-ui-block-list-type-configuration.element.ts @@ -1,5 +1,5 @@ -import { type UmbBlockTypeBase, UmbInputBlockTypeElement } from '@umbraco-cms/backoffice/block'; -import '@umbraco-cms/backoffice/block'; +import type { UmbBlockTypeBase, UmbInputBlockTypeElement } from '../../../../../block-type/index.js'; +import '../../../../../block-type/components/input-block-type/index.js'; import { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/config/block-configuration/property-editor-ui-block-list-type-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-list/config/block-configuration/property-editor-ui-block-list-type-configuration.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/config/block-configuration/property-editor-ui-block-list-type-configuration.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-list/config/block-configuration/property-editor-ui-block-list-type-configuration.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/config/block-configuration/property-editor-ui-block-list-type-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-list/config/block-configuration/property-editor-ui-block-list-type-configuration.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/config/block-configuration/property-editor-ui-block-list-type-configuration.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-list/config/block-configuration/property-editor-ui-block-list-type-configuration.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-list/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-list/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/property-editor-ui-block-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-list/property-editor-ui-block-list.element.ts similarity index 81% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/property-editor-ui-block-list.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-list/property-editor-ui-block-list.element.ts index e8714e0734..d21e30ca8c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/property-editor-ui-block-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-list/property-editor-ui-block-list.element.ts @@ -1,8 +1,8 @@ -import type { UmbPropertyEditorConfigCollection } from '../../config/index.js'; import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; -import { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; +import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; /** * @element umb-property-editor-ui-block-list diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/property-editor-ui-block-list.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-list/property-editor-ui-block-list.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/property-editor-ui-block-list.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-list/property-editor-ui-block-list.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/property-editor-ui-block-list.test.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-list/property-editor-ui-block-list.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/block-list/property-editor-ui-block-list.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/block-list/property-editor-ui-block-list.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/manifests.ts new file mode 100644 index 0000000000..b87817c389 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/property-editors/manifests.ts @@ -0,0 +1,4 @@ +import { manifests as blockGrid } from './block-grid/manifests.js'; +import { manifests as blockList } from './block-list/manifests.js'; + +export const manifests = [...blockGrid, ...blockList]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/manifests.ts index c243c2f906..a5174cf512 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/manifests.ts @@ -1,3 +1,4 @@ import { manifests as blockTypeManifests } from './block-type/manifests.js'; +import { manifests as blockManifests } from './block/manifests.js'; -export const manifests = [...blockTypeManifests]; +export const manifests = [...blockTypeManifests, ...blockManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/manifests.ts index 49f304aaff..a828ba2612 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/manifests.ts @@ -14,13 +14,11 @@ import { manifest as toggle } from './toggle/manifests.js'; import { manifest as markdownEditor } from './markdown-editor/manifests.js'; import { manifest as radioButtonList } from './radio-button-list/manifests.js'; import { manifest as checkboxList } from './checkbox-list/manifests.js'; -import { manifests as blockList } from './block-list/manifests.js'; import { manifest as numberRange } from './number-range/manifests.js'; import { manifest as mediaPicker } from './media-picker/manifests.js'; import { manifest as imageCropsConfiguration } from './image-crops-configuration/manifests.js'; import { manifest as imageCropper } from './image-cropper/manifests.js'; import { manifest as uploadField } from './upload-field/manifests.js'; -import { manifests as blockGrid } from './block-grid/manifests.js'; import { manifest as orderDirection } from './order-direction/manifests.js'; import { manifests as collectionView } from './collection-view/manifests.js'; import { manifests as tinyMCE } from './tiny-mce/manifests.js'; @@ -63,8 +61,6 @@ export const manifests: Array = [ ...numbers, ...textBoxes, ...treePicker, - ...blockList, - ...blockGrid, ...collectionView, ...tinyMCE, {