From d7a945046cbe3a79c600b5289e505e37b38852bf Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 14:49:01 +0200 Subject: [PATCH 01/23] import property creator element from components --- .../src/backoffice/core/components/index.ts | 2 ++ .../property-creator/property-creator.element.ts | 0 .../views/design/document-type-workspace-view-design.element.ts | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) rename src/Umbraco.Web.UI.Client/src/backoffice/core/{ => components}/property-creator/property-creator.element.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts index 2d3bf3b939..abcee8fe9b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts @@ -54,6 +54,8 @@ import './workspace/workspace-editor/workspace-editor.element'; import './workspace/workspace-footer/workspace-footer.element'; import './workspace/workspace-action-menu/workspace-action-menu.element'; +import './property-creator/property-creator.element'; + import './variant-selector/variant-selector.element'; import './code-editor'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/property-creator/property-creator.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/property-creator/property-creator.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/core/property-creator/property-creator.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/property-creator/property-creator.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/design/document-type-workspace-view-design.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/design/document-type-workspace-view-design.element.ts index 780f1c03c7..101d1f1b58 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/design/document-type-workspace-view-design.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/views/design/document-type-workspace-view-design.element.ts @@ -4,7 +4,6 @@ import { customElement, state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; import { UmbDocumentTypeWorkspaceContext } from '../../document-type-workspace.context'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import '../../../../../core/property-creator/property-creator.element'; import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-api'; @customElement('umb-document-type-workspace-view-design') From 0b798037c0b408da0bf50400f4f9532e8c497ef3 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 14:57:13 +0200 Subject: [PATCH 02/23] move tree context to lib --- src/Umbraco.Web.UI.Client/libs/tree/index.ts | 2 ++ .../backoffice/core/components => libs}/tree/tree.context.ts | 0 .../components/tree/tree-item-base/tree-item-base.context.ts | 4 ++-- .../src/backoffice/core/components/tree/tree.element.ts | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) rename src/Umbraco.Web.UI.Client/{src/backoffice/core/components => libs}/tree/tree.context.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/libs/tree/index.ts b/src/Umbraco.Web.UI.Client/libs/tree/index.ts index dcf04e2366..029ddbf0fd 100644 --- a/src/Umbraco.Web.UI.Client/libs/tree/index.ts +++ b/src/Umbraco.Web.UI.Client/libs/tree/index.ts @@ -1,3 +1,5 @@ +export * from './tree.context'; + export interface UmbTreeRootModel { type: string; name: string; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree.context.ts b/src/Umbraco.Web.UI.Client/libs/tree/tree.context.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree.context.ts rename to src/Umbraco.Web.UI.Client/libs/tree/tree.context.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.context.ts index d3a7bafd82..b28f9f45b6 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.context.ts @@ -1,8 +1,8 @@ import { map } from 'rxjs'; +import { UmbTreeItemContext } from '../tree-item.context.interface'; import { UMB_SECTION_CONTEXT_TOKEN, UMB_SECTION_SIDEBAR_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/section'; import type { UmbSectionContext, UmbSectionSidebarContext } from '@umbraco-cms/backoffice/section'; -import { UmbTreeContextBase } from '../tree.context'; -import { UmbTreeItemContext } from '../tree-item.context.interface'; +import { UmbTreeContextBase } from '@umbraco-cms/backoffice/tree'; import { ManifestEntityAction } from '@umbraco-cms/backoffice/extensions-registry'; import { UmbBooleanState, diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree.element.ts index 304fc8d38e..256fb57fd6 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree.element.ts @@ -1,7 +1,7 @@ import { html, nothing } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; -import { UmbTreeContextBase } from './tree.context'; +import { UmbTreeContextBase } from '@umbraco-cms/backoffice/tree'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { TreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbObserverController } from '@umbraco-cms/backoffice/observable-api'; From 6c79fadf088373b79f0e0e91e63f0d405fe8a6a6 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 15:02:06 +0200 Subject: [PATCH 03/23] move tree contexts to lib --- src/Umbraco.Web.UI.Client/libs/tree/index.ts | 2 ++ .../tree-item-base => libs/tree}/tree-item-base.context.ts | 0 .../components => libs}/tree/tree-item.context.interface.ts | 0 .../tree/entity-tree-item/entity-tree-item.context.ts | 2 +- .../components/tree/tree-item-base/tree-item-base.element.ts | 3 +-- .../file-system-tree-item/file-system-tree-item.context.ts | 2 +- 6 files changed, 5 insertions(+), 4 deletions(-) rename src/Umbraco.Web.UI.Client/{src/backoffice/core/components/tree/tree-item-base => libs/tree}/tree-item-base.context.ts (100%) rename src/Umbraco.Web.UI.Client/{src/backoffice/core/components => libs}/tree/tree-item.context.interface.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/libs/tree/index.ts b/src/Umbraco.Web.UI.Client/libs/tree/index.ts index 029ddbf0fd..a63531e505 100644 --- a/src/Umbraco.Web.UI.Client/libs/tree/index.ts +++ b/src/Umbraco.Web.UI.Client/libs/tree/index.ts @@ -1,4 +1,6 @@ export * from './tree.context'; +export * from './tree-item-base.context'; +export * from './tree-item.context.interface'; export interface UmbTreeRootModel { type: string; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.context.ts b/src/Umbraco.Web.UI.Client/libs/tree/tree-item-base.context.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.context.ts rename to src/Umbraco.Web.UI.Client/libs/tree/tree-item-base.context.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item.context.interface.ts b/src/Umbraco.Web.UI.Client/libs/tree/tree-item.context.interface.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item.context.interface.ts rename to src/Umbraco.Web.UI.Client/libs/tree/tree-item.context.interface.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/entity-tree-item/entity-tree-item.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/entity-tree-item/entity-tree-item.context.ts index 62db8e957c..4c61d2e624 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/entity-tree-item/entity-tree-item.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/entity-tree-item/entity-tree-item.context.ts @@ -1,4 +1,4 @@ -import { UmbTreeItemContextBase } from '../tree-item-base/tree-item-base.context'; +import { UmbTreeItemContextBase } from '@umbraco-cms/backoffice/tree'; import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller'; import { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.element.ts index ec0c2f70c5..fc7017304c 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/tree/tree-item-base/tree-item-base.element.ts @@ -3,8 +3,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; import { ifDefined } from 'lit/directives/if-defined.js'; import { repeat } from 'lit/directives/repeat.js'; -import { UmbTreeItemContext } from '../tree-item.context.interface'; -import { UMB_TREE_ITEM_CONTEXT_TOKEN } from './tree-item-base.context'; +import { UmbTreeItemContext, UMB_TREE_ITEM_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/tree'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { TreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.context.ts index 350d63ce47..448235c3b0 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/components/file-system-tree-item/file-system-tree-item.context.ts @@ -1,5 +1,5 @@ -import { UmbTreeItemContextBase } from '../../../core/components/tree/tree-item-base/tree-item-base.context'; import { urlFriendlyPathFromServerFilePath } from '../../utils'; +import { UmbTreeItemContextBase } from '@umbraco-cms/backoffice/tree'; import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller'; import { FileSystemTreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; From 7789160521b9f0c12a13fb61aaea7c6653657966 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 15:09:00 +0200 Subject: [PATCH 04/23] fix import --- .../documents/tree/tree-item/document-tree-item.context.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/tree/tree-item/document-tree-item.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/tree/tree-item/document-tree-item.context.ts index d64d42b88a..c14e4b0eed 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/tree/tree-item/document-tree-item.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/tree/tree-item/document-tree-item.context.ts @@ -1,4 +1,4 @@ -import { UmbTreeItemContextBase } from '../../../../core/components/tree/tree-item-base/tree-item-base.context'; +import { UmbTreeItemContextBase } from '@umbraco-cms/backoffice/tree'; import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller'; import { DocumentTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; From 71e619c2e768ad9ad575b75db49fb3356ae6d592 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 15:09:39 +0200 Subject: [PATCH 05/23] remove unused --- .../entity-actions/import/import-dictionary-modal.element.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal.element.ts index 1c3a2532e3..22edcbff78 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal.element.ts @@ -2,11 +2,9 @@ import { css, html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, query, state } from 'lit/decorators.js'; import { when } from 'lit/directives/when.js'; -import { repeat } from 'lit/directives/repeat.js'; -import { UmbTreeElement } from '../../../../core/components/tree/tree.element'; import { UmbDictionaryRepository } from '../../repository/dictionary.repository'; import { UmbImportDictionaryModalData, UmbImportDictionaryModalResult } from '@umbraco-cms/backoffice/modal'; -import { DictionaryItemResponseModel, ImportDictionaryRequestModel } from '@umbraco-cms/backoffice/backend-api'; +import { ImportDictionaryRequestModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbModalBaseElement } from '@umbraco-cms/internal/modal'; @customElement('umb-import-dictionary-modal') From dded9d5e0b2cda86ee0c6e9497992ac46bda1b47 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 15:11:07 +0200 Subject: [PATCH 06/23] update import order --- .../views/table/user-collection-table-view.element.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/user-collection-table-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/user-collection-table-view.element.ts index abfeb3a509..06970754cf 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/user-collection-table-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/user-collection-table-view.element.ts @@ -1,7 +1,6 @@ import { css, html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; -import type { UserGroupEntity } from '@umbraco-cms/backoffice/user-group'; import { UmbTableElement, UmbTableColumn, @@ -16,6 +15,7 @@ import { UMB_USER_GROUP_STORE_CONTEXT_TOKEN, } from '../../../../user-groups/repository/user-group.store'; import { UmbUserCollectionContext } from '../../user-collection.context'; +import type { UserGroupEntity } from '@umbraco-cms/backoffice/user-group'; import { UMB_COLLECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/collection'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { UserResponseModel } from '@umbraco-cms/backoffice/backend-api'; From a54186c54ce7ac8ff17ebd89606e3cb28d6c256d Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 15:23:51 +0200 Subject: [PATCH 07/23] add import path for core components --- src/Umbraco.Web.UI.Client/tsconfig.json | 1 + src/Umbraco.Web.UI.Client/web-test-runner.config.mjs | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index 8ec155f04a..de3fe97d3e 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -47,6 +47,7 @@ "@umbraco-cms/backoffice/tree": ["libs/tree"], "@umbraco-cms/backoffice/section": ["libs/section"], + "@umbraco-cms/backoffice/core/components": ["src/backoffice/core/components"], "@umbraco-cms/backoffice/user-group": ["src/backoffice/users/user-groups"], "@umbraco-cms/internal/lit-element": ["src/core/lit-element"], diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs index 4e33441cf3..608f3dd1df 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -63,6 +63,7 @@ export default { '@umbraco-cms/backoffice/tree': './libs/tree/index.ts', '@umbraco-cms/backoffice/section': './libs/section/index.ts', + '@umbraco-cms/backoffice/core/components': './src/backoffice/core/components/index.ts', '@umbraco-cms/backoffice/user-group': './src/backoffice/users/user-groups/index.ts', '@umbraco-cms/internal/lit-element': './src/core/lit-element/index.ts', From 7e02784da724cb6a415b35350dce4babeab6f399 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 15:24:08 +0200 Subject: [PATCH 08/23] add "backoffice" to vs code dictionary --- src/Umbraco.Web.UI.Client/.vscode/settings.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/.vscode/settings.json b/src/Umbraco.Web.UI.Client/.vscode/settings.json index 387d52b0f6..ab6227a730 100644 --- a/src/Umbraco.Web.UI.Client/.vscode/settings.json +++ b/src/Umbraco.Web.UI.Client/.vscode/settings.json @@ -1,6 +1,7 @@ { "cssVariables.lookupFiles": ["node_modules/@umbraco-ui/uui-css/dist/custom-properties.css"], "cSpell.words": [ + "backoffice", "combobox", "Elementable", "templating", From 66a4f7a8d65e4f9d3cadb60bd348be3a48265b1c Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 15:24:23 +0200 Subject: [PATCH 09/23] export everything from table module --- .../src/backoffice/core/components/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts index abcee8fe9b..de51d173a1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts @@ -62,4 +62,6 @@ import './code-editor'; import './tooltip-menu/tooltip-menu.element'; +export * from './table'; + export const manifests = [...debugManifests]; From 3d43c81f3e4e4a2118498bbd7c673c5eae18b6cd Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 15:24:50 +0200 Subject: [PATCH 10/23] update imports to use import alias --- .../document-table-actions-column-layout.element.ts | 2 +- .../views/table/document-table-collection-view.element.ts | 2 +- .../collection-view/media-table-collection-view.element.ts | 2 +- .../workspace/language-root/language-root-workspace.element.ts | 2 +- .../relation/workspace-view-relation-type-relation.element.ts | 2 +- .../dictionary/dashboard-translation-dictionary.element.ts | 2 +- .../workspace/user-group-table-name-column-layout.element.ts | 2 +- .../user-group-table-sections-column-layout.element.ts | 2 +- .../user-groups/workspace/user-group-workspace-edit.element.ts | 1 + .../user-groups/workspace/workspace-view-user-groups.element.ts | 2 +- .../name/user-table-name-column-layout.element.ts | 2 +- .../views/table/user-collection-table-view.element.ts | 2 +- 12 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/column-layouts/document-table-actions-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/column-layouts/document-table-actions-column-layout.element.ts index b280bd69ba..eec62e33ae 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/column-layouts/document-table-actions-column-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/column-layouts/document-table-actions-column-layout.element.ts @@ -1,7 +1,7 @@ import { css, html, LitElement, nothing } from 'lit'; import { ifDefined } from 'lit/directives/if-defined.js'; import { customElement, property, state } from 'lit/decorators.js'; -import type { UmbTableColumn, UmbTableItem } from '../../../../../../core/components/table'; +import type { UmbTableColumn, UmbTableItem } from '@umbraco-cms/backoffice/core/components'; import { UmbExecutedEvent } from '@umbraco-cms/backoffice/events'; // TODO: this could be done more generic, but for now we just need it for the document table diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/document-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/document-table-collection-view.element.ts index 333f14c85c..d3d5c13636 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/document-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/collection/views/table/document-table-collection-view.element.ts @@ -10,7 +10,7 @@ import { UmbTableItem, UmbTableOrderedEvent, UmbTableSelectedEvent, -} from '../../../../../core/components/table'; +} from '@umbraco-cms/backoffice/core/components'; import { UMB_COLLECTION_CONTEXT_TOKEN, UmbCollectionContext } from '@umbraco-cms/backoffice/collection'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { DocumentTreeItemResponseModel, EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/collection-view/media-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/collection-view/media-table-collection-view.element.ts index d9b4aaa890..3cabecb7af 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/collection-view/media-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/collection-view/media-table-collection-view.element.ts @@ -9,7 +9,7 @@ import type { UmbTableItem, UmbTableOrderedEvent, UmbTableSelectedEvent, -} from '../../../core/components/table'; +} from '@umbraco-cms/backoffice/core/components'; import type { MediaDetails } from '../'; import { UmbCollectionContext, UMB_COLLECTION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/collection'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-workspace.element.ts index 56783b7722..cba3701abf 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language-root/language-root-workspace.element.ts @@ -1,7 +1,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { UmbTableColumn, UmbTableConfig, UmbTableItem } from '../../../../core/components/table'; +import { UmbTableColumn, UmbTableConfig, UmbTableItem } from '@umbraco-cms/backoffice/core/components'; import { UmbLanguageRepository } from '../../repository/language.repository'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { LanguageResponseModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation/workspace-view-relation-type-relation.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation/workspace-view-relation-type-relation.element.ts index 893e5f042b..b7ca550b52 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation/workspace-view-relation-type-relation.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation/workspace-view-relation-type-relation.element.ts @@ -1,7 +1,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { UmbTableColumn, UmbTableConfig } from '../../../../../core/components/table'; +import { UmbTableColumn, UmbTableConfig } from '@umbraco-cms/backoffice/core/components'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { RelationResponseModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbWorkspaceEditorViewExtensionElement } from '@umbraco-cms/backoffice/extensions-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dashboards/dictionary/dashboard-translation-dictionary.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dashboards/dictionary/dashboard-translation-dictionary.element.ts index c3a4767d42..86f8c2671f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dashboards/dictionary/dashboard-translation-dictionary.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dashboards/dictionary/dashboard-translation-dictionary.element.ts @@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { when } from 'lit/directives/when.js'; -import { UmbTableConfig, UmbTableColumn, UmbTableItem } from '../../../core/components/table'; +import { UmbTableConfig, UmbTableColumn, UmbTableItem } from '@umbraco-cms/backoffice/core/components'; import { UmbDictionaryRepository } from '../../dictionary/repository/dictionary.repository'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { DictionaryOverviewResponseModel, LanguageResponseModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-table-name-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-table-name-column-layout.element.ts index 8f07cc172c..27bb98248b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-table-name-column-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-table-name-column-layout.element.ts @@ -1,6 +1,6 @@ import { html, LitElement } from 'lit'; import { customElement, property } from 'lit/decorators.js'; -import { UmbTableItem } from '../../../core/components/table'; +import type { UmbTableItem } from '@umbraco-cms/backoffice/core/components'; @customElement('umb-user-group-table-name-column-layout') export class UmbUserGroupTableNameColumnLayoutElement extends LitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-table-sections-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-table-sections-column-layout.element.ts index d793c485dc..9e47c0ef61 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-table-sections-column-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-table-sections-column-layout.element.ts @@ -1,6 +1,6 @@ import { html } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { UmbTableItem } from '../../../core/components/table'; +import type { UmbTableItem } from '@umbraco-cms/backoffice/core/components'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extensions-api'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-workspace-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-workspace-edit.element.ts index 79fc4ff43d..75bea4db17 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-workspace-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/user-group-workspace-edit.element.ts @@ -10,6 +10,7 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import '../../users/components/user-input/user-input.element'; import '../../../core/components/input-section/input-section.element'; + import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-api'; @customElement('umb-user-group-workspace-edit') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/workspace-view-user-groups.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/workspace-view-user-groups.element.ts index 6b160c3867..7b15b0ca9d 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/workspace-view-user-groups.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/workspace/workspace-view-user-groups.element.ts @@ -9,7 +9,7 @@ import { UmbTableItem, UmbTableOrderedEvent, UmbTableSelectedEvent, -} from '../../../core/components/table'; +} from '@umbraco-cms/backoffice/core/components'; import { UmbUserGroupStore, UMB_USER_GROUP_STORE_CONTEXT_TOKEN } from '../repository/user-group.store'; import type { UserGroupDetails } from '../types'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/column-layouts/name/user-table-name-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/column-layouts/name/user-table-name-column-layout.element.ts index d4e419b9d5..09530ef602 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/column-layouts/name/user-table-name-column-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/column-layouts/name/user-table-name-column-layout.element.ts @@ -1,6 +1,6 @@ import { html, LitElement } from 'lit'; import { customElement, property } from 'lit/decorators.js'; -import type { UmbTableColumn, UmbTableItem } from '../../../../../../../core/components/table/table.element'; +import type { UmbTableColumn, UmbTableItem } from '@umbraco-cms/backoffice/core/components'; @customElement('umb-user-table-name-column-layout') export class UmbUserTableNameColumnLayoutElement extends LitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/user-collection-table-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/user-collection-table-view.element.ts index 06970754cf..39b25b0ec6 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/user-collection-table-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/collection/views/table/user-collection-table-view.element.ts @@ -9,7 +9,7 @@ import { UmbTableSelectedEvent, UmbTableConfig, UmbTableOrderedEvent, -} from '../../../../../core/components/table/table.element'; +} from '@umbraco-cms/backoffice/core/components'; import { UmbUserGroupStore, UMB_USER_GROUP_STORE_CONTEXT_TOKEN, From 329dc80184c5ad39155ff69cb334dfb515026869 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 15:34:08 +0200 Subject: [PATCH 11/23] add type to import --- .../templates/workspace/template-workspace.element.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/workspace/template-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/workspace/template-workspace.element.ts index d4290d7117..7fe89f7f32 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/workspace/template-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/templates/workspace/template-workspace.element.ts @@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html } from 'lit'; import { customElement, query, state } from 'lit/decorators.js'; import { UUIInputElement } from '@umbraco-ui/uui'; -import { UmbCodeEditorElement } from '../../../core/components/code-editor/code-editor.element'; +import type { UmbCodeEditorElement } from '../../../core/components/code-editor/code-editor.element'; import { UmbTemplateWorkspaceContext } from './template-workspace.context'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; From 16fcf0c004dcc6196b1b2f939e1ef5226a951db1 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 15:48:30 +0200 Subject: [PATCH 12/23] reference img instead of import --- .../backoffice-frame/backoffice-header.element.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header.element.ts index f9e4a60f47..77f85253b2 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header.element.ts @@ -1,20 +1,17 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { css, CSSResultGroup, html, LitElement, unsafeCSS } from 'lit'; +import { css, CSSResultGroup, html, LitElement } from 'lit'; import { customElement } from 'lit/decorators.js'; -import logoImg from '/umbraco_logomark_white.svg'; import './backoffice-header-sections.element'; import './backoffice-header-apps.element'; @customElement('umb-backoffice-header') export class UmbBackofficeHeaderElement extends LitElement { - - render() { return html`
@@ -22,7 +19,7 @@ export class UmbBackofficeHeaderElement extends LitElement {
`; } - + static styles: CSSResultGroup = [ UUITextStyles, css` From 5cee555c2f172d61556354aaebdc04271c1d373d Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 15:49:00 +0200 Subject: [PATCH 13/23] import type --- .../components/variant-selector/variant-selector.element.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variant-selector/variant-selector.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variant-selector/variant-selector.element.ts index 6716888a9d..ddab9c83ab 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variant-selector/variant-selector.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variant-selector/variant-selector.element.ts @@ -7,7 +7,7 @@ import { UmbWorkspaceVariantContext, UMB_WORKSPACE_VARIANT_CONTEXT_TOKEN, } from '../workspace/workspace-variant/workspace-variant.context'; -import { ActiveVariant } from '../workspace/workspace-context/workspace-split-view-manager.class'; +import type { ActiveVariant } from '../workspace/workspace-context/workspace-split-view-manager.class'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { DocumentVariantResponseModel, ContentStateModel } from '@umbraco-cms/backoffice/backend-api'; From 7db4243b517c30a0a195da59376e4f23ac5039da Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 15:50:24 +0200 Subject: [PATCH 14/23] import element in component file --- .../src/backoffice/core/components/index.ts | 1 + .../documents/workspace/document-workspace-editor.element.ts | 1 - .../documents/workspace/document-workspace-split-view.element.ts | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts index de51d173a1..6510c68c5f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts @@ -53,6 +53,7 @@ import './workspace/workspace-action/workspace-action.element'; import './workspace/workspace-editor/workspace-editor.element'; import './workspace/workspace-footer/workspace-footer.element'; import './workspace/workspace-action-menu/workspace-action-menu.element'; +import './workspace/workspace-variant/workspace-variant.element'; import './property-creator/property-creator.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-editor.element.ts index a02284b560..d16cf62db1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-editor.element.ts @@ -8,7 +8,6 @@ import { UmbDocumentWorkspaceSplitViewElement } from './document-workspace-split import type { UmbRoute } from '@umbraco-cms/backoffice/router'; import type { UmbRouterSlotInitEvent } from '@umbraco-cms/internal/router'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import '../../../core/components/workspace/workspace-variant/workspace-variant.element'; import { VariantModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-split-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-split-view.element.ts index 6b4bedb89d..457aaea3f4 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-split-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-split-view.element.ts @@ -5,7 +5,6 @@ import { repeat } from 'lit/directives/repeat.js'; import { ActiveVariant } from '../../../core/components/workspace/workspace-context/workspace-split-view-manager.class'; import { UmbDocumentWorkspaceContext } from './document-workspace.context'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import '../../../core/components/workspace/workspace-variant/workspace-variant.element'; import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-api'; @customElement('umb-document-workspace-split-view') From da76acbb9f3f0878047624617b7b6603d081c839 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 15:59:47 +0200 Subject: [PATCH 15/23] add module for variant logic + update imports --- src/Umbraco.Web.UI.Client/libs/variant/index.ts | 1 + .../core/variants => libs/variant}/variant-id.class.ts | 0 .../input-multi-url-picker.element.ts | 6 ++---- .../property-type-based-property.element.ts | 6 ++---- .../variantable-property/variantable-property.element.ts | 6 ++---- .../workspace-property/workspace-property.context.ts | 2 +- .../workspace-property/workspace-property.element.ts | 2 +- .../workspace-context/workspace-split-view-manager.class.ts | 2 +- .../workspace-variable-entity-context.interface.ts | 2 +- .../workspace-variant/workspace-variant.context.ts | 2 +- .../uis/block-grid/property-editor-ui-block-grid.element.ts | 2 +- .../workspace/document-workspace-editor.element.ts | 2 +- .../documents/workspace/document-workspace.context.ts | 4 ++-- .../src/core/router/variant-router-slot.element.ts | 2 +- src/Umbraco.Web.UI.Client/tsconfig.json | 1 + src/Umbraco.Web.UI.Client/web-test-runner.config.mjs | 1 + 16 files changed, 19 insertions(+), 22 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/libs/variant/index.ts rename src/Umbraco.Web.UI.Client/{src/backoffice/core/variants => libs/variant}/variant-id.class.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/libs/variant/index.ts b/src/Umbraco.Web.UI.Client/libs/variant/index.ts new file mode 100644 index 0000000000..c4b6ea1ef4 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/libs/variant/index.ts @@ -0,0 +1 @@ +export * from './variant-id.class'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/variants/variant-id.class.ts b/src/Umbraco.Web.UI.Client/libs/variant/variant-id.class.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/core/variants/variant-id.class.ts rename to src/Umbraco.Web.UI.Client/libs/variant/variant-id.class.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-multi-url-picker/input-multi-url-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-multi-url-picker/input-multi-url-picker.element.ts index 0767c2d6e5..e5a1a37e89 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-multi-url-picker/input-multi-url-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/input-multi-url-picker/input-multi-url-picker.element.ts @@ -3,7 +3,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property, state } from 'lit/decorators.js'; import { FormControlMixin } from '@umbraco-ui/uui-base/lib/mixins'; import type { UUIModalSidebarSize } from '@umbraco-ui/uui'; -import type { UmbVariantId } from '../../variants/variant-id.class'; +import type { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import { UmbLinkPickerLink, UMB_LINK_PICKER_MODAL, @@ -20,8 +20,6 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; */ @customElement('umb-input-multi-url-picker') export class UmbInputMultiUrlPickerElement extends FormControlMixin(UmbLitElement) { - - protected getFormElement() { return undefined; } @@ -222,7 +220,7 @@ export class UmbInputMultiUrlPickerElement extends FormControlMixin(UmbLitElemen `; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/property-type-based-property/property-type-based-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/property-type-based-property/property-type-based-property.element.ts index 5712375742..7490e70f95 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/property-type-based-property/property-type-based-property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/property-type-based-property/property-type-based-property.element.ts @@ -2,8 +2,8 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html } from 'lit'; import { ifDefined } from 'lit/directives/if-defined.js'; import { customElement, property, state } from 'lit/decorators.js'; +import type { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import { UmbDataTypeRepository } from '../../../settings/data-types/repository/data-type.repository'; -import { UmbVariantId } from '../../variants/variant-id.class'; import { UmbDocumentWorkspaceContext } from '../../../documents/documents/workspace/document-workspace.context'; import type { DataTypeResponseModel, @@ -17,8 +17,6 @@ import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-ap @customElement('umb-property-type-based-property') export class UmbPropertyTypeBasedPropertyElement extends UmbLitElement { - - @property({ type: Object, attribute: false }) public get property(): PropertyTypeResponseModelBaseModel | undefined { return this._property; @@ -114,7 +112,7 @@ export class UmbPropertyTypeBasedPropertyElement extends UmbLitElement { .propertyVariantId=${this.propertyVariantId} .config=${this._dataTypeData}>`; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variantable-property/variantable-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variantable-property/variantable-property.element.ts index 0705a28a7a..b691988c8b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variantable-property/variantable-property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variantable-property/variantable-property.element.ts @@ -1,7 +1,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { UmbVariantId } from '../../variants/variant-id.class'; +import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import { UMB_WORKSPACE_VARIANT_CONTEXT_TOKEN } from '../workspace/workspace-variant/workspace-variant.context'; import type { PropertyTypeResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; import '../workspace-property/workspace-property.element'; @@ -9,8 +9,6 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; @customElement('umb-variantable-property') export class UmbVariantablePropertyElement extends UmbLitElement { - - private _property?: PropertyTypeResponseModelBaseModel | undefined; @property({ type: Object, attribute: false }) public get property(): PropertyTypeResponseModelBaseModel | undefined { @@ -62,7 +60,7 @@ export class UmbVariantablePropertyElement extends UmbLitElement { .property=${this._property} .propertyVariantId=${this._propertyVariantId}>`; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace-property/workspace-property.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace-property/workspace-property.context.ts index 5cad4cae04..e1b32969bb 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace-property/workspace-property.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace-property/workspace-property.context.ts @@ -1,4 +1,4 @@ -import { UmbVariantId } from '../../variants/variant-id.class'; +import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import { UmbWorkspaceVariableEntityContextInterface } from '../workspace/workspace-context/workspace-variable-entity-context.interface'; import { UMB_WORKSPACE_VARIANT_CONTEXT_TOKEN } from '../workspace/workspace-variant/workspace-variant.context'; import type { DataTypeResponseModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace-property/workspace-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace-property/workspace-property.element.ts index e65ed465b0..ed37995ec8 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace-property/workspace-property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace-property/workspace-property.element.ts @@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; import { ifDefined } from 'lit/directives/if-defined.js'; -import { UmbVariantId } from '../../variants/variant-id.class'; +import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import { UmbWorkspacePropertyContext } from './workspace-property.context'; import { createExtensionElement, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extensions-api'; import type { ManifestPropertyEditorUI } from '@umbraco-cms/backoffice/extensions-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-split-view-manager.class.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-split-view-manager.class.ts index b300be5ebf..facca7d905 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-split-view-manager.class.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-split-view-manager.class.ts @@ -1,4 +1,4 @@ -import { UmbVariantId } from '../../../variants/variant-id.class'; +import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller'; import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-variable-entity-context.interface.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-variable-entity-context.interface.ts index b46abfeed7..45f2be4d9b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-variable-entity-context.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-variable-entity-context.interface.ts @@ -1,5 +1,5 @@ import type { Observable } from 'rxjs'; -import { UmbVariantId } from '../../../variants/variant-id.class'; +import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import { UmbWorkspaceSplitViewManager } from './workspace-split-view-manager.class'; import type { UmbEntityWorkspaceContextInterface } from '@umbraco-cms/backoffice/workspace'; import type { ValueModelBaseModel, VariantResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-variant/workspace-variant.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-variant/workspace-variant.context.ts index 4364c6d3b8..dfd81d33db 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-variant/workspace-variant.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-variant/workspace-variant.context.ts @@ -1,5 +1,5 @@ +import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import { UmbDocumentWorkspaceContext } from '../../../../documents/documents/workspace/document-workspace.context'; -import { UmbVariantId } from '../../../variants/variant-id.class'; import { UmbWorkspaceVariableEntityContextInterface } from '../workspace-context/workspace-variable-entity-context.interface'; import { ActiveVariant } from '../workspace-context/workspace-split-view-manager.class'; import { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/property-editor-ui-block-grid.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/property-editor-ui-block-grid.element.ts index 8668375a0b..72e9c34152 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/property-editor-ui-block-grid.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/uis/block-grid/property-editor-ui-block-grid.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { UmbVariantId } from '../../../variants/variant-id.class'; +import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import { UMB_WORKSPACE_VARIANT_CONTEXT_TOKEN } from '../../../components/workspace/workspace-variant/workspace-variant.context'; import { UMB_WORKSPACE_PROPERTY_CONTEXT_TOKEN } from '../../../components/workspace-property/workspace-property.context'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-editor.element.ts index d16cf62db1..2ba1fa1828 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-editor.element.ts @@ -1,7 +1,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { UmbVariantId } from '../../../core/variants/variant-id.class'; +import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import { ActiveVariant } from '../../../core/components/workspace/workspace-context/workspace-split-view-manager.class'; import { UmbDocumentWorkspaceContext } from './document-workspace.context'; import { UmbDocumentWorkspaceSplitViewElement } from './document-workspace-split-view.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts index 5ed036afbf..86740e8a61 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts @@ -1,9 +1,9 @@ -import { UmbContentTypePropertyStructureManager } from '@umbraco-cms/backoffice/content-type'; +import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import { UmbDocumentRepository } from '../repository/document.repository'; import { UmbDocumentTypeRepository } from '../../document-types/repository/document-type.repository'; import { UmbWorkspaceVariableEntityContextInterface } from '../../../core/components/workspace/workspace-context/workspace-variable-entity-context.interface'; -import { UmbVariantId } from '../../../core/variants/variant-id.class'; import { UmbWorkspaceSplitViewManager } from '../../../core/components/workspace/workspace-context/workspace-split-view-manager.class'; +import { UmbContentTypePropertyStructureManager } from '@umbraco-cms/backoffice/content-type'; import { UmbWorkspaceContext } from '@umbraco-cms/backoffice/workspace'; import type { CreateDocumentRequestModel, DocumentResponseModel } from '@umbraco-cms/backoffice/backend-api'; import { diff --git a/src/Umbraco.Web.UI.Client/src/core/router/variant-router-slot.element.ts b/src/Umbraco.Web.UI.Client/src/core/router/variant-router-slot.element.ts index bfb18b3e48..61f133c674 100644 --- a/src/Umbraco.Web.UI.Client/src/core/router/variant-router-slot.element.ts +++ b/src/Umbraco.Web.UI.Client/src/core/router/variant-router-slot.element.ts @@ -1,5 +1,5 @@ import { customElement, property } from 'lit/decorators.js'; -import { UmbVariantId } from '../../backoffice/core/variants/variant-id.class'; +import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import { UmbRouterSlotElement } from './router-slot.element'; import { UmbRoute } from '@umbraco-cms/backoffice/router'; diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index de3fe97d3e..e4fd9a2518 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -46,6 +46,7 @@ "@umbraco-cms/backoffice/collection": ["libs/collection"], "@umbraco-cms/backoffice/tree": ["libs/tree"], "@umbraco-cms/backoffice/section": ["libs/section"], + "@umbraco-cms/backoffice/variant": ["libs/variant"], "@umbraco-cms/backoffice/core/components": ["src/backoffice/core/components"], "@umbraco-cms/backoffice/user-group": ["src/backoffice/users/user-groups"], diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs index 608f3dd1df..9ce6f34ed6 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -62,6 +62,7 @@ export default { '@umbraco-cms/backoffice/collection': './libs/collection/index.ts', '@umbraco-cms/backoffice/tree': './libs/tree/index.ts', '@umbraco-cms/backoffice/section': './libs/section/index.ts', + '@umbraco-cms/backoffice/variant': './libs/variant/index.ts', '@umbraco-cms/backoffice/core/components': './src/backoffice/core/components/index.ts', '@umbraco-cms/backoffice/user-group': './src/backoffice/users/user-groups/index.ts', From 56fee66c961b24a1cdcdebbf6ca57d593c9092ea Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 16:01:01 +0200 Subject: [PATCH 16/23] update import --- src/Umbraco.Web.UI.Client/libs/tree/tree-item-base.context.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/libs/tree/tree-item-base.context.ts b/src/Umbraco.Web.UI.Client/libs/tree/tree-item-base.context.ts index b28f9f45b6..73c885daac 100644 --- a/src/Umbraco.Web.UI.Client/libs/tree/tree-item-base.context.ts +++ b/src/Umbraco.Web.UI.Client/libs/tree/tree-item-base.context.ts @@ -1,5 +1,5 @@ import { map } from 'rxjs'; -import { UmbTreeItemContext } from '../tree-item.context.interface'; +import { UmbTreeItemContext } from './tree-item.context.interface'; import { UMB_SECTION_CONTEXT_TOKEN, UMB_SECTION_SIDEBAR_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/section'; import type { UmbSectionContext, UmbSectionSidebarContext } from '@umbraco-cms/backoffice/section'; import { UmbTreeContextBase } from '@umbraco-cms/backoffice/tree'; From 0dcbdc4a0a49a9e3b2caca58fa71fb39e652d252 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 16:08:19 +0200 Subject: [PATCH 17/23] move workspace-split-view-manager to workspace lib --- src/Umbraco.Web.UI.Client/libs/workspace/index.ts | 1 + .../workspace}/workspace-split-view-manager.class.ts | 0 .../components/variant-selector/variant-selector.element.ts | 2 +- .../workspace-variable-entity-context.interface.ts | 6 ++++-- .../workspace-variant/workspace-variant.context.ts | 2 +- .../workspace/document-workspace-editor.element.ts | 2 +- .../workspace/document-workspace-split-view.element.ts | 2 +- .../documents/workspace/document-workspace.context.ts | 3 +-- 8 files changed, 10 insertions(+), 8 deletions(-) rename src/Umbraco.Web.UI.Client/{src/backoffice/core/components/workspace/workspace-context => libs/workspace}/workspace-split-view-manager.class.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/libs/workspace/index.ts b/src/Umbraco.Web.UI.Client/libs/workspace/index.ts index de14fcfee4..aeb6753e07 100644 --- a/src/Umbraco.Web.UI.Client/libs/workspace/index.ts +++ b/src/Umbraco.Web.UI.Client/libs/workspace/index.ts @@ -1,2 +1,3 @@ export * from './actions'; export * from './context'; +export * from './workspace-split-view-manager.class'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-split-view-manager.class.ts b/src/Umbraco.Web.UI.Client/libs/workspace/workspace-split-view-manager.class.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-split-view-manager.class.ts rename to src/Umbraco.Web.UI.Client/libs/workspace/workspace-split-view-manager.class.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variant-selector/variant-selector.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variant-selector/variant-selector.element.ts index ddab9c83ab..7bd64de046 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variant-selector/variant-selector.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variant-selector/variant-selector.element.ts @@ -7,7 +7,7 @@ import { UmbWorkspaceVariantContext, UMB_WORKSPACE_VARIANT_CONTEXT_TOKEN, } from '../workspace/workspace-variant/workspace-variant.context'; -import type { ActiveVariant } from '../workspace/workspace-context/workspace-split-view-manager.class'; +import type { ActiveVariant } from '@umbraco-cms/backoffice/workspace'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { DocumentVariantResponseModel, ContentStateModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-variable-entity-context.interface.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-variable-entity-context.interface.ts index 45f2be4d9b..73b1ca155e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-variable-entity-context.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-context/workspace-variable-entity-context.interface.ts @@ -1,7 +1,9 @@ import type { Observable } from 'rxjs'; import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; -import { UmbWorkspaceSplitViewManager } from './workspace-split-view-manager.class'; -import type { UmbEntityWorkspaceContextInterface } from '@umbraco-cms/backoffice/workspace'; +import type { + UmbEntityWorkspaceContextInterface, + UmbWorkspaceSplitViewManager, +} from '@umbraco-cms/backoffice/workspace'; import type { ValueModelBaseModel, VariantResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; export interface UmbWorkspaceVariableEntityContextInterface extends UmbEntityWorkspaceContextInterface { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-variant/workspace-variant.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-variant/workspace-variant.context.ts index dfd81d33db..25bf1a75b7 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-variant/workspace-variant.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/workspace/workspace-variant/workspace-variant.context.ts @@ -1,7 +1,7 @@ import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import { UmbDocumentWorkspaceContext } from '../../../../documents/documents/workspace/document-workspace.context'; import { UmbWorkspaceVariableEntityContextInterface } from '../workspace-context/workspace-variable-entity-context.interface'; -import { ActiveVariant } from '../workspace-context/workspace-split-view-manager.class'; +import { ActiveVariant } from '@umbraco-cms/backoffice/workspace'; import { UmbContextConsumerController, UmbContextProviderController, diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-editor.element.ts index 2ba1fa1828..9fc16cae57 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-editor.element.ts @@ -2,9 +2,9 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; -import { ActiveVariant } from '../../../core/components/workspace/workspace-context/workspace-split-view-manager.class'; import { UmbDocumentWorkspaceContext } from './document-workspace.context'; import { UmbDocumentWorkspaceSplitViewElement } from './document-workspace-split-view.element'; +import { ActiveVariant } from '@umbraco-cms/backoffice/workspace'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; import type { UmbRouterSlotInitEvent } from '@umbraco-cms/internal/router'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-split-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-split-view.element.ts index 457aaea3f4..f60370b208 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-split-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace-split-view.element.ts @@ -2,8 +2,8 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; -import { ActiveVariant } from '../../../core/components/workspace/workspace-context/workspace-split-view-manager.class'; import { UmbDocumentWorkspaceContext } from './document-workspace.context'; +import { ActiveVariant } from '@umbraco-cms/backoffice/workspace'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts index 86740e8a61..b3fe1f8c77 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts @@ -2,9 +2,8 @@ import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import { UmbDocumentRepository } from '../repository/document.repository'; import { UmbDocumentTypeRepository } from '../../document-types/repository/document-type.repository'; import { UmbWorkspaceVariableEntityContextInterface } from '../../../core/components/workspace/workspace-context/workspace-variable-entity-context.interface'; -import { UmbWorkspaceSplitViewManager } from '../../../core/components/workspace/workspace-context/workspace-split-view-manager.class'; import { UmbContentTypePropertyStructureManager } from '@umbraco-cms/backoffice/content-type'; -import { UmbWorkspaceContext } from '@umbraco-cms/backoffice/workspace'; +import { UmbWorkspaceContext, UmbWorkspaceSplitViewManager } from '@umbraco-cms/backoffice/workspace'; import type { CreateDocumentRequestModel, DocumentResponseModel } from '@umbraco-cms/backoffice/backend-api'; import { partialUpdateFrozenArray, From 8a53a29ccf9cb687dcb2d120facfedbb340869d3 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 18:48:08 +0200 Subject: [PATCH 18/23] move examine modal registration to search package --- .../src/backoffice/search/manifests.ts | 10 +++++++--- .../src/backoffice/settings/dashboards/manifests.ts | 13 ++----------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/search/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/search/manifests.ts index c7c827ab26..68b960fca1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/search/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/search/manifests.ts @@ -1,6 +1,6 @@ import type { ManifestTypes } from '@umbraco-cms/backoffice/extensions-registry'; -const headerApps: Array = [ +export const manifests: Array = [ { type: 'headerApp', alias: 'Umb.HeaderApp.Search', @@ -46,6 +46,10 @@ const headerApps: Array = [ href: '/section/content/workspace/document/edit/c05da24d-7740-447b-9cdc-bd8ce2172e38/en-us/view/content/tab/Local%20blog%20tab', }, }, + { + type: 'modal', + alias: 'Umb.Modal.ExamineFieldsSettings', + name: 'Examine Field Settings Modal', + loader: () => import('./examine-management-dashboard/views/modal-views/fields-settings.element'), + }, ]; - -export const manifests = [...headerApps]; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/manifests.ts index 3f336c9820..541d091df9 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/manifests.ts @@ -1,4 +1,4 @@ -import type { ManifestDashboard, ManifestModal } from '@umbraco-cms/backoffice/extensions-registry'; +import type { ManifestDashboard } from '@umbraco-cms/backoffice/extensions-registry'; const dashboards: Array = [ { @@ -93,13 +93,4 @@ const dashboards: Array = [ }, ]; -const modals: Array = [ - { - type: 'modal', - alias: 'Umb.Modal.ExamineFieldsSettings', - name: 'Examine Field Settings Modal', - loader: () => import('../../search/examine-management-dashboard/views/modal-views/fields-settings.element'), - }, -]; - -export const manifests = [...dashboards, ...modals]; +export const manifests = [...dashboards]; From 531cb26b6933d51e1c791fe85458c065114e3d6c Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 19:05:45 +0200 Subject: [PATCH 19/23] move property config into components + remove direct import of workspace-property --- .../src/backoffice/core/components/index.ts | 37 ++++++++++++------- .../property-editor-config.element.ts | 5 +-- .../property-editor-config.stories.ts | 0 .../property-type-based-property.element.ts | 1 - .../variantable-property.element.ts | 1 - ...ata-type-details-workspace-view.element.ts | 5 +-- 6 files changed, 26 insertions(+), 23 deletions(-) rename src/Umbraco.Web.UI.Client/src/backoffice/core/{property-editors/shared => components}/property-editor-config/property-editor-config.element.ts (98%) rename src/Umbraco.Web.UI.Client/src/backoffice/core/{property-editors/shared => components}/property-editor-config/property-editor-config.stories.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts index 6510c68c5f..a485d7735e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/index.ts @@ -4,21 +4,32 @@ import { manifests as debugManifests } from './debug/manifests'; // TODO: we need to move these files into their respective folders/silos. We then need a way for a silo to globally register a component import './body-layout/body-layout.element'; import './footer-layout/footer-layout.element'; + +// TODO: delete these two and change usage to umb-dropdown +import './button-with-dropdown/button-with-dropdown.element'; +import './tooltip-menu/tooltip-menu.element'; + +import './dropdown/dropdown.element'; +import './code-block/code-block.element'; +import './debug/debug.element'; +import './empty-state/empty-state.element'; +import './extension-slot/extension-slot.element'; +import './table/table.element'; + import './entity-action/entity-action-list.element'; import './entity-action/entity-action.element'; + +import './entity-bulk-action/entity-bulk-action.element'; + import './backoffice-frame/backoffice-header.element'; import './backoffice-frame/backoffice-main.element'; import './backoffice-frame/backoffice-modal-container.element'; import './backoffice-frame/backoffice-notification-container.element'; -import './button-with-dropdown/button-with-dropdown.element'; -import './code-block/code-block.element'; + import './collection/collection.element'; import './collection/collection-toolbar.element'; import './collection/collection-selection-actions.element'; -import './debug/debug.element'; -import './dropdown/dropdown.element'; -import './empty-state/empty-state.element'; -import './extension-slot/extension-slot.element'; + import './input-checkbox-list/input-checkbox-list.element'; import './input-color-picker/input-color-picker.element'; import './input-eye-dropper/input-eye-dropper.element'; @@ -26,23 +37,24 @@ import './input-multi-url-picker/input-multi-url-picker.element'; import './input-slider/input-slider.element'; import './input-toggle/input-toggle.element'; import './input-upload-field/input-upload-field.element'; + import './property-type-based-property/property-type-based-property.element'; + import './ref-property-editor-ui/ref-property-editor-ui.element'; +import './property-editor-config/property-editor-config.element'; + import './section/section-main/section-main.element'; import './section/section-sidebar/section-sidebar.element'; import './section/section.element'; -import './table/table.element'; - import './tree/tree.element'; import './tree/entity-tree-item/entity-tree-item.element'; import './tree/tree-menu-item/tree-menu-item.element'; -import './entity-bulk-action/entity-bulk-action.element'; - import './menu/menu-item-base/menu-item-base.element'; import './variantable-property/variantable-property.element'; +import './property-creator/property-creator.element'; import './header-app/header-app-button.element'; @@ -54,15 +66,12 @@ import './workspace/workspace-editor/workspace-editor.element'; import './workspace/workspace-footer/workspace-footer.element'; import './workspace/workspace-action-menu/workspace-action-menu.element'; import './workspace/workspace-variant/workspace-variant.element'; - -import './property-creator/property-creator.element'; +import './workspace-property/workspace-property.element'; import './variant-selector/variant-selector.element'; import './code-editor'; -import './tooltip-menu/tooltip-menu.element'; - export * from './table'; export const manifests = [...debugManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/shared/property-editor-config/property-editor-config.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/property-editor-config/property-editor-config.element.ts similarity index 98% rename from src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/shared/property-editor-config/property-editor-config.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/property-editor-config/property-editor-config.element.ts index 2a4a483d93..4813c2df68 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/shared/property-editor-config/property-editor-config.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/property-editor-config/property-editor-config.element.ts @@ -8,7 +8,6 @@ import type { } from '@umbraco-cms/backoffice/extensions-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extensions-api'; -import '../../../components/workspace-property/workspace-property.element'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; /** @@ -17,8 +16,6 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; */ @customElement('umb-property-editor-config') export class UmbPropertyEditorConfigElement extends UmbLitElement { - - /** * Property Editor UI Alias. The element will render configuration for a Property Editor UI with this alias. * @type {string} @@ -122,7 +119,7 @@ export class UmbPropertyEditorConfigElement extends UmbLitElement { : html`
No configuration
`} `; } - + static styles = [UUITextStyles]; } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/shared/property-editor-config/property-editor-config.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/property-editor-config/property-editor-config.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/core/property-editors/shared/property-editor-config/property-editor-config.stories.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/core/components/property-editor-config/property-editor-config.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/property-type-based-property/property-type-based-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/property-type-based-property/property-type-based-property.element.ts index 7490e70f95..a1ddbe808c 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/property-type-based-property/property-type-based-property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/property-type-based-property/property-type-based-property.element.ts @@ -10,7 +10,6 @@ import type { DataTypePropertyPresentationModel, PropertyTypeResponseModelBaseModel, } from '@umbraco-cms/backoffice/backend-api'; -import '../workspace-property/workspace-property.element'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { UmbObserverController } from '@umbraco-cms/backoffice/observable-api'; import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variantable-property/variantable-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variantable-property/variantable-property.element.ts index b691988c8b..752c524627 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variantable-property/variantable-property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/variantable-property/variantable-property.element.ts @@ -4,7 +4,6 @@ import { customElement, property, state } from 'lit/decorators.js'; import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import { UMB_WORKSPACE_VARIANT_CONTEXT_TOKEN } from '../workspace/workspace-variant/workspace-variant.context'; import type { PropertyTypeResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; -import '../workspace-property/workspace-property.element'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; @customElement('umb-variantable-property') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/details/data-type-details-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/details/data-type-details-workspace-view.element.ts index 3c6694c4c8..ecf794f32d 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/details/data-type-details-workspace-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/details/data-type-details-workspace-view.element.ts @@ -11,11 +11,10 @@ import { import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import type { DataTypeResponseModel } from '@umbraco-cms/backoffice/backend-api'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extensions-api'; - -import '../../../../../core/property-editors/shared/property-editor-config/property-editor-config.element'; -import '../../../../../core/components/ref-property-editor-ui/ref-property-editor-ui.element'; import { UmbWorkspaceEditorViewExtensionElement } from '@umbraco-cms/backoffice/extensions-registry'; +import '../../../../../core/components/ref-property-editor-ui/ref-property-editor-ui.element'; + @customElement('umb-data-type-details-workspace-view') export class UmbDataTypeDetailsWorkspaceViewEditElement extends UmbLitElement From 15a07ab9df546c3eb5375ae8ca7ea49ce6b5a1cf Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 May 2023 19:07:21 +0200 Subject: [PATCH 20/23] remove direct import of ref --- .../views/details/data-type-details-workspace-view.element.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/details/data-type-details-workspace-view.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/details/data-type-details-workspace-view.element.ts index ecf794f32d..6d9fca92f2 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/details/data-type-details-workspace-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/details/data-type-details-workspace-view.element.ts @@ -13,8 +13,6 @@ import type { DataTypeResponseModel } from '@umbraco-cms/backoffice/backend-api' import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extensions-api'; import { UmbWorkspaceEditorViewExtensionElement } from '@umbraco-cms/backoffice/extensions-registry'; -import '../../../../../core/components/ref-property-editor-ui/ref-property-editor-ui.element'; - @customElement('umb-data-type-details-workspace-view') export class UmbDataTypeDetailsWorkspaceViewEditElement extends UmbLitElement From 28ed0c6e1e37595941343e5f40ce6ba93bcbaa4c Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 8 May 2023 11:07:08 +0200 Subject: [PATCH 21/23] add app context to get the backofficePath --- .../src/app-config.interface.ts | 13 +++++++++++ src/Umbraco.Web.UI.Client/src/app.context.ts | 16 ++++++++++++++ src/Umbraco.Web.UI.Client/src/app.ts | 6 ++++- .../backoffice-header.element.ts | 22 +++++++++++++++---- 4 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/app-config.interface.ts create mode 100644 src/Umbraco.Web.UI.Client/src/app.context.ts diff --git a/src/Umbraco.Web.UI.Client/src/app-config.interface.ts b/src/Umbraco.Web.UI.Client/src/app-config.interface.ts new file mode 100644 index 0000000000..1ffdf91845 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/app-config.interface.ts @@ -0,0 +1,13 @@ +/** + * Configuration interface for the Umbraco App Element. + * @export + * @interface UmbAppConfig + */ +export interface UmbAppConfig { + /** + * The base path of the backoffice. + * @type {string} + * @memberof UmbAppConfig + */ + backofficePath: string; +} diff --git a/src/Umbraco.Web.UI.Client/src/app.context.ts b/src/Umbraco.Web.UI.Client/src/app.context.ts new file mode 100644 index 0000000000..4429e3fed3 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/app.context.ts @@ -0,0 +1,16 @@ +import { UmbAppConfig } from './app-config.interface'; +import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; + +export class UmbAppContext { + #backofficePath: string; + + constructor(config: UmbAppConfig) { + this.#backofficePath = config.backofficePath; + } + + getBackofficePath() { + return this.#backofficePath; + } +} + +export const UMB_APP = new UmbContextToken('UMB_APP'); diff --git a/src/Umbraco.Web.UI.Client/src/app.ts b/src/Umbraco.Web.UI.Client/src/app.ts index be6f2b76cc..f34a0a03e4 100644 --- a/src/Umbraco.Web.UI.Client/src/app.ts +++ b/src/Umbraco.Web.UI.Client/src/app.ts @@ -13,6 +13,7 @@ import { customElement, property } from 'lit/decorators.js'; import { UmbAuthFlow } from './core/auth/auth-flow'; import { UmbIconStore } from './core/stores/icon/icon.store'; import type { UmbErrorElement } from './error/error.element'; +import { UMB_APP, UmbAppContext } from './app.context'; import type { Guard, UmbRoute } from '@umbraco-cms/backoffice/router'; import { pathWithoutBasePath } from '@umbraco-cms/backoffice/router'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; @@ -37,7 +38,8 @@ export class UmbAppElement extends UmbLitElement { * @attr */ @property({ type: String }) - private backofficePath = '/umbraco'; + // TODO: get from server config + private backofficePath = import.meta.env.DEV ? '' : '/umbraco'; private _routes: UmbRoute[] = [ { @@ -73,6 +75,8 @@ export class UmbAppElement extends UmbLitElement { `${window.location.origin}${this.backofficePath}` ); + // TODO: Make a combined App Context + this.provideContext(UMB_APP, new UmbAppContext({ backofficePath: this.backofficePath })); this.provideContext(UMB_SERVER_URL, OpenAPI.BASE); this._setup(); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header.element.ts index 77f85253b2..74bfa1aece 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header.element.ts @@ -1,17 +1,31 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; -import { css, CSSResultGroup, html, LitElement } from 'lit'; -import { customElement } from 'lit/decorators.js'; +import { css, CSSResultGroup, html } from 'lit'; +import { customElement, state } from 'lit/decorators.js'; +import { UMB_APP } from '../../../../app.context'; +import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api'; import './backoffice-header-sections.element'; import './backoffice-header-apps.element'; @customElement('umb-backoffice-header') -export class UmbBackofficeHeaderElement extends LitElement { +export class UmbBackofficeHeaderElement extends UmbLitElement { + @state() + _backofficePath = ''; + + constructor() { + super(); + + new UmbContextConsumerController(this, UMB_APP, (appContext) => { + this._backofficePath = appContext.getBackofficePath(); + }); + } + render() { return html`
From ea1ac7578512752030501178e1753bb0d208c314 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 8 May 2023 11:11:10 +0200 Subject: [PATCH 22/23] add asset manager TODO --- .../components/backoffice-frame/backoffice-header.element.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header.element.ts index 74bfa1aece..133dcbeacb 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header.element.ts @@ -25,6 +25,7 @@ export class UmbBackofficeHeaderElement extends UmbLitElement { return html`
From 144a25d4b5314cc84f4528bc287951df182b499e Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 8 May 2023 15:13:54 +0200 Subject: [PATCH 23/23] import image --- .../backoffice-header.element.ts | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header.element.ts index 133dcbeacb..9309244edf 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/components/backoffice-frame/backoffice-header.element.ts @@ -1,32 +1,19 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, CSSResultGroup, html } from 'lit'; -import { customElement, state } from 'lit/decorators.js'; -import { UMB_APP } from '../../../../app.context'; +import { customElement } from 'lit/decorators.js'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api'; +import logoImg from '/umbraco_logomark_white.svg'; import './backoffice-header-sections.element'; import './backoffice-header-apps.element'; @customElement('umb-backoffice-header') export class UmbBackofficeHeaderElement extends UmbLitElement { - @state() - _backofficePath = ''; - - constructor() { - super(); - - new UmbContextConsumerController(this, UMB_APP, (appContext) => { - this._backofficePath = appContext.getBackofficePath(); - }); - } - render() { return html`