Merge branch 'main' of https://github.com/lavanya-bmw/portal-frontend …

…into fix/1148/semantic-hub-filters

CHANGELOG.md

@@ -9,6 +9,8 @@
 
 ### Bugfixes
 
+- **Technical User Management**
+  - fixed usertype column to display data from API [#1253](https://github.com/eclipse-tractusx/portal-frontend/pull/1253)
 - **Semantic Hub**
   - Fixed semantic hub data on click of filters and on click on refresh icon [#1273](https://github.com/eclipse-tractusx/portal-frontend/pull/1273)
 

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

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',

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
   }