From 9f46b654fa2a9d8dc37a184e8c8f4f830f255e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesper=20M=C3=B8ller=20Jensen?= <26099018+JesmoDev@users.noreply.github.com> Date: Wed, 15 Mar 2023 20:39:59 +1300 Subject: [PATCH] rename workspace views --- .../relation-types/workspace/manifests.ts | 24 +++++++++---------- ...e-workspace-view-relation-type.element.ts} | 22 +++++++++-------- ...e-workspace-view-relation-type.stories.ts} | 14 +++++------ ...ce-view-relation-type-relation.element.ts} | 22 ++++++++--------- ...ce-view-relation-type-relation.stories.ts} | 14 +++++------ 5 files changed, 49 insertions(+), 47 deletions(-) rename src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/{edit/relation-type-workspace-view-edit.element.ts => relation-type/relation-type-workspace-view-relation-type.element.ts} (78%) rename src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/{edit/relation-type-workspace-view-edit.stories.ts => relation-type/relation-type-workspace-view-relation-type.stories.ts} (51%) rename src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/{info/workspace-view-relation-type-info.element.ts => relation/workspace-view-relation-type-relation.element.ts} (65%) rename src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/{info/workspace-view-relation-type-info.stories.ts => relation/workspace-view-relation-type-relation.stories.ts} (52%) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/manifests.ts index 29f4d0d30b..3385e4bf1f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/manifests.ts @@ -14,28 +14,28 @@ const workspace: ManifestWorkspace = { const workspaceViews: Array = [ { type: 'workspaceView', - alias: 'Umb.WorkspaceView.RelationType.Edit', - name: 'Relation Type Workspace Edit View', - loader: () => import('./views/edit/relation-type-workspace-view-edit.element'), + alias: 'Umb.WorkspaceView.RelationType.RelationType', + name: 'Relation Type Workspace RelationType View', + loader: () => import('./views/relation-type/relation-type-workspace-view-relation-type.element'), weight: 90, meta: { workspaces: ['Umb.Workspace.RelationType'], - label: 'Edit', - pathname: 'edit', - icon: 'edit', + label: 'RelationType', + pathname: 'relation-type', + icon: 'umb:info', }, }, { type: 'workspaceView', - alias: 'Umb.WorkspaceView.RelationType.Info', - name: 'Relation Type Workspace Info View', - loader: () => import('./views/info/workspace-view-relation-type-info.element'), + alias: 'Umb.WorkspaceView.RelationType.Relation', + name: 'Relation Type Workspace Relation View', + loader: () => import('./views/relation/workspace-view-relation-type-relation.element'), weight: 90, meta: { workspaces: ['Umb.Workspace.RelationType'], - label: 'Info', - pathname: 'info', - icon: 'info', + label: 'Relation', + pathname: 'relation', + icon: 'umb:trafic', }, }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/edit/relation-type-workspace-view-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation-type/relation-type-workspace-view-relation-type.element.ts similarity index 78% rename from src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/edit/relation-type-workspace-view-edit.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation-type/relation-type-workspace-view-relation-type.element.ts index 020c7c3076..e26888d083 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/edit/relation-type-workspace-view-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation-type/relation-type-workspace-view-relation-type.element.ts @@ -7,8 +7,8 @@ import { UmbRelationTypeWorkspaceContext } from '../../relation-type-workspace.c import { UmbLitElement } from '@umbraco-cms/element'; import type { RelationTypeBaseModel, RelationTypeResponseModel } from '@umbraco-cms/backend-api'; -@customElement('umb-relation-type-workspace-view-edit') -export class UmbRelationTypeWorkspaceViewEditElement extends UmbLitElement { +@customElement('umb-relation-type-workspace-view-relation-type') +export class UmbRelationTypeWorkspaceViewRelationTypeElement extends UmbLitElement { static styles = [ UUITextStyles, css` @@ -63,7 +63,7 @@ export class UmbRelationTypeWorkspaceViewEditElement extends UmbLitElement { + slot="relation-typeor"> @@ -72,7 +72,7 @@ export class UmbRelationTypeWorkspaceViewEditElement extends UmbLitElement { ${this.#renderChildProperty()} @@ -81,22 +81,24 @@ export class UmbRelationTypeWorkspaceViewEditElement extends UmbLitElement { } #renderParentProperty() { - if (this._relationType?.key) return html`
${this._relationType.parentObjectTypeName}
`; + if (this._relationType?.key) + return html`
${this._relationType.parentObjectTypeName}
`; - return html``; + return html``; } #renderChildProperty() { - if (this._relationType?.key) return html`
${this._relationType.parentObjectTypeName}
`; + if (this._relationType?.key) + return html`
${this._relationType.parentObjectTypeName}
`; - return html``; + return html``; } } -export default UmbRelationTypeWorkspaceViewEditElement; +export default UmbRelationTypeWorkspaceViewRelationTypeElement; declare global { interface HTMLElementTagNameMap { - 'umb-relation-type-workspace-view-edit': UmbRelationTypeWorkspaceViewEditElement; + 'umb-relation-type-workspace-view-relation-type': UmbRelationTypeWorkspaceViewRelationTypeElement; } } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/edit/relation-type-workspace-view-edit.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation-type/relation-type-workspace-view-relation-type.stories.ts similarity index 51% rename from src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/edit/relation-type-workspace-view-edit.stories.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation-type/relation-type-workspace-view-relation-type.stories.ts index b07c51b892..284b58e8ce 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/edit/relation-type-workspace-view-edit.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation-type/relation-type-workspace-view-relation-type.stories.ts @@ -3,15 +3,15 @@ import { html } from 'lit-html'; //import { data } from '../../../../../core/mocks/data/relation-type.data'; -import type { UmbRelationTypeWorkspaceViewEditElement } from './relation-type-workspace-view-edit.element'; +import type { UmbRelationTypeWorkspaceViewRelationTypeElement } from './relation-type-workspace-view-relation-type.element'; -import './relation-type-workspace-view-edit.element'; +import './relation-type-workspace-view-relation-type.element'; //import { UmbRelationTypeWorkspaceContext } from '../../workspace-relation-type.context'; export default { - title: 'Workspaces/Relation Type/Views/Edit', - component: 'umb-relation-type-workspace-view-edit', - id: 'umb-relation-type-workspace-view-edit', + title: 'Workspaces/Relation Type/Views/RelationType', + component: 'umb-relation-type-workspace-view-relation-type', + id: 'umb-relation-type-workspace-view-relation-type', decorators: [ (story) => { return html`TODO: make use of mocked workspace context??`; @@ -22,6 +22,6 @@ export default { ], } as Meta; -export const AAAOverview: Story = () => - html` `; +export const AAAOverview: Story = () => + html` `; AAAOverview.storyName = 'Overview'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/info/workspace-view-relation-type-info.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation/workspace-view-relation-type-relation.element.ts similarity index 65% rename from src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/info/workspace-view-relation-type-info.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation/workspace-view-relation-type-relation.element.ts index c2c93bbc9c..f8faea9ad7 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/info/workspace-view-relation-type-info.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation/workspace-view-relation-type-relation.element.ts @@ -6,8 +6,8 @@ import { UmbRelationTypeWorkspaceContext } from '../../relation-type-workspace.c import { UmbLitElement } from '@umbraco-cms/element'; import { RelationTypeResponseModel } from '@umbraco-cms/backend-api'; -@customElement('umb-workspace-view-relation-type-info') -export class UmbWorkspaceViewRelationTypeInfoElement extends UmbLitElement { +@customElement('umb-workspace-view-relation-type-relation') +export class UmbWorkspaceViewRelationTypeRelationElement extends UmbLitElement { static styles = [UUITextStyles, css``]; @state() @@ -35,21 +35,21 @@ export class UmbWorkspaceViewRelationTypeInfoElement extends UmbLitElement { } render() { - return html` ${this._renderGeneralInfo()}${this._renderReferences()} `; + return html` ${this._renderGeneralRelation()}${this._renderReferences()} `; } - private _renderGeneralInfo() { + private _renderGeneralRelation() { return html` -
${this._RelationType?.key}
+
${this._RelationType?.key}
- -
${this._RelationType?.propertyEditorAlias}
+ +
${this._RelationType?.propertyRelationTypeorAlias}
- -
${this._RelationType?.propertyEditorUiAlias}
+ +
${this._RelationType?.propertyRelationTypeorUiAlias}
`; @@ -60,10 +60,10 @@ export class UmbWorkspaceViewRelationTypeInfoElement extends UmbLitElement { } } -export default UmbWorkspaceViewRelationTypeInfoElement; +export default UmbWorkspaceViewRelationTypeRelationElement; declare global { interface HTMLElementTagNameMap { - 'umb-workspace-view-relation-type-info': UmbWorkspaceViewRelationTypeInfoElement; + 'umb-workspace-view-relation-type-relation': UmbWorkspaceViewRelationTypeRelationElement; } } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/info/workspace-view-relation-type-info.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation/workspace-view-relation-type-relation.stories.ts similarity index 52% rename from src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/info/workspace-view-relation-type-info.stories.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation/workspace-view-relation-type-relation.stories.ts index 6abee6dff4..49657d8e70 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/info/workspace-view-relation-type-info.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/relation-types/workspace/views/relation/workspace-view-relation-type-relation.stories.ts @@ -1,4 +1,4 @@ -import './workspace-view-relation-type-info.element'; +import './workspace-view-relation-type-relation.element'; import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; @@ -6,12 +6,12 @@ import { html } from 'lit-html'; //import { data } from '../../../../../core/mocks/data/relation-type.data'; //import { UmbRelationTypeContext } from '../../relation-type.context'; -import type { UmbWorkspaceViewRelationTypeInfoElement } from './workspace-view-relation-type-info.element'; +import type { UmbWorkspaceViewRelationTypeRelationElement } from './workspace-view-relation-type-relation.element'; export default { - title: 'Workspaces/Relation Type/Views/Info', - component: 'umb-workspace-view-relation-type-info', - id: 'umb-workspace-view-relation-type-info', + title: 'Workspaces/Relation Type/Views/Relation', + component: 'umb-workspace-view-relation-type-relation', + id: 'umb-workspace-view-relation-type-relation', decorators: [ (story) => { return html`TODO: make use of mocked workspace context??`; @@ -22,6 +22,6 @@ export default { ], } as Meta; -export const AAAOverview: Story = () => - html` `; +export const AAAOverview: Story = () => + html` `; AAAOverview.storyName = 'Overview';