From 56740a3301b50d19c05d17db5fb93215869ef1fa Mon Sep 17 00:00:00 2001 From: Phil Schneider Date: Mon, 2 Sep 2024 09:39:23 +0200 Subject: [PATCH 1/8] build(release): bump version for v2.2.0-RC2 (#1060) * build: update changelog * build(release): bump version for v2.2.0-RC2 ---------------- Reviewed-By: Martin Rohrmeier --- CHANGELOG.md | 18 ++++++++++++------ DEPENDENCIES | 29 +++++++++++++++-------------- package.json | 4 ++-- 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d6ed7b74..9193313a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,24 @@ # Changelog -## Unreleased +## 2.2.0-RC2 ### Feature - **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 +- **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 -- Service Subscription + - 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 -- Partner Network - - Change interface of the partner network apis. add /members to the POST api and update the business logic accordingly + +### Bugfixes + +- **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 diff --git a/DEPENDENCIES b/DEPENDENCIES index 57b4e27ec..7300986a7 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -64,7 +64,7 @@ npm/npmjs/-/ci-info/3.9.0, MIT, approved, clearlydefined npm/npmjs/-/cjs-module-lexer/1.2.3, MIT, approved, #9069 npm/npmjs/-/classnames/2.5.1, MIT, approved, clearlydefined npm/npmjs/-/cliui/8.0.1, ISC AND Artistic-2.0, approved, #3753 -npm/npmjs/-/clsx/2.1.0, MIT, approved, clearlydefined +npm/npmjs/-/clsx/2.1.1, MIT, approved, clearlydefined npm/npmjs/-/co/4.6.0, MIT, approved, clearlydefined npm/npmjs/-/collect-v8-coverage/1.0.2, MIT, approved, clearlydefined npm/npmjs/-/color-convert/1.9.3, MIT, approved, clearlydefined @@ -90,7 +90,7 @@ npm/npmjs/-/data-view-buffer/1.0.1, MIT, approved, clearlydefined npm/npmjs/-/data-view-byte-length/1.0.1, MIT, approved, clearlydefined npm/npmjs/-/data-view-byte-offset/1.0.0, MIT, approved, clearlydefined npm/npmjs/-/date-fns/3.6.0, MIT, approved, #14000 -npm/npmjs/-/dayjs/1.11.12, MIT, approved, #9149 +npm/npmjs/-/dayjs/1.11.13, MIT, approved, #9149 npm/npmjs/-/debug/3.2.7, MIT, approved, clearlydefined npm/npmjs/-/debug/4.3.4, MIT, approved, clearlydefined npm/npmjs/-/decimal.js/10.4.3, MIT, approved, clearlydefined @@ -389,7 +389,7 @@ npm/npmjs/-/path-is-absolute/1.0.1, MIT, approved, clearlydefined npm/npmjs/-/path-key/3.1.1, MIT, approved, clearlydefined npm/npmjs/-/path-parse/1.0.7, MIT, approved, clearlydefined npm/npmjs/-/path-type/4.0.0, MIT, approved, clearlydefined -npm/npmjs/-/phone/3.1.49, MIT, approved, #10500 +npm/npmjs/-/phone/3.1.50, MIT, approved, #10500 npm/npmjs/-/picocolors/1.0.0, ISC, approved, #14718 npm/npmjs/-/picomatch/2.3.1, MIT, approved, clearlydefined npm/npmjs/-/pirates/4.0.6, MIT, approved, #680 @@ -416,7 +416,7 @@ npm/npmjs/-/react-hook-form/7.51.5, MIT, approved, #13909 npm/npmjs/-/react-i18next/14.1.3, MIT AND Apache-2.0, approved, #13870 npm/npmjs/-/react-is/16.13.1, MIT, approved, clearlydefined npm/npmjs/-/react-is/17.0.2, MIT, approved, clearlydefined -npm/npmjs/-/react-is/18.2.0, MIT, approved, clearlydefined +npm/npmjs/-/react-is/18.3.1, MIT, approved, clearlydefined npm/npmjs/-/react-player/2.15.1, MIT, approved, #13914 npm/npmjs/-/react-redux/9.1.2, MIT AND (BSD-2-Clause AND ISC AND MIT) AND BSD-3-Clause, approved, #13913 npm/npmjs/-/react-refresh/0.14.0, MIT, approved, clearlydefined @@ -678,14 +678,14 @@ npm/npmjs/@jridgewell/sourcemap-codec/1.4.15, MIT, approved, clearlydefined npm/npmjs/@jridgewell/trace-mapping/0.3.25, MIT, approved, #9904 npm/npmjs/@jridgewell/trace-mapping/0.3.9, MIT, approved, #9904 npm/npmjs/@mui/base/5.0.0-beta.40, MIT, approved, #2992 -npm/npmjs/@mui/core-downloads-tracker/5.15.15, MIT, approved, clearlydefined -npm/npmjs/@mui/icons-material/5.15.15, MIT AND CC-BY-3.0, approved, #13171 -npm/npmjs/@mui/material/5.15.15, MIT AND CC-BY-3.0, approved, #13175 -npm/npmjs/@mui/private-theming/5.15.14, MIT AND CC-BY-3.0, approved, #13174 -npm/npmjs/@mui/styled-engine/5.15.14, MIT AND CC-BY-3.0, approved, #13173 -npm/npmjs/@mui/system/5.15.15, MIT, approved, #13170 -npm/npmjs/@mui/types/7.2.14, MIT, approved, #16017 -npm/npmjs/@mui/utils/5.15.14, MIT AND OFL-1.1 AND CC-BY-3.0, approved, #13927 +npm/npmjs/@mui/core-downloads-tracker/5.16.7, MIT, approved, clearlydefined +npm/npmjs/@mui/icons-material/5.15.21, MIT AND CC-BY-3.0, approved, #13171 +npm/npmjs/@mui/material/5.15.21, MIT AND CC-BY-3.0, approved, #13175 +npm/npmjs/@mui/private-theming/5.16.6, MIT, approved, #15717 +npm/npmjs/@mui/styled-engine/5.16.6, MIT, approved, #15718 +npm/npmjs/@mui/system/5.16.7, MIT, approved, #15715 +npm/npmjs/@mui/types/7.2.15, MIT, approved, #16017 +npm/npmjs/@mui/utils/5.16.6, MIT, approved, #15716 npm/npmjs/@mui/x-data-grid/6.19.11, MIT, approved, #14027 npm/npmjs/@mui/x-date-pickers/6.19.9, MIT, approved, #14025 npm/npmjs/@nodelib/fs.scandir/2.1.5, MIT, approved, clearlydefined @@ -694,7 +694,7 @@ npm/npmjs/@nodelib/fs.walk/1.2.8, MIT, approved, clearlydefined npm/npmjs/@popperjs/core/2.11.8, MIT, approved, clearlydefined npm/npmjs/@react-hook/cache/1.1.1, MIT, approved, clearlydefined npm/npmjs/@react-hook/latest/1.0.3, MIT, approved, clearlydefined -npm/npmjs/@reduxjs/toolkit/2.2.6, MIT AND (BSD-2-Clause AND ISC AND MIT) AND Apache-2.0, approved, #14170 +npm/npmjs/@reduxjs/toolkit/2.2.7, MIT AND (BSD-2-Clause AND ISC AND MIT) AND Apache-2.0, approved, #14170 npm/npmjs/@remix-run/router/1.15.3, MIT, approved, clearlydefined npm/npmjs/@rollup/pluginutils/5.1.0, MIT, approved, clearlydefined npm/npmjs/@rollup/rollup-android-arm-eabi/4.17.2, MIT, approved, clearlydefined @@ -729,7 +729,7 @@ npm/npmjs/@svgr/core/8.1.0, MIT, approved, clearlydefined npm/npmjs/@svgr/hast-util-to-babel-ast/8.0.0, MIT, approved, clearlydefined npm/npmjs/@svgr/plugin-jsx/8.1.0, MIT, approved, clearlydefined npm/npmjs/@testing-library/dom/9.3.4, MIT AND (MIT AND WTFPL), approved, #9038 -npm/npmjs/@testing-library/jest-dom/6.4.6, MIT, approved, clearlydefined +npm/npmjs/@testing-library/jest-dom/6.4.8, MIT, approved, clearlydefined npm/npmjs/@testing-library/react/14.2.2, MIT, approved, #13316 npm/npmjs/@testing-library/user-event/14.5.2, MIT, approved, clearlydefined npm/npmjs/@tootallnate/once/2.0.0, MIT, approved, clearlydefined @@ -760,6 +760,7 @@ npm/npmjs/@types/node/20.11.30, MIT, approved, #13826 npm/npmjs/@types/papaparse/5.3.14, MIT, approved, #10964 npm/npmjs/@types/parse-json/4.0.2, MIT, approved, clearlydefined npm/npmjs/@types/prop-types/15.7.11, MIT, approved, clearlydefined +npm/npmjs/@types/prop-types/15.7.12, MIT, approved, clearlydefined npm/npmjs/@types/qs/6.9.15, MIT, approved, #14071 npm/npmjs/@types/react-dom/18.2.22, MIT, approved, #8256 npm/npmjs/@types/react-redux/7.1.33, MIT, approved, #10970 diff --git a/package.json b/package.json index 12ed647ac..e4701b741 100644 --- a/package.json +++ b/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", @@ -71,6 +71,7 @@ "@testing-library/jest-dom": "^6.4.6", "@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", @@ -82,7 +83,6 @@ "@types/react-dom": "^18.2.22", "@types/react-redux": "^7.1.33", "@types/react-slick": "^0.23.13", - "@types/autosuggest-highlight": "^3.2.3", "@typescript-eslint/eslint-plugin": "^7.3.1", "@typescript-eslint/parser": "^7.3.1", "@vitejs/plugin-react": "^4.2.1", From 50f124a3ee07e47bfa80569d9a127f2ddccb13b0 Mon Sep 17 00:00:00 2001 From: Martin Rohrmeier Date: Thu, 5 Sep 2024 15:51:03 +0200 Subject: [PATCH 2/8] feat(application requests and connector management): update skipped status (#1074) --- CHANGELOG.md | 7 +++ DEPENDENCIES | 29 ++++++------ src/assets/locales/de/main.json | 10 ++++- src/assets/locales/en/main.json | 10 ++++- .../CompanyDetailsHelper.tsx | 8 ++++ .../RegistrationRequests.scss | 1 - .../CheckList/CheckListFullButtons.tsx | 15 +++++++ .../registrationTableColumns.tsx | 19 ++++++++ .../EdcConnector/edcConnectorTableColumns.tsx | 3 +- .../shared/basic/Progress/index.tsx | 44 +++++++++++-------- .../admin/applicationRequestApiSlice.ts | 4 ++ 11 files changed, 110 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9193313a9..03b5c48fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## unreleased (2.2.0-RC3) + +### Change + +- **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) + ## 2.2.0-RC2 ### Feature diff --git a/DEPENDENCIES b/DEPENDENCIES index 7300986a7..57b4e27ec 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -64,7 +64,7 @@ npm/npmjs/-/ci-info/3.9.0, MIT, approved, clearlydefined npm/npmjs/-/cjs-module-lexer/1.2.3, MIT, approved, #9069 npm/npmjs/-/classnames/2.5.1, MIT, approved, clearlydefined npm/npmjs/-/cliui/8.0.1, ISC AND Artistic-2.0, approved, #3753 -npm/npmjs/-/clsx/2.1.1, MIT, approved, clearlydefined +npm/npmjs/-/clsx/2.1.0, MIT, approved, clearlydefined npm/npmjs/-/co/4.6.0, MIT, approved, clearlydefined npm/npmjs/-/collect-v8-coverage/1.0.2, MIT, approved, clearlydefined npm/npmjs/-/color-convert/1.9.3, MIT, approved, clearlydefined @@ -90,7 +90,7 @@ npm/npmjs/-/data-view-buffer/1.0.1, MIT, approved, clearlydefined npm/npmjs/-/data-view-byte-length/1.0.1, MIT, approved, clearlydefined npm/npmjs/-/data-view-byte-offset/1.0.0, MIT, approved, clearlydefined npm/npmjs/-/date-fns/3.6.0, MIT, approved, #14000 -npm/npmjs/-/dayjs/1.11.13, MIT, approved, #9149 +npm/npmjs/-/dayjs/1.11.12, MIT, approved, #9149 npm/npmjs/-/debug/3.2.7, MIT, approved, clearlydefined npm/npmjs/-/debug/4.3.4, MIT, approved, clearlydefined npm/npmjs/-/decimal.js/10.4.3, MIT, approved, clearlydefined @@ -389,7 +389,7 @@ npm/npmjs/-/path-is-absolute/1.0.1, MIT, approved, clearlydefined npm/npmjs/-/path-key/3.1.1, MIT, approved, clearlydefined npm/npmjs/-/path-parse/1.0.7, MIT, approved, clearlydefined npm/npmjs/-/path-type/4.0.0, MIT, approved, clearlydefined -npm/npmjs/-/phone/3.1.50, MIT, approved, #10500 +npm/npmjs/-/phone/3.1.49, MIT, approved, #10500 npm/npmjs/-/picocolors/1.0.0, ISC, approved, #14718 npm/npmjs/-/picomatch/2.3.1, MIT, approved, clearlydefined npm/npmjs/-/pirates/4.0.6, MIT, approved, #680 @@ -416,7 +416,7 @@ npm/npmjs/-/react-hook-form/7.51.5, MIT, approved, #13909 npm/npmjs/-/react-i18next/14.1.3, MIT AND Apache-2.0, approved, #13870 npm/npmjs/-/react-is/16.13.1, MIT, approved, clearlydefined npm/npmjs/-/react-is/17.0.2, MIT, approved, clearlydefined -npm/npmjs/-/react-is/18.3.1, MIT, approved, clearlydefined +npm/npmjs/-/react-is/18.2.0, MIT, approved, clearlydefined npm/npmjs/-/react-player/2.15.1, MIT, approved, #13914 npm/npmjs/-/react-redux/9.1.2, MIT AND (BSD-2-Clause AND ISC AND MIT) AND BSD-3-Clause, approved, #13913 npm/npmjs/-/react-refresh/0.14.0, MIT, approved, clearlydefined @@ -678,14 +678,14 @@ npm/npmjs/@jridgewell/sourcemap-codec/1.4.15, MIT, approved, clearlydefined npm/npmjs/@jridgewell/trace-mapping/0.3.25, MIT, approved, #9904 npm/npmjs/@jridgewell/trace-mapping/0.3.9, MIT, approved, #9904 npm/npmjs/@mui/base/5.0.0-beta.40, MIT, approved, #2992 -npm/npmjs/@mui/core-downloads-tracker/5.16.7, MIT, approved, clearlydefined -npm/npmjs/@mui/icons-material/5.15.21, MIT AND CC-BY-3.0, approved, #13171 -npm/npmjs/@mui/material/5.15.21, MIT AND CC-BY-3.0, approved, #13175 -npm/npmjs/@mui/private-theming/5.16.6, MIT, approved, #15717 -npm/npmjs/@mui/styled-engine/5.16.6, MIT, approved, #15718 -npm/npmjs/@mui/system/5.16.7, MIT, approved, #15715 -npm/npmjs/@mui/types/7.2.15, MIT, approved, #16017 -npm/npmjs/@mui/utils/5.16.6, MIT, approved, #15716 +npm/npmjs/@mui/core-downloads-tracker/5.15.15, MIT, approved, clearlydefined +npm/npmjs/@mui/icons-material/5.15.15, MIT AND CC-BY-3.0, approved, #13171 +npm/npmjs/@mui/material/5.15.15, MIT AND CC-BY-3.0, approved, #13175 +npm/npmjs/@mui/private-theming/5.15.14, MIT AND CC-BY-3.0, approved, #13174 +npm/npmjs/@mui/styled-engine/5.15.14, MIT AND CC-BY-3.0, approved, #13173 +npm/npmjs/@mui/system/5.15.15, MIT, approved, #13170 +npm/npmjs/@mui/types/7.2.14, MIT, approved, #16017 +npm/npmjs/@mui/utils/5.15.14, MIT AND OFL-1.1 AND CC-BY-3.0, approved, #13927 npm/npmjs/@mui/x-data-grid/6.19.11, MIT, approved, #14027 npm/npmjs/@mui/x-date-pickers/6.19.9, MIT, approved, #14025 npm/npmjs/@nodelib/fs.scandir/2.1.5, MIT, approved, clearlydefined @@ -694,7 +694,7 @@ npm/npmjs/@nodelib/fs.walk/1.2.8, MIT, approved, clearlydefined npm/npmjs/@popperjs/core/2.11.8, MIT, approved, clearlydefined npm/npmjs/@react-hook/cache/1.1.1, MIT, approved, clearlydefined npm/npmjs/@react-hook/latest/1.0.3, MIT, approved, clearlydefined -npm/npmjs/@reduxjs/toolkit/2.2.7, MIT AND (BSD-2-Clause AND ISC AND MIT) AND Apache-2.0, approved, #14170 +npm/npmjs/@reduxjs/toolkit/2.2.6, MIT AND (BSD-2-Clause AND ISC AND MIT) AND Apache-2.0, approved, #14170 npm/npmjs/@remix-run/router/1.15.3, MIT, approved, clearlydefined npm/npmjs/@rollup/pluginutils/5.1.0, MIT, approved, clearlydefined npm/npmjs/@rollup/rollup-android-arm-eabi/4.17.2, MIT, approved, clearlydefined @@ -729,7 +729,7 @@ npm/npmjs/@svgr/core/8.1.0, MIT, approved, clearlydefined npm/npmjs/@svgr/hast-util-to-babel-ast/8.0.0, MIT, approved, clearlydefined npm/npmjs/@svgr/plugin-jsx/8.1.0, MIT, approved, clearlydefined npm/npmjs/@testing-library/dom/9.3.4, MIT AND (MIT AND WTFPL), approved, #9038 -npm/npmjs/@testing-library/jest-dom/6.4.8, MIT, approved, clearlydefined +npm/npmjs/@testing-library/jest-dom/6.4.6, MIT, approved, clearlydefined npm/npmjs/@testing-library/react/14.2.2, MIT, approved, #13316 npm/npmjs/@testing-library/user-event/14.5.2, MIT, approved, clearlydefined npm/npmjs/@tootallnate/once/2.0.0, MIT, approved, clearlydefined @@ -760,7 +760,6 @@ npm/npmjs/@types/node/20.11.30, MIT, approved, #13826 npm/npmjs/@types/papaparse/5.3.14, MIT, approved, #10964 npm/npmjs/@types/parse-json/4.0.2, MIT, approved, clearlydefined npm/npmjs/@types/prop-types/15.7.11, MIT, approved, clearlydefined -npm/npmjs/@types/prop-types/15.7.12, MIT, approved, clearlydefined npm/npmjs/@types/qs/6.9.15, MIT, approved, #14071 npm/npmjs/@types/react-dom/18.2.22, MIT, approved, #8256 npm/npmjs/@types/react-redux/7.1.33, MIT, approved, #10970 diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json index b566cf13b..9d791cb54 100644 --- a/src/assets/locales/de/main.json +++ b/src/assets/locales/de/main.json @@ -188,6 +188,7 @@ "buttonprogress": "in progress", "buttonrejected": "rejected", "buttoncompleted": "completed", + "buttonPartiallyCompleted": "teilweise abgeschlossen", "buttonerror": "error", "cellconfirmed": "bestätigt", "celldeclined": "abgelehnt", @@ -569,7 +570,7 @@ "location": "Location", "tooltipText": "Connector's status is pending", "sdDescription": "SD Registration", - "sdRegistrationToolTip": "Die Selbstbeschreibung wurde ausgelöst. Der Vorgang kann bis zu ein paar Minuten dauern.", + "sdRegistrationToolTip": "Das SD-Dokument ist noch nicht geladen. Dies könnte auf die Deaktivierung der SD-Fabrik zurückzuführen sein. Dieser Prozess wird so bald wie möglich vom CX-Administrator neu ausgelöst.", "hostCompanyName": "Host", "providerCompanyName": "Customer", "connectorUrl": "Connector-URL" @@ -1616,7 +1617,8 @@ "DONE": "approved", "IN_PROGRESS": "in progress", "FAILED": "failed", - "TO_DO": "to do" + "TO_DO": "to do", + "SKIPPED": "skipped" }, "buttonApprove": "Approve", "buttonConfirm": "Confirm", @@ -1774,6 +1776,10 @@ "FAILED": { "title": "Ihre Aktion ist erforderlich, um fortzufahren.", "description": "The self-description creation was unsuccessful. Details regarding the unsuccessful process can get found below. Additionally you can retrigger the endpoint (by resetting the status) or close/reject the company registration." + }, + "SKIPPED": { + "title": "Von Ihrer Seite sind keine Maßnahmen erforderlich", + "description": "Die Erstellung der Selbstbeschreibung wurde absichtlich übersprungen. Dieser Prozess wird vom CX-Operator so bald wie möglich wieder ausgelöst." } } }, diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json index aef08c23b..de78c9269 100644 --- a/src/assets/locales/en/main.json +++ b/src/assets/locales/en/main.json @@ -187,6 +187,7 @@ "buttonprogress": "in progress", "buttonrejected": "rejected", "buttoncompleted": "completed", + "buttonPartiallyCompleted": "partially completed", "buttonerror": "error", "cellconfirmed": "confirmed", "celldeclined": "declined", @@ -568,7 +569,7 @@ "location": "Location", "tooltipText": "Connector's status is pending", "sdDescription": "SD Registration", - "sdRegistrationToolTip": "The Self-Description is triggered. Process might take up to a couple of minutes.", + "sdRegistrationToolTip": "The SD Document is not yet loaded. This could be due to the deactivation of the Sd Factory. This process will be retriggered as soon as possible by the CX Admin", "hostCompanyName": "Host", "providerCompanyName": "Customer", "connectorUrl": "Connector URL" @@ -1583,7 +1584,8 @@ "DONE": "approved", "IN_PROGRESS": "in progress", "FAILED": "failed", - "TO_DO": "to do" + "TO_DO": "to do", + "SKIPPED": "skipped" }, "buttonApprove": "Approve", "buttonConfirm": "Confirm", @@ -1741,6 +1743,10 @@ "FAILED": { "title": "Your action is needed.", "description": "The self-description creation was unsuccessful. Details regarding the unsuccessful process can get found below. Additionally you can retrigger the endpoint (by resetting the status) or close/reject the company registration." + }, + "SKIPPED": { + "title": "No action needed from your side", + "description": "The self-description creation was skipped on purpose. This process will be retriggered by the CX Operator as soon as possible." } } }, diff --git a/src/components/pages/Admin/components/RegistrationRequests/CompanyDetailOverlay/CompanyDetailsHelper.tsx b/src/components/pages/Admin/components/RegistrationRequests/CompanyDetailOverlay/CompanyDetailsHelper.tsx index 3834eda6f..4b1834ff1 100644 --- a/src/components/pages/Admin/components/RegistrationRequests/CompanyDetailOverlay/CompanyDetailsHelper.tsx +++ b/src/components/pages/Admin/components/RegistrationRequests/CompanyDetailOverlay/CompanyDetailsHelper.tsx @@ -36,6 +36,14 @@ export const getTitle = ( ) => { const getStatus = () => { if ( + selectedRequest?.applicationStatus === + ApplicationRequestStatus.CONFIRMED && + selectedRequest?.applicationChecklist?.filter( + (checklist) => checklist.statusId === ProgressStatus.SKIPPED + ).length > 0 + ) { + return t('content.admin.registration-requests.buttonPartiallyCompleted') + } else if ( selectedRequest?.applicationStatus === ApplicationRequestStatus.SUBMITTED ) { const failedItems = selectedRequest.applicationChecklist.filter( diff --git a/src/components/pages/Admin/components/RegistrationRequests/RegistrationRequests.scss b/src/components/pages/Admin/components/RegistrationRequests/RegistrationRequests.scss index 5ba76d408..0d6b192f4 100644 --- a/src/components/pages/Admin/components/RegistrationRequests/RegistrationRequests.scss +++ b/src/components/pages/Admin/components/RegistrationRequests/RegistrationRequests.scss @@ -197,7 +197,6 @@ align-items: center; border-radius: 30px; padding: 5px; - width: 140px; .statusText { margin: 0 auto; diff --git a/src/components/pages/Admin/components/RegistrationRequests/components/CheckList/CheckListFullButtons.tsx b/src/components/pages/Admin/components/RegistrationRequests/components/CheckList/CheckListFullButtons.tsx index f3ccec8ab..31d43e002 100644 --- a/src/components/pages/Admin/components/RegistrationRequests/components/CheckList/CheckListFullButtons.tsx +++ b/src/components/pages/Admin/components/RegistrationRequests/components/CheckList/CheckListFullButtons.tsx @@ -98,6 +98,19 @@ export default function CheckListFullButtons({ ), backgroundColor: '#FFF6FF', } + case ProgressStatus.SKIPPED: + return { + icon: ( + + ), + backgroundColor: '#ffffff', + } } } @@ -111,6 +124,8 @@ export default function CheckListFullButtons({ return 'confirmed' case ProgressStatus.FAILED: return 'declined' + case ProgressStatus.SKIPPED: + return 'label' } } diff --git a/src/components/pages/Admin/components/RegistrationRequests/registrationTableColumns.tsx b/src/components/pages/Admin/components/RegistrationRequests/registrationTableColumns.tsx index e185305bd..db62cd830 100644 --- a/src/components/pages/Admin/components/RegistrationRequests/registrationTableColumns.tsx +++ b/src/components/pages/Admin/components/RegistrationRequests/registrationTableColumns.tsx @@ -69,6 +69,11 @@ export const StatusProgress = ({ style={{ border: `2px solid ${style.border}`, background: style.background, + width: + statusText === + t('content.admin.registration-requests.buttonPartiallyCompleted') + ? 'max-width' + : '140px', }} > - { - switch (applicationStatus) { - case ApplicationRequestStatus.CONFIRMED: - return { - progressBg: '#e2f6c7', - progressColor: 'conic-gradient(#00aa55 360deg 360deg)', - } - case ApplicationRequestStatus.DECLINED: - case ApplicationRequestStatus.CANCELLED_BY_CUSTOMER: - return { - progressBg: '#fee7e2', - progressColor: 'conic-gradient(#d91e18 360deg 360deg)', - } - default: - return { - progressBg: '#ffffff', - progressColor: `conic-gradient(#00aa55 ${green}deg, #efb800 ${green}deg ${yellow}deg, #d91e18 ${yellow}deg ${red}deg, #ffffff ${red}deg 360deg)`, - } - } + if (ApplicationRequestStatus.CONFIRMED && items?.SKIPPED === 1) { + return { + progressBg: '#eaf1fe', + progressColor: '#0f71cb', + } + } else + switch (applicationStatus) { + case ApplicationRequestStatus.CONFIRMED: + return { + progressBg: '#e2f6c7', + progressColor: 'conic-gradient(#00aa55 360deg 360deg)', + } + case ApplicationRequestStatus.DECLINED: + case ApplicationRequestStatus.CANCELLED_BY_CUSTOMER: + return { + progressBg: '#fee7e2', + progressColor: 'conic-gradient(#d91e18 360deg 360deg)', + } + default: + return { + progressBg: '#ffffff', + progressColor: `conic-gradient(#00aa55 ${green}deg, #efb800 ${green}deg ${yellow}deg, #d91e18 ${yellow}deg ${red}deg, #ffffff ${red}deg 360deg)`, + } + } } return ( @@ -65,7 +71,7 @@ export const Progress = ({ }} > {applicationStatus !== ApplicationRequestStatus.DECLINED && - `${items.DONE}/${totalItems}`} + `${items.DONE + items.SKIPPED}/${totalItems}`} ) diff --git a/src/features/admin/applicationRequestApiSlice.ts b/src/features/admin/applicationRequestApiSlice.ts index 94c182f18..697d85e78 100644 --- a/src/features/admin/applicationRequestApiSlice.ts +++ b/src/features/admin/applicationRequestApiSlice.ts @@ -55,6 +55,7 @@ export enum ProgressStatus { TO_DO = 'TO_DO', DONE = 'DONE', FAILED = 'FAILED', + SKIPPED = 'SKIPPED', } export type ProgressType = { @@ -62,6 +63,7 @@ export type ProgressType = { DONE: number FAILED: number IN_PROGRESS: number + SKIPPED: number } export const initialProgressValue: ProgressType = { @@ -69,6 +71,7 @@ export const initialProgressValue: ProgressType = { DONE: 0, FAILED: 0, IN_PROGRESS: 0, + SKIPPED: 0, } export enum StatusType { @@ -128,6 +131,7 @@ export const progressMapper = { IN_PROGRESS: 5, TO_DO: 0, FAILED: 0, + SKIPPED: 0, } export interface ApplicationRequest { From 62b441d48f8ec37215358ff32f62c7cdd5cf5293 Mon Sep 17 00:00:00 2001 From: Martin Rohrmeier Date: Thu, 5 Sep 2024 15:52:03 +0200 Subject: [PATCH 3/8] feat(technical user management): remove inactive filter (#1067) --- CHANGELOG.md | 4 +++- .../pages/TechnicalUserManagement/TechnicalUserTable.tsx | 5 ----- src/features/admin/serviceApiSlice.ts | 7 ------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03b5c48fc..8f5da3919 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,11 @@ # Changelog -## unreleased (2.2.0-RC3) +## (unreleased) 2.2.0-RC3 ### 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) diff --git a/src/components/pages/TechnicalUserManagement/TechnicalUserTable.tsx b/src/components/pages/TechnicalUserManagement/TechnicalUserTable.tsx index c87bcef15..ba16ae818 100644 --- a/src/components/pages/TechnicalUserManagement/TechnicalUserTable.tsx +++ b/src/components/pages/TechnicalUserManagement/TechnicalUserTable.tsx @@ -81,11 +81,6 @@ export const TechnicalUserTable = () => { buttonValue: ServiceAccountStatusFilter.ACTIVE, onButtonClick: setView, }, - { - buttonText: t('content.usermanagement.technicalUser.tabs.inactive'), - buttonValue: ServiceAccountStatusFilter.INACTIVE, - onButtonClick: setView, - }, { buttonText: t('content.usermanagement.technicalUser.tabs.managed'), buttonValue: ServiceAccountStatusFilter.MANAGED, diff --git a/src/features/admin/serviceApiSlice.ts b/src/features/admin/serviceApiSlice.ts index d07c52b03..ac7b07da5 100644 --- a/src/features/admin/serviceApiSlice.ts +++ b/src/features/admin/serviceApiSlice.ts @@ -98,7 +98,6 @@ export interface ServiceAccountsResponseType { export enum ServiceAccountStatusFilter { ACTIVE = 'ACTIVE', - INACTIVE = 'INACTIVE', MANAGED = 'MANAGED', OWNED = 'OWNED', } @@ -152,12 +151,6 @@ export const apiSlice = createApi({ fetchArgs.args.statusFilter === ServiceAccountStatusFilter.ACTIVE ) { return `${url}&clientId=${fetchArgs.args!.expr}` - } else if ( - !isFetchArgs && - fetchArgs.args.statusFilter && - fetchArgs.args.statusFilter === ServiceAccountStatusFilter.INACTIVE - ) { - return `${url}&filterForInactive=true` } else if ( !isFetchArgs && fetchArgs.args.statusFilter && From b83b7d3e79d3e0c6ad59fa0ae2182cdb51d92e0c Mon Sep 17 00:00:00 2001 From: Manojava Koushik <111366021+manojava-gk@users.noreply.github.com> Date: Thu, 5 Sep 2024 19:35:23 +0530 Subject: [PATCH 4/8] fix(company data): fix broken modal and translation error (#1070) --- CHANGELOG.md | 5 +++++ .../pages/CompanyData/components/AddressDetails.tsx | 2 +- src/components/shared/basic/DeleteObjectContent/style.scss | 3 --- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f5da3919..2d50f1134 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## (unreleased) 2.2.0-RC3 +- Confirm Modal + - Fix broken title and description section +- Company data + - Fix translation error + ### Change - **Technical User Management** diff --git a/src/components/pages/CompanyData/components/AddressDetails.tsx b/src/components/pages/CompanyData/components/AddressDetails.tsx index 3db7f0eb9..fcdc9d131 100644 --- a/src/components/pages/CompanyData/components/AddressDetails.tsx +++ b/src/components/pages/CompanyData/components/AddressDetails.tsx @@ -32,7 +32,7 @@ export default function AddressDetails({ const companyAddressData = useSelector(companyDataSelector) const addressData = [ { - key: t('content.companyData.address.form.companySite.name'), + key: t('content.companyData.site.form.site.name'), value: companyAddressData.site?.name ?? '', }, { diff --git a/src/components/shared/basic/DeleteObjectContent/style.scss b/src/components/shared/basic/DeleteObjectContent/style.scss index 067f308fc..78d64d292 100644 --- a/src/components/shared/basic/DeleteObjectContent/style.scss +++ b/src/components/shared/basic/DeleteObjectContent/style.scss @@ -19,9 +19,6 @@ ********************************************************************************/ .remove-object-content { - max-width: 930px; - margin-top: -20px; - * { width: fit-content; text-align: center; From ac42d7553d3c61f5a6db087884a6c54fb842017b Mon Sep 17 00:00:00 2001 From: Manojava Koushik <111366021+manojava-gk@users.noreply.github.com> Date: Fri, 6 Sep 2024 16:22:21 +0530 Subject: [PATCH 5/8] fix(company data): remove page notification (#1071) --- CHANGELOG.md | 2 ++ DEPENDENCIES | 2 +- package.json | 2 +- .../overlays/CSVUploadOverlay/index.tsx | 1 - .../components/CompanyAddressList.tsx | 20 +++++++++++++++++-- src/components/pages/CompanyData/index.tsx | 15 -------------- yarn.lock | 8 ++++---- 7 files changed, 26 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d50f1134..a048d1f26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## (unreleased) 2.2.0-RC3 +- Company Data + - Remove page notification on download csv template action - Confirm Modal - Fix broken title and description section - Company data diff --git a/DEPENDENCIES b/DEPENDENCIES index 57b4e27ec..918a799f0 100644 --- a/DEPENDENCIES +++ b/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.4.0, Apache-2.0 AND CC-BY-4.0 AND OFL-1.1, approved, #16027 +npm/npmjs/@catena-x/portal-shared-components/3.5.1, Apache-2.0 AND CC-BY-4.0 AND OFL-1.1, approved, #16079 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 diff --git a/package.json b/package.json index e4701b741..1bde68e47 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ ] }, "dependencies": { - "@catena-x/portal-shared-components": "^3.4.0", + "@catena-x/portal-shared-components": "^3.5.1", "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.5", "@hookform/error-message": "^2.0.1", diff --git a/src/components/overlays/CSVUploadOverlay/index.tsx b/src/components/overlays/CSVUploadOverlay/index.tsx index d2a514718..5ea856d78 100644 --- a/src/components/overlays/CSVUploadOverlay/index.tsx +++ b/src/components/overlays/CSVUploadOverlay/index.tsx @@ -102,7 +102,6 @@ export default function CSVUploadOverlay(): JSX.Element { document.body.appendChild(a) a.click() a.remove() - CopySuccess(t('content.companyData.upload.downloadSuccess')) }) } diff --git a/src/components/pages/CompanyData/components/CompanyAddressList.tsx b/src/components/pages/CompanyData/components/CompanyAddressList.tsx index 816ae07fe..33789dcd4 100644 --- a/src/components/pages/CompanyData/components/CompanyAddressList.tsx +++ b/src/components/pages/CompanyData/components/CompanyAddressList.tsx @@ -45,6 +45,10 @@ import { setSharingStateInfo, } from 'features/companyData/slice' import { statusColorMap } from 'utils/dataMapper' +import { show } from 'features/control/overlay' +import { OVERLAYS } from 'types/Constants' +import UploadIcon from '@mui/icons-material/Upload' +import AddCircleOutlineIcon from '@mui/icons-material/AddCircleOutline' export const CompanyAddressList = ({ handleButtonClick, @@ -186,12 +190,24 @@ export const CompanyAddressList = ({ setPage((i) => i + 1) }} hideFooterPagination={true} + buttons={[ + { + title: t('content.companyData.table.buttonSite'), + click: () => { + handleSecondButtonClick() + }, + icon: , + }, + { + title: t('content.companyData.csvUploadBtn'), + click: () => dispatch(show(OVERLAYS.CSV_UPLOAD_OVERLAY)), + icon: , + }, + ]} autoFocus={false} onButtonClick={handleButtonClick} rowsCount={inputs.length + outputs.length} buttonLabel={t('content.companyData.table.buttonAddress')} - secondButtonLabel={t('content.companyData.table.buttonSite')} - onSecondButtonClick={handleSecondButtonClick} toolbarVariant="premium" searchPlaceholder={t('content.companyData.table.search')} columnHeadersBackgroundColor={'#FFFFFF'} diff --git a/src/components/pages/CompanyData/index.tsx b/src/components/pages/CompanyData/index.tsx index 167888a1d..10d184f31 100644 --- a/src/components/pages/CompanyData/index.tsx +++ b/src/components/pages/CompanyData/index.tsx @@ -23,13 +23,8 @@ import MyCompanyInfoComponent from '../Organization/MyCompanyInfoComponent' import EditForm from './components/EditForm' import { useDispatch } from 'react-redux' import { setCompanyPageRefetch } from 'features/companyData/slice' -import { Button } from '@catena-x/portal-shared-components' -import { useTranslation } from 'react-i18next' -import { show } from 'features/control/overlay' -import { OVERLAYS } from 'types/Constants' export default function CompanyData() { - const { t } = useTranslation() const [showOverlay, setShowOverlay] = useState({ address: false, site: false, @@ -48,16 +43,6 @@ export default function CompanyData() {
-
- -
{ diff --git a/yarn.lock b/yarn.lock index 376984254..a58c660bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -329,10 +329,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@catena-x/portal-shared-components@^3.4.0": - version "3.4.0" - resolved "https://registry.yarnpkg.com/@catena-x/portal-shared-components/-/portal-shared-components-3.4.0.tgz#68f9b2c6d4a567b347cd008a113a3f5f7bf64a89" - integrity sha512-EYhOSvwuXZt1zXPPpCFfSe+6I8VghH8fClH80aud+x8UhMiZbBzOOn6kjAZKnpKH9qoyEX4TqpE4ZUYxnfagMA== +"@catena-x/portal-shared-components@^3.5.1": + version "3.5.1" + resolved "https://registry.yarnpkg.com/@catena-x/portal-shared-components/-/portal-shared-components-3.5.1.tgz#d2caf4acf4c0197bca392054e0b9f8f1b451b704" + integrity sha512-xWAqM2FuTTBF3Koyjkvf1ZJi36DDwDuXin3nlkbB8hRwBKKV5fWLGQN+3bcwCoA6quNK/Juj7PQ2BYYqrQEDRw== dependencies: "@date-io/date-fns" "^3.0.0" "@emotion/react" "^11.11.4" From 50ff2f8895d8cb532e91e9ee1fbde53b94228f63 Mon Sep 17 00:00:00 2001 From: lavanya-bmw <106523828+lavanya-bmw@users.noreply.github.com> Date: Mon, 9 Sep 2024 18:55:10 +0530 Subject: [PATCH 6/8] feat(technical user management): update filters (#1087) --- CHANGELOG.md | 1 + src/assets/locales/de/main.json | 3 +-- src/assets/locales/en/main.json | 3 +-- .../TechnicalUserTable.tsx | 18 ++++++------------ src/features/admin/serviceApiSlice.ts | 10 ++++------ 5 files changed, 13 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a048d1f26..b61379196 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - **Technical User Management** - Removed 'Inactive' filter in technical user management [#1046](https://github.com/eclipse-tractusx/portal-frontend/pull/1046) + - Update filters view and logic [#1087](https://github.com/eclipse-tractusx/portal-frontend/pull/1087) - **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) diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json index 9d791cb54..99dcbd5db 100644 --- a/src/assets/locales/de/main.json +++ b/src/assets/locales/de/main.json @@ -940,8 +940,7 @@ "resetCredentialError": "Something went wrong", "resetCredentialSuccess": "Credential reset was successful", "tabs": { - "active": "Aktiv", - "inactive": "Inaktiv", + "showAll": "Alle anzeigen", "managed": "Gelang es", "owned": "Besessen" }, diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json index de78c9269..2bb92b6c7 100644 --- a/src/assets/locales/en/main.json +++ b/src/assets/locales/en/main.json @@ -944,8 +944,7 @@ "resetCredentialError": "Something went wrong", "resetCredentialSuccess": "Credential reset was successful", "tabs": { - "active": "Active", - "inactive": "Inactive", + "showAll": "Show All", "managed": "Managed", "owned": "Owned" }, diff --git a/src/components/pages/TechnicalUserManagement/TechnicalUserTable.tsx b/src/components/pages/TechnicalUserManagement/TechnicalUserTable.tsx index ba16ae818..3802f5e52 100644 --- a/src/components/pages/TechnicalUserManagement/TechnicalUserTable.tsx +++ b/src/components/pages/TechnicalUserManagement/TechnicalUserTable.tsx @@ -42,13 +42,7 @@ interface FetchHookArgsType { statusFilter: string expr: string } -type StatusTagColor = - | 'pending' - | 'confirmed' - | 'declined' - | 'label' - | 'deleted' - | undefined +type StatusTagColor = 'pending' | 'confirmed' | 'label' | undefined export const TechnicalUserTable = () => { const { t } = useTranslation() @@ -57,7 +51,9 @@ export const TechnicalUserTable = () => { const [fetchHookArgs, setFetchHookArgs] = useState() const [expr, setExpr] = useState('') const [refresh, setRefresh] = useState(0) - const [group, setGroup] = useState(ServiceAccountStatusFilter.ACTIVE) + const [group, setGroup] = useState( + ServiceAccountStatusFilter.SHOW_ALL + ) const setView = (e: React.MouseEvent) => { const viewValue = e.currentTarget.value setGroup(viewValue) @@ -77,8 +73,8 @@ export const TechnicalUserTable = () => { const filterButtons = [ { - buttonText: t('content.usermanagement.technicalUser.tabs.active'), - buttonValue: ServiceAccountStatusFilter.ACTIVE, + buttonText: t('content.usermanagement.technicalUser.tabs.showAll'), + buttonValue: ServiceAccountStatusFilter.SHOW_ALL, onButtonClick: setView, }, { @@ -95,8 +91,6 @@ export const TechnicalUserTable = () => { const statusColorMap: Record = { [ServiceAccountStatus.ACTIVE]: 'confirmed', - [ServiceAccountStatus.INACTIVE]: 'declined', - [ServiceAccountStatus.DELETED]: 'deleted', [ServiceAccountStatus.PENDING]: 'pending', [ServiceAccountStatus.PENDING_DELETION]: 'pending', } diff --git a/src/features/admin/serviceApiSlice.ts b/src/features/admin/serviceApiSlice.ts index ac7b07da5..3c7047309 100644 --- a/src/features/admin/serviceApiSlice.ts +++ b/src/features/admin/serviceApiSlice.ts @@ -50,9 +50,7 @@ export interface ServiceAccountCreate { export enum ServiceAccountStatus { ACTIVE = 'ACTIVE', - INACTIVE = 'INACTIVE', PENDING = 'PENDING', - DELETED = 'DELETED', PENDING_DELETION = 'PENDING_DELETION', } @@ -97,7 +95,7 @@ export interface ServiceAccountsResponseType { } export enum ServiceAccountStatusFilter { - ACTIVE = 'ACTIVE', + SHOW_ALL = 'show all', MANAGED = 'MANAGED', OWNED = 'OWNED', } @@ -142,19 +140,19 @@ export const apiSlice = createApi({ if ( isFetchArgs && fetchArgs.args.statusFilter && - fetchArgs.args.statusFilter !== ServiceAccountStatusFilter.ACTIVE + fetchArgs.args.statusFilter !== ServiceAccountStatusFilter.SHOW_ALL ) { return `${url}&clientId=${fetchArgs.args!.expr}&isOwner=${isOwner}` } else if ( isFetchArgs && fetchArgs.args.statusFilter && - fetchArgs.args.statusFilter === ServiceAccountStatusFilter.ACTIVE + fetchArgs.args.statusFilter === ServiceAccountStatusFilter.SHOW_ALL ) { return `${url}&clientId=${fetchArgs.args!.expr}` } else if ( !isFetchArgs && fetchArgs.args.statusFilter && - fetchArgs.args.statusFilter !== ServiceAccountStatusFilter.ACTIVE + fetchArgs.args.statusFilter !== ServiceAccountStatusFilter.SHOW_ALL ) { return `${url}&isOwner=${isOwner}` } else { From 7886301acd43d5a114f0ee7b9b00a1695658e86d Mon Sep 17 00:00:00 2001 From: Manojava Koushik <111366021+manojava-gk@users.noreply.github.com> Date: Tue, 10 Sep 2024 12:35:14 +0530 Subject: [PATCH 7/8] fix(company data): disable csv upload (#1091) --- CHANGELOG.md | 1 + .../pages/CompanyData/components/CompanyAddressList.tsx | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b61379196..7a285a8bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Fix broken title and description section - Company data - Fix translation error + - Disable csv upload ### Change diff --git a/src/components/pages/CompanyData/components/CompanyAddressList.tsx b/src/components/pages/CompanyData/components/CompanyAddressList.tsx index 33789dcd4..1c490f1fc 100644 --- a/src/components/pages/CompanyData/components/CompanyAddressList.tsx +++ b/src/components/pages/CompanyData/components/CompanyAddressList.tsx @@ -45,9 +45,6 @@ import { setSharingStateInfo, } from 'features/companyData/slice' import { statusColorMap } from 'utils/dataMapper' -import { show } from 'features/control/overlay' -import { OVERLAYS } from 'types/Constants' -import UploadIcon from '@mui/icons-material/Upload' import AddCircleOutlineIcon from '@mui/icons-material/AddCircleOutline' export const CompanyAddressList = ({ @@ -198,11 +195,6 @@ export const CompanyAddressList = ({ }, icon: , }, - { - title: t('content.companyData.csvUploadBtn'), - click: () => dispatch(show(OVERLAYS.CSV_UPLOAD_OVERLAY)), - icon: , - }, ]} autoFocus={false} onButtonClick={handleButtonClick} From e0ba13efed01ab3b982c978ad65d9c58ba4059a2 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Tue, 10 Sep 2024 14:49:09 +0200 Subject: [PATCH 8/8] build(2.2.0-rc4): bump version and update docs --- CHANGELOG.md | 41 +++++++++++++++++++++-------------------- package.json | 2 +- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a285a8bd..1454fc9e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,42 +1,43 @@ # Changelog -## (unreleased) 2.2.0-RC3 - -- Company Data - - Remove page notification on download csv template action -- Confirm Modal - - Fix broken title and description section -- Company data - - Fix translation error - - Disable csv upload +## 2.2.0-RC3 ### Change - **Technical User Management** - - Removed 'Inactive' filter in technical user management [#1046](https://github.com/eclipse-tractusx/portal-frontend/pull/1046) - - Update filters view and logic [#1087](https://github.com/eclipse-tractusx/portal-frontend/pull/1087) -- **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) + - removed 'Inactive' filter in technical user management [#1046](https://github.com/eclipse-tractusx/portal-frontend/pull/1046) + - updated filters view and logic [#1087](https://github.com/eclipse-tractusx/portal-frontend/pull/1087) +- **Skipping of GX compliance service interface** + - updated the status (skipped) in application requests and changed checkbox in connector management [#1019](https://github.com/eclipse-tractusx/portal-frontend/pull/1019) +- **Company data** + - disabled csv upload [#1091](https://github.com/eclipse-tractusx/portal-frontend/pull/1091) + +### Bugfixes + +- **Company data** + - removed page notification on download csv template action [#1071](https://github.com/eclipse-tractusx/portal-frontend/pull/1071) + - fixed broken title and description in modal [#1070](https://github.com/eclipse-tractusx/portal-frontend/pull/1070) + - fixed translation error [#1070](https://github.com/eclipse-tractusx/portal-frontend/pull/1070) ## 2.2.0-RC2 ### Feature - **Onboarding Service Provider Management**: - - Create new page for onboarding service provider management [#1052](https://github.com/eclipse-tractusx/portal-frontend/pull/1052) + - created 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) + - disabled confirm button if input value is not matching with the regular expression [#1056](https://github.com/eclipse-tractusx/portal-frontend/pull/1056) + - fixed infinite loop issue in add New Address Modal + - added 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 + - updated auto setup api response data in the service subscription response overlay ### Bugfixes - **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) + - changed 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) + - fixed person name regex patter [#1040](https://github.com/eclipse-tractusx/portal-frontend/pull/1040) ## 2.2.0-RC1 diff --git a/package.json b/package.json index 1bde68e47..400a139b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@catena-x/portal-frontend", - "version": "v2.2.0-RC2", + "version": "v2.2.0-RC3", "description": "Catena-X Portal Frontend", "author": "Catena-X Contributors", "license": "Apache-2.0",