From 8c7d11b6bd8a9a037c536aea304842d2b2b8840f Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 23 Feb 2024 19:33:23 +0100 Subject: [PATCH 01/10] remove unused mappers --- ...ata-source-paged-response-data.function.ts | 41 ------------------- ...nd-data-source-paged-response-data.test.ts | 38 ----------------- ...tend-data-source-response-data.function.ts | 29 ------------- .../extend-data-source-response-data.test.ts | 24 ----------- 4 files changed, 132 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/extend-data-source-paged-response-data.function.ts delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/extend-data-source-paged-response-data.test.ts delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/extend-data-source-response-data.function.ts delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/extend-data-source-response-data.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/extend-data-source-paged-response-data.function.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/extend-data-source-paged-response-data.function.ts deleted file mode 100644 index e3f7bfcc61..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/extend-data-source-paged-response-data.function.ts +++ /dev/null @@ -1,41 +0,0 @@ -import type { DataSourceResponse, UmbPagedModel } from '../index.js'; -import type { Diff } from '@umbraco-cms/backoffice/utils'; - -/** - * This function extends the data set of a paged DataSourceResponse. - * Provide the desired type as a generic type parameter. - * This will require the appendData argument to fill in the missing properties of the items. - * @param response {DataSourceResponse>} - * @param appendData {object} Additional properties to append to the data set. - * @returns {DataSourceResponse>} - * - * @example - * - * type originalResponseType = { foo: string }; - * type extendedResponseType = { foo: string, bar: string }; - * - * const extendedResponse = extendDataSourcePagedResponseData(originalResponse, { bar: 'some additional data' }); - * - * extendedResponse.data.items[0].bar is now equal to 'some additional data' - */ -export function extendDataSourcePagedResponseData< - ExtendedDataType extends IncomingDataType, - IncomingDataType extends object = object, - MissingPropsType extends object = Diff, - // Maybe this Omit<..., "$ype"> can be removed, but for now it kept showing up as a difference, though its not a difference on the two types. - ToType = IncomingDataType & ExtendedDataType, ->( - response: DataSourceResponse>, - appendData: MissingPropsType, -): DataSourceResponse> { - if (response.data === undefined) return response as unknown as DataSourceResponse>; - return { - ...response, - data: { - ...response.data, - items: response.data.items.map((x) => { - return { ...x, ...appendData } as unknown as ToType; - }), - }, - }; -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/extend-data-source-paged-response-data.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/extend-data-source-paged-response-data.test.ts deleted file mode 100644 index 533f637da3..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/extend-data-source-paged-response-data.test.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { expect } from '@open-wc/testing'; -import type { UmbPagedModel } from './types.js'; -import type { DataSourceResponse } from './data-source-response.interface.js'; -import { extendDataSourcePagedResponseData } from './extend-data-source-paged-response-data.function.js'; - -describe('extendDataSourcePagedResponseData', () => { - it('is a function', () => { - expect(extendDataSourcePagedResponseData).that.is.a('function'); - }); - - describe('Extending data set', () => { - it('has an controllerAlias property', () => { - const response: DataSourceResponse> = { - data: { - items: [ - { - original: 'prop', - }, - { - original: 'prop', - }, - ], - total: 2, - }, - }; - - const extendedResponse = extendDataSourcePagedResponseData(response, { foo: 'bar' }); - - expect(extendedResponse.data).that.is.a('object'); - expect(extendedResponse.data?.items[1]) - .to.have.property('original') - .to.be.equal('prop'); - expect(extendedResponse.data?.items[1]) - .to.have.property('foo') - .to.be.equal('bar'); - }); - }); -}); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/extend-data-source-response-data.function.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/extend-data-source-response-data.function.ts deleted file mode 100644 index 632d70129c..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/extend-data-source-response-data.function.ts +++ /dev/null @@ -1,29 +0,0 @@ -import type { DataSourceResponse } from '../index.js'; -import type { Diff } from '@umbraco-cms/backoffice/utils'; - -/** - * This function extends the data set of a DataSourceResponse. - * Provide the desired type as a generic type parameter. - * This will require the appendData argument to fill in the missing properties of the data. - * @param response {DataSourceResponse} - * @param appendData {object} Additional properties to append to the data. - * @returns {DataSourceResponse} - * - * @example - * - * type originalResponseType = { foo: string }; - * type extendedResponseType = { foo: string, bar: string }; - * - * const extendedResponse = extendDataSourceResponseData(originalResponse, { bar: 'some additional data' }); - * - * extendedResponse.data.bar is now equal to 'some additional data' - */ -export function extendDataSourceResponseData< - ExtendedDataType extends IncomingDataType, - IncomingDataType extends object = object, - MissingPropsType extends object = Diff, - ToType = IncomingDataType & ExtendedDataType, ->(response: DataSourceResponse, appendData: MissingPropsType): DataSourceResponse { - if (response.data === undefined) return response as unknown as DataSourceResponse; - return { ...response, data: { ...response.data, ...appendData } as unknown as ToType }; -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/extend-data-source-response-data.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/extend-data-source-response-data.test.ts deleted file mode 100644 index c3ebe86b01..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/extend-data-source-response-data.test.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { expect } from '@open-wc/testing'; -import { extendDataSourceResponseData } from './extend-data-source-response-data.function.js'; -import type { DataSourceResponse } from './data-source-response.interface.js'; - -describe('extendDataSourceResponseData', () => { - it('is a function', () => { - expect(extendDataSourceResponseData).that.is.a('function'); - }); - - describe('Extending data set', () => { - it('has extended data of DataSourceResponse', () => { - const response: DataSourceResponse = { - data: { - original: 'prop', - }, - }; - - const extendedResponse = extendDataSourceResponseData(response, { foo: 'bar' }); - - expect(extendedResponse.data).to.have.property('original').to.be.equal('prop'); - expect(extendedResponse.data).to.have.property('foo').to.be.equal('bar'); - }); - }); -}); From 7f999f523359d2dc4389d250c2f9ceb573e1a937 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 23 Feb 2024 19:33:46 +0100 Subject: [PATCH 02/10] remove export --- .../src/packages/core/repository/data-source/index.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts index 4980a9bbe6..9da8f3ad03 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts @@ -2,7 +2,5 @@ export * from './collection-data-source.interface.js'; export * from './copy-data-source.interface.js'; export * from './data-source-response.interface.js'; export * from './data-source.interface.js'; -export * from './extend-data-source-paged-response-data.function.js'; -export * from './extend-data-source-response-data.function.js'; export * from './move-data-source.interface.js'; export * from './types.js'; From 625b4ef8a7afd85bddab87a4db9c4c0b6d31279d Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 23 Feb 2024 19:34:23 +0100 Subject: [PATCH 03/10] remove deprecated interface --- .../data-source/data-source.interface.ts | 19 ------------------- .../core/repository/data-source/index.ts | 1 - 2 files changed, 20 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/data-source.interface.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/data-source.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/data-source.interface.ts deleted file mode 100644 index b1309ffb4c..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/data-source.interface.ts +++ /dev/null @@ -1,19 +0,0 @@ -import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; - -export interface UmbDataSource< - CreateRequestType, - CreateResponseType, - UpdateRequestType, - ResponseType, - CreateScaffoldPresetType = Partial, - ScaffoldResponseType = Partial, -> { - createScaffold( - parentId: string | null, - preset?: Partial | CreateScaffoldPresetType, - ): Promise>; - create(data: CreateRequestType): Promise>; - read(unique: string): Promise>; - update(unique: string, data: UpdateRequestType): Promise>; - delete(unique: string): Promise; -} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts index 9da8f3ad03..4dbee0ac06 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts @@ -1,6 +1,5 @@ export * from './collection-data-source.interface.js'; export * from './copy-data-source.interface.js'; export * from './data-source-response.interface.js'; -export * from './data-source.interface.js'; export * from './move-data-source.interface.js'; export * from './types.js'; From 86a476d12b8e03726ddf17ae5574c2102646a6e7 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 23 Feb 2024 19:41:03 +0100 Subject: [PATCH 04/10] move to folders --- .../{data-source => copy}/copy-data-source.interface.ts | 0 .../core/repository/{ => copy}/copy-repository.interface.ts | 2 +- .../src/packages/core/repository/copy/index.ts | 2 ++ .../src/packages/core/repository/data-source/index.ts | 4 +--- .../src/packages/core/repository/index.ts | 6 ++++-- .../src/packages/core/repository/move/index.ts | 2 ++ .../{data-source => move}/move-data-source.interface.ts | 0 .../core/repository/{ => move}/move-repository.interface.ts | 0 .../src/packages/core/repository/{data-source => }/types.ts | 0 9 files changed, 10 insertions(+), 6 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/core/repository/{data-source => copy}/copy-data-source.interface.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/repository/{ => copy}/copy-repository.interface.ts (64%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/repository/copy/index.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/repository/move/index.ts rename src/Umbraco.Web.UI.Client/src/packages/core/repository/{data-source => move}/move-data-source.interface.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/repository/{ => move}/move-repository.interface.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/repository/{data-source => }/types.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/copy-data-source.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/copy/copy-data-source.interface.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/copy-data-source.interface.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/repository/copy/copy-data-source.interface.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/copy-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/copy/copy-repository.interface.ts similarity index 64% rename from src/Umbraco.Web.UI.Client/src/packages/core/repository/copy-repository.interface.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/repository/copy/copy-repository.interface.ts index ce814944ce..f017ad5f4b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/copy-repository.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/copy/copy-repository.interface.ts @@ -1,4 +1,4 @@ -import type { DataSourceResponse } from './data-source/index.js'; +import type { DataSourceResponse } from '../data-source/index.js'; export interface UmbCopyRepository { copy(unique: string, targetUnique: string): Promise>; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/copy/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/copy/index.ts new file mode 100644 index 0000000000..e5630ce0f5 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/copy/index.ts @@ -0,0 +1,2 @@ +export type { UmbCopyDataSource } from './copy-data-source.interface.js'; +export type { UmbCopyRepository } from './copy-repository.interface.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts index 4dbee0ac06..7f005b5524 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts @@ -1,5 +1,3 @@ export * from './collection-data-source.interface.js'; -export * from './copy-data-source.interface.js'; export * from './data-source-response.interface.js'; -export * from './move-data-source.interface.js'; -export * from './types.js'; +export * from '../types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts index fe44883534..c3b8b01ecc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts @@ -1,10 +1,12 @@ export * from './data-source/index.js'; export * from './detail/detail-repository.interface.js'; export * from './collection-repository.interface.js'; -export * from './move-repository.interface.js'; -export * from './copy-repository.interface.js'; +export * from './move/move-repository.interface.js'; export * from './repository-items.manager.js'; export * from './repository-base.js'; export * from './item/index.js'; export * from './detail/index.js'; + +export type { UmbMoveDataSource, UmbMoveRepository } from './move/index.js'; +export type { UmbCopyDataSource, UmbCopyRepository } from './copy/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/move/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/move/index.ts new file mode 100644 index 0000000000..cefe904535 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/move/index.ts @@ -0,0 +1,2 @@ +export type { UmbMoveDataSource } from './move-data-source.interface.js'; +export type { UmbMoveRepository } from './move-repository.interface.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/move-data-source.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/move/move-data-source.interface.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/move-data-source.interface.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/repository/move/move-data-source.interface.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/move-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/move/move-repository.interface.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/repository/move-repository.interface.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/repository/move/move-repository.interface.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/types.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/types.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/repository/types.ts From d53f304f544d250543875f2603c794b797488173 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 23 Feb 2024 19:41:49 +0100 Subject: [PATCH 05/10] update imports --- .../structure/content-type-structure-server-data-source-base.ts | 2 +- .../repository/data-source/collection-data-source.interface.ts | 2 +- .../packages/core/repository/move/move-repository.interface.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-server-data-source-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-server-data-source-base.ts index 1afffa33aa..a9e8896cce 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-server-data-source-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-server-data-source-base.ts @@ -1,4 +1,4 @@ -import type { UmbPagedModel } from '../../repository/data-source/types.js'; +import type { UmbPagedModel } from '../../repository/types.js'; import type { UmbContentTypeStructureDataSource } from './content-type-structure-data-source.interface.js'; import type { AllowedContentTypeModel, ItemResponseModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/collection-data-source.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/collection-data-source.interface.ts index 3277b5c3ae..952b7e0122 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/collection-data-source.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/collection-data-source.interface.ts @@ -1,5 +1,5 @@ import type { DataSourceResponse } from '../index.js'; -import type { UmbPagedModel } from './types.js'; +import type { UmbPagedModel } from '../types.js'; export interface UmbCollectionDataSource { getCollection(filter: FilterType): Promise>>; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/move/move-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/move/move-repository.interface.ts index 487a7e4446..540fd0001a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/move/move-repository.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/move/move-repository.interface.ts @@ -1,4 +1,4 @@ -import type { UmbDataSourceErrorResponse } from './data-source/index.js'; +import type { UmbDataSourceErrorResponse } from '../data-source/index.js'; export interface UmbMoveRepository { move(unique: string, targetUnique: string): Promise; From 6ccd864f3ab494be9c55345351ffb6345aff18b3 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 23 Feb 2024 19:47:18 +0100 Subject: [PATCH 06/10] move collection repo interfaces to collection module --- .../src/packages/core/collection/index.ts | 1 + .../repository}/collection-data-source.interface.ts | 4 ++-- .../repository/collection-repository.interface.ts | 0 .../src/packages/core/collection/repository/index.ts | 2 ++ .../src/packages/core/repository/data-source/index.ts | 1 - .../src/packages/core/repository/detail/index.ts | 1 + .../src/packages/core/repository/index.ts | 3 --- 7 files changed, 6 insertions(+), 6 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/core/{repository/data-source => collection/repository}/collection-data-source.interface.ts (58%) rename src/Umbraco.Web.UI.Client/src/packages/core/{ => collection}/repository/collection-repository.interface.ts (100%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/collection/repository/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/index.ts index 724bcad260..ea28b055bd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/index.ts @@ -13,3 +13,4 @@ export { UMB_COLLECTION_ALIAS_CONDITION } from './collection-alias.condition.js' export { UMB_COLLECTION_BULK_ACTION_PERMISSION_CONDITION } from './collection-bulk-action-permission.condition.js'; export { UmbCollectionActionElement, UmbCollectionActionBase } from './action/index.js'; +export type { UmbCollectionDataSource, UmbCollectionRepository } from './repository/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/collection-data-source.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/repository/collection-data-source.interface.ts similarity index 58% rename from src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/collection-data-source.interface.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/collection/repository/collection-data-source.interface.ts index 952b7e0122..3f256fce86 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/collection-data-source.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/repository/collection-data-source.interface.ts @@ -1,5 +1,5 @@ -import type { DataSourceResponse } from '../index.js'; -import type { UmbPagedModel } from '../types.js'; +import type { DataSourceResponse } from '../../repository/index.js'; +import type { UmbPagedModel } from '../../repository/types.js'; export interface UmbCollectionDataSource { getCollection(filter: FilterType): Promise>>; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/collection-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/repository/collection-repository.interface.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/repository/collection-repository.interface.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/collection/repository/collection-repository.interface.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/repository/index.ts new file mode 100644 index 0000000000..0bb7639017 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/repository/index.ts @@ -0,0 +1,2 @@ +export type { UmbCollectionDataSource } from './collection-data-source.interface.js'; +export type { UmbCollectionRepository } from './collection-repository.interface.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts index 7f005b5524..d586f297a9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts @@ -1,3 +1,2 @@ -export * from './collection-data-source.interface.js'; export * from './data-source-response.interface.js'; export * from '../types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/detail/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/detail/index.ts index 79f90f5f1a..72321c033e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/detail/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/detail/index.ts @@ -1,2 +1,3 @@ export type { UmbDetailDataSource, UmbDetailDataSourceConstructor } from './detail-data-source.interface.js'; export { UmbDetailRepositoryBase } from './detail-repository-base.js'; +export type { UmbDetailRepository } from './detail-repository.interface.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts index c3b8b01ecc..f70170091f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts @@ -1,7 +1,4 @@ export * from './data-source/index.js'; -export * from './detail/detail-repository.interface.js'; -export * from './collection-repository.interface.js'; -export * from './move/move-repository.interface.js'; export * from './repository-items.manager.js'; export * from './repository-base.js'; From f7ab317a07901e24a68d4dd1e1249ee286c5034b Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 23 Feb 2024 19:56:24 +0100 Subject: [PATCH 07/10] update import of collection interfaces --- .../core/collection/default/collection-default.context.ts | 3 +-- .../repository/extension-collection.repository.ts | 3 ++- .../src/packages/core/repository/data-source/index.ts | 1 - .../repository/dictionary-collection.repository.ts | 2 +- .../repository/dictionary-collection.server.data-source.ts | 2 +- .../src/packages/dictionary/collection/repository/types.ts | 2 +- .../repository/document-collection.repository.ts | 2 +- .../repository/document-collection.server.data-source.ts | 7 ++++--- .../repository/language-collection.repository.ts | 2 +- .../repository/language-collection.server.data-source.ts | 2 +- .../src/packages/language/collection/repository/types.ts | 2 +- .../collection/repository/media-collection.repository.ts | 2 +- .../repository/media-collection.server.data-source.ts | 2 +- .../repository/member-group-collection.repository.ts | 2 +- .../member-group-collection.server.data-source.ts | 2 +- .../members/member-group/collection/repository/types.ts | 2 +- .../collection/repository/member-collection.repository.ts | 2 +- .../repository/member-collection.server.data-source.ts | 2 +- .../packages/members/member/collection/repository/types.ts | 2 +- .../repository/sources/relation-type.server.data.ts | 6 +----- .../repository/user-group-collection.repository.ts | 2 +- .../repository/user-group-collection.server.data-source.ts | 2 +- .../src/packages/user/user/collection/repository/types.ts | 2 +- .../collection/repository/user-collection.repository.ts | 2 +- .../repository/user-collection.server.data-source.ts | 2 +- 25 files changed, 28 insertions(+), 32 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/default/collection-default.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/default/collection-default.context.ts index b5e7d859ae..4a678c6b25 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/default/collection-default.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/default/collection-default.context.ts @@ -9,8 +9,7 @@ import { UmbSelectionManager, UmbPaginationManager } from '@umbraco-cms/backoffi import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import type { ManifestCollection, ManifestRepository } from '@umbraco-cms/backoffice/extension-registry'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; -import type { UmbCollectionFilterModel } from '@umbraco-cms/backoffice/collection'; -import type { UmbCollectionRepository } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionFilterModel, UmbCollectionRepository } from '@umbraco-cms/backoffice/collection'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export class UmbDefaultCollectionContext< diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/repository/extension-collection.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/repository/extension-collection.repository.ts index b22217c949..ec027d897b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/repository/extension-collection.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/repository/extension-collection.repository.ts @@ -1,7 +1,8 @@ import { umbExtensionsRegistry } from '../../registry.js'; import type { ManifestTypes } from '../../models/index.js'; -import { UmbRepositoryBase, type UmbCollectionRepository } from '@umbraco-cms/backoffice/repository'; +import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; +import type { UmbCollectionRepository } from '@umbraco-cms/backoffice/collection'; export interface UmbExtensionCollectionFilter { skip: number; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts index d586f297a9..e3d0208758 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts @@ -1,2 +1 @@ export * from './data-source-response.interface.js'; -export * from '../types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/dictionary-collection.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/dictionary-collection.repository.ts index 3f02a0ee2e..0ee0ed768e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/dictionary-collection.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/dictionary-collection.repository.ts @@ -1,7 +1,7 @@ import type { UmbDictionaryCollectionFilterModel } from '../types.js'; import { UmbDictionaryCollectionServerDataSource } from './dictionary-collection.server.data-source.js'; import type { UmbDictionaryCollectionDataSource } from './types.js'; -import type { UmbCollectionRepository } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionRepository } from '@umbraco-cms/backoffice/collection'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export class UmbDictionaryCollectionRepository implements UmbCollectionRepository { diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/dictionary-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/dictionary-collection.server.data-source.ts index 61aeaedeab..f1c9e01e53 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/dictionary-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/dictionary-collection.server.data-source.ts @@ -1,6 +1,6 @@ import type { UmbDictionaryCollectionFilterModel, UmbDictionaryCollectionModel } from '../types.js'; import { UMB_DICTIONARY_ENTITY_TYPE } from '../../entity.js'; -import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; import { DictionaryResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/types.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/types.ts index 1827cc0f29..8b4fc32709 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/collection/repository/types.ts @@ -1,5 +1,5 @@ import type { UmbDictionaryCollectionFilterModel, UmbDictionaryCollectionModel } from '../types.js'; -import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; export type UmbDictionaryCollectionDataSource = UmbCollectionDataSource< UmbDictionaryCollectionModel, diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/repository/document-collection.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/repository/document-collection.repository.ts index ebd5b771b2..47042ffd2d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/repository/document-collection.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/repository/document-collection.repository.ts @@ -1,6 +1,6 @@ import type { UmbDocumentCollectionFilterModel } from '../types.js'; import { UmbDocumentCollectionServerDataSource } from './document-collection.server.data-source.js'; -import type { UmbCollectionRepository } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionRepository } from '@umbraco-cms/backoffice/collection'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export class UmbDocumentCollectionRepository implements UmbCollectionRepository { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/repository/document-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/repository/document-collection.server.data-source.ts index febaef4250..d2709afa67 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/repository/document-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/repository/document-collection.server.data-source.ts @@ -2,7 +2,7 @@ import type { UmbDocumentCollectionFilterModel, UmbDocumentCollectionItemModel } import { DirectionModel, DocumentResource } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { DocumentCollectionResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export class UmbDocumentCollectionServerDataSource implements UmbCollectionDataSource { @@ -36,7 +36,6 @@ export class UmbDocumentCollectionServerDataSource implements UmbCollectionDataS if (data) { const items = data.items.map((item: DocumentCollectionResponseModel) => { - // TODO: [LK] Temp solution, review how to get the name from the corresponding variant. const variant = item.variants[0]; @@ -49,7 +48,9 @@ export class UmbDocumentCollectionServerDataSource implements UmbCollectionDataS state: variant.state, updateDate: new Date(variant.updateDate), updater: item.updater, - values: item.values.map((item) => { return { alias: item.alias, value: item.value }; }), + values: item.values.map((item) => { + return { alias: item.alias, value: item.value }; + }), }; return model; }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/language-collection.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/language-collection.repository.ts index f4078e4ccd..8f2a018756 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/language-collection.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/language-collection.repository.ts @@ -1,7 +1,7 @@ import type { UmbLanguageCollectionFilterModel } from '../types.js'; import { UmbLanguageCollectionServerDataSource } from './language-collection.server.data-source.js'; import type { UmbLanguageCollectionDataSource } from './types.js'; -import type { UmbCollectionRepository } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionRepository } from '@umbraco-cms/backoffice/collection'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export class UmbLanguageCollectionRepository implements UmbCollectionRepository { diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/language-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/language-collection.server.data-source.ts index 2a7910bfa7..d336aae76e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/language-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/language-collection.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbLanguageCollectionFilterModel } from '../types.js'; import type { UmbLanguageDetailModel } from '../../types.js'; import { UMB_LANGUAGE_ENTITY_TYPE } from '../../entity.js'; -import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; import { LanguageResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/types.ts b/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/types.ts index ebc992f8ef..8c5a676ecc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/collection/repository/types.ts @@ -1,6 +1,6 @@ import type { UmbLanguageDetailModel } from '../../types.js'; import type { UmbLanguageCollectionFilterModel } from '../types.js'; -import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; export type UmbLanguageCollectionDataSource = UmbCollectionDataSource< UmbLanguageDetailModel, diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/repository/media-collection.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/repository/media-collection.repository.ts index 5e50325d21..5b1df5cf8b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/repository/media-collection.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/repository/media-collection.repository.ts @@ -1,6 +1,6 @@ import type { UmbMediaCollectionFilterModel } from '../types.js'; import { UmbMediaCollectionServerDataSource } from './media-collection.server.data-source.js'; -import type { UmbCollectionRepository } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionRepository } from '@umbraco-cms/backoffice/collection'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export class UmbMediaCollectionRepository implements UmbCollectionRepository { diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/repository/media-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/repository/media-collection.server.data-source.ts index 18c29e0801..3f8b3fc203 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/repository/media-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/repository/media-collection.server.data-source.ts @@ -2,7 +2,7 @@ import type { UmbMediaCollectionFilterModel, UmbMediaCollectionItemModel } from import { DirectionModel, MediaResource } from '@umbraco-cms/backoffice/external/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import type { MediaCollectionResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; -import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export class UmbMediaCollectionServerDataSource implements UmbCollectionDataSource { diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/repository/member-group-collection.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/repository/member-group-collection.repository.ts index e98edce3b7..436484d116 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/repository/member-group-collection.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/repository/member-group-collection.repository.ts @@ -1,7 +1,7 @@ import type { UmbMemberGroupCollectionFilterModel } from '../types.js'; import { UmbMemberGroupCollectionServerDataSource } from './member-group-collection.server.data-source.js'; import type { UmbMemberGroupCollectionDataSource } from './types.js'; -import type { UmbCollectionRepository } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionRepository } from '@umbraco-cms/backoffice/collection'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export class UmbMemberGroupCollectionRepository implements UmbCollectionRepository { diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/repository/member-group-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/repository/member-group-collection.server.data-source.ts index 79c5e9d2fe..cd9cefd13e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/repository/member-group-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/repository/member-group-collection.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbMemberGroupCollectionFilterModel, UmbMemberGroupCollectionModel } from '../types.js'; import type { UmbMemberGroupDetailModel } from '../../types.js'; import { UMB_MEMBER_GROUP_ENTITY_TYPE } from '../../entity.js'; -import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/repository/types.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/repository/types.ts index 547df8ec0f..e2f3fbfcb1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/repository/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/repository/types.ts @@ -1,5 +1,5 @@ import type { UmbMemberGroupCollectionFilterModel, UmbMemberGroupCollectionModel } from '../types.js'; -import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; export type UmbMemberGroupCollectionDataSource = UmbCollectionDataSource< UmbMemberGroupCollectionModel, diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/member-collection.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/member-collection.repository.ts index 3c87047cb2..3cf5f4de08 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/member-collection.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/member-collection.repository.ts @@ -1,7 +1,7 @@ import type { UmbMemberCollectionFilterModel } from '../types.js'; import { UmbMemberCollectionServerDataSource } from './member-collection.server.data-source.js'; import type { UmbMemberCollectionDataSource } from './types.js'; -import type { UmbCollectionRepository } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionRepository } from '@umbraco-cms/backoffice/collection'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export class UmbMemberCollectionRepository implements UmbCollectionRepository { diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/member-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/member-collection.server.data-source.ts index 6b5399cbcb..5c07640b3f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/member-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/member-collection.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbMemberCollectionFilterModel, UmbMemberCollectionModel } from '../types.js'; import type { UmbMemberDetailModel } from '../../types.js'; import { UMB_MEMBER_ENTITY_TYPE } from '../../entity.js'; -import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; import { MemberResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/types.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/types.ts index 3d35f9a39a..e1b249ab1a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/repository/types.ts @@ -1,6 +1,6 @@ import type { UmbMemberDetailModel } from '../../types.js'; import type { UmbMemberCollectionFilterModel } from '../types.js'; -import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; export type UmbMemberCollectionDataSource = UmbCollectionDataSource< UmbMemberDetailModel, diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/sources/relation-type.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/sources/relation-type.server.data.ts index e46c2384b3..decdbf2cf3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/sources/relation-type.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/sources/relation-type.server.data.ts @@ -1,4 +1,3 @@ -import type { UmbDataSource } from '@umbraco-cms/backoffice/repository'; import type { RelationTypeResponseModel, CreateRelationTypeRequestModel, @@ -15,10 +14,7 @@ import { UmbId } from '@umbraco-cms/backoffice/id'; * @class UmbRelationTypeServerDataSource * @implements {RepositoryDetailDataSource} */ -export class UmbRelationTypeServerDataSource - implements - UmbDataSource -{ +export class UmbRelationTypeServerDataSource { #host: UmbControllerHost; /** diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.repository.ts index 154cad42b8..af519d97f1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.repository.ts @@ -3,7 +3,7 @@ import type { UmbUserGroupDetailStore } from '../../repository/index.js'; import { UMB_USER_GROUP_DETAIL_STORE_CONTEXT } from '../../repository/index.js'; import type { UmbUserGroupCollectionFilterModel } from '../types.js'; import { UmbUserGroupCollectionServerDataSource } from './user-group-collection.server.data-source.js'; -import type { UmbCollectionDataSource, UmbCollectionRepository } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionDataSource, UmbCollectionRepository } from '@umbraco-cms/backoffice/collection'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data-source.ts index 1fde909b47..bc4dedf5f7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data-source.ts @@ -2,7 +2,7 @@ import type { UmbUserGroupCollectionFilterModel } from '../types.js'; import type { UmbUserGroupDetailModel } from '../../types.js'; import { UMB_USER_GROUP_ENTITY_TYPE } from '../../entity.js'; import { UserGroupResource } from '@umbraco-cms/backoffice/external/backend-api'; -import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/types.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/types.ts index 8f7093e737..74b0522535 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/types.ts @@ -1,6 +1,6 @@ import type { UmbUserDetailModel } from '../../types.js'; import type { UmbUserCollectionFilterModel } from '../types.js'; -import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; export interface UmbUserCollectionDataSource extends UmbCollectionDataSource {} diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.repository.ts index a7d802cdb1..c2de31c1b7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.repository.ts @@ -2,7 +2,7 @@ import { UmbUserRepositoryBase } from '../../repository/user-repository-base.js' import type { UmbUserCollectionFilterModel } from '../types.js'; import { UmbUserCollectionServerDataSource } from './user-collection.server.data-source.js'; import type { UmbUserCollectionDataSource } from './types.js'; -import type { UmbCollectionRepository } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionRepository } from '@umbraco-cms/backoffice/collection'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export class UmbUserCollectionRepository extends UmbUserRepositoryBase implements UmbCollectionRepository { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data-source.ts index 170ebce01c..3775ebad50 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data-source.ts @@ -1,7 +1,7 @@ import type { UmbUserDetailModel } from '../../types.js'; import { UMB_USER_ENTITY_TYPE } from '../../entity.js'; import type { UmbUserCollectionFilterModel } from '../types.js'; -import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/repository'; +import type { UmbCollectionDataSource } from '@umbraco-cms/backoffice/collection'; import type { UserResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import { UserResource } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; From eb28636edba985db6fa4b4ccb381b82d40d5991e Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 23 Feb 2024 19:59:24 +0100 Subject: [PATCH 08/10] remove folder --- .../{data-source => }/data-source-response.interface.ts | 0 .../src/packages/core/repository/data-source/index.ts | 1 - .../src/packages/core/repository/index.ts | 2 +- .../core/tree/folder/folder-data-source.interface.ts | 5 +---- 4 files changed, 2 insertions(+), 6 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/core/repository/{data-source => }/data-source-response.interface.ts (100%) delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/data-source-response.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source-response.interface.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/data-source-response.interface.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source-response.interface.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts deleted file mode 100644 index e3d0208758..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './data-source-response.interface.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts index f70170091f..cbfe2eafc0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts @@ -1,9 +1,9 @@ -export * from './data-source/index.js'; export * from './repository-items.manager.js'; export * from './repository-base.js'; export * from './item/index.js'; export * from './detail/index.js'; +export type { DataSourceResponse, UmbDataSourceErrorResponse } from './data-source-response.interface.js'; export type { UmbMoveDataSource, UmbMoveRepository } from './move/index.js'; export type { UmbCopyDataSource, UmbCopyRepository } from './copy/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/folder-data-source.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/folder-data-source.interface.ts index 9da5cf5611..9b5763942b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/folder-data-source.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/folder-data-source.interface.ts @@ -1,7 +1,4 @@ -import type { - DataSourceResponse, - UmbDataSourceErrorResponse, -} from '../../repository/data-source/data-source-response.interface.js'; +import type { DataSourceResponse, UmbDataSourceErrorResponse } from '@umbraco-cms/backoffice/repository'; import type { UmbCreateFolderModel, UmbFolderModel, UmbUpdateFolderModel } from './types.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; From e61157b21c498cd3a9ab43867d21670c6f697570 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 23 Feb 2024 20:01:49 +0100 Subject: [PATCH 09/10] export of paged data model --- src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts index cbfe2eafc0..584a609b30 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/index.ts @@ -7,3 +7,4 @@ export * from './detail/index.js'; export type { DataSourceResponse, UmbDataSourceErrorResponse } from './data-source-response.interface.js'; export type { UmbMoveDataSource, UmbMoveRepository } from './move/index.js'; export type { UmbCopyDataSource, UmbCopyRepository } from './copy/index.js'; +export type { UmbPagedModel } from './types.js'; From 5f5ed9ab841e4170ac36c75984e00187d59aa7ed Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 23 Feb 2024 20:04:48 +0100 Subject: [PATCH 10/10] import updates --- .../packages/core/repository/copy/copy-repository.interface.ts | 2 +- .../core/repository/detail/detail-data-source.interface.ts | 2 +- .../core/repository/detail/detail-repository.interface.ts | 2 +- .../packages/core/repository/move/move-repository.interface.ts | 2 +- .../packages/core/tree/folder/folder-repository.interface.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/copy/copy-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/copy/copy-repository.interface.ts index f017ad5f4b..7dd2abe75b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/copy/copy-repository.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/copy/copy-repository.interface.ts @@ -1,4 +1,4 @@ -import type { DataSourceResponse } from '../data-source/index.js'; +import type { DataSourceResponse } from '../data-source-response.interface.js'; export interface UmbCopyRepository { copy(unique: string, targetUnique: string): Promise>; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/detail/detail-data-source.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/detail/detail-data-source.interface.ts index 799f508af6..dd0f37a173 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/detail/detail-data-source.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/detail/detail-data-source.interface.ts @@ -1,4 +1,4 @@ -import type { DataSourceResponse } from '../data-source/index.js'; +import type { DataSourceResponse } from '../data-source-response.interface.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export interface UmbDetailDataSourceConstructor { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/detail/detail-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/detail/detail-repository.interface.ts index 7e93071c85..1bf5213cdf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/detail/detail-repository.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/detail/detail-repository.interface.ts @@ -1,4 +1,4 @@ -import type { DataSourceResponse, UmbDataSourceErrorResponse } from '../data-source/index.js'; +import type { DataSourceResponse, UmbDataSourceErrorResponse } from '../data-source-response.interface.js'; import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; export interface UmbDetailRepository { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/move/move-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/move/move-repository.interface.ts index 540fd0001a..df80f262a8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/move/move-repository.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/move/move-repository.interface.ts @@ -1,4 +1,4 @@ -import type { UmbDataSourceErrorResponse } from '../data-source/index.js'; +import type { UmbDataSourceErrorResponse } from '../data-source-response.interface.js'; export interface UmbMoveRepository { move(unique: string, targetUnique: string): Promise; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/folder-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/folder-repository.interface.ts index 5abefb09f5..3da288efc6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/folder-repository.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/folder/folder-repository.interface.ts @@ -1,5 +1,5 @@ -import type { DataSourceResponse, UmbDataSourceErrorResponse } from '../../repository/data-source/index.js'; import type { UmbCreateFolderModel, UmbFolderModel, UmbUpdateFolderModel } from './types.js'; +import type { DataSourceResponse, UmbDataSourceErrorResponse } from '@umbraco-cms/backoffice/repository'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; export interface UmbFolderRepository extends UmbApi { createScaffold(parentUnique: string | null): Promise>;