release: merge main into dev (#197)

CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 1.6.0-RC5
+
+### Change
+
+- Certificate Request Board - changed to dynamic error message as per API response
+- Updated asterisk color to red in app release and service release forms
+- Credential management board enhanced by filters
+
+### Features
+
+- Notifications added
+  - credential approval
+  - credential reject and
+  - subscription url msgs
+- Technical user create overlay enhanced by role description as well as direct help link
+
+### Bugfix
+
+- Permission validation 'Credential Mgmt' page updated to 'decision_ssicredential'
+- App description change - fixed page break issue in case of api response without language tag for each FE supported language
+- Notification message link - 'UseCases' welcome message fixed
+- handle empty customer link section in managed connectors
+- Overlay fix of activation response
+
 ## 1.6.0-RC4
 
 ### Change

DEPENDENCIES

@@ -1124,7 +1124,7 @@ npm/npmjs/@babel/template/7.22.5, MIT, approved, #9017
 npm/npmjs/@babel/traverse/7.22.5, MIT, approved, #8954
 npm/npmjs/@babel/types/7.22.5, MIT, approved, #8967
 npm/npmjs/@bcoe/v8-coverage/0.2.3, ISC AND MIT, approved, clearlydefined
-npm/npmjs/@catena-x/portal-shared-components/2.0.12, Apache-2.0 AND (BSD-3-Clause AND MIT), approved, #9187
+npm/npmjs/@catena-x/portal-shared-components/2.0.14, Apache-2.0 AND (BSD-3-Clause AND MIT), approved, #9187
 npm/npmjs/@csstools/normalize.css/12.0.0, CC0-1.0, approved, clearlydefined
 npm/npmjs/@csstools/postcss-cascade-layers/1.1.1, CC0-1.0, approved, clearlydefined
 npm/npmjs/@csstools/postcss-color-function/1.1.1, CC0-1.0 AND (MIT AND W3C-20150513) AND W3C-20150513 AND MIT, approved, #3022

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catena-x/portal-frontend",
-  "version": "v1.6.0-RC4",
+  "version": "v1.6.0-RC5",
   "description": "Catena-X Portal Frontend",
   "author": "Catena-X Contributors",
   "license": "Apache-2.0",
@@ -26,7 +26,7 @@
     ]
   },
   "dependencies": {
-    "@catena-x/portal-shared-components": "^2.0.13",
+    "@catena-x/portal-shared-components": "^2.0.14",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@hookform/error-message": "^2.0.1",

src/assets/locales/de/main.json

@@ -242,10 +242,13 @@
           "none": "Nicht kategorisiert",
           "businesspartnermanagement": "Geschäftspartner Datenmanagement",
           "circulareconomy": "Kreislaufwirtschaft",
-          "quality&demandmanagement": "Bedarfs- & Qualitätsmanagement",
+          "qualitymanagement": "Bedarfs- & Qualitätsmanagement",
           "demandandcapacitymanagement": "Bedarfs- & Kapazitätsmanagement",
           "traceability": "Rückverfolgbarkeit",
-          "manufacturingasaservice": "Produzieren als Dienst"
+          "manufacturingasaservice": "Produzieren als Dienst",
+          "sustainability&co2-footprint": "Sustainability & CO2 Footprint",
+          "real-timecontrol": "Real Time Control",
+          "modularproduction ": "Modular Production"
         },
         "noMatch": "Keine Treffer",
         "for": "für"
