build(2.1.0-rc1): merge main into main

CHANGELOG.md

@@ -2,39 +2,65 @@
 
 ## Unreleased
 
-### Bugfix
+### Change
+
+- Page headers
+  - harmonization and standardization of page headers, added consistent headers and removed unused code
+
+### Feature
+
+- Use scroll to top button from shared components
+
+### Bugfixes
 
-- Overlay
-  - Fix consistency issue in overlays where form input is used
-- Company Wallet
-  - Use appropriate path to display logo on cards
-- App Subscription
-  - Register URL changes for Autosetup
-- Refactor
-  - Remove unnecessary import of Typography, Dialog and Circular Progress from mui and use those from shared-components
-- Connector Management
-  - fetch details using api, added permissions and fixed error messages
-- App Release Process
-  - Integrated role deletion with BE api reponse
-- Company Application Registraion Detail Overlay
-  - UI improvements
-  - Add correct registration application checklist items
 - Fixed incorrect usage of pre-commit hook
 - Fix consistency issue in constants file. Use camel case for all page paths. Update corresponding usage in other files
 
+## 2.1.0-RC1
+
+### Change
+
+- **Scroll Integration**:
+  - integrated now scroll-to-top component from shared components for all pages [#872](https://github.com/eclipse-tractusx/portal-frontend/pull/872)
+- **Credential Request**:
+  - UI improvements such as table headers, joint table columns, type updates, etc. [#866](https://github.com/eclipse-tractusx/portal-frontend/pull/866)
+
 ### Feature
 
-- Admin Credential
-  - Credential Request Management Board Improvements
-- Company data
-  - New company data page created
-  - Connect to the gate api to fetch the records
-  - Create and Edit address/site feature introduced
-- App marketplace
-  - Add more and collapse button to category view
-- Page headers
-  - harmonization and standardization of page headers, added consistent headers and removed unused code
-- Use scroll to top button from shared components
+- **Company Role**:
+  - added support for optional terms [#879](https://github.com/eclipse-tractusx/portal-frontend/pull/879)
+- **Company Data Management**:
+  - released Company data management page for Legal Entity, Sites and Addresses incl. simple status management [#731](https://github.com/eclipse-tractusx/portal-frontend/pull/731)
+- **Connector Management**:
+  - released connector detail view including change connector url, view SD document, etc. Add details overlay [#848](https://github.com/eclipse-tractusx/portal-frontend/pull/848)
+
+### Technical Maintenance
+
+- **Dependencies**:
+  - bumped GitHub actions [#846](https://github.com/eclipse-tractusx/portal-frontend/pull/846)
+- **Refactoring**:
+  - removed direct imports from MUI [#855](https://github.com/eclipse-tractusx/portal-frontend/pull/855)
+
+### Bugfixes
+
+- **PartnerNetwork Registration OSP**:
+  - fixed access to customer registration consent UI for OSP customers [#913](https://github.com/eclipse-tractusx/portal-frontend/pull/913)
+- **App Subscription**:
+  - allowed empty URL in register URL overlay [#842](https://github.com/eclipse-tractusx/portal-frontend/pull/842)
+- **Registration Detail**:
+  - fixed translation of registration process flow technical keys – Credential and BPNL Credential [#862](https://github.com/eclipse-tractusx/portal-frontend/pull/862)
+- **App Release Process**:
+  - integrated missing app release process `app role deletion` function with BE API response [#850](https://github.com/eclipse-tractusx/portal-frontend/pull/850)
+- **Company Wallet**:
+  - fixed transaction logo path [#845](https://github.com/eclipse-tractusx/portal-frontend/pull/845)
+- **Overlays**:
+  - fixed consistency for form input fields across the application [#843](https://github.com/eclipse-tractusx/portal-frontend/pull/843)
+- **My Organization View**:
+  - fixed permission validation for `my organization` view [#857](https://github.com/eclipse-tractusx/portal-frontend/pull/857)
+- **App Marketplace**:
+  - fixed app category view more and collapse button function [#805](https://github.com/eclipse-tractusx/portal-frontend/pull/805)
+- **Connector Management**:
+  - fixed blank page issue on clicking on details [#925](https://github.com/eclipse-tractusx/portal-frontend/pull/925)
 
 ## 2.0.0
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catena-x/portal-frontend",
-  "version": "v2.0.0",
+  "version": "v2.1.0-RC1",
   "description": "Catena-X Portal Frontend",
   "author": "Catena-X Contributors",
   "license": "Apache-2.0",

src/assets/locales/de/main.json

@@ -1847,6 +1847,8 @@
         "companyInfo": "Company Info",
         "certificate": "Zertifikat",
         "document": "Dokumente",
+        "status": "Status",
+        "action": "Aktion",
         "type": {
           "TRACEABILITY_FRAMEWORK": "Traceability",
           "PCF_FRAMEWORK": "PCF Framework",

src/assets/locales/en/main.json

@@ -1923,6 +1923,8 @@
         "companyInfo": "Company Info",
         "certificate": "Certificate",
         "document": "Document",
+        "status": "Status",
+        "action": "Action",
         "type": {
           "TRACEABILITY_FRAMEWORK": "Traceability",
           "PCF_FRAMEWORK": "PCF Framework",

src/components/Main.tsx

@@ -67,7 +67,7 @@ export default function Main() {
   }, [dispatch, searchParams])
 
   if (location.pathname === `/${PAGES.REGISTRATION}`)
-    return <Redirect path="registration" />
+    return <Redirect path={PAGES.REGISTRATION} />
 
   if (
     companyData &&
@@ -79,13 +79,17 @@ export default function Main() {
       ApplicationStatus.UPLOAD_DOCUMENTS,
       ApplicationStatus.VERIFY,
     ].includes(companyData.applicationStatus) &&
-    !location.search.includes('overlay=consent_osp')
+    location.pathname !== `/${PAGES.CONSENT_OSP}`
   ) {
     return (
       <>
         <Header main={[]} user={AccessService.userMenuReg()} />
         <MainSearchOverlay />
-        {location.pathname === '/logout' ? <Logout /> : renderSection()}
+        {location.pathname === `/${PAGES.LOGOUT}` ? (
+          <Logout />
+        ) : (
+          renderSection()
+        )}
         <Footer pages={AccessService.footerMenu()} />
         <MenuInfo main={[]} />
       </>