yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename filterCollection to getCollection

Browse Source
This commit is contained in:
Mads Rasmussen
2023-11-02 12:30:12 +01:00
parent 07840ea99e
commit 30c339d10f
7 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/collection-data-source.interface.ts
View File

@@ -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<ItemType = any, PagedItemType = UmbPagedData<ItemType>> {
filterCollection(filter: any): Promise<DataSourceResponse<PagedItemType>>;
export interface UmbCollectionDataSource<ItemType = any, FilterType = unknown> {
getCollection(filter: FilterType): Promise<DataSourceResponse<UmbPagedData<ItemType>>>;
}

4
src/Umbraco.Web.UI.Client/src/packages/core/repository/data-source/types.ts Normal file
View File

@@ -0,0 +1,4 @@
export interface UmbPagedData<T> {
total: number;
items: Array<T>;
}

8
src/Umbraco.Web.UI.Client/src/packages/core/repository/tree-repository.interface.ts
View File

@@ -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<T> {
total: number;
items: Array<T>;
}
export interface UmbTreeRepository<
TreeItemType extends EntityTreeItemResponseModel,
TreeRootType extends UmbTreeRootModel = UmbTreeRootEntityModel

2
src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.repository.ts
View File

@@ -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);

2
src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.server.data.ts
View File

@@ -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({}));
}

5
src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.repository.ts
View File

@@ -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<UserResponseModel>;
#collectionSource: UmbCollectionDataSource<UserResponseModel, UmbUserCollectionFilterModel>;
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);
}

2
src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data.ts
View File

@@ -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<UmbUserDetail>(response, {
entityType: USER_ENTITY_TYPE,