@@ -539,9 +542,10 @@
             "tooltipMsg": "Laden Sie das Zertifikat hoch, das die öffentlichen Schlüsselinformationen Ihres Connectors enthält."
           },
           "subscription": {
-            "label": "Customer Link",
+            "label": "Customer Link*",
             "placeholder": "Select the related subscription",
-            "tooltipMsg": "Select the related subscription"
+            "tooltipMsg": "Select the related subscription",
+            "error": "Customer link is mandatory"
           }
         },
         "create": {
@@ -782,11 +786,13 @@
       "technicalUserSubheadlineSuccess": "Der technische Benutzer wurde mit den folgenden Daten angelegt:",
       "technicalUserSubheadlineError": "Something went wrong. The technical user did not got created due to a system error. Please try it later again or contact your administrator.",
       "chooseUserRole": "Benutzer-Rolle für den Portalzugriff auswählen",
+      "help": "Help",
       "helperText": "Bitte geben Sie alle erforderlichen Informationen ein, bevor Sie fortfahren.",
       "roleDesc": "Role Description Details",
       "technicalUser": {
         "addOverlay": {
-          "service": "Dienst",
+          "service": "Technical User Role",
+          "serviceSubHeading": "Select one service roles:",
           "username": "Username",
           "description": "Beschreibung",
           "spocHeadline": "Single Point of Contact (SPoC)",
@@ -1003,14 +1009,14 @@
       "technicalIntegration": {
         "headerTitle": "Technical Integration",
         "headerDescription": "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard .Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard .",
-        "step1Header": "1. User Role Upload *",
+        "step1Header": "1. User Role Upload",
         "step1HeaderDescription": "[copy] Lorem ipsum sapientem ne neque dolor erat,eros solet invidunt duo Quisque aliquid leo. Pretium patrioque sociis eu nihil Cum enim ad, ipsum alii vidisse justo id. Option porttitor diam voluptua. Cu Eam augue dolor dolores quis,",
         "clientID": "Client ID",
         "URL": "URL",
         "pleaseEnterValidURL": "Please enter a valid URL",
         "URLPlaceholder": "http://www.loremipsum.de",
         "clientCreated": "Client created",
-        "step2Header": "2. Technical User Setup *",
+        "step2Header": "2. Technical User Setup",
         "step2HeaderDescription": "[copy] Lorem ipsum sapientem ne neque dolor erat,eros solet invidunt duo Quisque aliquid leo. Pretium patrioque sociis eu nihil Cum enim ad, ipsum alii vidisse justo id. Option porttitor diam voluptua. Cu Eam augue dolor dolores quis,",
         "uploadRolesDescription": "Upload all app roles by using the available upload template (csv) file added attached",
         "rolesPreview": "Preview of Roles uploaded",
@@ -1491,7 +1497,7 @@
     },
     "adminCertificate": {
       "headline": "Credential Request Overview",
-      "search": "Suchen via Zertifikatstyp",
+      "search": "Suchen via Name der Firma",
       "tabs": {
         "all": "Alle",
         "open": "Offen",
@@ -1536,7 +1542,7 @@
         "uploadDocumentTitle": "Please upload your certificate proof:",
         "note": "Please upload only pdf files with maximum 1 MB.",
         "descriptionLabel": "Description for verification",
-        "error": "Something went wrong!",
+        "error": "Something went wrong. ",
         "success": "Certificate uploaded successfully."
       },
       "successCertificate": {

src/assets/locales/de/notification.json

@@ -87,13 +87,25 @@
     "title": "Assigned User Roles Updated - {{app}}",
     "content": "Hallo {{username}}, \n\nIhre App-Benutzerrollen wurden von Ihrem Unternehmensadministrator aktualisiert. Mit dem Wechsel der Rolle ändern sich Ihre Zugriffsrechte. Weitere Einzelheiten zu den Rollenänderungen finden sie anbei. \n\nHinzugefügte Rollen: {{addedRoles}} \n\nEntfernte Rollen: {{removedRoles}}"
   },
+  "CREDENTIAL_APPROVAL": {
+    "title": "Verified Credential {{credentialType}} angelegt",
+    "content": "Verified Credential {{credentialType}} wurde ihrem Company Wallet hinzugefügt."
+  },
+  "CREDENTIAL_REJECTED": {
+    "title": "Verified Credential {{credentialType}} abgelehnt",
+    "content": "Verified Credential {{credentialType}} wurde abgelehnt. Sie können jederzeit die Anfrage wiederholen."
+  },
+  "SUBSCRIPTION_URL_UPDATE": {
+    "title": "App URL {{app}} updated",
+    "content": "Der App Provider hat die hinterlegte App Instance URL für ihre abonnierte App {{app}} geändert.\n\nNeue URL: {{newUrl}}"
+  },
   "link": {
     "appmarketplace": "Zum App Marketplace",
     "technicalsetup": "Zur Connector Registrierung",
     "home": "Zur Startseite",
     "app": "Zur App",
     "user": "Zum Benutzer",
-    "usecases": "Zu den Use Cases",
+    "usecase": "Zu den Use Case",
     "serviceprovider": "Go to service provider",
     "appmanagementboard": "App Management Board öffnen",
     "servicemanagementboard": "Service Management Board öffnen",

src/assets/locales/de/servicerelease.json

@@ -26,18 +26,18 @@
   "step1": {
     "headerTitle": "Service Card Erstellen",
     "headerDescription": "Die folgenden Eingabefelder und Uploads werden verwendet, um Ihre Service-'Service Card' zu erstellen, die auf dem Marktplatz platziert wird. Die Servicekarte ist der erste Berührungspunkt mit dem Kunden.",
-    "serviceName": "Service Name*",
-    "serviceType": "Service Type*",
+    "serviceName": "Service Name",
+    "serviceType": "Service Type",
     "serviceTypePlaceholder": "Wählen Sie den Servicetyp aus",
-    "shortDescriptionEN": "Kurzbeschreibung (en)*",
-    "shortDescriptionDE": "Kurzbeschreibung (de)*",
+    "shortDescriptionEN": "Kurzbeschreibung (en)",
+    "shortDescriptionDE": "Kurzbeschreibung (de)",
     "serviceLeadImageUpload": "Service Card Bild"
   },
   "step2": {
     "headerTitle": "Service Details",
     "headerDescription": "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard .Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard .",
-    "longDescriptionEN": "Service Beschreibung (en)*",
-    "longDescriptionDE": "Service Beschreibung (de)*",
+    "longDescriptionEN": "Service Beschreibung (en)",
+    "longDescriptionDE": "Service Beschreibung (de)",
     "doc": "Supporting Material",
     "note": "Info:",
     "providerDetails": "Provider Details",
@@ -209,13 +209,16 @@
     "longDescriptionTitleEN": "Description - English",
     "longDescriptionTitleDE": "Description - German",
     "backToBoard": "Back to Admin Board",
+    "noDocumentsAvailable": "No documents available",
     "documents": {
       "heading": "Documents",
       "message": "In the following section additional documents/information are shared by the app provider. Click on the document name to download them. "
     },
     "provider": {
       "heading": "Provider Information",
-      "message": "If you have any question, want to get in contact or visit the provider website, you can find all necessary information below."
+      "message": "If you have any question, want to get in contact or visit the provider website, you can find all necessary information below.",
+      "homepage": "Homepage",
+      "email": "E-Mail"
     },
     "technicalUserSetup": {
       "heading": "Technical User Setup",

src/assets/locales/en/main.json

@@ -241,10 +241,13 @@
           "none": "Not categorized",
           "businesspartnermanagement": "Business Partner Data Management",
           "circulareconomy": "Circular Economy",
-          "quality&demandmanagement": "Demand & Quality Management",
+          "qualitymanagement": "Demand & Quality Management",
           "demandandcapacitymanagement": "Demand & Capacity Management",
           "traceability": "Traceability",
-          "manufacturingasaservice": "Manufacturing as a Service"
+          "manufacturingasaservice": "Manufacturing as a Service",
+          "sustainability&co2-footprint": "Sustainability & CO2 Footprint",
+          "real-timecontrol": "Real Time Control",
+          "modularproduction ": "Modular Production"
         },
         "noMatch": "No Matches",
         "for": "for"
@@ -538,9 +541,10 @@
             "tooltipMsg": "Upload the certificate that contains your connector's public key information."
           },
           "subscription": {
-            "label": "Customer Link",
+            "label": "Customer Link*",
             "placeholder": "Select the related subscription",
-            "tooltipMsg": "Select the related subscription"
+            "tooltipMsg": "Select the related subscription",
+            "error": "Customer link is mandatory"
           }
         },
         "create": {
@@ -780,11 +784,13 @@
       "technicalUserSubheadlineSuccess": "Congratulations, the technical user got successfully created. Below you can find all the relevant details needed to apply the technical user for your service connection. Please ensure that you keep this secrets confidential.",
       "technicalUserSubheadlineError": "Something went wrong. The technical user did not got created due to a system error. Please try it later again or contact your administrator.",
       "chooseUserRole": "Select CX Portal User Role",
+      "help": "Help",
       "helperText": "Please enter all required information before proceeding.",
       "roleDesc": "Role Description Details",
       "technicalUser": {
         "addOverlay": {
-          "service": "Service",
+          "service": "Technical User Role",
+          "serviceSubHeading": "Select one service roles:",
           "username": "Username",
           "description": "Description",
           "spocHeadline": "Single Point of Contact (SPoC)",
@@ -928,7 +934,7 @@
         "salesManager": "Sales Manager",
         "salesManagerPlaceholder": "Please select a Sales Manager",
         "salesManagerDescription": "Please select the app sales manager via the dropdown below. The sales manager can only get set if a user of your company has the respective portal role. The sales manager will get informed as soon as a app subscribtion request is triggered by the customer.",
-        "pricingInformation": "Pricing Information (e.g. free / charged ( to be defined)",
+        "pricingInformation": "Pricing Information (e.g. free / charged (to be defined))",
         "appLeadImageUpload": "App Lead Image Upload"
       },
       "appPage": {
@@ -965,14 +971,14 @@
       "technicalIntegration": {
         "headerTitle": "Technical Integration",
         "headerDescription": "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard .Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard .",
-        "step1Header": "1. User Role Upload *",
+        "step1Header": "1. User Role Upload",
         "step1HeaderDescription": "[copy] Lorem ipsum sapientem ne neque dolor erat,eros solet invidunt duo Quisque aliquid leo. Pretium patrioque sociis eu nihil Cum enim ad, ipsum alii vidisse justo id. Option porttitor diam voluptua. Cu Eam augue dolor dolores quis,",
         "clientID": "Client ID",
         "URL": "URL",
         "pleaseEnterValidURL": "Please enter a valid URL",
         "URLPlaceholder": "http://www.loremipsum.de",
         "clientCreated": "Client created",
-        "step2Header": "2. Technical User Setup *",
+        "step2Header": "2. Technical User Setup",
         "step2HeaderDescription": "[copy] Lorem ipsum sapientem ne neque dolor erat,eros solet invidunt duo Quisque aliquid leo. Pretium patrioque sociis eu nihil Cum enim ad, ipsum alii vidisse justo id. Option porttitor diam voluptua. Cu Eam augue dolor dolores quis,",
         "uploadRolesDescription": "Upload all app roles by using the available upload template (csv) file added attached",
         "rolesPreview": "Preview of Roles uploaded",
@@ -1475,7 +1481,7 @@
         "uploadDocumentTitle": "Please upload your certificate proof:",
         "note": "Please upload only pdf files with maximum 1 MB.",
         "descriptionLabel": "Description for verification",
-        "error": "Something went wrong!",
+        "error": "Something went wrong. ",
         "success": "Certificate uploaded successfully."
       },
       "successCertificate": {
@@ -1497,7 +1503,7 @@
     },
     "adminCertificate": {
       "headline": "Credential Request Overview",
-      "search": "...search for certificate type",
+      "search": "...search for Company Name",
       "tabs": {
         "all": "All",
         "open": "Open",

src/assets/locales/en/notification.json

@@ -83,13 +83,25 @@
     "title": "Assigned User Roles Updated - {{app}}",
     "content": "Hallo {{username}}, \n\nyour app user roles got updated by your company administrator. With the change of the role assignment your access rights have changed. You can find all details regarding the role change below. \n\nNew Roles: {{addedRoles}} \n\nRemoved Roles: {{removedRoles}}"
   },
+  "CREDENTIAL_APPROVAL": {
+    "title": "Verified Credential {{credentialType}} assigned",
+    "content": "Verified Credential {{credentialType}} got assigned to your company wallet."
+  },
+  "CREDENTIAL_REJECTED": {
+    "title": "Verified Credential {{credentialType}} declined",
+    "content": "Verified Credential {{credentialType}} got declined. You can start a new request immediately."
+  },
+  "SUBSCRIPTION_URL_UPDATE": {
+    "title": "App URL {{app}} updated",
+    "content": "The app provider has changed the stored App Instance URL for your subscribed app {{app}}.\n\nNew URL: {{newUrl}}"
+  },
   "link": {
     "appmarketplace": "Go to app marketplace",
     "technicalsetup": "Go to connector configuration",
     "home": "Go to home page",
     "app": "Go to app",
     "user": "Go to user",
-    "usecases": "Go to use cases",
+    "usecase": "Go to Use Case",
     "serviceprovider": "Go to service provider",
     "appmanagementboard": "Get there",
     "servicemanagementboard": "Get there",

src/assets/locales/en/servicerelease.json

@@ -26,18 +26,18 @@
   "step1": {
     "headerTitle": "Create Service",
     "headerDescription": "The following input fields and uploads are used to create your service 'Service Card' which will be placed inside the marketplace. The service card is the first touchpoint with the customer.",
-    "serviceName": "Service Name*",
-    "serviceType": "Service Type*",
+    "serviceName": "Service Name",
+    "serviceType": "Service Type",
     "serviceTypePlaceholder": "Select a Service Type Id",
-    "shortDescriptionEN": "Short Description (en)*",
-    "shortDescriptionDE": "Short Description (de)*",
+    "shortDescriptionEN": "Short Description (en)",
+    "shortDescriptionDE": "Short Description (de)",
     "serviceLeadImageUpload": "Service Card Image"
   },
   "step2": {
     "headerTitle": "Service Details",
     "headerDescription": "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard .Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard .",
-    "longDescriptionEN": "Long Description (en)*",
-    "longDescriptionDE": "Long Description (de)*",
+    "longDescriptionEN": "Long Description (en)",
+    "longDescriptionDE": "Long Description (de)",
     "doc": "Supporting Material",
     "note": "Note:",
     "providerDetails": "Provider Details",
@@ -209,13 +209,16 @@
     "longDescriptionTitleEN": "Description - English",
     "longDescriptionTitleDE": "Description - German",
     "backToBoard": "Back to Admin Board",
+    "noDocumentsAvailable": "No documents available",
     "documents": {
       "heading": "Documents",
       "message": "In the following section additional documents/information are shared by the app provider. Click on the document name to download them. "
     },
     "provider": {
       "heading": "Provider Information",
-      "message": "If you have any question, want to get in contact or visit the provider website, you can find all necessary information below."
+      "message": "If you have any question, want to get in contact or visit the provider website, you can find all necessary information below.",
+      "homepage": "Homepage",
+      "email": "E-Mail"
     },
     "technicalUserSetup": {
       "heading": "Technical User Setup",

src/components/overlays/AddTechnicalUser/TechnicalUserAddForm.scss

@@ -17,7 +17,27 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
-
 .form-input {
   padding: 0;
 }
+
+.helpText {
+  display: flex;
+  color: #0d55af !important;
+  margin-top: 30px !important;
+  text-decoration: none;
+  margin-bottom: 20px !important;
+
+  svg {
+    font-size: 20px;
+  }
+}
+
+.technicalUserForm {
+  display: grid;
+
+  .roleDescription {
+    line-height: 0;
+    margin: 5px 27px 20px;
+  }
+}