From 79e916ac718d54b40d7ce6671d1f0f791e2d767c Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Fri, 13 Jan 2023 10:18:08 +0000 Subject: [PATCH 1/2] Change sidebar-menu-item manifest for Setting trees to match same order as current backoffice --- .../document-blueprints/sidebar-menu-item/manifests.ts | 2 +- .../documents/document-types/sidebar-menu-item/manifests.ts | 2 +- .../media/media-types/sidebar-menu-item/manifests.ts | 2 +- .../members/member-types/sidebar-menu-item/manifests.ts | 4 ++-- .../settings/data-types/sidebar-menu-item/manifests.ts | 2 +- .../settings/extensions/sidebar-menu-item/manifests.ts | 2 +- .../settings/languages/sidebar-menu-item/manifests.ts | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-blueprints/sidebar-menu-item/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-blueprints/sidebar-menu-item/manifests.ts index ff53b0a7b2..3705f991fb 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-blueprints/sidebar-menu-item/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-blueprints/sidebar-menu-item/manifests.ts @@ -4,7 +4,7 @@ const sidebarMenuItem: ManifestSidebarMenuItem = { type: 'sidebarMenuItem', alias: 'Umb.SidebarMenuItem.DocumentBlueprints', name: 'Document Blueprints Sidebar Menu Item', - weight: 400, + weight: 90, meta: { label: 'Document Blueprints', icon: 'umb:blueprint', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/sidebar-menu-item/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/sidebar-menu-item/manifests.ts index 53e01634f7..eb4bb99c23 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/sidebar-menu-item/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/sidebar-menu-item/manifests.ts @@ -4,7 +4,7 @@ const sidebarMenuItem: ManifestSidebarMenuItem = { type: 'sidebarMenuItem', alias: 'Umb.SidebarMenuItem.DocumentTypes', name: 'Document Types Sidebar Menu Item', - weight: 400, + weight: 10, loader: () => import('./document-types-sidebar-menu-item.element'), meta: { label: 'Document Types', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/sidebar-menu-item/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/sidebar-menu-item/manifests.ts index 876dad916c..43c7f4d04d 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/sidebar-menu-item/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/sidebar-menu-item/manifests.ts @@ -4,7 +4,7 @@ const sidebarMenuItem: ManifestSidebarMenuItem = { type: 'sidebarMenuItem', alias: 'Umb.SidebarMenuItem.MediaTypes', name: 'Media Types Sidebar Menu Item', - weight: 200, + weight: 20, loader: () => import('./media-types-sidebar-menu-item.element'), meta: { label: 'Media Types', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/sidebar-menu-item/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/sidebar-menu-item/manifests.ts index 35cf69235d..da52d7247e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/sidebar-menu-item/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/sidebar-menu-item/manifests.ts @@ -4,12 +4,12 @@ const sidebarMenuItem: ManifestSidebarMenuItem = { type: 'sidebarMenuItem', alias: 'Umb.SidebarMenuItem.MemberTypes', name: 'Member Types Sidebar Menu Item', - weight: 400, + weight: 30, loader: () => import('./member-types-sidebar-menu-item.element'), meta: { label: 'Member Types', icon: 'umb:folder', - sections: ['Umb.Section.Members'], + sections: ['Umb.Section.Settings'], }, }; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/sidebar-menu-item/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/sidebar-menu-item/manifests.ts index ffc44cf079..a478315824 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/sidebar-menu-item/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/sidebar-menu-item/manifests.ts @@ -4,7 +4,7 @@ const sidebarMenuItem: ManifestSidebarMenuItem = { type: 'sidebarMenuItem', alias: 'Umb.SidebarMenuItem.DataTypes', name: 'Data Types Sidebar Menu Item', - weight: 400, + weight: 40, loader: () => import('./data-types-sidebar-menu-item.element'), meta: { label: 'Data Types', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/extensions/sidebar-menu-item/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/extensions/sidebar-menu-item/manifests.ts index f9da1a80ff..17d40bba06 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/extensions/sidebar-menu-item/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/extensions/sidebar-menu-item/manifests.ts @@ -4,7 +4,7 @@ const sidebarMenuItem: ManifestSidebarMenuItem = { type: 'sidebarMenuItem', alias: 'Umb.SidebarMenuItem.Extensions', name: 'Extensions Sidebar Menu Item', - weight: 400, + weight: 100, meta: { label: 'Extensions', icon: 'umb:wand', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/sidebar-menu-item/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/sidebar-menu-item/manifests.ts index 2a11d9fced..a6e4b14ef1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/sidebar-menu-item/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/sidebar-menu-item/manifests.ts @@ -4,7 +4,7 @@ const sidebarMenuItem: ManifestSidebarMenuItem = { type: 'sidebarMenuItem', alias: 'Umb.SidebarMenuItem.Languages', name: 'Languages Sidebar Menu Item', - weight: 400, + weight: 80, meta: { label: 'Languages', icon: 'umb:globe', From 49cbe337bba5cf468f1529c1c6dba754f260afdf Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Fri, 13 Jan 2023 11:19:26 +0000 Subject: [PATCH 2/2] Scaffold the logviewer in the settings tree & empty workspace like Languages --- .../src/backoffice/settings/index.ts | 4 +++- .../settings/logviewer/manifests.ts | 4 ++++ .../logviewer/sidebar-menu-item/manifests.ts | 16 ++++++++++++++ .../logviewer-root-workspace.element.ts | 21 +++++++++++++++++++ .../workspace/logviewer-root/manifests.ts | 17 +++++++++++++++ .../settings/logviewer/workspace/manifests.ts | 3 +++ 6 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/manifests.ts create mode 100644 src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/sidebar-menu-item/manifests.ts create mode 100644 src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts create mode 100644 src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/manifests.ts create mode 100644 src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/index.ts index f5b9f03dc6..7c60e09fb9 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/index.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/index.ts @@ -3,6 +3,7 @@ import { manifests as dashboardManifests } from './dashboards/manifests'; import { manifests as dataTypeManifests } from './data-types/manifests'; import { manifests as extensionManifests } from './extensions/manifests'; import { manifests as languageManifests } from './languages/manifests'; +import { manifests as logviewerManifests } from './logviewer/manifests'; import { ManifestTypes, umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; @@ -18,5 +19,6 @@ registerExtensions([ ...dashboardManifests, ...dataTypeManifests, ...extensionManifests, - ...languageManifests + ...languageManifests, + ...logviewerManifests ]); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/manifests.ts new file mode 100644 index 0000000000..450deac4e9 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/manifests.ts @@ -0,0 +1,4 @@ +import { manifests as treeManifests } from './sidebar-menu-item/manifests'; +import { manifests as workspaceManifests } from './workspace/manifests'; + +export const manifests = [...treeManifests, ...workspaceManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/sidebar-menu-item/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/sidebar-menu-item/manifests.ts new file mode 100644 index 0000000000..718f324bfb --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/sidebar-menu-item/manifests.ts @@ -0,0 +1,16 @@ +import type { ManifestSidebarMenuItem } from '@umbraco-cms/models'; + +const sidebarMenuItem: ManifestSidebarMenuItem = { + type: 'sidebarMenuItem', + alias: 'Umb.SidebarMenuItem.LogViewer', + name: 'LogViewer Sidebar Menu Item', + weight: 70, + meta: { + label: 'Log Viewer', + icon: 'umb:box-alt', + sections: ['Umb.Section.Settings'], + entityType: 'logviewer-root', + }, +}; + +export const manifests = [sidebarMenuItem]; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts new file mode 100644 index 0000000000..f3f77a5ded --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts @@ -0,0 +1,21 @@ +import { html, LitElement } from 'lit'; +import { customElement } from 'lit/decorators.js'; + +@customElement('umb-logviewer-root-workspace') +export class UmbLogViewerRootWorkspaceElement extends LitElement { + render() { + return html` +
+

LogViewer Root Workspace

+
+ `; + } +} + +export default UmbLogViewerRootWorkspaceElement; + +declare global { + interface HTMLElementTagNameMap { + 'umb-logviewer-root-workspace': UmbLogViewerRootWorkspaceElement; + } +} diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/manifests.ts new file mode 100644 index 0000000000..1e06c4df7d --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/logviewer-root/manifests.ts @@ -0,0 +1,17 @@ +import type { ManifestWorkspace, ManifestWorkspaceAction, ManifestWorkspaceView } from '@umbraco-cms/models'; + +const workspace: ManifestWorkspace = { + type: 'workspace', + alias: 'Umb.Workspace.LogviewerRoot', + name: 'LogViewer Root Workspace', + loader: () => import('./logviewer-root-workspace.element'), + meta: { + entityType: 'logviewer-root', + }, +}; + +const workspaceViews: Array = []; + +const workspaceActions: Array = []; + +export const manifests = [workspace, ...workspaceViews, ...workspaceActions]; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/manifests.ts new file mode 100644 index 0000000000..4f3d6db1e4 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/logviewer/workspace/manifests.ts @@ -0,0 +1,3 @@ +import { manifests as logviewerRootManifests } from './logviewer-root/manifests'; + +export const manifests = [...logviewerRootManifests];