From 0dc78385bb549d8fd87380ae1d357ae03e9ee0ab Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 19 May 2023 13:35:54 +0200 Subject: [PATCH] fix import of tree logic --- .../src/packages/core/index.ts | 6 ++++++ .../packages/core/tree/context-menu/index.ts | 2 ++ .../entity-tree-item.context.ts | 2 +- .../core/tree/entity-tree-item/index.ts | 2 ++ .../src/packages/core/tree/index.ts | 7 +++++-- .../tree-item-base/tree-item-base.context.ts | 2 +- .../tree-item-base/tree-item-base.element.ts | 3 ++- .../packages/core/tree/tree-menu-item/index.ts | 1 + .../src/packages/core/tree/tree.element.ts | 2 +- src/Umbraco.Web.UI.Client/tsconfig.json | 17 +++++++++-------- 10 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/tree/context-menu/index.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-tree-item/index.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-menu-item/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/index.ts index db09b0779b..96cad02ae6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/index.ts @@ -11,6 +11,12 @@ import { UmbContextProviderController } from '@umbraco-cms/backoffice/context-ap import type { UmbEntryPointOnInit } from '@umbraco-cms/backoffice/extension-api'; import { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; +// TODO: temp solution to make sure all elements are registered +import './collection'; +import './tree'; +import './debug'; +import './entity-action'; +import './entity-bulk-action'; import './menu'; export const manifests: Array = [ diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/context-menu/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/context-menu/index.ts new file mode 100644 index 0000000000..c15534f8bb --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/context-menu/index.ts @@ -0,0 +1,2 @@ +export * from './tree-context-menu-page.service'; +export * from './tree-context-menu.service'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-tree-item/entity-tree-item.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-tree-item/entity-tree-item.context.ts index e275d28461..2221d97cb2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-tree-item/entity-tree-item.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-tree-item/entity-tree-item.context.ts @@ -1,4 +1,4 @@ -import { UmbTreeItemContextBase } from 'src/packages/core/tree'; +import { UmbTreeItemContextBase } from '../tree-item-base/tree-item-base.context'; import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import { EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-tree-item/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-tree-item/index.ts new file mode 100644 index 0000000000..0fed4020a8 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-tree-item/index.ts @@ -0,0 +1,2 @@ +export * from './entity-tree-item.context'; +export * from './entity-tree-item.element'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts index 7fd66b4dbc..a700433e44 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts @@ -1,6 +1,9 @@ -export * from './tree.context'; -export * from './tree-item-base'; +export * from './context-menu'; +export * from './entity-tree-item'; export * from './tree-item'; +export * from './tree-item-base'; +export * from './tree-menu-item'; +export * from './tree.context'; export * from './tree.element'; export interface UmbTreeRootModel { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.context.ts index 4b3a8d7015..544af462cb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.context.ts @@ -1,8 +1,8 @@ import { map } from 'rxjs'; import { UmbTreeItemContext } from '../tree-item/tree-item.context.interface'; +import { UmbTreeContextBase } from '../tree.context'; 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 'src/packages/core/tree'; import { ManifestEntityAction, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbBooleanState, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.element.ts index ecd35c1dce..574906ff94 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.element.ts @@ -3,7 +3,8 @@ 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, UMB_TREE_ITEM_CONTEXT_TOKEN } from 'src/packages/core/tree'; +import { UmbTreeItemContext } from '../tree-item'; +import { UMB_TREE_ITEM_CONTEXT_TOKEN } from '../tree-item-base'; 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/packages/core/tree/tree-menu-item/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-menu-item/index.ts new file mode 100644 index 0000000000..eb2bdd805e --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-menu-item/index.ts @@ -0,0 +1 @@ +export * from './tree-menu-item.element'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.element.ts index 59ca8660a5..5e72ab69f9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/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 'src/packages/core/tree'; +import { UmbTreeContextBase } from './tree.context'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { TreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbObserverController } from '@umbraco-cms/backoffice/observable-api'; diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index 6012c1b3e0..a086127930 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -37,25 +37,26 @@ "@umbraco-cms/backoffice/data-type": ["src/packages/core/components/data-type"], // CORE + "@umbraco-cms/backoffice/action": ["src/packages/core/action"], + "@umbraco-cms/backoffice/collection": ["src/packages/core/collection"], "@umbraco-cms/backoffice/components": ["src/packages/core/components"], "@umbraco-cms/backoffice/content-type": ["src/packages/core/content-type"], - "@umbraco-cms/backoffice/action": ["src/packages/core/action"], + "@umbraco-cms/backoffice/debug": ["src/packages/core/debug"], "@umbraco-cms/backoffice/entity-action": ["src/packages/core/entity-action"], "@umbraco-cms/backoffice/entity-bulk-action": ["src/packages/core/entity-bulk-action"], "@umbraco-cms/backoffice/extension-registry": ["src/packages/core/extension-registry"], + "@umbraco-cms/backoffice/id": ["src/packages/core/id"], + "@umbraco-cms/backoffice/menu": ["src/packages/core/menu"], "@umbraco-cms/backoffice/modal": ["src/packages/core/modal"], "@umbraco-cms/backoffice/notification": ["src/packages/core/notification"], - "@umbraco-cms/backoffice/property-editor": ["src/packages/core/property-editor"], + "@umbraco-cms/backoffice/picker-input": ["src/packages/core/picker-input"], + "@umbraco-cms/backoffice/section": ["src/packages/core/section"], "@umbraco-cms/backoffice/sorter": ["src/packages/core/sorter"], "@umbraco-cms/backoffice/store": ["src/packages/core/store"], - "@umbraco-cms/backoffice/workspace": ["src/packages/core/workspace"], - "@umbraco-cms/backoffice/id": ["src/packages/core/id"], - "@umbraco-cms/backoffice/collection": ["src/packages/core/collection"], "@umbraco-cms/backoffice/tree": ["src/packages/core/tree"], - "@umbraco-cms/backoffice/section": ["src/packages/core/section"], "@umbraco-cms/backoffice/variant": ["src/packages/core/variant"], - "@umbraco-cms/backoffice/picker-input": ["src/packages/core/picker-input"], - "@umbraco-cms/backoffice/menu": ["src/packages/core/menu"], + "@umbraco-cms/backoffice/workspace": ["src/packages/core/workspace"], + "@umbraco-cms/backoffice/property-editor": ["src/packages/core/property-editor"], // USERS "@umbraco-cms/backoffice/user-group": ["src/packages/users/user-groups"],