release(1.6.0-RC3): merge main to dev #167

Reviewed-By: Martin Rohrmeier <[email protected]>

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 1.6.0-RC3
+
+### Change
+
+- App Subscription Management
+  - Activation Approval Overlay (enhanced by customer name, bpn, technical user permission, appId)
+- Technical User Management
+  - support managed tech user with app information
+- Connector Registration
+  - managed connector option only available for app/service provider
+  - info message added for inactive select scenario
+
+### Bugfix
+
+- Managed connector registration api call - technicalUserID string empty instead of submitting the subscriptionID
+
 ## 1.6.0-RC2
 
 ### 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.5, Apache-2.0 AND (BSD-3-Clause AND MIT), approved, #9187
+npm/npmjs/@catena-x/portal-shared-components/2.0.11, 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-RC2",
+  "version": "v1.6.0-RC3",
   "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.5",
+    "@catena-x/portal-shared-components": "^2.0.11",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@hookform/error-message": "^2.0.1",

src/assets/locales/de/main.json

@@ -473,11 +473,13 @@
       "modal": {
         "company": {
           "title": "Connect company connector",
-          "intro": "Registrierung eines Company Connectoren welcher im eigenen Firmennetz implementiert ist."
+          "intro": "Registrierung eines Company Connectoren welcher im eigenen Firmennetz implementiert ist.",
+          "disableDescription": "Diese Option ist nur verfügbar, wenn Ihr Unternehmen aktiver Teilnehmer ist. Unternehmensrollen können vom Unternehmensadministrator /company-role geändert werden"
         },
         "managed": {
           "title": "Register Managed Connector",
-          "intro": "Register a managed connector of your customer / 3rd party provided. This selection is mainly service provider relevant, which offers managed connectors to data provider/consumer. If you want to register your own connector, please use the selection above."
+          "intro": "Register a managed connector of your customer / 3rd party provided. This selection is mainly service provider relevant, which offers managed connectors to data provider/consumer. If you want to register your own connector, please use the selection above.",
+          "disableDescription": "Diese Option ist nur verfügbar, wenn Ihr Unternehmen App-Anbieter oder Dienstanbieter ist. Unternehmensrollen können vom Unternehmensadministrator /company-role geändert werden"
         },
         "daps": {
           "title": "Create DAPS Registration",
@@ -1175,8 +1177,14 @@
         "technicalUserDetailsDescription": "Below the technical user profile used to create the technical user for the app tenant is shared. With clicking on 'Confirm' below, the technical user is getting created with the respective configured permissions. Please note the technical user is customer specific.",
         "technicalUserProfileHeading": "Technical User Profile",
         "successDescription": "The app subscription got successfully activated, the customer got informed via email. Please find the technical user details below:",
-        "clientId": "Client Id",
-        "clientSecret": "Client Secret"
+        "clientDetails": "Client Details",
+        "customer": "Customer",
+        "bpn": "BPN",
+        "technicalDetails": "Technical Details",
+        "appClientId": "App Id (Client ID)",
+        "technicalClientId": "Technical User Client ID",
+        "technicalSecret": "Technical User Secret",
+        "technicalPermission": "Technical User Permission"
       },
       "detailOverlay": {
         "title": "Provider View",
@@ -1194,6 +1202,7 @@
         "contact": "Contact",
         "technicalDetails": "Technical Details",
         "appTenantUrl": "App Tenant URL",
+        "appId": "App ID (clientID)",
         "technicalName": "Technical User Name",
         "technicalPermission": "Technical User Permission",
         "helpText": "For any questions regarding these change(s), please contact the Catena-X helpdesk:",
@@ -1504,7 +1513,7 @@
       },
       "uploadCertificate": "Upload Certificate",
       "updateCertificate": {
-        "title": "Upload new certificate for {company name}",
+        "title": "Upload new certificate",
         "description": "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.",
         "selectLabel": "Type of certificate",
         "placeholder": "Please select",
@@ -1595,7 +1604,10 @@
       "permission": "Berechtigung",
       "userId": "Benutzeridentifikation",
       "redirectURI": "Redirect-URI",
-      "toBeUpdated": "To be updated"
+      "toBeUpdated": "To be updated",
+      "type": "Type",
+      "owner": "Owner",
+      "offerLink": "Offer Link"
     },
     "actions": {
       "cancel": "Abbrechen",

src/assets/locales/en/main.json

@@ -472,11 +472,13 @@
       "modal": {
         "company": {
           "title": "Connect company connector",
-          "intro": "Registration of a company connector which is implemented in your own company network."
+          "intro": "Registration of a company connector which is implemented in your own company network.",
+          "disableDescription": "This option is only available if your company is Active Participant. Company roles can get changed by the company admin /company-role"
         },
         "managed": {
           "title": "Register Managed Connector",
-          "intro": "Register a managed connector of your customer / 3rd party provided. This selection is mainly service provider relevant, which offers managed connectors to data provider/consumer. If you want to register your own connector, please use the selection above."
+          "intro": "Register a managed connector of your customer / 3rd party provided. This selection is mainly service provider relevant, which offers managed connectors to data provider/consumer. If you want to register your own connector, please use the selection above.",
+          "disableDescription": "This option is only available if your company is App Provider or Service Provider. Company roles can get changed by the company admin /company-role"
         },
         "daps": {
           "title": "Create DAPS Registration",
@@ -1137,8 +1139,14 @@
         "technicalUserDetailsDescription": "Below the technical user profile used to create the technical user for the app tenant is shared. With clicking on 'Confirm' below, the technical user is getting created with the respective configured permissions. Please note the technical user is customer specific.",
         "technicalUserProfileHeading": "Technical User Profile",
         "successDescription": "The app subscription got successfully activated, the customer got informed via email about the app activation. Please find the technical user details below:",
-        "clientId": "Client Id",
-        "clientSecret": "Client Secret"
+        "clientDetails": "Client Details",
+        "customer": "Customer",
+        "bpn": "BPN",
+        "technicalDetails": "Technical Details",
+        "appClientId": "App Id (Client ID)",
+        "technicalClientId": "Technical User Client ID",
+        "technicalSecret": "Technical User Secret",
+        "technicalPermission": "Technical User Permission"
       },
       "detailOverlay": {
         "title": "Provider View",
@@ -1156,6 +1164,7 @@
         "contact": "Contact",
         "technicalDetails": "Technical Details",
         "appTenantUrl": "App Tenant URL",
+        "appId": "App ID (clientID)",
         "technicalName": "Technical User Name",
         "technicalPermission": "Technical User Permission",
         "helpText": "For any questions regarding these change(s), please contact the Catena-X helpdesk:",
@@ -1443,7 +1452,7 @@
       },
       "uploadCertificate": "Upload Certificate",
       "updateCertificate": {
-        "title": "Upload new certificate for {company name}",
+        "title": "Upload new certificate",
         "description": "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.",
         "selectLabel": "Type of certificate",
         "placeholder": "Please select",
@@ -1559,7 +1568,10 @@
       "permission": "Permission",
       "userId": "User Id",
       "redirectURI": "Redirect URI",
-      "toBeUpdated": "To be updated"
+      "toBeUpdated": "To be updated",
+      "type": "Type",
+      "owner": "Owner",
+      "offerLink": "Offer Link"
     },
     "actions": {
       "cancel": "Cancel",