From 3c831d1c26b240b07affadf23e24e672fa5e6b29 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 15 May 2024 14:07:26 +0200 Subject: [PATCH] add type --- .../src/mocks/data/user/user.db.ts | 21 ++++++++++++++----- .../mocks/handlers/user/filter.handlers.ts | 2 +- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts index 1725d64d10..b30b8cc216 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts @@ -17,11 +17,22 @@ import type { } from '@umbraco-cms/backoffice/external/backend-api'; import { UserStateModel } from '@umbraco-cms/backoffice/external/backend-api'; -const userGroupFilter = (filterOptions: any, item: UmbMockUserModel) => +interface UserFilterOptions { + skip: number; + take: number; + orderBy: string; + orderDirection: string; + userGroupIds: Array<{ id: string }>; + userStates: Array; + filter: string; +} + +const userGroupFilter = (filterOptions: UserFilterOptions, item: UmbMockUserModel) => arrayFilter(filterOptions.userGroupIds, item.userGroupIds); -const userStateFilter = (filterOptions: any, item: UmbMockUserModel) => +const userStateFilter = (filterOptions: UserFilterOptions, item: UmbMockUserModel) => stringFilter(filterOptions.userStates, item.state); -const userQueryFilter = (filterOptions: any, item: UmbMockUserModel) => queryFilter(filterOptions.filter, item.name); +const userQueryFilter = (filterOptions: UserFilterOptions, item: UmbMockUserModel) => + queryFilter(filterOptions.filter, item.name); // Temp mocked database class UmbUserMockDB extends UmbEntityMockDbBase { @@ -155,10 +166,10 @@ class UmbUserMockDB extends UmbEntityMockDbBase { return { userId: newUserId }; } - filter(options: any): PagedUserResponseModel { + filter(options: UserFilterOptions): PagedUserResponseModel { const allItems = this.getAll(); - const filterOptions = { + const filterOptions: UserFilterOptions = { skip: options.skip || 0, take: options.take || 25, orderBy: options.orderBy || 'name', diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/filter.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/filter.handlers.ts index 8d078cfb57..f01d2922a3 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/filter.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/filter.handlers.ts @@ -13,7 +13,7 @@ export const handlers = [ const userStates = req.url.searchParams.getAll('userStates'); const filter = req.url.searchParams.get('filter'); - const options = { + const options: any = { skip: skip || undefined, take: take || undefined, orderBy: orderBy || undefined,