From 2a4912905641b0d80ada8d071109d7aaa27398df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 27 Apr 2023 15:42:10 +0200 Subject: [PATCH] workspaceView rename to workspaceEditorView --- .../models/workspace-editor-view.model.ts | 2 +- .../document-blueprints/workspace/manifests.ts | 4 ++-- .../document-type-workspace-editor.element.ts | 4 ++-- .../document-types/workspace/manifests.ts | 4 ++-- .../document-picker-modal.element.ts | 8 ++++---- .../document-type-picker-modal.element.ts | 8 ++++---- .../documents/documents/workspace/manifests.ts | 4 ++-- .../workspace/media-type-workspace-edit.element.ts | 8 ++++---- .../media-picker/media-picker-modal.element.ts | 8 ++++---- .../backoffice/media/media/workspace/manifests.ts | 4 ++-- .../workspace/media-workspace-edit.element.ts | 8 ++++---- .../member-group-workspace-edit.element.ts | 8 ++++---- .../member-type-workspace-edit.element.ts | 6 +++--- .../workspace/member-workspace-edit.element.ts | 6 +++--- .../workspace/workspace-package-builder.element.ts | 8 ++++---- .../workspace/workspace-package.element.ts | 6 +++--- .../workspace/data-type-workspace-edit.element.ts | 4 ++-- .../workspace/extension-root-workspace.element.ts | 4 ++-- .../language/language-workspace-edit.element.ts | 8 ++++---- .../relation-type-workspace-edit.element.ts | 8 ++++---- .../src/backoffice/shared/components/index.ts | 2 +- .../workspace-editor.element.ts} | 10 +++++----- .../workspace-editor.stories.ts} | 14 +++++++------- .../workspace-footer/workspace-footer.stories.ts | 2 +- .../workspace-variant/workspace-variant.element.ts | 10 ++++------ .../embedded-media/embedded-media-modal.element.ts | 8 ++++---- .../icon-picker/icon-picker-modal.element.ts | 4 ++-- .../link-picker/link-picker-modal.element.ts | 8 ++++---- .../property-settings-modal.element.ts | 8 ++++---- .../section-picker/section-picker-modal.element.ts | 8 ++++---- .../template-picker-modal.element.ts | 4 ++-- .../property-editor-ui-picker-modal.element.ts | 8 ++++---- .../workspace/stylesheet-workspace-edit.element.ts | 6 +++--- .../workspace/template-workspace.element.ts | 8 ++++---- .../workspace/dictionary-workspace-edit.element.ts | 8 ++++---- .../current-user/current-user-modal.element.ts | 6 +++--- .../user-group-picker-modal.element.ts | 8 ++++---- .../workspace/user-group-workspace-edit.element.ts | 4 ++-- .../users/workspace/user-workspace-edit.element.ts | 4 ++-- .../users/workspace/user-workspace.element.ts | 2 +- 40 files changed, 125 insertions(+), 127 deletions(-) rename src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/{workspace-layout/workspace-layout.element.ts => workspace-editor/workspace-editor.element.ts} (94%) rename src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/{workspace-layout/workspace-layout.stories.ts => workspace-editor/workspace-editor.stories.ts} (62%) diff --git a/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace-editor-view.model.ts b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace-editor-view.model.ts index 55c3a067c1..61aab74915 100644 --- a/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace-editor-view.model.ts +++ b/src/Umbraco.Web.UI.Client/libs/extensions-registry/models/workspace-editor-view.model.ts @@ -2,7 +2,7 @@ import type { UmbWorkspaceEditorViewExtensionElement } from '../interfaces/works import type { ManifestWithView } from '.'; export interface ManifestWorkspaceEditorView extends ManifestWithView { - type: 'workspaceView'; + type: 'workspaceEditorView'; conditions: ConditionsWorkspaceView; } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-blueprints/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-blueprints/workspace/manifests.ts index 979cda0fa9..edc306f9d3 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-blueprints/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-blueprints/workspace/manifests.ts @@ -14,7 +14,7 @@ const workspace: ManifestWorkspace = { }, }; -const workspaceViews: Array = []; +const workspaceEditorViews: Array = []; const workspaceActions: Array = []; -export const manifests = [workspace, ...workspaceViews, ...workspaceActions]; +export const manifests = [workspace, ...workspaceEditorViews, ...workspaceActions]; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace-editor.element.ts index 21c13cfe67..5ce19e0fe8 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace-editor.element.ts @@ -83,7 +83,7 @@ export class UmbDocumentTypeWorkspaceEditorElement extends UmbLitElement { render() { return html` - + - + `; } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/manifests.ts index eaed32c121..7a0b1fa4f7 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/manifests.ts @@ -15,7 +15,7 @@ const workspace: ManifestWorkspace = { }, }; -const workspaceViews: Array = [ +const workspaceEditorViews: Array = [ { type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.DocumentType.Design', @@ -95,4 +95,4 @@ const workspaceActions: Array = [ }, ]; -export const manifests = [workspace, ...workspaceViews, ...workspaceActions]; +export const manifests = [workspace, ...workspaceEditorViews, ...workspaceActions]; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-picker/document-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-picker/document-picker-modal.element.ts index a228328e63..f56e5a3eb6 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-picker/document-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-picker/document-picker-modal.element.ts @@ -11,7 +11,7 @@ export class UmbDocumentPickerModalElement extends UmbModalBaseElement< UmbDocumentPickerModalData, UmbDocumentPickerModalResult > { - + @state() _selection: Array = []; @@ -42,7 +42,7 @@ export class UmbDocumentPickerModalElement extends UmbModalBaseElement< render() { return html` - +
@@ -56,10 +56,10 @@ export class UmbDocumentPickerModalElement extends UmbModalBaseElement< - + `; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-type-picker/document-type-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-type-picker/document-type-picker-modal.element.ts index cfc526eb20..32a32bb1f0 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-type-picker/document-type-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/modals/document-type-picker/document-type-picker-modal.element.ts @@ -11,7 +11,7 @@ export class UmbDocumentTypePickerModalElement extends UmbModalBaseElement< UmbDocumentTypePickerModalData, UmbDocumentTypePickerModalResult > { - + @state() _selection: Array = []; @@ -42,7 +42,7 @@ export class UmbDocumentTypePickerModalElement extends UmbModalBaseElement< render() { return html` - +
@@ -56,10 +56,10 @@ export class UmbDocumentTypePickerModalElement extends UmbModalBaseElement< - + `; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/manifests.ts index 743b854587..8485aba0df 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/manifests.ts @@ -19,7 +19,7 @@ const workspace: ManifestWorkspace = { }, }; -const workspaceViews: Array = [ +const workspaceEditorViews: Array = [ { type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.Document.Edit', @@ -132,4 +132,4 @@ const workspaceActions: Array = [ }, ]; -export const manifests = [workspace, ...workspaceViews, ...workspaceViewCollections, ...workspaceActions]; +export const manifests = [workspace, ...workspaceEditorViews, ...workspaceViewCollections, ...workspaceActions]; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/workspace/media-type-workspace-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/workspace/media-type-workspace-edit.element.ts index efdec63f87..dc73cab408 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/workspace/media-type-workspace-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media-types/workspace/media-type-workspace-edit.element.ts @@ -8,7 +8,7 @@ import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-ap @customElement('umb-media-type-workspace-edit') export class UmbMediaTypeWorkspaceEditElement extends UmbLitElement { - + @state() private _mediaTypeName?: string | null = ''; @@ -42,11 +42,11 @@ export class UmbMediaTypeWorkspaceEditElement extends UmbLitElement { } render() { - return html` + return html` - `; + `; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/modals/media-picker/media-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/modals/media-picker/media-picker-modal.element.ts index bd9655512c..3cac92aec2 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/modals/media-picker/media-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/modals/media-picker/media-picker-modal.element.ts @@ -10,7 +10,7 @@ export class UmbMediaPickerModalElement extends UmbModalBaseElement< UmbMediaPickerModalData, UmbMediaPickerModalResult > { - + @state() _selection: Array = []; @@ -41,7 +41,7 @@ export class UmbMediaPickerModalElement extends UmbModalBaseElement< render() { return html` - +
@@ -55,10 +55,10 @@ export class UmbMediaPickerModalElement extends UmbModalBaseElement< - + `; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/workspace/manifests.ts index 12d70d2ff4..40a369f34f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/workspace/manifests.ts @@ -17,7 +17,7 @@ const workspace: ManifestWorkspace = { }, }; -const workspaceViews: Array = [ +const workspaceEditorViews: Array = [ { type: 'workspaceEditorView', alias: 'Umb.WorkspaceView.Media.Edit', @@ -86,4 +86,4 @@ const workspaceActions: Array = [ }, ]; -export const manifests = [workspace, ...workspaceViews, ...workspaceViewCollections, ...workspaceActions]; +export const manifests = [workspace, ...workspaceEditorViews, ...workspaceViewCollections, ...workspaceActions]; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/workspace/media-workspace-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/workspace/media-workspace-edit.element.ts index 651454dd8f..3aae72d902 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/workspace/media-workspace-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/workspace/media-workspace-edit.element.ts @@ -7,7 +7,7 @@ import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-ap @customElement('umb-media-workspace-edit') export class UmbMediaWorkspaceEditElement extends UmbLitElement { - + @state() _id?: string; @@ -30,15 +30,15 @@ export class UmbMediaWorkspaceEditElement extends UmbLitElement { render() { if (!this._id) return nothing; - return html` + return html` - `; + `; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/workspace/member-group-workspace-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/workspace/member-group-workspace-edit.element.ts index acbebc3a5b..1d87666038 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/workspace/member-group-workspace-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-groups/workspace/member-group-workspace-edit.element.ts @@ -13,7 +13,7 @@ import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-ap */ @customElement('umb-member-group-workspace-edit') export class UmbMemberGroupWorkspaceEditElement extends UmbLitElement { - + #workspaceContext?: UmbWorkspaceMemberGroupContext; @@ -46,13 +46,13 @@ export class UmbMemberGroupWorkspaceEditElement extends UmbLitElement { } render() { - return html` + return html` - `; + `; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/workspace/member-type-workspace-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/workspace/member-type-workspace-edit.element.ts index 5d7d195fb6..88747c5a85 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/workspace/member-type-workspace-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/members/member-types/workspace/member-type-workspace-edit.element.ts @@ -5,14 +5,14 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; @customElement('umb-member-type-workspace-edit') export class UmbMemberTypeWorkspaceEditElement extends UmbLitElement { - + render() { return html` - Member Type Workspace + Member Type Workspace `; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/members/members/workspace/member-workspace-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/members/members/workspace/member-workspace-edit.element.ts index 6e21c30ca6..99e31b5151 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/members/members/workspace/member-workspace-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/members/members/workspace/member-workspace-edit.element.ts @@ -4,12 +4,12 @@ import { customElement } from 'lit/decorators.js'; @customElement('umb-member-workspace-edit') export class UmbMemberWorkspaceEditElement extends LitElement { - + render() { - return html` Member Workspace `; + return html` Member Workspace `; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-builder/workspace/workspace-package-builder.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-builder/workspace/workspace-package-builder.element.ts index 439cab0304..cf6287835e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-builder/workspace/workspace-package-builder.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-builder/workspace/workspace-package-builder.element.ts @@ -13,7 +13,7 @@ import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco @customElement('umb-workspace-package-builder') export class UmbWorkspacePackageBuilderElement extends UmbLitElement { - + @property() entityId?: string; @@ -85,11 +85,11 @@ export class UmbWorkspacePackageBuilderElement extends UmbLitElement { render() { return html` - + ${this.#renderHeader()} ${this.#renderEditors()} ${this.#renderActions()} - + `; } @@ -264,7 +264,7 @@ export class UmbWorkspacePackageBuilderElement extends UmbLitElement { `; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-repo/workspace/workspace-package.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-repo/workspace/workspace-package.element.ts index efe25ddfaa..f33d0da6f6 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-repo/workspace/workspace-package.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-repo/workspace/workspace-package.element.ts @@ -4,7 +4,7 @@ import { customElement, property, state } from 'lit/decorators.js'; @customElement('umb-workspace-package') export class UmbWorkspacePackageElement extends LitElement { - + @property() entityId?: string; @@ -40,9 +40,9 @@ export class UmbWorkspacePackageElement extends LitElement { } render() { - return html` ${this._renderHeader()} `; + return html` ${this._renderHeader()} `; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/data-type-workspace-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/data-type-workspace-edit.element.ts index 4fc480ab3f..49f8d3affc 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/data-type-workspace-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/data-type-workspace-edit.element.ts @@ -52,9 +52,9 @@ export class UmbDataTypeWorkspaceEditElement extends UmbLitElement { render() { return html` - + - + `; } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/extensions/workspace/extension-root-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/extensions/workspace/extension-root-workspace.element.ts index 9e79ec54e9..d12b09b79d 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/extensions/workspace/extension-root-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/extensions/workspace/extension-root-workspace.element.ts @@ -57,7 +57,7 @@ export class UmbExtensionRootWorkspaceElement extends UmbLitElement { render() { return html` - + @@ -91,7 +91,7 @@ export class UmbExtensionRootWorkspaceElement extends UmbLitElement { )} - + `; } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/language-workspace-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/language-workspace-edit.element.ts index 5c701d85ef..00153be58f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/language-workspace-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/languages/workspace/language/language-workspace-edit.element.ts @@ -10,7 +10,7 @@ import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-ap @customElement('umb-language-workspace-edit') export class UmbLanguageWorkspaceEditElement extends UmbLitElement { - + #workspaceContext?: UmbLanguageWorkspaceContext; @@ -50,7 +50,7 @@ export class UmbLanguageWorkspaceEditElement extends UmbLitElement { } render() { - return html` + return html` - `; + `; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/relation-type-workspace-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/relation-type-workspace-edit.element.ts index 4357b69e82..399b0d251e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/relation-type-workspace-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/relation-type-workspace-edit.element.ts @@ -13,7 +13,7 @@ import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-ap */ @customElement('umb-relation-type-workspace-edit-element') export class UmbRelationTypeWorkspaceEditElement extends UmbLitElement { - + #workspaceContext?: UmbRelationTypeWorkspaceContext; @@ -47,16 +47,16 @@ export class UmbRelationTypeWorkspaceEditElement extends UmbLitElement { render() { return html` - + - + `; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/index.ts index e73c831328..a56e0ab18f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/index.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/index.ts @@ -56,7 +56,7 @@ import './history/history-list.element'; import './history/history-item.element'; import './workspace/workspace-action/workspace-action.element'; -import './workspace/workspace-layout/workspace-layout.element'; +import './workspace/workspace-editor/workspace-editor.element'; import './workspace/workspace-footer/workspace-footer.element'; import './template-card/template-card.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-layout/workspace-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-editor/workspace-editor.element.ts similarity index 94% rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-layout/workspace-layout.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-editor/workspace-editor.element.ts index 114704e5c8..b2cf99b277 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-layout/workspace-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-editor/workspace-editor.element.ts @@ -17,7 +17,7 @@ import '../../extension-slot/extension-slot.element'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; /** - * @element umb-workspace-layout + * @element umb-workspace-editor * @description * @slot icon - Slot for icon * @slot header - Slot for workspace header @@ -30,8 +30,8 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; * @extends {UmbLitElement} */ // TODO: stop naming this something with layout. as its not just an layout. it hooks up with extensions. -@customElement('umb-workspace-layout') -export class UmbWorkspaceLayoutElement extends UmbLitElement { +@customElement('umb-workspace-editor') +export class UmbWorkspaceEditorElement extends UmbLitElement { @property() public headline = ''; @@ -103,7 +103,7 @@ export class UmbWorkspaceLayoutElement extends UmbLitElement { component: () => { if (manifest.type === 'workspaceViewCollection') { return import( - '../../../../shared/components/workspace/workspace-content/views/collection/workspace-view-collection.element' + '../workspace-content/views/collection/workspace-view-collection.element' ) as unknown as Promise; } return createExtensionElement(manifest); @@ -224,6 +224,6 @@ export class UmbWorkspaceLayoutElement extends UmbLitElement { declare global { interface HTMLElementTagNameMap { - 'umb-workspace-layout': UmbWorkspaceLayoutElement; + 'umb-workspace-editor': UmbWorkspaceEditorElement; } } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-layout/workspace-layout.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-editor/workspace-editor.stories.ts similarity index 62% rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-layout/workspace-layout.stories.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-editor/workspace-editor.stories.ts index ba84a2855e..734f874d9c 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-layout/workspace-layout.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-editor/workspace-editor.stories.ts @@ -1,21 +1,21 @@ -import './workspace-layout.element'; +import './workspace-editor.element'; import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit'; -import type { UmbWorkspaceLayoutElement } from './workspace-layout.element'; +import type { UmbWorkspaceEditorElement } from './workspace-editor.element'; export default { - title: 'Workspaces/Shared/Editor Entity Layout', - component: 'umb-workspace-layout', - id: 'umb-workspace-layout', + title: 'Workspaces/Shared/Workspace Editor', + component: 'umb-workspace-editor', + id: 'umb-workspace-editor', } as Meta; -export const AAAOverview: Story = () => html` +export const AAAOverview: Story = () => html`
Icon slot
Name slot
Footer slot
Actions slot
Default slot -`; +`; AAAOverview.storyName = 'Overview'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-footer/workspace-footer.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-footer/workspace-footer.stories.ts index 01d2d3246f..1dc0fbb9eb 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-footer/workspace-footer.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-footer/workspace-footer.stories.ts @@ -1,4 +1,4 @@ -import '../workspace-layout/workspace-layout.element'; +import '../workspace-editor/workspace-editor.element'; import './workspace-footer.element'; import { Meta, Story } from '@storybook/web-components'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-variant/workspace-variant.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-variant/workspace-variant.element.ts index 2ae60b30db..36a761d443 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-variant/workspace-variant.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-variant/workspace-variant.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 '../workspace-layout/workspace-layout.element'; +import '../workspace-editor/workspace-editor.element'; import '../../../../shared/components/variant-selector/variant-selector.element.ts'; // Lazy load @@ -18,8 +18,6 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; */ @customElement('umb-workspace-variant') export class UmbWorkspaceVariantContentElement extends UmbLitElement { - - // TODO: stop prop drilling this alias. Instead use the workspace context. @property() alias!: string; @@ -40,7 +38,7 @@ export class UmbWorkspaceVariantContentElement extends UmbLitElement { render() { return html` - ` : ''} - + `; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/embedded-media/embedded-media-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/embedded-media/embedded-media-modal.element.ts index ce7de0f359..d1ce56eb46 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/embedded-media/embedded-media-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/embedded-media/embedded-media-modal.element.ts @@ -26,7 +26,7 @@ interface UmbEmbeddedMediaModalModel { @customElement('umb-embedded-media-modal') export class UmbEmbeddedMediaModalElement extends UmbLitElement { - + #loading = false; #embedResult!: OEmbedResult; @@ -164,7 +164,7 @@ export class UmbEmbeddedMediaModalElement extends UmbLitElement { render() { return html` - +
@@ -227,10 +227,10 @@ export class UmbEmbeddedMediaModalElement extends UmbLitElement { look="primary" label="Submit" @click=${this.#handleConfirm}> - + `; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.element.ts index 4dadf09877..8c42d0242b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/icon-picker/icon-picker-modal.element.ts @@ -83,7 +83,7 @@ export class UmbIconPickerModalElement extends UmbModalBaseElement +
${this.renderSearchbar()}
@@ -104,7 +104,7 @@ export class UmbIconPickerModalElement extends UmbModalBaseElement Submit - + `; } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/link-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/link-picker-modal.element.ts index 3c94113484..df4510682f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/link-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/link-picker/link-picker-modal.element.ts @@ -14,7 +14,7 @@ import { buildUdi, getKeyFromUdi } from '@umbraco-cms/backoffice/utils'; @customElement('umb-link-picker-modal') export class UmbLinkPickerModalElement extends UmbModalBaseElement { - + @state() _selectedKey?: string; @@ -91,7 +91,7 @@ export class UmbLinkPickerModalElement extends UmbModalBaseElement +
${this._renderLinkUrlInput()} ${this._renderAnchorInput()}
@@ -121,7 +121,7 @@ export class UmbLinkPickerModalElement extends UmbModalBaseElement
- + `; } @@ -170,7 +170,7 @@ export class UmbLinkPickerModalElement extends UmbModalBaseElement`; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/property-settings/property-settings-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/property-settings/property-settings-modal.element.ts index 20deb3097d..690978f919 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/property-settings/property-settings-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/property-settings/property-settings-modal.element.ts @@ -14,7 +14,7 @@ import { UmbModalBaseElement } from '@umbraco-cms/internal/modal'; @customElement('umb-property-settings-modal') export class UmbPropertySettingsModalElement extends UmbModalBaseElement { - + @state() private _selectedPropertyEditorUI?: ManifestPropertyEditorUI; @state() private _selectedPropertyEditorUIAlias = ''; @@ -200,7 +200,7 @@ export class UmbPropertySettingsModalElement extends UmbModalBaseElement
- +
@@ -241,7 +241,7 @@ export class UmbPropertySettingsModalElement extends UmbModalBaseElement
- + `; @@ -333,7 +333,7 @@ export class UmbPropertySettingsModalElement extends UmbModalBaseElement { - + @state() private _sections: Array = []; @@ -21,7 +21,7 @@ export class UmbSectionPickerModalElement extends UmbModalElementPickerBase +
@@ -42,10 +42,10 @@ export class UmbSectionPickerModalElement extends UmbModalElementPickerBase
-
+ `; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template-picker/template-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template-picker/template-picker-modal.element.ts index ef63b2064b..d458e732d9 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template-picker/template-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template-picker/template-picker-modal.element.ts @@ -42,7 +42,7 @@ export class UmbTemplatePickerModalElement extends UmbModalBaseElement< // TODO: make umb-tree have a disabled option (string array like selection)? render() { return html` - +
@@ -56,7 +56,7 @@ export class UmbTemplatePickerModalElement extends UmbModalBaseElement<
- + `; } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts index eaf2856fa2..8188c21356 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts @@ -18,7 +18,7 @@ interface GroupedPropertyEditorUIs { } @customElement('umb-property-editor-ui-picker-modal') export class UmbPropertyEditorUIPickerModalElement extends UmbLitElement { - + @property({ type: Object }) data?: UmbPropertyEditorUIPickerModalData; @@ -89,13 +89,13 @@ export class UmbPropertyEditorUIPickerModalElement extends UmbLitElement { render() { return html` - + ${this._renderFilter()} ${this._renderGrid()}
- + `; } @@ -131,7 +131,7 @@ export class UmbPropertyEditorUIPickerModalElement extends UmbLitElement { )} `; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/stylesheets/workspace/stylesheet-workspace-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/stylesheets/workspace/stylesheet-workspace-edit.element.ts index 2de5896840..d8e0fda3ca 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/stylesheets/workspace/stylesheet-workspace-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/stylesheets/workspace/stylesheet-workspace-edit.element.ts @@ -4,12 +4,12 @@ import { customElement } from 'lit/decorators.js'; @customElement('umb-stylesheet-workspace-edit') export class UmbStylesheetWorkspaceEditElement extends LitElement { - + render() { - return html` Stylesheet workspace `; + return html` Stylesheet workspace `; } - + static styles = [ UUITextStyles, css` 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 68b7f41475..5e40f48595 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 @@ -8,7 +8,7 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; @customElement('umb-template-workspace') export class UmbTemplateWorkspaceElement extends UmbLitElement { - + public load(entityId: string) { this.#templateWorkspaceContext.load(entityId); @@ -66,7 +66,7 @@ export class UmbTemplateWorkspaceElement extends UmbLitElement { render() { // TODO: add correct UI elements - return html` + return html` - `; + `; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/workspace/dictionary-workspace-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/workspace/dictionary-workspace-edit.element.ts index e03da52678..12a0155a1a 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/workspace/dictionary-workspace-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/workspace/dictionary-workspace-edit.element.ts @@ -8,7 +8,7 @@ import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/context-ap @customElement('umb-dictionary-workspace-edit') export class UmbDictionaryWorkspaceEditElement extends UmbLitElement { - + @state() private _name?: string | null = ''; @@ -42,17 +42,17 @@ export class UmbDictionaryWorkspaceEditElement extends UmbLitElement { render() { return html` - + - + `; } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/modals/current-user/current-user-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/modals/current-user/current-user-modal.element.ts index 578b9eb269..7e1a194704 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/modals/current-user/current-user-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/modals/current-user/current-user-modal.element.ts @@ -45,7 +45,7 @@ export class UmbCurrentUserModalElement extends UmbLitElement { render() { return html` - +
@@ -53,7 +53,7 @@ export class UmbCurrentUserModalElement extends UmbLitElement { Close Logout - + `; } @@ -65,7 +65,7 @@ export class UmbCurrentUserModalElement extends UmbLitElement { color: var(--uui-color-text); } :host, - umb-workspace-layout { + umb-workspace-editor { width: 100%; height: 100%; } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/modals/user-group-picker/user-group-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/modals/user-group-picker/user-group-picker-modal.element.ts index d85c609eb1..537d541997 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/modals/user-group-picker/user-group-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-groups/modals/user-group-picker/user-group-picker-modal.element.ts @@ -7,7 +7,7 @@ import type { UserGroupDetails } from '@umbraco-cms/backoffice/models'; @customElement('umb-user-group-picker-modal') export class UmbUserGroupPickerModalElement extends UmbModalElementPickerBase { - + @state() private _userGroups: Array = []; @@ -29,7 +29,7 @@ export class UmbUserGroupPickerModalElement extends UmbModalElementPickerBase +
@@ -51,10 +51,10 @@ export class UmbUserGroupPickerModalElement extends UmbModalElementPickerBase - + `; } - + static styles = [ UUITextStyles, css` 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 16b1b6c3a2..edce7b010c 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 @@ -295,13 +295,13 @@ export class UmbUserGroupWorkspaceEditElement extends UmbLitElement { if (!this._userGroup) return nothing; return html` - +
${this.renderLeftColumn()}
${this.renderRightColumn()}
- + `; } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace-edit.element.ts index ea2a0aba75..469bf5fba4 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace-edit.element.ts @@ -93,13 +93,13 @@ export class UmbUserWorkspaceEditElement extends UmbLitElement { if (!this._user) return html`User not found`; return html` - + ${this.#renderHeader()}
${this.#renderLeftColumn()}
${this.#renderRightColumn()}
- + `; } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts index 03499b4b5c..864cf1c6c4 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts @@ -8,7 +8,7 @@ import type { UmbRoute } from '@umbraco-cms/backoffice/router'; import '../../../shared/components/input-user-group/input-user-group.element'; import '../../../shared/property-editors/uis/document-picker/property-editor-ui-document-picker.element'; -import '../../../shared/components/workspace/workspace-layout/workspace-layout.element'; +import '../../../shared/components/workspace/workspace-editor/workspace-editor.element'; @customElement('umb-user-workspace') export class UmbUserWorkspaceElement extends UmbLitElement {