From f84e0f92799bdab1e20d3f07a6813d69d55ab1f9 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 2 May 2023 20:58:16 +0200 Subject: [PATCH] move media related components to media module --- .../src/backoffice/media/media/components/index.ts | 1 + .../input-media-picker/input-media-picker.element.ts | 6 ++---- .../input-media-picker/input-media-picker.stories.ts | 0 .../input-media-picker/input-media-picker.test.ts | 0 .../workspace/workspace-package-builder.element.ts | 7 ++++--- .../src/backoffice/shared/components/index.ts | 1 - .../property-editor-ui-media-picker.element.ts | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/backoffice/media/media/components/index.ts rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => media/media}/components/input-media-picker/input-media-picker.element.ts (98%) rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => media/media}/components/input-media-picker/input-media-picker.stories.ts (100%) rename src/Umbraco.Web.UI.Client/src/backoffice/{shared => media/media}/components/input-media-picker/input-media-picker.test.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/components/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/components/index.ts new file mode 100644 index 0000000000..9186c4a7d0 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/components/index.ts @@ -0,0 +1 @@ +import './input-media-picker/input-media-picker.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-media-picker/input-media-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/components/input-media-picker/input-media-picker.element.ts similarity index 98% rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-media-picker/input-media-picker.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/media/media/components/input-media-picker/input-media-picker.element.ts index 8ee9138b5f..4c66716703 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-media-picker/input-media-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/components/input-media-picker/input-media-picker.element.ts @@ -3,7 +3,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property, state } from 'lit/decorators.js'; import { ifDefined } from 'lit/directives/if-defined.js'; import { FormControlMixin } from '@umbraco-ui/uui-base/lib/mixins'; -import { UmbMediaRepository } from '../../../media/media/repository/media.repository'; +import { UmbMediaRepository } from '../../repository/media.repository'; import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN, @@ -16,8 +16,6 @@ import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-a @customElement('umb-input-media-picker') export class UmbInputMediaPickerElement extends FormControlMixin(UmbLitElement) { - - /** * This is a minimum amount of selected items in this input. * @type {number} @@ -184,7 +182,7 @@ export class UmbInputMediaPickerElement extends FormControlMixin(UmbLitElement) `; //TODO: } - + static styles = [ UUITextStyles, css` diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-media-picker/input-media-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/components/input-media-picker/input-media-picker.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-media-picker/input-media-picker.stories.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/media/media/components/input-media-picker/input-media-picker.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-media-picker/input-media-picker.test.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/components/input-media-picker/input-media-picker.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-media-picker/input-media-picker.test.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/media/media/components/input-media-picker/input-media-picker.test.ts 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 128b87f286..94afd03b7a 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 @@ -3,9 +3,10 @@ import { UUIBooleanInputEvent, UUIInputElement, UUIInputEvent } from '@umbraco-u import { css, html, nothing } from 'lit'; import { customElement, property, query, state } from 'lit/decorators.js'; import { ifDefined } from 'lit/directives/if-defined.js'; -import { UmbInputDocumentPickerElement } from '../../../documents/documents/components/input-document-picker/input-document-picker.element'; -import { UmbInputMediaPickerElement } from '../../../shared/components/input-media-picker/input-media-picker.element'; -import { UmbInputLanguagePickerElement } from '../../../settings/languages/components/input-language-picker/input-language-picker.element'; +// TODO: update to module imports when ready +import type { UmbInputDocumentPickerElement } from '../../../documents/documents/components/input-document-picker/input-document-picker.element'; +import type { UmbInputMediaPickerElement } from '../../../media/media/components/input-media-picker/input-media-picker.element'; +import type { UmbInputLanguagePickerElement } from '../../../settings/languages/components/input-language-picker/input-language-picker.element'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { PackageDefinitionResponseModel, PackageResource } from '@umbraco-cms/backoffice/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; 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 57c6dead8d..947a28c566 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 @@ -22,7 +22,6 @@ import './extension-slot/extension-slot.element'; import './input-checkbox-list/input-checkbox-list.element'; import './input-color-picker/input-color-picker.element'; import './input-eye-dropper/input-eye-dropper.element'; -import './input-media-picker/input-media-picker.element'; import './input-multi-url-picker/input-multi-url-picker.element'; import './input-slider/input-slider.element'; import './input-toggle/input-toggle.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts index a50c76f135..1e02b68ff6 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/media-picker/property-editor-ui-media-picker.element.ts @@ -1,6 +1,6 @@ import { html } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { UmbInputMediaPickerElement } from '../../../../../backoffice/shared/components/input-media-picker/input-media-picker.element'; +import { UmbInputMediaPickerElement } from '../../../../media/media/components/input-media-picker/input-media-picker.element'; import { UmbPropertyEditorExtensionElement } from '@umbraco-cms/backoffice/extensions-registry'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import type { DataTypePropertyPresentationModel } from '@umbraco-cms/backoffice/backend-api';