From 6b944334aefab86d00afdacb1509aa9dd730e959 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 2 Jan 2023 15:21:31 +0100 Subject: [PATCH] move extension manifests --- .../src/backoffice/core/extensions/manifests.ts | 4 ++++ ...t.ts => extension-root-workspace.element.ts} | 10 +++++----- ...s.ts => extension-root-workspace.stories.ts} | 6 +++--- .../core/extensions/workspace/manifests.ts | 17 +++++++++++++++++ .../src/backoffice/core/index.ts | 3 ++- .../src/backoffice/workspaces.manifest.ts | 9 --------- 6 files changed, 31 insertions(+), 18 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/manifests.ts rename src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/workspace/{extension-root/workspace-extension-root.element.ts => extension-root-workspace.element.ts} (88%) rename src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/workspace/{extension-root/workspace-extension-root.stories.ts => extension-root-workspace.stories.ts} (63%) create mode 100644 src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/workspace/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/manifests.ts new file mode 100644 index 0000000000..50ca8c1723 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/manifests.ts @@ -0,0 +1,4 @@ +import { manifests as treeManifests } from './tree/manifests'; +import { manifests as workspaceManifests } from './workspace/manifests'; + +export const manifests = [...treeManifests, ...workspaceManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/workspace/extension-root/workspace-extension-root.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/workspace/extension-root-workspace.element.ts similarity index 88% rename from src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/workspace/extension-root/workspace-extension-root.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/workspace/extension-root-workspace.element.ts index f857292dc9..9b833b3128 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/workspace/extension-root/workspace-extension-root.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/workspace/extension-root-workspace.element.ts @@ -6,8 +6,8 @@ import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import type { ManifestTypes } from '@umbraco-cms/models'; -@customElement('umb-workspace-extension-root') -export class UmbWorkspaceExtensionRootElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { +@customElement('umb-extension-root-workspace') +export class UmbExtensionRootWorkspaceElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { @state() private _extensions: Array = []; @@ -47,7 +47,7 @@ export class UmbWorkspaceExtensionRootElement extends UmbContextConsumerMixin(Um umbExtensionsRegistry.unregister(extension.alias)}> - + ` )} @@ -58,10 +58,10 @@ export class UmbWorkspaceExtensionRootElement extends UmbContextConsumerMixin(Um } } -export default UmbWorkspaceExtensionRootElement; +export default UmbExtensionRootWorkspaceElement; declare global { interface HTMLElementTagNameMap { - 'umb-workspace-extension-root': UmbWorkspaceExtensionRootElement; + 'umb-extension-root-workspace': UmbExtensionRootWorkspaceElement; } } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/workspace/extension-root/workspace-extension-root.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/workspace/extension-root-workspace.stories.ts similarity index 63% rename from src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/workspace/extension-root/workspace-extension-root.stories.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/workspace/extension-root-workspace.stories.ts index 3dc8954327..65223c1522 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/workspace/extension-root/workspace-extension-root.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/workspace/extension-root-workspace.stories.ts @@ -1,9 +1,9 @@ -import './workspace-extension-root.element'; +import './extension-root-workspace.element'; import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; -import type { UmbWorkspaceExtensionRootElement } from './workspace-extension-root.element'; +import type { UmbExtensionRootWorkspaceElement } from './extension-root-workspace.element'; export default { title: 'Workspaces/Extensions', @@ -11,6 +11,6 @@ export default { id: 'umb-workspace-extension-root', } as Meta; -export const AAAOverview: Story = () => +export const AAAOverview: Story = () => html` `; AAAOverview.storyName = 'Overview'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/workspace/manifests.ts new file mode 100644 index 0000000000..b6fb47aaf6 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/extensions/workspace/manifests.ts @@ -0,0 +1,17 @@ +import type { ManifestWorkspace, ManifestWorkspaceAction, ManifestWorkspaceView } from '@umbraco-cms/models'; + +const workspace: ManifestWorkspace = { + type: 'workspace', + alias: 'Umb.Workspace.ExtensionRoot', + name: 'Extension Root Workspace', + loader: () => import('./extension-root-workspace.element'), + meta: { + entityType: 'extension-root', + }, +}; + +const workspaceViews: Array = []; + +const workspaceActions: Array = []; + +export const manifests = [workspace, ...workspaceViews, ...workspaceActions]; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/core/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/core/index.ts index e4b3442464..a9020fe5a1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/core/index.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/core/index.ts @@ -1,6 +1,7 @@ import { manifests as dashboardManifests } from './dashboards/manifests'; import { manifests as settingsSectionManifests } from './settings-section/manifests'; import { manifests as languageManifests } from './languages/manifests'; +import { manifests as extensionManifests } from './extensions/manifests'; import { ManifestTypes, umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; @@ -11,4 +12,4 @@ const registerExtensions = (manifests: Array | Array = [ - { - type: 'workspace', - alias: 'Umb.Workspace.Extensions', - name: 'Extensions Workspace', - loader: () => import('./core/extensions/workspace/extension-root/workspace-extension-root.element'), - meta: { - entityType: 'extension-root', - }, - }, { type: 'workspace', alias: 'Umb.Workspace.User',