From a9836e71dd03312b35306dac6ac37659f2eeb487 Mon Sep 17 00:00:00 2001 From: lavanya-bmw <106523828+lavanya-bmw@users.noreply.github.com> Date: Thu, 24 Oct 2024 12:10:00 +0530 Subject: [PATCH] fix(technical user management): display usertype column data (#1253) https://github.com/eclipse-tractusx/portal-frontend/issues/1252 --- CHANGELOG.md | 5 +++++ DEPENDENCIES | 4 ++-- .../pages/TechnicalUserManagement/TechnicalUserTable.tsx | 2 +- src/features/admin/serviceApiSlice.ts | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f263b9d03..18ab6f9cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ - **Onboarding Service Provider** - removed deprecated page onboardingServiceProvider and every related link [#1261](https://github.com/eclipse-tractusx/portal-frontend/pull/1261) +### Bugfixes + +- **Technical User Management** + - fixed usertype column to display data from API [#1253](https://github.com/eclipse-tractusx/portal-frontend/pull/1253) + ## 2.3.0-alpha.3 ### Change diff --git a/DEPENDENCIES b/DEPENDENCIES index fc6ad3cb2..da27e2af0 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -408,9 +408,9 @@ npm/npmjs/-/qs/6.13.0, BSD-3-Clause, approved, clearlydefined npm/npmjs/-/querystringify/2.2.0, MIT, approved, clearlydefined npm/npmjs/-/queue-microtask/1.2.3, MIT, approved, clearlydefined npm/npmjs/-/react-dom/18.3.1, MIT, approved, clearlydefined -npm/npmjs/-/react-dropzone/14.2.3, MIT, approved, clearlydefined +npm/npmjs/-/react-dropzone/14.2.3, MIT, approved, #16858 npm/npmjs/-/react-fast-compare/3.2.2, MIT, approved, clearlydefined -npm/npmjs/-/react-hook-form/7.53.0, MIT, approved, clearlydefined +npm/npmjs/-/react-hook-form/7.53.0, MIT, approved, #16857 npm/npmjs/-/react-i18next/14.1.3, MIT AND Apache-2.0, approved, #13870 npm/npmjs/-/react-is/16.13.1, MIT, approved, clearlydefined npm/npmjs/-/react-is/17.0.2, MIT, approved, clearlydefined diff --git a/src/components/pages/TechnicalUserManagement/TechnicalUserTable.tsx b/src/components/pages/TechnicalUserManagement/TechnicalUserTable.tsx index 4c8c96904..9876c654d 100644 --- a/src/components/pages/TechnicalUserManagement/TechnicalUserTable.tsx +++ b/src/components/pages/TechnicalUserManagement/TechnicalUserTable.tsx @@ -155,7 +155,7 @@ export const TechnicalUserTable = () => { headerName: t('global.field.userType'), flex: 1.2, valueGetter: ({ row }: { row: ServiceAccountListEntry }) => - row.usertype || '-', + row.userType || '-', }, { field: 'offer', diff --git a/src/features/admin/serviceApiSlice.ts b/src/features/admin/serviceApiSlice.ts index 56b11ef62..e4676a3c0 100644 --- a/src/features/admin/serviceApiSlice.ts +++ b/src/features/admin/serviceApiSlice.ts @@ -60,7 +60,7 @@ export interface ServiceAccountListEntry { name: string status: ServiceAccountStatus isOwner?: boolean - usertype: string + userType: string offer?: { name?: string }