From 0649c0d41ab36bd059b02926db59eb8099f5801d Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 5 Feb 2024 21:10:49 +0100 Subject: [PATCH] mapping after new models --- .../src/mocks/data/user/user.data.ts | 10 +++++----- .../src/mocks/data/user/user.db.ts | 6 +++--- .../user-collection.server.data-source.ts | 6 +++--- .../grid/user-grid-collection-view.element.ts | 2 +- .../user-table-collection-view.element.ts | 4 ++-- .../create/create-user-modal.element.ts | 2 +- .../detail/user-detail.server.data-source.ts | 20 +++++++++---------- .../src/packages/user/user/types.ts | 6 +++--- .../user-workspace-access-settings.element.ts | 17 ++++++++-------- 9 files changed, 37 insertions(+), 36 deletions(-) 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 index 916f0fb978..58cc1f0c83 100644 --- 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 @@ -6,7 +6,7 @@ export type UmbMockUserModel = UserResponseModel & UserItemResponseModel; export const data: Array = [ { id: 'bca6c733-a63d-4353-a271-9a8b6bcca8bd', - contentStartNodeIds: [], + documentStartNodeIds: [], mediaStartNodeIds: [], name: 'Umbraco User', email: 'noreply@umbraco.com', @@ -24,7 +24,7 @@ export const data: Array = [ }, { id: '82e11d3d-b91d-43c9-9071-34d28e62e81d', - contentStartNodeIds: ['simple-document-id'], + documentStartNodeIds: ['simple-document-id'], mediaStartNodeIds: ['f2f81a40-c989-4b6b-84e2-057cecd3adc1'], name: 'Amelie Walker', email: 'awalker1@domain.com', @@ -42,7 +42,7 @@ export const data: Array = [ }, { id: 'aa1d83a9-bc7f-47d2-b288-58d8a31f5017', - contentStartNodeIds: [], + documentStartNodeIds: [], mediaStartNodeIds: [], name: 'Oliver Kim', email: 'okim1@domain.com', @@ -60,7 +60,7 @@ export const data: Array = [ }, { id: 'ff2f4a50-d3d4-4bc4-869d-c7948c160e54', - contentStartNodeIds: [], + documentStartNodeIds: [], mediaStartNodeIds: [], name: 'Eliana Nieves', email: 'enieves1@domain.com', @@ -78,7 +78,7 @@ export const data: Array = [ }, { id: 'c290c6d9-9f12-4838-8567-621b52a178de', - contentStartNodeIds: [], + documentStartNodeIds: [], mediaStartNodeIds: [], name: 'Jasmine Patel', email: 'jpatel1@domain.com', 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 4fedb73312..757ac65cdd 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 @@ -62,7 +62,7 @@ class UmbUserMockDB extends UmbEntityMockDbBase { hasAccessToAllLanguages: true, languageIsoCode: firstUser.languageIsoCode, languages: [], - documentStartNodeIds: firstUser.contentStartNodeIds, + documentStartNodeIds: firstUser.documentStartNodeIds, mediaStartNodeIds: firstUser.mediaStartNodeIds, permissions, }; @@ -163,7 +163,7 @@ const createMockMapper = (item: CreateUserRequestModel): UmbMockUserModel => { userGroupIds: item.userGroupIds, id: UmbId.new(), languageIsoCode: null, - contentStartNodeIds: [], + documentStartNodeIds: [], mediaStartNodeIds: [], avatarUrls: [], state: UserStateModel.INACTIVE, @@ -184,7 +184,7 @@ const detailResponseMapper = (item: UmbMockUserModel): UserResponseModel => { userGroupIds: item.userGroupIds, id: item.id, languageIsoCode: item.languageIsoCode, - contentStartNodeIds: item.contentStartNodeIds, + documentStartNodeIds: item.documentStartNodeIds, mediaStartNodeIds: item.mediaStartNodeIds, avatarUrls: item.avatarUrls, state: item.state, 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 546554d4f6..9f654ee9ae 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 @@ -46,11 +46,11 @@ export class UmbUserCollectionServerDataSource implements UmbCollectionDataSourc email: item.email, userName: item.userName, name: item.name, - userGroupIds: item.userGroupIds, + userGroupUniques: item.userGroupIds, unique: item.id, languageIsoCode: item.languageIsoCode || null, - contentStartNodeIds: item.contentStartNodeIds, - mediaStartNodeIds: item.mediaStartNodeIds, + documentStartNodeUniques: item.documentStartNodeIds, + mediaStartNodeUniques: item.mediaStartNodeIds, avatarUrls: item.avatarUrls, state: item.state, failedLoginAttempts: item.failedLoginAttempts, diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/grid/user-grid-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/grid/user-grid-collection-view.element.ts index 236782dfef..69447aab3e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/grid/user-grid-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/grid/user-grid-collection-view.element.ts @@ -107,7 +107,7 @@ export class UmbUserGridCollectionViewElement extends UmbLitElement { #renderUserGroupNames(user: UmbUserDetailModel) { const userGroupNames = this.#userGroups - .filter((userGroup) => user.userGroupIds?.includes(userGroup.unique)) + .filter((userGroup) => user.userGroupUniques?.includes(userGroup.unique)) .map((userGroup) => userGroup.name) .join(', '); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/user-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/user-table-collection-view.element.ts index 292f8397a1..76344d6a62 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/user-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/user-table-collection-view.element.ts @@ -87,7 +87,7 @@ export class UmbUserTableCollectionViewElement extends UmbLitElement { async #observeUserGroups() { if (this._users.length === 0) return; - const userGroupsIds = [...new Set(this._users.flatMap((user) => user.userGroupIds))]; + const userGroupsIds = [...new Set(this._users.flatMap((user) => user.userGroupUniques))]; const { asObservable } = await this.#userGroupItemRepository.requestItems(userGroupsIds); this.observe( asObservable(), @@ -121,7 +121,7 @@ export class UmbUserTableCollectionViewElement extends UmbLitElement { }, { columnAlias: 'userGroup', - value: this.#getUserGroupNames(user.userGroupIds ?? []), + value: this.#getUserGroupNames(user.userGroupUniques ?? []), }, { columnAlias: 'userLastLogin', diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/create-user-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/create-user-modal.element.ts index 9ee4cf0a3f..1568423786 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/create-user-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/create-user-modal.element.ts @@ -45,7 +45,7 @@ export class UmbCreateUserModalElement extends UmbModalBaseElement { userScaffold.name = name; userScaffold.email = email; userScaffold.userName = email; - userScaffold.userGroupIds = userGroups; + userScaffold.userGroupUniques = userGroups; // TODO: figure out when to use email or username const { data } = await this.#userDetailRepository.create(userScaffold); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.server.data-source.ts index 3c8e2ffe41..10d809d344 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.server.data-source.ts @@ -34,7 +34,7 @@ export class UmbUserServerDataSource implements UmbDetailDataSource; + userGroupUniques: Array; unique: string; languageIsoCode: string | null; - contentStartNodeIds: Array; - mediaStartNodeIds: Array; + documentStartNodeUniques: Array; + mediaStartNodeUniques: Array; avatarUrls: Array; state: UserStateModel | null; failedLoginAttempts: number; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-access-settings/user-workspace-access-settings.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-access-settings/user-workspace-access-settings.element.ts index f6a00b80f6..c8d87c45c3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-access-settings/user-workspace-access-settings.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-access-settings/user-workspace-access-settings.element.ts @@ -26,17 +26,17 @@ export class UmbUserWorkspaceAccessSettingsElement extends UmbLitElement { #onUserGroupsChange(event: UmbChangeEvent) { const target = event.target as UmbUserGroupInputElement; - this.#userWorkspaceContext?.updateProperty('userGroupIds', target.selectedIds); + this.#userWorkspaceContext?.updateProperty('userGroupUniques', target.selectedIds); } #onDocumentStartNodeChange(event: UmbChangeEvent) { const target = event.target as UmbInputDocumentElement; - this.#userWorkspaceContext?.updateProperty('contentStartNodeIds', target.selectedIds); + this.#userWorkspaceContext?.updateProperty('documentStartNodeUniques', target.selectedIds); } #onMediaStartNodeChange(event: UmbChangeEvent) { const target = event.target as UmbInputMediaElement; - this.#userWorkspaceContext?.updateProperty('mediaStartNodeIds', target.selectedIds); + this.#userWorkspaceContext?.updateProperty('mediaStartNodeUniques', target.selectedIds); } render() { @@ -48,14 +48,14 @@ export class UmbUserWorkspaceAccessSettingsElement extends UmbLitElement { description="${this.localize.term('user_groupsHelp')}"> @@ -63,7 +63,7 @@ export class UmbUserWorkspaceAccessSettingsElement extends UmbLitElement { label=${this.localize.term('user_mediastartnodes')} description=${this.localize.term('user_mediastartnodeshelp')}> @@ -85,12 +85,13 @@ export class UmbUserWorkspaceAccessSettingsElement extends UmbLitElement { #renderDocumentStartNodes() { return html` Content - `; + `; } #renderMediaStartNodes() { return html` Media - `; + `; } static styles = [