Merge branch 'main' into fix/701-replace-logs

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## Unreleased
+
+### Bugfixes
+
+- **Error Handling**
+  - Replaced logs with appropriate handler [#1072](https://github.com/eclipse-tractusx/portal-frontend/pull/1072)
+
 ## Unreleased 2.2.0-RC3
 
 ### Feature
@@ -24,7 +31,9 @@
 
 - **Connector Management**
   - fixed technical user selection
-- Technical User
+- **IDP management**
+  - Fixed IDP management page title & description
+- **Technical User**
   - Show appropriate error message.
   - Fix closing page notification bar issue
 - **IDP management**
@@ -37,8 +46,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)
-- **Error Handling**
-  - Replaced logs with appropriate handler [#1072](https://github.com/eclipse-tractusx/portal-frontend/pull/1072)
+- **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)
 

src/assets/locales/de/idp.json

@@ -45,8 +45,8 @@
     "metadata_url_invalid_error": "Please enter valid metadata url"
   },
   "page": {
-    "title": "Identity Provider Config",
-    "desc": "Here you can manage how the users of your company authenticate with Catena-X. <br /><br />On registration we have created an IDP with one user entry for the admin (that's probably you ;). <br />Many companies already have their own IDP where users authenticate using their known company user id and a familiar login mask. In this case you will probably prefer to use your own company IDP and you can create and manage the federation on this page."
+    "title": "Konfiguration des Identitätsanbieters",
+    "desc": "Auf dieser Seite können Sie die Benutzerauthentifizierung für Ihr Unternehmen verwalten. <br/><br/> Bei der Registrierung haben wir einen Identity Provider (IDP) mit einem einzigen Benutzereintrag für den Administrator eingerichtet. Viele Organisationen unterhalten bereits ihren eigenen IDP, bei dem sich Benutzer mit ihren etablierten Unternehmensbenutzer-IDs und vertrauten Anmeldeoberflächen authentifizieren. In solchen Fällen möchten Sie möglicherweise Ihren vorhandenen Unternehmens-IDP nutzen. Auf dieser Seite können Sie die erforderliche Föderation erstellen und verwalten."
   },
   "add": {
     "title": "Add your Identity Provider (IdP)",

src/assets/locales/en/idp.json

@@ -45,8 +45,8 @@
     "metadata_url_invalid_error": "Please enter valid metadata url"
   },
   "page": {
-    "title": "Identity Provider Config",
-    "desc": "Here you can manage how the users of your company authenticate with Catena-X. <br /><br />On registration we have created an IDP with one user entry for the admin (that's probably you ;). <br />Many companies already have their own IDP where users authenticate using their known company user id and a familiar login mask. In this case you will probably prefer to use your own company IDP and you can create and manage the federation on this page."
+    "title": "Identity Provider configuration",
+    "desc": "This page provides the functionality to manage user authentication for your company. <br/><br/> Upon registration, we have established an Identity Provider (IDP) with a single user entry for the administrator. Many organizations already maintain their own IDP, where users authenticate using their established company user IDs and familiar login interfaces. In such cases, you may prefer to leverage your existing company IDP. You can create and manage the necessary federation on this page."
   },
   "add": {
     "title": "Add your Identity Provider (IdP)",

src/components/pages/IDPManagement/index.tsx

@@ -38,7 +38,7 @@ export default function IDPManagement() {
         <div className="idp-management-header">
           <Trans>
             <Typography variant="h2" className="idp-management-title">
-              {t('idpManagement.title')}
+              {t('page.title')}
             </Typography>
           </Trans>
           <Trans>

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={() => {