From 77462cc27bf208936af17f60ea844d2b53226dfb Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 13 Nov 2023 20:14:03 +0100 Subject: [PATCH] wip: collect data type detail repo in one folder --- .../components/ref-data-type/ref-data-type.element.ts | 4 ++-- .../data-types/entity-actions/create/create.action.ts | 4 ++-- ...ta-type-picker-flow-data-type-picker-modal.element.ts | 4 ++-- .../data-type-picker-flow-modal.element.ts | 4 ++-- .../data-type-detail.repository.ts} | 9 ++++----- .../{sources => detail}/data-type.server.data.ts | 0 .../src/packages/settings/data-types/repository/index.ts | 2 +- .../packages/settings/data-types/repository/manifests.ts | 4 ++-- .../data-types/workspace/data-type-workspace.context.ts | 6 +++--- 9 files changed, 18 insertions(+), 19 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/{data-type.repository.ts => detail/data-type-detail.repository.ts} (94%) rename src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/{sources => detail}/data-type.server.data.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/components/ref-data-type/ref-data-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/components/ref-data-type/ref-data-type.element.ts index 2329a95cc8..55e348be28 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/components/ref-data-type/ref-data-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/components/ref-data-type/ref-data-type.element.ts @@ -1,4 +1,4 @@ -import { UmbDataTypeRepository } from '../../repository/data-type.repository.js'; +import { UmbDataTypeDetailRepository } from '../../repository/detail/data-type-detail.repository.js'; import { UUIRefNodeElement } from '@umbraco-cms/backoffice/external/uui'; import { html, customElement, property, state, css } from '@umbraco-cms/backoffice/external/lit'; import { UmbElementMixin } from '@umbraco-cms/backoffice/element-api'; @@ -39,7 +39,7 @@ export class UmbRefDataTypeElement extends UmbElementMixin(UUIRefNodeElement) { } } - repository = new UmbDataTypeRepository(this); + repository = new UmbDataTypeDetailRepository(this); /** * Property Editor UI Alias diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/entity-actions/create/create.action.ts index 7ec93bf46b..76f398b338 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/entity-actions/create/create.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/entity-actions/create/create.action.ts @@ -1,10 +1,10 @@ -import { UmbDataTypeRepository } from '../../repository/data-type.repository.js'; +import { UmbDataTypeDetailRepository } from '../../repository/detail/data-type-detail.repository.js'; import { UMB_DATA_TYPE_CREATE_OPTIONS_MODAL } from './modal/index.js'; import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action'; import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import { UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal'; -export class UmbCreateDataTypeEntityAction extends UmbEntityActionBase { +export class UmbCreateDataTypeEntityAction extends UmbEntityActionBase { #modalManagerContext?: UmbModalManagerContext; constructor(host: UmbControllerHostElement, repositoryAlias: string, unique: string) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.ts index fe69627ffa..368d54bd26 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.ts @@ -1,4 +1,4 @@ -import { UmbDataTypeRepository } from '../../repository/data-type.repository.js'; +import { UmbDataTypeDetailRepository } from '../../repository/detail/data-type-detail.repository.js'; import { css, html, customElement, property, state, repeat, when } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { @@ -32,7 +32,7 @@ export class UmbDataTypePickerFlowDataTypePickerModalElement extends UmbLitEleme private async _observeDataTypesOf(propertyEditorUiAlias: string) { if (!this.data) return; - const dataTypeRepository = new UmbDataTypeRepository(this); + const dataTypeRepository = new UmbDataTypeDetailRepository(this); // TODO: This is a hack to get the data types of a property editor ui alias. // TODO: Make sure filtering works data-type that does not have a property editor ui, but should be using the default property editor UI for those. diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts index e58b76edd6..ef5687261d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts @@ -1,4 +1,4 @@ -import { UmbDataTypeRepository } from '../../repository/data-type.repository.js'; +import { UmbDataTypeDetailRepository } from '../../repository/detail/data-type-detail.repository.js'; import { css, html, repeat, customElement, property, state, when, nothing } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; @@ -58,7 +58,7 @@ export class UmbDataTypePickerFlowModalElement extends UmbLitElement { constructor() { super(); - this.#repository = new UmbDataTypeRepository(this); + this.#repository = new UmbDataTypeDetailRepository(this); new UmbModalRouteRegistrationController(this, UMB_DATA_TYPE_PICKER_FLOW_DATA_TYPE_PICKER_MODAL) .addAdditionalPath(':uiAlias') diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/data-type.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/detail/data-type-detail.repository.ts similarity index 94% rename from src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/data-type.repository.ts rename to src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/detail/data-type-detail.repository.ts index 42df33b053..687e0ba50f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/data-type.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/detail/data-type-detail.repository.ts @@ -1,6 +1,6 @@ -import { UmbDataTypeServerDataSource } from './sources/data-type.server.data.js'; -import { UmbDataTypeRepositoryBase } from './data-type-repository-base.js'; -import { createTreeItem } from './utils.js'; +import { UmbDataTypeServerDataSource } from './data-type.server.data.js'; +import { UmbDataTypeRepositoryBase } from '../data-type-repository-base.js'; +import { createTreeItem } from '../utils.js'; import type { UmbDetailRepository, UmbDataSource } from '@umbraco-cms/backoffice/repository'; import { type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { @@ -8,7 +8,7 @@ import { DataTypeResponseModel, UpdateDataTypeRequestModel, } from '@umbraco-cms/backoffice/backend-api'; -export class UmbDataTypeRepository +export class UmbDataTypeDetailRepository extends UmbDataTypeRepositoryBase implements UmbDetailRepository { @@ -19,7 +19,6 @@ export class UmbDataTypeRepository this.#detailSource = new UmbDataTypeServerDataSource(this); } - // DETAILS: async createScaffold(parentId: string | null) { if (parentId === undefined) throw new Error('Parent id is missing'); await this._init; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/sources/data-type.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/detail/data-type.server.data.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/sources/data-type.server.data.ts rename to src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/detail/data-type.server.data.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/index.ts index 1d069d1139..0ee3bec3c5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/index.ts @@ -1 +1 @@ -export { UmbDataTypeRepository } from './data-type.repository.js'; +export { UmbDataTypeDetailRepository as UmbDataTypeRepository } from './detail/data-type-detail.repository.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/manifests.ts index c804489199..15e92817d0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/repository/manifests.ts @@ -1,4 +1,4 @@ -import { UmbDataTypeRepository } from './data-type.repository.js'; +import { UmbDataTypeDetailRepository } from './detail/data-type-detail.repository.js'; import { UmbDataTypeStore } from './data-type.store.js'; import { manifests as itemManifests } from './item/manifests.js'; import { manifests as moveManifests } from './move/manifests.js'; @@ -12,7 +12,7 @@ const repository: ManifestRepository = { type: 'repository', alias: DATA_TYPE_REPOSITORY_ALIAS, name: 'Data Type Repository', - api: UmbDataTypeRepository, + api: UmbDataTypeDetailRepository, }; export const DATA_TYPE_STORE_ALIAS = 'Umb.Store.DataType'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/data-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/data-type-workspace.context.ts index 8c91ba0078..cb84c569bd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/data-type-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/workspace/data-type-workspace.context.ts @@ -1,4 +1,4 @@ -import { UmbDataTypeRepository } from '../repository/data-type.repository.js'; +import { UmbDataTypeDetailRepository } from '../repository/detail/data-type-detail.repository.js'; import { UmbDataTypeVariantContext } from '../variant-context/data-type-variant-context.js'; import { UmbInvariantableWorkspaceContextInterface, @@ -23,7 +23,7 @@ import { import { UMB_PROPERTY_EDITOR_SCHEMA_ALIAS_DEFAULT } from '@umbraco-cms/backoffice/property-editor'; export class UmbDataTypeWorkspaceContext - extends UmbWorkspaceContext + extends UmbWorkspaceContext implements UmbInvariantableWorkspaceContextInterface { // TODO: revisit. temp solution because the create and response models are different. @@ -62,7 +62,7 @@ export class UmbDataTypeWorkspaceContext propertyEditorUiName = this.#propertyEditorUiName.asObservable(); constructor(host: UmbControllerHostElement) { - super(host, 'Umb.Workspace.DataType', new UmbDataTypeRepository(host)); + super(host, 'Umb.Workspace.DataType', new UmbDataTypeDetailRepository(host)); this.#observePropertyEditorUIAlias(); }