From a47a22c0f78db1631dc5cae931d4a2183d01d07e Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 22 Nov 2023 13:32:00 +0100 Subject: [PATCH] split up user db and data --- .../src/mocks/data/user/user.data.ts | 89 +++++++++++++++++ .../data/{user.data.ts => user/user.db.ts} | 95 +------------------ .../mocks/handlers/user/current.handlers.ts | 2 +- .../mocks/handlers/user/detail.handlers.ts | 2 +- .../mocks/handlers/user/disable.handlers.ts | 2 +- .../mocks/handlers/user/enable.handlers.ts | 2 +- .../mocks/handlers/user/filter.handlers.ts | 2 +- .../mocks/handlers/user/invite.handlers.ts | 2 +- .../src/mocks/handlers/user/item.handlers.ts | 2 +- .../handlers/user/set-user-groups.handlers.ts | 2 +- .../mocks/handlers/user/unlock.handlers.ts | 2 +- 11 files changed, 102 insertions(+), 100 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/mocks/data/user/user.data.ts rename src/Umbraco.Web.UI.Client/src/mocks/data/{user.data.ts => user/user.db.ts} (63%) diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.data.ts new file mode 100644 index 0000000000..c10f52fb45 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.data.ts @@ -0,0 +1,89 @@ +import { UserResponseModel, UserStateModel } from '@umbraco-cms/backoffice/backend-api'; + +export const data: Array = [ + { + id: 'bca6c733-a63d-4353-a271-9a8b6bcca8bd', + type: 'user', + contentStartNodeIds: [], + mediaStartNodeIds: [], + name: 'Umbraco User', + email: 'noreply@umbraco.com', + languageIsoCode: 'en-US', + state: UserStateModel.ACTIVE, + lastLoginDate: '9/10/2022', + lastLockoutDate: '11/23/2021', + lastPasswordChangeDate: '1/10/2022', + updateDate: '2/10/2022', + createDate: '3/13/2022', + failedLoginAttempts: 946, + userGroupIds: ['user-group-administrators-id', 'user-group-editors-id'], + }, + { + id: '82e11d3d-b91d-43c9-9071-34d28e62e81d', + type: 'user', + contentStartNodeIds: ['simple-document-id'], + mediaStartNodeIds: ['f2f81a40-c989-4b6b-84e2-057cecd3adc1'], + name: 'Amelie Walker', + email: 'awalker1@domain.com', + languageIsoCode: 'Japanese', + state: UserStateModel.INACTIVE, + lastLoginDate: '2023-10-12T18:30:32.879Z', + lastLockoutDate: null, + lastPasswordChangeDate: '2023-10-12T18:30:32.879Z', + updateDate: '2023-10-12T18:30:32.879Z', + createDate: '2023-10-12T18:30:32.879Z', + failedLoginAttempts: 0, + userGroupIds: ['user-group-administrators-id'], + }, + { + id: 'aa1d83a9-bc7f-47d2-b288-58d8a31f5017', + type: 'user', + contentStartNodeIds: [], + mediaStartNodeIds: [], + name: 'Oliver Kim', + email: 'okim1@domain.com', + languageIsoCode: 'Russian', + state: UserStateModel.ACTIVE, + lastLoginDate: '2023-10-12T18:30:32.879Z', + lastLockoutDate: null, + lastPasswordChangeDate: '2023-10-12T18:30:32.879Z', + updateDate: '2023-10-12T18:30:32.879Z', + createDate: '2023-10-12T18:30:32.879Z', + failedLoginAttempts: 0, + userGroupIds: ['user-group-administrators-id'], + }, + { + id: 'ff2f4a50-d3d4-4bc4-869d-c7948c160e54', + type: 'user', + contentStartNodeIds: [], + mediaStartNodeIds: [], + name: 'Eliana Nieves', + email: 'enieves1@domain.com', + languageIsoCode: 'Spanish', + state: UserStateModel.INVITED, + lastLoginDate: '2023-10-12T18:30:32.879Z', + lastLockoutDate: null, + lastPasswordChangeDate: null, + updateDate: '2023-10-12T18:30:32.879Z', + createDate: '2023-10-12T18:30:32.879Z', + failedLoginAttempts: 0, + userGroupIds: ['user-group-administrators-id'], + }, + { + id: 'c290c6d9-9f12-4838-8567-621b52a178de', + type: 'user', + contentStartNodeIds: [], + mediaStartNodeIds: [], + name: 'Jasmine Patel', + email: 'jpatel1@domain.com', + languageIsoCode: 'Hindi', + state: UserStateModel.LOCKED_OUT, + lastLoginDate: '2023-10-12T18:30:32.879Z', + lastLockoutDate: '2023-10-12T18:30:32.879Z', + lastPasswordChangeDate: null, + updateDate: '2023-10-12T18:30:32.879Z', + createDate: '2023-10-12T18:30:32.879Z', + failedLoginAttempts: 25, + userGroupIds: ['user-group-administrators-id'], + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/user.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts similarity index 63% rename from src/Umbraco.Web.UI.Client/src/mocks/data/user.data.ts rename to src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts index 31fa389e2d..814c6f59d4 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/user.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts @@ -1,6 +1,7 @@ -import { UmbEntityData } from './entity.data.js'; -import { umbUserGroupData } from './user-group/user-group.db.js'; -import { arrayFilter, stringFilter, queryFilter } from './utils.js'; +import { UmbEntityData } from '../entity.data.js'; +import { umbUserGroupData } from '../user-group/user-group.db.js'; +import { arrayFilter, stringFilter, queryFilter } from '../utils.js'; +import { data } from '../data-type.data.js'; import { UmbId } from '@umbraco-cms/backoffice/id'; import { UmbCurrentUser } from '@umbraco-cms/backoffice/current-user'; import { @@ -188,92 +189,4 @@ class UmbUserData extends UmbEntityData { } } -export const data: Array = [ - { - id: 'bca6c733-a63d-4353-a271-9a8b6bcca8bd', - type: 'user', - contentStartNodeIds: [], - mediaStartNodeIds: [], - name: 'Umbraco User', - email: 'noreply@umbraco.com', - languageIsoCode: 'en-US', - state: UserStateModel.ACTIVE, - lastLoginDate: '9/10/2022', - lastLockoutDate: '11/23/2021', - lastPasswordChangeDate: '1/10/2022', - updateDate: '2/10/2022', - createDate: '3/13/2022', - failedLoginAttempts: 946, - userGroupIds: ['user-group-administrators-id', 'user-group-editors-id'], - }, - { - id: '82e11d3d-b91d-43c9-9071-34d28e62e81d', - type: 'user', - contentStartNodeIds: ['simple-document-id'], - mediaStartNodeIds: ['f2f81a40-c989-4b6b-84e2-057cecd3adc1'], - name: 'Amelie Walker', - email: 'awalker1@domain.com', - languageIsoCode: 'Japanese', - state: UserStateModel.INACTIVE, - lastLoginDate: '2023-10-12T18:30:32.879Z', - lastLockoutDate: null, - lastPasswordChangeDate: '2023-10-12T18:30:32.879Z', - updateDate: '2023-10-12T18:30:32.879Z', - createDate: '2023-10-12T18:30:32.879Z', - failedLoginAttempts: 0, - userGroupIds: ['user-group-administrators-id'], - }, - { - id: 'aa1d83a9-bc7f-47d2-b288-58d8a31f5017', - type: 'user', - contentStartNodeIds: [], - mediaStartNodeIds: [], - name: 'Oliver Kim', - email: 'okim1@domain.com', - languageIsoCode: 'Russian', - state: UserStateModel.ACTIVE, - lastLoginDate: '2023-10-12T18:30:32.879Z', - lastLockoutDate: null, - lastPasswordChangeDate: '2023-10-12T18:30:32.879Z', - updateDate: '2023-10-12T18:30:32.879Z', - createDate: '2023-10-12T18:30:32.879Z', - failedLoginAttempts: 0, - userGroupIds: ['user-group-administrators-id'], - }, - { - id: 'ff2f4a50-d3d4-4bc4-869d-c7948c160e54', - type: 'user', - contentStartNodeIds: [], - mediaStartNodeIds: [], - name: 'Eliana Nieves', - email: 'enieves1@domain.com', - languageIsoCode: 'Spanish', - state: UserStateModel.INVITED, - lastLoginDate: '2023-10-12T18:30:32.879Z', - lastLockoutDate: null, - lastPasswordChangeDate: null, - updateDate: '2023-10-12T18:30:32.879Z', - createDate: '2023-10-12T18:30:32.879Z', - failedLoginAttempts: 0, - userGroupIds: ['user-group-administrators-id'], - }, - { - id: 'c290c6d9-9f12-4838-8567-621b52a178de', - type: 'user', - contentStartNodeIds: [], - mediaStartNodeIds: [], - name: 'Jasmine Patel', - email: 'jpatel1@domain.com', - languageIsoCode: 'Hindi', - state: UserStateModel.LOCKED_OUT, - lastLoginDate: '2023-10-12T18:30:32.879Z', - lastLockoutDate: '2023-10-12T18:30:32.879Z', - lastPasswordChangeDate: null, - updateDate: '2023-10-12T18:30:32.879Z', - createDate: '2023-10-12T18:30:32.879Z', - failedLoginAttempts: 25, - userGroupIds: ['user-group-administrators-id'], - }, -]; - export const umbUsersData = new UmbUserData(data); diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/current.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/current.handlers.ts index 889b4e8aad..6ce117649d 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/current.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/current.handlers.ts @@ -1,5 +1,5 @@ const { rest } = window.MockServiceWorker; -import { umbUsersData } from '../../data/user.data.js'; +import { umbUsersData } from '../../data/user/user.db.js'; import { UMB_SLUG } from './slug.js'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/detail.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/detail.handlers.ts index 90bf0f8588..67664fd48f 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/detail.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/detail.handlers.ts @@ -1,5 +1,5 @@ const { rest } = window.MockServiceWorker; -import { umbUsersData } from '../../data/user.data.js'; +import { umbUsersData } from '../../data/user/user.db.js'; import { UMB_SLUG } from './slug.js'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/disable.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/disable.handlers.ts index fcaef8c691..1ac22761ce 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/disable.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/disable.handlers.ts @@ -1,5 +1,5 @@ const { rest } = window.MockServiceWorker; -import { umbUsersData } from '../../data/user.data.js'; +import { umbUsersData } from '../../data/user/user.db.js'; import { UMB_SLUG } from './slug.js'; import { DisableUserRequestModel } from '@umbraco-cms/backoffice/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/enable.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/enable.handlers.ts index c02e12947d..029d31ce63 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/enable.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/enable.handlers.ts @@ -1,5 +1,5 @@ const { rest } = window.MockServiceWorker; -import { umbUsersData } from '../../data/user.data.js'; +import { umbUsersData } from '../../data/user/user.db.js'; import { UMB_SLUG } from './slug.js'; import { EnableUserRequestModel } from '@umbraco-cms/backoffice/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; 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 033e7acc48..cfbbdffd4d 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 @@ -1,5 +1,5 @@ const { rest } = window.MockServiceWorker; -import { umbUsersData } from '../../data/user.data.js'; +import { umbUsersData } from '../../data/user/user.db.js'; import { UMB_SLUG } from './slug.js'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/invite.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/invite.handlers.ts index f1cca800dc..b03239b043 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/invite.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/invite.handlers.ts @@ -1,5 +1,5 @@ const { rest } = window.MockServiceWorker; -import { umbUsersData } from '../../data/user.data.js'; +import { umbUsersData } from '../../data/user/user.db.js'; import { UMB_SLUG } from './slug.js'; import { InviteUserRequestModel } from '@umbraco-cms/backoffice/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/item.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/item.handlers.ts index 1618619c9d..1210a0bc54 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/item.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/item.handlers.ts @@ -1,5 +1,5 @@ const { rest } = window.MockServiceWorker; -import { umbUsersData } from '../../data/user.data.js'; +import { umbUsersData } from '../../data/user/user.db.js'; import { UMB_SLUG } from './slug.js'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/set-user-groups.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/set-user-groups.handlers.ts index 1e984f1e80..d75454521b 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/set-user-groups.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/set-user-groups.handlers.ts @@ -1,5 +1,5 @@ const { rest } = window.MockServiceWorker; -import { umbUsersData } from '../../data/user.data.js'; +import { umbUsersData } from '../../data/user/user.db.js'; import { UMB_SLUG } from './slug.js'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/unlock.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/unlock.handlers.ts index f445ba58fa..1f9c4be73a 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/unlock.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/user/unlock.handlers.ts @@ -1,5 +1,5 @@ const { rest } = window.MockServiceWorker; -import { umbUsersData } from '../../data/user.data.js'; +import { umbUsersData } from '../../data/user/user.db.js'; import { UMB_SLUG } from './slug.js'; import { UnlockUsersRequestModel } from '@umbraco-cms/backoffice/backend-api'; import { umbracoPath } from '@umbraco-cms/backoffice/utils';