From 5e8dfadd53bfb1536b437ea2fdaba3cc24d4f39c Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 9 Aug 2022 11:09:29 +0200 Subject: [PATCH] move node editor to shared folder --- .../editors/content/editor-content.element.ts | 2 +- .../backoffice/editors/media/editor-media.element.ts | 2 +- .../editors/{ => shared}/node/editor-node.element.ts | 12 ++++++------ .../editors/{ => shared}/node/editor-node.stories.ts | 2 +- .../editors/{ => shared}/node/node.context.ts | 4 ++-- .../node/views/edit/editor-view-node-edit.element.ts | 6 +++--- .../node/views/edit/editor-view-node-edit.stories.ts | 2 +- .../node/views/info/editor-view-node-info.element.ts | 2 +- .../node/views/info/editor-view-node-info.stories.ts | 2 +- .../src/temp-internal-manifests.ts | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) rename src/Umbraco.Web.UI.Client/src/backoffice/editors/{ => shared}/node/editor-node.element.ts (93%) rename src/Umbraco.Web.UI.Client/src/backoffice/editors/{ => shared}/node/editor-node.stories.ts (88%) rename src/Umbraco.Web.UI.Client/src/backoffice/editors/{ => shared}/node/node.context.ts (91%) rename src/Umbraco.Web.UI.Client/src/backoffice/editors/{ => shared}/node/views/edit/editor-view-node-edit.element.ts (88%) rename src/Umbraco.Web.UI.Client/src/backoffice/editors/{ => shared}/node/views/edit/editor-view-node-edit.stories.ts (92%) rename src/Umbraco.Web.UI.Client/src/backoffice/editors/{ => shared}/node/views/info/editor-view-node-info.element.ts (94%) rename src/Umbraco.Web.UI.Client/src/backoffice/editors/{ => shared}/node/views/info/editor-view-node-info.stories.ts (92%) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/content/editor-content.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/content/editor-content.element.ts index 9191daef1d..e9f52283fc 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/content/editor-content.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/content/editor-content.element.ts @@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; import { customElement, property } from 'lit/decorators.js'; -import '../node/editor-node.element'; +import '../shared/node/editor-node.element'; @customElement('umb-editor-content') export class UmbEditorContentElement extends LitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/media/editor-media.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/media/editor-media.element.ts index db09743192..6c20a43fdf 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/media/editor-media.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/media/editor-media.element.ts @@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; import { customElement, property } from 'lit/decorators.js'; -import '../node/editor-node.element'; +import '../shared/node/editor-node.element'; @customElement('umb-editor-media') export class UmbEditorMediaElement extends LitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/editor-node.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/editor-node.element.ts similarity index 93% rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/node/editor-node.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/editor-node.element.ts index 4a3a140772..7f6863c9f2 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/editor-node.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/editor-node.element.ts @@ -2,20 +2,20 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; import { UUIInputElement, UUIInputEvent } from '@umbraco-ui/uui'; -import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../core/context'; -import { UmbNodeStore } from '../../../core/stores/node.store'; +import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../../core/context'; +import { UmbNodeStore } from '../../../../core/stores/node.store'; import { distinctUntilChanged, Subscription } from 'rxjs'; -import { NodeEntity } from '../../../mocks/data/node.data'; -import type { UmbNotificationService } from '../../../core/services/notification'; +import { NodeEntity } from '../../../../mocks/data/node.data'; +import type { UmbNotificationService } from '../../../../core/services/notification'; import { UmbNodeContext } from './node.context'; -import '../shared/editor-entity/editor-entity.element'; +import '../../shared/editor-entity/editor-entity.element'; // Lazy load // TODO: Make this dynamic, use load-extensions method to loop over extensions for this node. import './views/edit/editor-view-node-edit.element'; import './views/info/editor-view-node-info.element'; -import { UmbNotificationDefaultData } from '../../../core/services/notification/layouts/default'; +import { UmbNotificationDefaultData } from '../../../../core/services/notification/layouts/default'; @customElement('umb-editor-node') export class UmbEditorNodeElement extends UmbContextProviderMixin(UmbContextConsumerMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/editor-node.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/editor-node.stories.ts similarity index 88% rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/node/editor-node.stories.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/editor-node.stories.ts index 038ccea883..16cc3eadad 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/editor-node.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/editor-node.stories.ts @@ -4,7 +4,7 @@ import { html } from 'lit-html'; import { UmbEditorNodeElement } from './editor-node.element'; import './editor-node.element'; -import { data } from '../../../mocks/data/node.data'; +import { data } from '../../../../mocks/data/node.data'; export default { title: 'Editors/Node', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/node.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/node.context.ts similarity index 91% rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/node/node.context.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/node.context.ts index 0aace0e193..4728f95661 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/node.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/node.context.ts @@ -1,5 +1,5 @@ import { BehaviorSubject, Observable } from 'rxjs'; -import { NodeEntity } from '../../../mocks/data/node.data'; +import { NodeEntity } from '../../../../mocks/data/node.data'; export class UmbNodeContext { // TODO: figure out how fine grained we want to make our observables. @@ -7,7 +7,7 @@ export class UmbNodeContext { id: -1, key: '', name: '', - alias: '', + type: '', icon: '', properties: [ { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/views/edit/editor-view-node-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/edit/editor-view-node-edit.element.ts similarity index 88% rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/node/views/edit/editor-view-node-edit.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/edit/editor-view-node-edit.element.ts index f19e76bdc9..26441c77b2 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/views/edit/editor-view-node-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/edit/editor-view-node-edit.element.ts @@ -1,12 +1,12 @@ import { css, html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; -import { NodeProperty, NodePropertyData } from '../../../../../mocks/data/node.data'; -import { UmbContextConsumerMixin } from '../../../../../core/context'; +import { NodeProperty, NodePropertyData } from '../../../../../../mocks/data/node.data'; +import { UmbContextConsumerMixin } from '../../../../../../core/context'; import { UmbNodeContext } from '../../node.context'; import { Subscription, distinctUntilChanged } from 'rxjs'; -import '../../../../components/node-property.element'; +import '../../../../../components/node-property.element'; @customElement('umb-editor-view-node-edit') export class UmbEditorViewNodeEditElement extends UmbContextConsumerMixin(LitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/views/edit/editor-view-node-edit.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/edit/editor-view-node-edit.stories.ts similarity index 92% rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/node/views/edit/editor-view-node-edit.stories.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/edit/editor-view-node-edit.stories.ts index 80f77f6edf..157f9bd00f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/views/edit/editor-view-node-edit.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/edit/editor-view-node-edit.stories.ts @@ -4,7 +4,7 @@ import { html } from 'lit-html'; import { UmbNodeContext } from '../../node.context'; import { UmbEditorViewNodeEditElement } from './editor-view-node-edit.element'; import './editor-view-node-edit.element'; -import { data } from '../../../../../mocks/data/node.data'; +import { data } from '../../../../../../mocks/data/node.data'; export default { title: 'Editors/Node/Views/Edit', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/views/info/editor-view-node-info.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/info/editor-view-node-info.element.ts similarity index 94% rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/node/views/info/editor-view-node-info.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/info/editor-view-node-info.element.ts index 90b358a939..e987b05ea7 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/views/info/editor-view-node-info.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/info/editor-view-node-info.element.ts @@ -1,7 +1,7 @@ import { css, html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; -import { UmbContextConsumerMixin } from '../../../../../core/context'; +import { UmbContextConsumerMixin } from '../../../../../../core/context'; import { UmbNodeContext } from '../../node.context'; import { Subscription, distinctUntilChanged } from 'rxjs'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/views/info/editor-view-node-info.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/info/editor-view-node-info.stories.ts similarity index 92% rename from src/Umbraco.Web.UI.Client/src/backoffice/editors/node/views/info/editor-view-node-info.stories.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/info/editor-view-node-info.stories.ts index fbd43f7ffa..c35dd4e174 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/node/views/info/editor-view-node-info.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/info/editor-view-node-info.stories.ts @@ -4,7 +4,7 @@ import { html } from 'lit-html'; import { UmbNodeContext } from '../../node.context'; import { UmbEditorViewNodeInfoElement } from './editor-view-node-info.element'; import './editor-view-node-info.element'; -import { data } from '../../../../../mocks/data/node.data'; +import { data } from '../../../../../../mocks/data/node.data'; export default { title: 'Editors/Node/Views/Info', diff --git a/src/Umbraco.Web.UI.Client/src/temp-internal-manifests.ts b/src/Umbraco.Web.UI.Client/src/temp-internal-manifests.ts index 411bfecb00..00a9dd37fd 100644 --- a/src/Umbraco.Web.UI.Client/src/temp-internal-manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/temp-internal-manifests.ts @@ -106,7 +106,7 @@ export const internalManifests: Array = [ alias: 'Umb.EditorView.ContentEdit', name: 'Content', elementName: 'umb-editor-view-node-edit', - js: () => import('./backoffice/editors/node/views/edit/editor-view-node-edit.element'), + js: () => import('./backoffice/editors/shared/node/views/edit/editor-view-node-edit.element'), meta: { // TODO: how do we want to filter where editor views are shown? https://our.umbraco.com/documentation/extending/Content-Apps/#setting-up-the-plugin // this is a temp solution @@ -121,7 +121,7 @@ export const internalManifests: Array = [ alias: 'Umb.EditorView.ContentInfo', name: 'Info', elementName: 'umb-editor-view-node-info', - js: () => import('./backoffice/editors/node/views/info/editor-view-node-info.element'), + js: () => import('./backoffice/editors/shared/node/views/info/editor-view-node-info.element'), meta: { // TODO: how do we want to filter where editor views are shown? https://our.umbraco.com/documentation/extending/Content-Apps/#setting-up-the-plugin // this is a temp solution