Merge pull request #755 from eclipse-tractusx/main

build(2.0.0-rc5): merge main into dev

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 2.0.0-RC5
+
+### Feature
+
+- Partner Network - improved overlay of Company Data
+- Technical Setup - improved Connector Registration overlay
+- Credential Management - adjusted document data and sorting
+
+### Bugfix
+
+- Application Requests
+  - fixed displaying of incorrect company roles in case of requester company with role "Onboarding Service Provider"
+
 ## 2.0.0-RC4
 
 ### Feature

DEPENDENCIES

@@ -455,7 +455,7 @@ npm/npmjs/-/safe-regex-test/1.0.3, MIT, approved, clearlydefined
 npm/npmjs/-/safer-buffer/2.1.2, MIT, approved, clearlydefined
 npm/npmjs/-/sass/1.72.0, MIT, approved, clearlydefined
 npm/npmjs/-/saxes/6.0.0, ISC, approved, clearlydefined
-npm/npmjs/-/scheduler/0.23.0, MIT, approved, clearlydefined
+npm/npmjs/-/scheduler/0.23.0, MIT, approved, #14589
 npm/npmjs/-/semver/6.3.1, ISC, approved, clearlydefined
 npm/npmjs/-/semver/7.6.0, ISC, approved, clearlydefined
 npm/npmjs/-/set-function-length/1.2.2, MIT, approved, #12772
@@ -599,7 +599,7 @@ npm/npmjs/@babel/template/7.24.0, MIT, approved, clearlydefined
 npm/npmjs/@babel/traverse/7.24.1, MIT AND (BSD-2-Clause AND ISC AND MIT) AND BSD-2-Clause AND BSD-3-Clause, approved, #13926
 npm/npmjs/@babel/types/7.24.0, MIT, approved, clearlydefined
 npm/npmjs/@bcoe/v8-coverage/0.2.3, ISC AND MIT, approved, clearlydefined
-npm/npmjs/@catena-x/portal-shared-components/3.0.4, Apache-2.0 AND CC-BY-4.0 AND OFL-1.1, approved, #14247
+npm/npmjs/@catena-x/portal-shared-components/3.0.7, Apache-2.0 AND CC-BY-4.0 AND OFL-1.1, approved, #14247
 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

index.html

@@ -29,7 +29,7 @@
     <div id="app"></div>
     <script>
       // Do NOT change 'ENV' without changing 'custom_env_vars_anchor' in scripts/inject-dynamic-env.sh as well
-      const ENV = {PORTAL_ASSETS_URL:"http://localhost:3000/assets",PORTAL_BACKEND_URL:"https://portal-backend.example.org",CENTRALIDP_URL:"https://centralidp.example.org/auth",SSI_CREDENTIAL_URL:"https://ssi-credential-issuer.example.org",BPDM_API_URL:"https://business-partners.example.org/pool/api",SEMANTICS_URL:"https://semantics.example.org",MANAGED_IDENTITY_WALLETS_NEW_URL:"https://managed-identity-wallets-new.example.org",REALM:"CX-Central",CLIENT_ID:"Cl2-CX-Portal",CLIENT_ID_SEMANTIC:"Cl3-CX-Semantic",CLIENT_ID_MIW:"Cl5-CX-Custodian",CLIENT_ID_SSI_CREDENTIAL:"Cl24-CX-SSI-CredentialIssuer"}
+      const ENV = {PORTAL_ASSETS_URL:"http://localhost:3000/assets",PORTAL_BACKEND_URL:"https://portal-backend.example.org",CENTRALIDP_URL:"https://centralidp.example.org/auth",SSI_CREDENTIAL_URL:"https://ssi-credential-issuer.example.org",BPDM_API_URL:"https://business-partners.example.org/pool/v6",SEMANTICS_URL:"https://semantics.example.org",MANAGED_IDENTITY_WALLETS_NEW_URL:"https://managed-identity-wallets-new.example.org",REALM:"CX-Central",CLIENT_ID:"Cl2-CX-Portal",CLIENT_ID_SEMANTIC:"Cl3-CX-Semantic",CLIENT_ID_MIW:"Cl5-CX-Custodian",CLIENT_ID_SSI_CREDENTIAL:"Cl24-CX-SSI-CredentialIssuer"}
     </script>
     <script type="module" src="/src/index.tsx"></script>
   </body>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catena-x/portal-frontend",
