Merge branch 'release/v2.3.0-RC3' into fix/701-replace-logs

Author: charmi-v

CHANGELOG.md

@@ -2,8 +2,17 @@
 
 ## Unreleased
 
+### Change
+
+- **Technical Uaer Management**
+  - enhanced technical user management creation page by role type [#1303](https://github.com/eclipse-tractusx/portal-frontend/pull/1303)
+
 ### Bugfixes
 
+- **Home Page**
+  - fixed clicking on apps in Home page URL navigation failed [#1285](https://github.com/eclipse-tractusx/portal-frontend/pull/1285)
+- **App Registration Process**
+  - fixed wrong api calling to download documents [#1299](https://github.com/eclipse-tractusx/portal-frontend/pull/1299)
 - **Error Handling**
   - Replaced logs with appropriate handler [#1072](https://github.com/eclipse-tractusx/portal-frontend/pull/1072)
 
@@ -24,6 +33,11 @@
 - **App Overview**
   - updated the regex for search validation for numeric and special characters [#1179] (https://github.com/eclipse-tractusx/portal-frontend/pull/1179)
 
+### Feature
+
+- **Clearinghouse Self-Description**
+  - enhance admin UI for managing SD document retriggering [#1292](https://github.com/eclipse-tractusx/portal-frontend/pull/1292)
+
 ## 2.3.0-RC1
 
 ### Change

DEPENDENCIES

@@ -595,7 +595,7 @@ npm/npmjs/@babel/template/7.25.0, MIT, approved, clearlydefined
 npm/npmjs/@babel/traverse/7.25.6, MIT, approved, clearlydefined
 npm/npmjs/@babel/types/7.25.6, MIT AND (BSD-2-Clause AND ISC AND MIT) AND BSD-2-Clause AND BSD-3-Clause, approved, #16040
 npm/npmjs/@bcoe/v8-coverage/0.2.3, ISC AND MIT, approved, clearlydefined
-npm/npmjs/@catena-x/portal-shared-components/3.6.1, Apache-2.0 AND CC-BY-4.0 AND OFL-1.1, approved, #16144
+npm/npmjs/@catena-x/portal-shared-components/3.7.3, Apache-2.0 AND CC-BY-4.0 AND OFL-1.1, approved, #17145
 npm/npmjs/@cspotcode/source-map-support/0.8.1, MIT, approved, clearlydefined
 npm/npmjs/@date-io/core/3.0.0, MIT, approved, clearlydefined
 npm/npmjs/@date-io/date-fns/3.0.0, MIT, approved, #14023

package.json

@@ -34,7 +34,7 @@
     ]
   },
   "dependencies": {
-    "@catena-x/portal-shared-components": "^3.6.1",
+    "@catena-x/portal-shared-components": "^3.7.3",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
     "@hookform/error-message": "^2.0.1",

src/assets/locales/de/main.json

@@ -714,10 +714,10 @@
           },
           "url": {
             "label": "Connector-Katalog-Endpunkt*",
-            "placeholder": "Connector URL",
+            "placeholder": "Example: https://connector.control.plane/api/v1/dsp",
             "mandatoryError": "Die Connector-URL ist obligatorisch.",
             "patternError": "Geben Sie eine gültige URL ein – z. B.: https://catena-x.net",
-            "tooltipMsg": "URL of the connector endpoint. Only https:// endpoints are allowed"
+            "tooltipMsg": "Base URL of the Catalog Service endpoint of a DSP Connector, e.g., https://connector.control.plane/{catalogPath}."
           },
           "bpn": {
             "label": "Connector Owner*",
@@ -1070,13 +1070,14 @@
       "heading": "Status der Eigenerklärung",
       "description": "Diese Seite bietet einen Überblick über den aktuellen Stand der Eigenerklärungen für Administratoren.",
       "reprocess": "Nachverarbeiten",
-      "complianceStatus": "Compliance-Status:",
+      "selfDescriptionFactoryInterface": "Self-Description Factory Schnittstelle",
       "legalPerson": "Juristische Person",
       "legalPersonDesc": "Übersicht über Unternehmen mit fehlender Eigenerklärung einer juristischen Person",
       "connectors": "Connectors",
       "connectorsDesc": "Übersicht über Unternehmen mit fehlender Eigenerklärung der Konnektoren",
       "errorMsg": "Fehler! Etwas ist schief gelaufen",
-      "noDataMsg": "Keine Datensätze gefunden."
+      "noDataMsg": "Keine Datensätze gefunden.",
+      "statusMsg": "Der Status der Self-Description Factory Schnittstelle kann nur durch Konfiguration (siehe Installationsanleitung) geändert werden"
     },
     "addUser": {
       "headline": "Erstelle einen neuen User",
@@ -1096,15 +1097,19 @@
       "technicalUser": {
         "addOverlay": {
           "service": "Technical User Role",
-          "serviceSubHeading": "Select one of the following service roles:",
+          "note": "<strong>Notiz:</strong> Die Auswahl sowohl interner als auch externer Benutzer für denselben Dienst ist nicht möglich.",
+          "internalRoles": "Interne Rollen:",
+          "externalRoles": "Externe Rollen:",
           "username": "Username*",
           "description": "Beschreibung*",
           "spocHeadline": "Single Point of Contact (SPoC)",
           "org": "Organization name",
           "email": "E-Mail Address",
           "name": "Username",
+          "roleMandatory": "Die Rolle des technischen Benutzers ist obligatorisch",
           "error": {
             "select": "Bitte wählen Sie einen Wert.",
+            "username": "Bitte geben Sie den Benutzernamen ein.",
             "description": "Bitte geben Sie eine Beschreibung ein."
           }
         }
@@ -2266,8 +2271,12 @@
       "success": "OSP-Rückruf erfolgreich konfiguriert",
       "callbackUrlError": "Fehler beim Konfigurieren des OSP-Rückrufs",
       "callbackUrl": {
-        "name": "Rückruf-URL",
-        "hint": "Geben Sie die Rückruf-URL Ihres IDP ein, die mit „/.well-known/openid-configuration“ endet'"
+        "name": "Statusrückruf URL",
+        "hint": "Statusrückruf URL ist verpflichtend"
+      },
+      "authUrl": {
+        "name": "Auth URL",
+        "hint": "Statusrückruf URL ist verpflichtend"
       },
       "clientId": {
         "name": "Kunden-ID",
@@ -2315,7 +2324,10 @@
       "placeholder": "",
       "uploadError": "Not Uploaded",
       "uploadSuccess": "Uploaded",
-      "uploadProgess": "Uploaded % of % files"
+      "uploadProgess": "Uploaded % of % files",
+      "error": {
+        "fileTooLarge": "Datei ist größer als"
+      }
     },
     "userRoles": {
       "title": "Assigned Catena-X Portal Roles",

src/assets/locales/en/main.json

@@ -720,10 +720,10 @@
           },
           "url": {
             "label": "Connector Catalogue Endpoint*",
-            "placeholder": "Connector URL",
+            "placeholder": "Example: https://connector.control.plane/api/v1/dsp",
             "mandatoryError": "Connector URL is mandatory.",
             "patternError": "Enter a valid url - eg: https://catena-x.net",
-            "tooltipMsg": "URL of the connector endpoint. Only https:// endpoints are allowed"
+            "tooltipMsg": "Base URL of the Catalog Service endpoint of a DSP Connector, e.g., https://connector.control.plane/{catalogPath}."
           },
           "bpn": {
             "label": "Connector Owner*",
@@ -1075,13 +1075,14 @@
       "heading": "Self-Description Document Status",
       "description": "This page provides an overview of the current status of self-descriptions for administrators.",
       "reprocess": "Reprocess",
-      "complianceStatus": "Compliance Status:",
+      "selfDescriptionFactoryInterface": "Self-Description Factory Interface",
       "legalPerson": "Legal Person",
       "legalPersonDesc": "Overview of companies with missing legal person self-description",
       "connectors": "Connectors",
       "connectorsDesc": "Overview of companies with missing connector self-description",
       "errorMsg": "Error! Something went wrong",
-      "noDataMsg": "No records found."
+      "noDataMsg": "No records found.",
+      "statusMsg": "The status of the self-description factory interface can only be changed by configuration (see installation manual)"
     },
     "addUser": {
       "headline": "Add User Account",
@@ -1101,16 +1102,20 @@
       "technicalUser": {
         "addOverlay": {
           "service": "Technical User Role",
-          "serviceSubHeading": "Select one of the following service roles:",
+          "note": "<strong>Note:</strong> Selection of both internal and external users for the same service is not possible.",
+          "internalRoles": "Internal Roles :",
+          "externalRoles": "External Roles :",
           "username": "Username*",
           "description": "Description*",
           "spocHeadline": "Single Point of Contact (SPoC)",
           "org": "Organization name",
           "email": "E-Mail Address",
           "name": "Username",
+          "roleMandatory": "Technical user Role is mandatory",
           "error": {
             "select": "Please select a value.",
-            "description": "Please enter a description."
+            "username": "Please enter username.",
+            "description": "Please enter description."
           }
         }
       }
@@ -2241,7 +2246,11 @@
       "callbackUrlError": "Failed configuring OSP callback",
       "callbackUrl": {
         "name": "Callback URL",
-        "hint": "Enter the callback URL from your IDP that ends with '/.well-known/openid-configuration'"
+        "hint": "Status callback URL is mandatory"
+      },
+      "authUrl": {
+        "name": "Auth URL",
+        "hint": "Auth URL is mandatory"
       },
       "clientId": {
         "name": "Client ID",
@@ -2289,7 +2298,10 @@
       "placeholder": "",
       "uploadError": "Not Uploaded",
       "uploadSuccess": "Uploaded",
-      "uploadProgess": "Uploaded % of % files"
+      "uploadProgess": "Uploaded % of % files",
+      "error": {
+        "fileTooLarge": "File is larger than"
+      }
     },
     "userRoles": {
       "title": "Assigned Catena-X Portal Roles",