From 30c339d10f67bc4b109d1d659fb5535d047cb8bb Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 2 Nov 2023 12:30:12 +0100 Subject: [PATCH] rename filterCollection to getCollection --- .../data-source/collection-data-source.interface.ts | 6 +++--- .../src/packages/core/repository/data-source/types.ts | 4 ++++ .../packages/core/repository/tree-repository.interface.ts | 8 ++------ .../repository/user-group-collection.repository.ts | 2 +- .../repository/user-group-collection.server.data.ts | 2 +- .../collection/repository/user-collection.repository.ts | 5 +++-- .../collection/repository/user-collection.server.data.ts | 2 +- 7 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/types.ts 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 31a27c4f27..8b592ef855 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,6 +1,6 @@ -import type { UmbPagedData } from '../tree-repository.interface.js'; import type { DataSourceResponse } from '../index.js'; +import type { UmbPagedData } from './types.js'; -export interface UmbCollectionDataSource> { - filterCollection(filter: any): Promise>; +export interface UmbCollectionDataSource { + getCollection(filter: FilterType): Promise>>; } 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/data-source/types.ts new file mode 100644 index 0000000000..18876c86af --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/types.ts @@ -0,0 +1,4 @@ +export interface UmbPagedData { + total: number; + items: Array; +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/tree-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/tree-repository.interface.ts index 4fda292e92..1ed01cfdc3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/tree-repository.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/tree-repository.interface.ts @@ -1,12 +1,8 @@ -import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; +import { type UmbPagedData } from './data-source/types.js'; +import { type Observable } from '@umbraco-cms/backoffice/external/rxjs'; import type { UmbTreeRootEntityModel, UmbTreeRootModel } from '@umbraco-cms/backoffice/tree'; import { ProblemDetails, EntityTreeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; -export interface UmbPagedData { - total: number; - items: Array; -} - export interface UmbTreeRepository< TreeItemType extends EntityTreeItemResponseModel, TreeRootType extends UmbTreeRootModel = UmbTreeRootEntityModel 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 c0cccf6e8c..17bc531166 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 @@ -27,7 +27,7 @@ export class UmbUserGroupCollectionRepository implements UmbCollectionRepository async requestCollection(filter: UmbUserGroupCollectionFilterModel = { skip: 0, take: 100 }) { await this.#init; - const { data, error } = await this.#collectionSource.filterCollection(filter); + const { data, error } = await this.#collectionSource.getCollection(filter); if (data) { this.#detailStore?.appendItems(data.items); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data.ts index 16cc62733f..7d6b434109 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data.ts @@ -26,7 +26,7 @@ export class UmbUserGroupCollectionServerDataSource implements UmbCollectionData return tryExecuteAndNotify(this.#host, UserGroupResource.getUserGroup({})); } - filterCollection(filter: UmbUserGroupCollectionFilterModel) { + getCollection(filter: UmbUserGroupCollectionFilterModel) { // TODO: Switch this to the filter endpoint when available return tryExecuteAndNotify(this.#host, UserGroupResource.getUserGroup({})); } 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 6b75c23992..c30c001772 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 @@ -6,7 +6,7 @@ import { UmbCollectionDataSource, UmbCollectionRepository } from '@umbraco-cms/b import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export class UmbUserCollectionRepository extends UmbUserRepositoryBase implements UmbCollectionRepository { - #collectionSource: UmbCollectionDataSource; + #collectionSource: UmbCollectionDataSource; constructor(host: UmbControllerHost) { super(host); @@ -16,9 +16,10 @@ export class UmbUserCollectionRepository extends UmbUserRepositoryBase implement async requestCollection(filter: UmbUserCollectionFilterModel = { skip: 0, take: 100 }) { await this.init; - const { data, error } = await this.#collectionSource.filterCollection(filter); + const { data, error } = await this.#collectionSource.getCollection(filter); if (data) { + debugger; this.detailStore!.appendItems(data.items); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data.ts index 5113cb9af3..2e242108b4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data.ts @@ -40,7 +40,7 @@ export class UmbUserCollectionServerDataSource implements UmbCollectionDataSourc * @return {*} * @memberof UmbUserCollectionServerDataSource */ - async filterCollection(filter: UmbUserCollectionFilterModel) { + async getCollection(filter: UmbUserCollectionFilterModel) { const response = await tryExecuteAndNotify(this.#host, UserResource.getUserFilter(filter)); return extendDataSourcePagedResponseData(response, { entityType: USER_ENTITY_TYPE,