-  "version": "v2.0.0-RC4",
+  "version": "v2.0.0-RC5",
   "description": "Catena-X Portal Frontend",
   "author": "Catena-X Contributors",
   "license": "Apache-2.0",
@@ -27,7 +27,7 @@
     ]
   },
   "dependencies": {
-    "@catena-x/portal-shared-components": "^3.0.4",
+    "@catena-x/portal-shared-components": "^3.0.7",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.0",
     "@hookform/error-message": "^2.0.1",

scripts/inject-dynamic-env.sh

@@ -22,7 +22,7 @@
 # Define custom variable
 custom_env_vars='{PORTAL_ASSETS_URL:"'$PORTAL_ASSETS_URL'",PORTAL_BACKEND_URL:"'$PORTAL_BACKEND_URL'",CENTRALIDP_URL:"'$CENTRALIDP_URL'",SSI_CREDENTIAL_URL:"'$SSI_CREDENTIAL_URL'",BPDM_API_URL:"'$BPDM_API_URL'",SEMANTICS_URL:"'$SEMANTICS_URL'",MANAGED_IDENTITY_WALLETS_NEW_URL:"'$MANAGED_IDENTITY_WALLETS_NEW_URL'",REALM:"'$REALM'",CLIENT_ID:"'$CLIENT_ID'",CLIENT_ID_SEMANTIC:"'$CLIENT_ID_SEMANTIC'",CLIENT_ID_MIW:"'$CLIENT_ID_MIW'",CLIENT_ID_SSI_CREDENTIAL:"'$CLIENT_ID_SSI_CREDENTIAL'"}'
 # Define anchor variable
-custom_env_vars_anchor='{PORTAL_ASSETS_URL:"http://localhost:3000/assets",PORTAL_BACKEND_URL:"https://portal-backend.example.org",CENTRALIDP_URL:"https://centralidp.example.org/auth",SSI_CREDENTIAL_URL:"https://ssi-credential-issuer.example.org",BPDM_API_URL:"https://business-partners.example.org/pool/api",SEMANTICS_URL:"https://semantics.example.org",MANAGED_IDENTITY_WALLETS_NEW_URL:"https://managed-identity-wallets-new.example.org",REALM:"CX-Central",CLIENT_ID:"Cl2-CX-Portal",CLIENT_ID_SEMANTIC:"Cl3-CX-Semantic",CLIENT_ID_MIW:"Cl5-CX-Custodian",CLIENT_ID_SSI_CREDENTIAL:"Cl24-CX-SSI-CredentialIssuer"}'
+custom_env_vars_anchor='{PORTAL_ASSETS_URL:"http://localhost:3000/assets",PORTAL_BACKEND_URL:"https://portal-backend.example.org",CENTRALIDP_URL:"https://centralidp.example.org/auth",SSI_CREDENTIAL_URL:"https://ssi-credential-issuer.example.org",BPDM_API_URL:"https://business-partners.example.org/pool/v6",SEMANTICS_URL:"https://semantics.example.org",MANAGED_IDENTITY_WALLETS_NEW_URL:"https://managed-identity-wallets-new.example.org",REALM:"CX-Central",CLIENT_ID:"Cl2-CX-Portal",CLIENT_ID_SEMANTIC:"Cl3-CX-Semantic",CLIENT_ID_MIW:"Cl5-CX-Custodian",CLIENT_ID_SSI_CREDENTIAL:"Cl24-CX-SSI-CredentialIssuer"}'
 # Read content of the reference index.html file into the index_html_reference variable
 index_html_reference=`cat /usr/share/nginx/html/index.html.reference`
 # Replace the anchor variable with the custom variable in the index.html file 

src/assets/locales/de/main.json

@@ -190,6 +190,7 @@
           "roles": "Company Role(s)",
           "activeParticipation": "Teilnehmer",
           "appProvider": "App Anbieter",
+          "onboardingProvider": "Onboarding Service Anbieter",
           "serviceProvider": "Service Anbieter",
           "noinfo": "no data available",
           "commercialRegisterNumber": "Handelsregisternummer",
@@ -728,9 +729,12 @@
       "membershipnotificationdescription": "Bitte beachten Sie, dass die Mitgliedsinformationen möglicherweise falsch sind.",
       "searchbuttonlabel": "Suche",
       "overlay": {
-        "title": "Firmendetails",
+        "title": "Details zu Geschäftspartnerdaten",
         "companydatatitle": "Firmen Data",
-        "legalform": "Rechtsform"
+        "legalform": "Rechtsform",
+        "identifiers": "Identifiers",
+        "certificates": "Firmenzertifikate",
+        "noData": "No data available"
       }
     },
     "invite": {
@@ -1317,7 +1321,7 @@
       }
     },
     "serviceMarketplace": {
-      "headline": "Purchase Service Request",
+      "headline": "Service-Abonnement",
       "desc1": "Wenn Sie unten „Bestätigen“ auswählen, benachrichtigen Sie den App-Anbieter umgehend über Ihr Interesse an seinem Dienst und er beginnt mit dem Abonnementverfahren. Sollte der Anbieter weitere Einzelheiten benötigen, um fortzufahren, wird er sich direkt an Sie wenden.",
       "desc2": "Sobald alle notwendigen Informationen bestätigt und alle Fragen geklärt sind, wird der App-Anbieter mit der Aktivierung Ihres App-Mandanten fortfahren. Sie erhalten eine Benachrichtigung, die Sie durch alle weiteren Schritte führt, die Ihrerseits erforderlich sind.",
       "desc3": "WICHTIGER HINWEIS:WICHTIGER HINWEIS:",
@@ -1742,13 +1746,14 @@
       "search": "Suchen via Name der Firma",
       "tabs": {
         "all": "Alle",
-        "open": "Offen",
-        "confirmed": "Bestätigt",
-        "declined": "Abgelehnt"
+        "pending": "Ausstehend",
+        "active": "Aktiv",
+        "inactive": "Inaktiv",
+        "revoked": "Widerrufen"
       },
-      "sortOptions": {
-        "name": "Company Name",
-        "date": "Date"
+      "sort": {
+        "bpnlasc": "Business Partner Asc",
+        "bpnldesc": "Business Partner Desc"
       },
       "table": {
         "crendentialType": "Type",

src/assets/locales/en/main.json

@@ -189,6 +189,7 @@
           "roles": "Company Role(s)",
           "activeParticipation": "Participant",
           "appProvider": "App Provider",
+          "onboardingProvider": "Onboarding Service Provider",
           "serviceProvider": "Service Provider",
           "noinfo": "no data available",
           "commercialRegisterNumber": "Commercial Register Number",
@@ -684,7 +685,9 @@
             "tooltipMsg": "Description for new technical user",
             "mandatoryError": "Description is mandatory",
             "patternError": "Username should start with a letter. Allowed special characters are #. '!=()&” along with numbers and spaces"
-          }
+          },
+          "minLength": "Minlength is",
+          "maxLength": "Maxlength is"
         },
         "create": {
           "successTitle": "Create connector successfully completed",
@@ -697,9 +700,7 @@
           "successDescription": "Delete connector successfully completed.",
           "errorTitle": "Something went wrong",
           "errorDescription": "Something went wrong. Please try it later again or contact your administrator."
-        },
-        "minLength": "Minlength is",
-        "maxLength": "Maxlength is"
+        }
       }
     },
     "partnernetwork": {
@@ -727,9 +728,12 @@
       "membershipnotificationtitle": "Membership flag cannot be fetched.",
       "membershipnotificationdescription": "Please note that the membership information might be incorrect.",
       "overlay": {
-        "title": "Company Detail",
+        "title": "Business Partner Data Details",
         "companydatatitle": "Company Data",
-        "legalform": "Legal Form"
+        "legalform": "Legal Form",
+        "identifiers": "Identifiers",
+        "certificates": "Company Certificates",
+        "noData": "No data available"
       }
     },
     "invite": {
@@ -1279,7 +1283,7 @@
       }
     },
     "serviceMarketplace": {
-      "headline": "Purchase Service Request",
+      "headline": "Service Subscription",
       "desc1": "By selecting 'Confirm' below, you will promptly notify the app provider of your interest in their service, and they will commence the subscription procedure. Should the provider require further details to proceed, they will reach out to you directly.",
       "desc2": "Once all necessary information has been confirmed and any queries resolved, the app provider will proceed to activate your app tenant. You will receive a notification to guide you through any subsequent steps required on your part.",
       "desc3": "IMPORTANT NOTICE:",
@@ -1813,13 +1817,14 @@
       "search": "...search for Company Name",
       "tabs": {
         "all": "All",
-        "open": "Open",
-        "confirmed": "Confirmed",
-        "declined": "Declined"
+        "pending": "Pending",
+        "active": "Active",
+        "inactive": "Inactive",
+        "revoked": "Revoked"
       },
-      "sortOptions": {
-        "name": "By Name",
-        "date": "By Date"
+      "sort": {
+        "bpnlasc": "Business Partner Asc",
+        "bpnldesc": "Business Partner Desc"
       },
       "table": {
         "crendentialType": "Type",

src/components/overlays/AppMarketplaceRequest/index.tsx

@@ -131,7 +131,7 @@ export default function AppMarketplaceRequest({ id }: { id: string }) {
             <Typography variant="body2" sx={{ mb: '20px' }}>
               {t('content.appMarketplace.desc2')}
             </Typography>
-            <Typography variant="body2" sx={{ fontWeight: 'bold' }}>
+            <Typography variant="h5">
               {t('content.appMarketplace.desc3')}
             </Typography>
             <Typography variant="body2" sx={{ mb: '20px' }}>

src/components/overlays/BusinessPartnerInfo/index.tsx

@@ -19,7 +19,12 @@
  ********************************************************************************/
 
 import BusinessPartnerDetail from 'components/pages/PartnerNetwork/components/BusinessPartnerDetailOverlay/BusinessPartnerDetail'
-import { DialogContent, DialogHeader } from '@catena-x/portal-shared-components'
+import {
+  Button,
+  DialogActions,
+  DialogContent,
+  DialogHeader,
+} from '@catena-x/portal-shared-components'
 import { closeOverlay } from 'features/control/overlay'
 import { useTranslation } from 'react-i18next'
 import { useDispatch } from 'react-redux'
@@ -43,6 +48,12 @@ export default function BusinessPartnerInfo({ id }: { id: string }) {
       <DialogContent>
         <BusinessPartnerDetail id={id} />
       </DialogContent>
+
+      <DialogActions>
+        <Button variant="outlined" onClick={handleClose}>
+          {t('global.actions.close')}
+        </Button>
+      </DialogActions>
     </>
   )
 }

src/components/overlays/ServiceRequest/index.tsx

@@ -112,7 +112,7 @@ export default function ServiceRequest({ id }: { id: string }) {
             <Typography sx={{ mb: '20px' }} variant="body2">
               {t('content.serviceMarketplace.desc2')}
             </Typography>
-            <Typography sx={{ fontWeight: 'bold' }} variant="body2">
+            <Typography variant="h5">
               {t('content.serviceMarketplace.desc3')}
             </Typography>
             <Typography sx={{ mb: '20px' }} variant="body2">

src/components/pages/Admin/components/RegistrationRequests/CompanyDetailOverlay/index.tsx

@@ -82,6 +82,8 @@ const CompanyDetailOverlay = ({
       )
     } else if (str === 'APP_PROVIDER') {
       return t('content.admin.registration-requests.overlay.appProvider')
+    } else if (str === 'ONBOARDING_SERVICE_PROVIDER') {
+      return t('content.admin.registration-requests.overlay.onboardingProvider')
     } else {
       return t('content.admin.registration-requests.overlay.serviceProvider')
     }

src/components/pages/AdminCredential/AdminCredential.scss

@@ -57,6 +57,7 @@
     align-items: center;
     justify-content: center;
     cursor: pointer;
+    margin-right: 10px;
     .document-icon {
       color: #1977cc;
       font-size: 20px;