From 3acd1eb750a44a4b72ffeedc861ee286b9b998e5 Mon Sep 17 00:00:00 2001
From: charmi-v <charmi.vyas@smartsensesolutions.com>
Date: Fri, 6 Sep 2024 17:55:51 +0530
Subject: [PATCH] fix: display user management navigation button based on role
 validation (#1073)

---
 CHANGELOG.md                                  | 22 +++++++------------
 .../StageSubNavigation/StageSubNavigation.tsx | 10 +++++++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a308bc24..2038acfde 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,6 @@
 # Changelog
 
-## Unreleased
-
-### Bugfixes
-
-- **Connector Management**
-  - fixed technical user selection
-
-## 2.2.0-RC2
+## Unreleased 2.2.0-RC3
 
 ### Feature
 
@@ -16,12 +9,6 @@
 - **Company Subscription Management**
   - Extended the subscription detail page for customer to include more app-related information [#1051](https://github.com/eclipse-tractusx/portal-frontend/pull/1051)
 
-### BugFix
-
-- Technical User
-  - Show appropriate error message.
-  - Fix closing page notification bar issue
-
 ### Change
 
 - **Technical User Management**
@@ -35,6 +22,11 @@
 
 ### Bugfixes
 
+- **Connector Management**
+  - fixed technical user selection
+- **Technical User**
+  - Show appropriate error message.
+  - Fix closing page notification bar issue
 - **IDP management**
   - Fixed statusTag color in status coloumn [#978](https://github.com/eclipse-tractusx/portal-frontend/pull/978)
 - **Connector Management**
@@ -45,6 +37,8 @@
   - Fixed 'activeTab' conditions to load data for Tab-2(Registration Process) [#1050](https://github.com/eclipse-tractusx/portal-frontend/pull/1050)
 - **App Release Process**:
   - Fixed role upload does not work using Firefox [#1003](https://github.com/eclipse-tractusx/portal-frontend/pull/1003)
+- **Technical User Management**
+  - Display technicalUserManagement button based on role validation [#1073](https://github.com/eclipse-tractusx/portal-frontend/pull/1073)
 - **OSP Consent form**
   - Display invited company name in OSP consent form (Previously hard coded with 'BMW') [#1083](https://github.com/eclipse-tractusx/portal-frontend/pull/1083)
 
diff --git a/src/components/pages/UserManagement/StageSubNavigation/StageSubNavigation.tsx b/src/components/pages/UserManagement/StageSubNavigation/StageSubNavigation.tsx
index 7d3cc8db8..bd0bfe2d7 100644
--- a/src/components/pages/UserManagement/StageSubNavigation/StageSubNavigation.tsx
+++ b/src/components/pages/UserManagement/StageSubNavigation/StageSubNavigation.tsx
@@ -22,6 +22,8 @@ import { useEffect } from 'react'
 import { SubNavigation } from '@catena-x/portal-shared-components'
 import { useTranslation } from 'react-i18next'
 import { useNavigate } from 'react-router-dom'
+import UserService from 'services/UserService'
+import { PAGES, ROLES } from 'types/Constants'
 
 export const StageSubNavigation = () => {
   const { t } = useTranslation()
@@ -44,9 +46,13 @@ export const StageSubNavigation = () => {
 
   return (
     <SubNavigation
-      buttonLabel={t('navigation.subNavigation.buttonLabel')}
+      buttonLabel={
+        (UserService.hasRole(ROLES.TECH_USER_VIEW) &&
+          t('navigation.subNavigation.buttonLabel')) ||
+        undefined
+      }
       onButtonClick={() => {
-        navigate('/technicalUserManagement')
+        navigate(`/${PAGES.TECH_USER_MANAGEMENT}`)
       }}
       link1Label={t('navigation.subNavigation.link1Label')}
       onLink1Click={() => {