From cfbddce7f671b7b713cc840c0cf032f59960cb8b Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 25 Apr 2024 15:52:49 +0200 Subject: [PATCH] make dynamic root types --- .../input-document-root-picker.element.ts | 1 - .../src/packages/dynamic-root/index.ts | 1 + .../dynamic-root-origin-picker-modal.element.ts | 4 ++-- ...dynamic-root-query-step-picker-modal.element.ts | 4 ++-- .../repository/dynamic-root.repository.ts | 4 ++-- .../src/packages/dynamic-root/types.ts | 10 ++++++++++ ...editor-ui-content-picker-source-type.element.ts | 1 + .../property-editors/content-picker/types.ts | 14 +++++--------- 8 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/dynamic-root/types.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-root-picker/input-document-root-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-root-picker/input-document-root-picker.element.ts index fdf2e960ac..3de09d24ce 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-root-picker/input-document-root-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-root-picker/input-document-root-picker.element.ts @@ -15,7 +15,6 @@ import type { ManifestDynamicRootQueryStep, } from '@umbraco-cms/backoffice/extension-registry'; import type { UmbModalContext } from '@umbraco-cms/backoffice/modal'; -import type { UmbTreePickerDynamicRoot, UmbTreePickerDynamicRootQueryStep } from '@umbraco-cms/backoffice/components'; @customElement('umb-input-document-root-picker') export class UmbInputDocumentRootPickerElement extends UUIFormControlMixin(UmbLitElement, '') { diff --git a/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/index.ts b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/index.ts index 736a54915b..79982f751c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/index.ts @@ -1,2 +1,3 @@ export * from './modals/index.js'; export * from './repository/index.js'; +export * from './types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/modals/dynamic-root-origin-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/modals/dynamic-root-origin-picker-modal.element.ts index 378c52a26b..c9889092ae 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/modals/dynamic-root-origin-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/modals/dynamic-root-origin-picker-modal.element.ts @@ -1,9 +1,9 @@ import { UmbDocumentPickerContext } from '../../documents/documents/components/input-document/input-document.context.js'; +import type { UmbDynamicRoot } from '../types.js'; import type { UmbDynamicRootOriginModalData } from './index.js'; import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; import { html, customElement, state, ifDefined, repeat } from '@umbraco-cms/backoffice/external/lit'; import type { ManifestDynamicRootOrigin } from '@umbraco-cms/backoffice/extension-registry'; -import type { UmbTreePickerDynamicRoot } from '@umbraco-cms/backoffice/components'; @customElement('umb-dynamic-root-origin-picker-modal') export class UmbDynamicRootOriginPickerModalModalElement extends UmbModalBaseElement { @@ -57,7 +57,7 @@ export class UmbDynamicRootOriginPickerModalModalElement extends UmbModalBaseEle }); } - #submit(value: UmbTreePickerDynamicRoot) { + #submit(value: UmbDynamicRoot) { this.modalContext?.setValue(value); this.modalContext?.submit(); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/modals/dynamic-root-query-step-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/modals/dynamic-root-query-step-picker-modal.element.ts index 1a46ac1f8d..7555ffef86 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/modals/dynamic-root-query-step-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/modals/dynamic-root-query-step-picker-modal.element.ts @@ -1,9 +1,9 @@ import { UmbDocumentTypePickerContext } from '../../documents/document-types/components/input-document-type/input-document-type.context.js'; +import type { UmbDynamicRootQueryStep } from '../types.js'; import type { UmbDynamicRootQueryStepModalData } from './index.js'; import { UmbId } from '@umbraco-cms/backoffice/id'; import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; import { html, customElement, state, ifDefined, repeat } from '@umbraco-cms/backoffice/external/lit'; -import type { UmbTreePickerDynamicRootQueryStep } from '@umbraco-cms/backoffice/components'; import type { ManifestDynamicRootQueryStep } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-dynamic-root-query-step-picker-modal') @@ -44,7 +44,7 @@ export class UmbDynamicRootQueryStepPickerModalModalElement extends UmbModalBase }); } - #submit(value: UmbTreePickerDynamicRootQueryStep) { + #submit(value: UmbDynamicRootQueryStep) { this.modalContext?.setValue(value); this.modalContext?.submit(); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.repository.ts index 91eb4ec1dc..a86ba25725 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.repository.ts @@ -1,8 +1,8 @@ +import type { UmbDynamicRoot } from '../types.js'; import { UmbDynamicRootServerDataSource } from './dynamic-root.server.data.js'; import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { DynamicRootRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; -import type { UmbTreePickerDynamicRoot } from '@umbraco-cms/backoffice/components'; const GUID_EMPTY: string = '00000000-0000-0000-0000-000000000000'; @@ -15,7 +15,7 @@ export class UmbDynamicRootRepository extends UmbControllerBase { this.#dataSource = new UmbDynamicRootServerDataSource(host); } - async postDynamicRootQuery(query: UmbTreePickerDynamicRoot, entityId: string, parentId?: string) { + async postDynamicRootQuery(query: UmbDynamicRoot, entityId: string, parentId?: string) { const model: DynamicRootRequestModel = { context: { id: entityId, diff --git a/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/types.ts b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/types.ts new file mode 100644 index 0000000000..f4fc928a16 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/types.ts @@ -0,0 +1,10 @@ +export type UmbDynamicRoot = { + originAlias: string; + originKey?: string; + querySteps?: Array; +}; + +export type UmbDynamicRootQueryStep = { + unique: string; + alias: string; +}; diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/config/source-type-picker/property-editor-ui-content-picker-source-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/config/source-type-picker/property-editor-ui-content-picker-source-type.element.ts index ba485d21b1..a72180bbb0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/config/source-type-picker/property-editor-ui-content-picker-source-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/config/source-type-picker/property-editor-ui-content-picker-source-type.element.ts @@ -1,3 +1,4 @@ +import type { UmbContentPickerSource } from '../../types.js'; import type { UmbInputMemberTypeElement } from '@umbraco-cms/backoffice/member-type'; import type { UmbInputDocumentTypeElement } from '@umbraco-cms/backoffice/document-type'; import type { UmbInputMediaTypeElement } from '@umbraco-cms/backoffice/media-type'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/types.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/types.ts index 9c8a7dafb8..0a6f345558 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/types.ts @@ -1,3 +1,5 @@ +import type { UmbDynamicRoot, UmbDynamicRootQueryStep } from '@umbraco-cms/backoffice/dynamic-root'; + export type UmbContentPickerSourceType = 'content' | 'member' | 'media'; export type UmbContentPickerSource = { @@ -6,14 +8,8 @@ export type UmbContentPickerSource = { dynamicRoot?: UmbContentPickerDynamicRoot; }; -export type UmbContentPickerDynamicRoot = { - originAlias: string; - originKey?: string; - querySteps?: Array; -}; +export interface UmbContentPickerDynamicRoot extends UmbDynamicRoot {} -export type UmbContentPickerDynamicRootQueryStep = { - unique: string; - alias: string; +export interface UmbContentPickerDynamicRootQueryStep extends UmbDynamicRootQueryStep { anyOfDocTypeKeys?: Array; -}; +}