build: merge release into main eclipse-tractusx#1061

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

CHANGELOG.md

@@ -2,15 +2,19 @@
 
 ## Unreleased
 
-### Bugfixes
+### Feature
 
-- **App Release Process**:
-  - Fixed role upload does not work using Firefox [#1003](https://github.com/eclipse-tractusx/portal-frontend/pull/1003)
+- Customer Detail Data Overlay
+  - implement new UI design for customer detail data overlay
 
 ### Change
 
+- **Technical User Management**
+  - Removed 'Inactive' filter in technical user management [#1046](https://github.com/eclipse-tractusx/portal-frontend/pull/1046)
 - **Application Requests and Connector Management**
   - update the status(skipped) in application requests and necessary changes with checkbox in connector management [#1019](https://github.com/eclipse-tractusx/portal-frontend/pull/1019)
+- **Technical User Management**
+  - Removed 'Inactive' filter in technical user management [#1046](https://github.com/eclipse-tractusx/portal-frontend/pull/1046)
 
 ### Bugfixes
 
@@ -22,16 +26,28 @@
   - Fixed back button navigation to service management instead of navigating to home page[#1038](https://github.com/eclipse-tractusx/portal-frontend/pull/1038)
 - **Application Requests**
   - 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)
+
+## 2.2.0-RC2
 
 ### Feature
 
-- Customer Detail Data Overlay
-  - implement new UI design for customer detail data overlay
+- **Onboarding Service Provider Management**:
+  - Create new page for onboarding service provider management [#1052](https://github.com/eclipse-tractusx/portal-frontend/pull/1052)
+- **Company data**
+  - Disable confirm button if input value is not matching with the regular expression [#1056](https://github.com/eclipse-tractusx/portal-frontend/pull/1056)
+  - Fix infinite loop issue in add New Address Modal
+  - Add new csv bulk upload modal [#1056](https://github.com/eclipse-tractusx/portal-frontend/pull/1056)
+- **Service Subscription**
+  - Update auto setup api response data in the service subscription response overlay
 
-### Change
+### Bugfixes
 
-- **Technical User Management**
-  - Removed 'Inactive' filter in technical user management [#1046](https://github.com/eclipse-tractusx/portal-frontend/pull/1046)
+- **Partner Network**
+  - Change interface of the partner network apis. add /members to the POST api and update the business logic accordingly [#1002](https://github.com/eclipse-tractusx/portal-frontend/pull/1002)
+- **Business Partner invite**
+  - fix person name regex patter [#1040](https://github.com/eclipse-tractusx/portal-frontend/pull/1040)
 
 ## 2.2.0-RC1
 
@@ -42,8 +58,8 @@
 - **Company data Management**
   - integrated /ready api to trigger once the new record is created [#958](https://github.com/eclipse-tractusx/portal-frontend/pull/958)
   - enabled displaying of sharing state error details in the company overlay details page [#958](https://github.com/eclipse-tractusx/portal-frontend/pull/958)
-- **App Subscription**
-  - remove subscribe_service requirement for app subscription [#1013](https://github.com/eclipse-tractusx/portal-frontend/pull/1013)
+- **Business partner invite**
+  - updated first name and last name pattern to allow 2 characters in business partner invite application form [#1025](https://github.com/eclipse-tractusx/portal-frontend/pull/1025)
 
 ### Feature
 

DEPENDENCIES

@@ -601,7 +601,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.33, Apache-2.0 AND CC-BY-4.0 AND OFL-1.1, approved, #14247
+npm/npmjs/@catena-x/portal-shared-components/3.4.0, Apache-2.0 AND CC-BY-4.0 AND OFL-1.1, approved, #16027
 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
@@ -738,6 +738,7 @@ npm/npmjs/@tsconfig/node12/1.0.11, MIT, approved, clearlydefined
 npm/npmjs/@tsconfig/node14/1.0.3, MIT, approved, clearlydefined
 npm/npmjs/@tsconfig/node16/1.0.4, MIT, approved, clearlydefined
 npm/npmjs/@types/aria-query/5.0.4, MIT, approved, #10958
+npm/npmjs/@types/autosuggest-highlight/3.2.3, MIT, approved, #11672
 npm/npmjs/@types/babel__core/7.20.5, MIT, approved, clearlydefined
 npm/npmjs/@types/babel__generator/7.6.8, MIT, approved, clearlydefined
 npm/npmjs/@types/babel__template/7.4.4, MIT, approved, clearlydefined

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catena-x/portal-frontend",
-  "version": "v2.2.0-RC1",
+  "version": "v2.2.0-RC2",
   "description": "Catena-X Portal Frontend",
   "author": "Catena-X Contributors",
   "license": "Apache-2.0",
@@ -34,7 +34,7 @@
     ]
   },
   "dependencies": {
-    "@catena-x/portal-shared-components": "^3.0.33",
+    "@catena-x/portal-shared-components": "^3.4.0",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
     "@hookform/error-message": "^2.0.1",
@@ -43,6 +43,7 @@
     "@mui/x-data-grid": "^6.19.11",
     "@react-hook/cache": "^1.1.1",
     "@reduxjs/toolkit": "^2.2.7",
+    "autosuggest-highlight": "^3.3.4",
     "axios": "^1.6.8",
     "buffer": "^6.0.3",
     "dayjs": "^1.11.13",
@@ -70,6 +71,7 @@
     "@testing-library/jest-dom": "^6.4.8",
     "@testing-library/react": "^14.2.2",
     "@testing-library/user-event": "^14.5.2",
+    "@types/autosuggest-highlight": "^3.2.3",
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.17.7",
     "@types/lodash.debounce": "^4.0.9",

src/assets/locales/de/main.json

@@ -69,7 +69,8 @@
     "companySubscriptions": "Firmenabonnements",
     "mycompany": "My Company",
     "mynotifications": "My Notifications",
-    "companyData": "Company Data"
+    "companyData": "Company Data",
+    "ManagementOnboardingServiceProvider": "Onboarding Service Provider"
   },
   "overlays": {
     "invite": "Neuen Geschäftspartner einladen",
@@ -2078,9 +2079,22 @@
     },
     "companyData": {
       "label": "Company Data",
+      "csvUploadBtn": "Upload CSV",
       "statusInfo": {
         "title": "Status Information"
       },
+      "upload": {
+        "title": "Upload CSV",
+        "fileSizeError": "Uploaded file is too big. Maximum 1MB is allowed",
+        "successDescription": "CSV Upload is success. Please close the modal to see updated list",
+        "note": "Note: Please upload only CSV files with maximum 1 MB.",
+        "errorDescription": "CSV Upload failed with the following erros",
+        "templateBtn": "Download CSV Template",
+        "emptyError": "Uploaded CSV is empty. Kindly check and upload again",
+        "copy": "Copy Error to clipboard",
+        "copySuccess": "Error messages copied successfully",
+        "downloadSuccess": "CSV template download successfully"
+      },
       "companyInfo": {
         "title": "Company Name",
         "legalEntityName": "Legal Entity Name",
@@ -2098,7 +2112,9 @@
         "location": "Location",
         "search": "search address / site",
         "noRowsMsg": "No Data yet",
-        "type": "Type"
+        "type": "Type",
+        "status": "Status",
+        "details": "Details"
       },
       "site": {
         "title": "Create new site",
@@ -2177,6 +2193,37 @@
         "title": "Create {name}",
         "description": "The changes could not be saved. Please try again"
       }
+    },
+    "onboardingServiceProvider": {
+      "headertitle": "Onboarding-Dienstleister-Management",
+      "desc": "[description] lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
+      "subDesc1": "OSP-Callback konfiguriert",
+      "subDesc2": "https://url.lorem.ipsum.dolor.sit.amet",
+      "tabletitle1": "OSP-Identitätsanbieter (IDPs)",
+      "tabletitle2": "Kundenübersicht",
+      "userList": "Benutzerliste",
+      "addIdentityProvider": "Identitätsanbieter hinzufügen",
+      "dialogTitle": "IdP-Metadaten konfigurieren",
+      "table": {
+        "customerName": "Kundenname",
+        "status": "Status",
+        "idpName": "IDP-Name",
+        "users": "Anzahl der Benutzer"
+      },
+      "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'"
+      },
+      "clientId": {
+        "name": "Kunden-ID",
+        "hint": "Geben Sie die von Ihrem IdP bereitgestellte Client-ID ein"
+      },
+      "clientSecret": {
+        "name": "Client-Geheimnis",
+        "hint": "Geben Sie das von Ihrem IdP bereitgestellte Client-Geheimnis ein"
+      }
     }
   },
   "navigation": {

src/assets/locales/en/main.json

@@ -68,7 +68,8 @@
     "companySubscriptions": "Company Subscriptions",
     "mycompany": "My Company",
     "mynotifications": "My Notifications",
-    "companyData": "Company Data"
+    "companyData": "Company Data",
+    "ManagementOnboardingServiceProvider": "Onboarding Service Provider"
   },
   "overlays": {
     "invite": "Invite new Business Partner",
@@ -2045,9 +2046,22 @@
     },
     "companyData": {
       "label": "Company Data",
+      "csvUploadBtn": "Upload CSV",
       "statusInfo": {
         "title": "Status Information"
       },
+      "upload": {
+        "title": "Upload CSV",
+        "fileSizeError": "Uploaded file is too big. Maximum 1MB is allowed",
+        "successDescription": "CSV Upload is success. Please close the modal to see updated list",
+        "note": "Note: Please upload only CSV files with maximum 1 MB.",
+        "errorDescription": "CSV Upload failed with the following erros",
+        "templateBtn": "Download CSV Template",
+        "emptyError": "Uploaded CSV is empty. Kindly check and upload again",
+        "copy": "Copy Error to clipboard",
+        "copySuccess": "Error messages copied successfully",
+        "downloadSuccess": "CSV template download successfully"
+      },
       "companyInfo": {
         "title": "Company Name",
         "legalEntityName": "Legal Entity Name",
@@ -2065,7 +2079,9 @@
         "location": "Location",
         "search": "search address / site",
         "noRowsMsg": "No Data yet",
-        "type": "Type"
+        "type": "Type",
+        "status": "Status",
+        "details": "Details"
       },
       "site": {
         "title": "Create new site",
@@ -2149,6 +2165,37 @@
         "title": "Create {name}",
         "description": "The changes could not be saved. Please try again"
       }
+    },
+    "onboardingServiceProvider": {
+      "headertitle": "Onboarding Service Provider Management",
+      "desc": "[description] lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
+      "subDesc1": "OSP Callback configured",
+      "subDesc2": "https://url.lorem.ipsum.dolor.sit.amet",
+      "tabletitle1": "OSP Identity Provider (IDPs)",
+      "tabletitle2": "Customer Overview",
+      "userList": "User List",
+      "addIdentityProvider": "Add Identity Provider",
+      "dialogTitle": "Configure IdP Metadata",
+      "table": {
+        "customerName": "Customer Name",
+        "status": "Status",
+        "idpName": "IDP name",
+        "users": "# of users"
+      },
+      "success": "Successfully configured OSP callback",
+      "callbackUrlError": "Failed configuring OSP callback",
+      "callbackUrl": {
+        "name": "Callback URL",
+        "hint": "Enter the callback URL from your IDP that ends with '/.well-known/openid-configuration'"
+      },
+      "clientId": {
+        "name": "Client ID",
+        "hint": "Enter the client ID provided by your IdP"
+      },
+      "clientSecret": {
+        "name": "Client Secret",
+        "hint": "Enter the client secret provided by your IdP"
+      }
     }
   },
   "navigation": {