From e266bb3392ddac6f18813b87776f62ff86f0e11c Mon Sep 17 00:00:00 2001 From: manojava-gk Date: Thu, 19 Sep 2024 14:29:29 +0530 Subject: [PATCH 01/14] fix(subscription): hover information on the status icon of app and service subscription --- CHANGELOG.md | 3 +-- .../Subscription/SubscriptionElements.tsx | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2bb99906..508410d0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,5 @@ # Changelog -## (unreleased) 2.2.0-RC3 - ## Unreleased ### Bugfixes @@ -15,6 +13,7 @@ - **App & Service Subcription Managment** - Search place holder text updated - Show only available offer names at the top + - Implement Hover-Information on the Status Icon of serviceSubscription - **Admin Service Management** - Resolved service title overlap and improved responsiveness on the admin service detail page [#1112](https://github.com/eclipse-tractusx/portal-frontend/pull/1112) diff --git a/src/components/shared/templates/Subscription/SubscriptionElements.tsx b/src/components/shared/templates/Subscription/SubscriptionElements.tsx index fbea6df5e..f1f566377 100644 --- a/src/components/shared/templates/Subscription/SubscriptionElements.tsx +++ b/src/components/shared/templates/Subscription/SubscriptionElements.tsx @@ -178,7 +178,15 @@ export default function SubscriptionElements({ subscription: CompanySubscriptionData ) => { if (subscription.offerSubscriptionStatus === SubscriptionStatus.ACTIVE) { - return + return ( + + + + ) } else if ( subscription.offerSubscriptionStatus === SubscriptionStatus.PENDING ) { @@ -211,7 +219,13 @@ export default function SubscriptionElements({ }) }} /> - + + + ) } else if ( From 04ec3294e3f4f36b6135fe36110f09934ccf94cc Mon Sep 17 00:00:00 2001 From: manojava-gk Date: Thu, 19 Sep 2024 14:34:27 +0530 Subject: [PATCH 02/14] fix(subscription): add translations --- src/assets/locales/de/main.json | 2 ++ src/assets/locales/en/main.json | 2 ++ .../shared/templates/Subscription/SubscriptionElements.tsx | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json index 9517608c6..5ed96934a 100644 --- a/src/assets/locales/de/main.json +++ b/src/assets/locales/de/main.json @@ -1488,6 +1488,8 @@ "pleaseEnterValidURL": "Please enter a valid URL", "error": "Error", "success": "Success", + "pending": "Subscription is Pending", + "active": "Subscription is Active", "tabs": { "request": "Request", "active": "Active", diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json index 06080b3b2..93daec674 100644 --- a/src/assets/locales/en/main.json +++ b/src/assets/locales/en/main.json @@ -1456,6 +1456,8 @@ "pleaseEnterValidURL": "Please enter a valid URL", "error": "Error", "success": "Success", + "pending": "Subscription is Pending", + "active": "Subscription is Active", "tabs": { "request": "Request", "active": "Active", diff --git a/src/components/shared/templates/Subscription/SubscriptionElements.tsx b/src/components/shared/templates/Subscription/SubscriptionElements.tsx index f1f566377..665b24bc6 100644 --- a/src/components/shared/templates/Subscription/SubscriptionElements.tsx +++ b/src/components/shared/templates/Subscription/SubscriptionElements.tsx @@ -182,7 +182,7 @@ export default function SubscriptionElements({ From b853b300f560090e21cc8dfe619df623e4074b31 Mon Sep 17 00:00:00 2001 From: manojava-gk Date: Thu, 19 Sep 2024 14:36:58 +0530 Subject: [PATCH 03/14] fix(chor): update dependency file --- DEPENDENCIES | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index c3d4f373d..9bdc4eff1 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -759,8 +759,8 @@ npm/npmjs/@types/lodash/4.17.7, MIT, approved, clearlydefined 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/prop-types/15.7.11, MIT, approved, #16176 +npm/npmjs/@types/prop-types/15.7.12, MIT, approved, #16176 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 From 4ee5c1c75f006d61ccb50b9edc3cf2b8817e7b30 Mon Sep 17 00:00:00 2001 From: manojava-gk Date: Thu, 19 Sep 2024 15:27:55 +0530 Subject: [PATCH 04/14] fix(subscription): update translation --- src/assets/locales/de/main.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json index 5ed96934a..40a9de8b8 100644 --- a/src/assets/locales/de/main.json +++ b/src/assets/locales/de/main.json @@ -1488,8 +1488,8 @@ "pleaseEnterValidURL": "Please enter a valid URL", "error": "Error", "success": "Success", - "pending": "Subscription is Pending", - "active": "Subscription is Active", + "pending": "Das Abonnement steht noch aus", + "active": "Das Abonnement ist aktiv", "tabs": { "request": "Request", "active": "Active", From fba9edcce0277268c1ad3aad40e91ec5f1cdc1af Mon Sep 17 00:00:00 2001 From: manojava-gk Date: Thu, 26 Sep 2024 11:35:30 +0530 Subject: [PATCH 05/14] fix(techuser): show error message post tech user deletion api error --- src/features/admin/serviceApiSlice.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/features/admin/serviceApiSlice.ts b/src/features/admin/serviceApiSlice.ts index 6a9f18203..28ef60eef 100644 --- a/src/features/admin/serviceApiSlice.ts +++ b/src/features/admin/serviceApiSlice.ts @@ -135,12 +135,6 @@ export const apiSlice = createApi({ url: `/api/administration/serviceaccount/owncompany/serviceaccounts/${id}`, method: 'DELETE', }), - // Add an ESLint exception until there is a solution - // eslint-disable-next-line - transformErrorResponse: (error: any) => - error?.errors?.[ - 'Org.Eclipse.TractusX.Portal.Backend.Administration.Service' - ]?.[0] ?? i18next.t('error.deleteTechUserNotificationErrorDescription'), }), fetchServiceAccountList: builder.query< PaginResult, From 7bd73793eb7d836d0448491a0d46b0ce35a23300 Mon Sep 17 00:00:00 2001 From: manojava-gk Date: Thu, 26 Sep 2024 11:39:55 +0530 Subject: [PATCH 06/14] fix(chor): fix chandelog --- CHANGELOG.md | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f38626c0..ffcd1f82f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,21 +6,6 @@ ### Bugfixes -- **Service Release Process** - - Updated description regex & validation error message to prevent only spaces in short & long description -- **OSP Consent form** - - Fixed missing street number in form [#1081](https://github.com/eclipse-tractusx/portal-frontend/issues/1081) -- **App and Service Admin board** - - Fix data disappearing issue on re-clicking active tab/filter in app/service admin board [#1100](https://github.com/eclipse-tractusx/portal-frontend/pull/1100) -- **App & Service Subcription Managment** - - Search place holder text updated - - Show only available offer names at the top - - Implement Hover-Information on the Status Icon of serviceSubscription -- **Admin Service Management** - - Resolved service title overlap and improved responsiveness on the admin service detail page [#1112](https://github.com/eclipse-tractusx/portal-frontend/pull/1112) - -## Unreleased 2.2.0-RC3 - ### Feature - **Customer Detail Data Overlay** From 79c6319d7beda827d9f66546965e05b4183e751d Mon Sep 17 00:00:00 2001 From: manojava-gk Date: Thu, 26 Sep 2024 11:42:04 +0530 Subject: [PATCH 07/14] fix(chor): add change log notes --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffcd1f82f..ff57caf0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## Unreleased +- **App & Service Subcription Managment** + - Search place holder text updated + - Show only available offer names at the top + - Implement Hover-Information on the Status Icon of serviceSubscription +- **Technical User** + - Show proper error message on failure of tech user deletion + ## 2.2.0-alpha.1 ### Bugfixes From df380f3be7a066264abefd7e08796283000e0b2d Mon Sep 17 00:00:00 2001 From: manojava-gk Date: Thu, 26 Sep 2024 12:04:12 +0530 Subject: [PATCH 08/14] fix(subscription): show hover text for in-progress state --- src/assets/locales/de/main.json | 1 + src/assets/locales/en/main.json | 1 + .../Subscription/SubscriptionElements.tsx | 24 ++++++++++++++----- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json index 40a9de8b8..6c9a37d3f 100644 --- a/src/assets/locales/de/main.json +++ b/src/assets/locales/de/main.json @@ -1490,6 +1490,7 @@ "success": "Success", "pending": "Das Abonnement steht noch aus", "active": "Das Abonnement ist aktiv", + "process": "Subscription is in Process", "tabs": { "request": "Request", "active": "Active", diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json index 93daec674..6003187ba 100644 --- a/src/assets/locales/en/main.json +++ b/src/assets/locales/en/main.json @@ -1458,6 +1458,7 @@ "success": "Success", "pending": "Subscription is Pending", "active": "Subscription is Active", + "process": "Subscription is in Process", "tabs": { "request": "Request", "active": "Active", diff --git a/src/components/shared/templates/Subscription/SubscriptionElements.tsx b/src/components/shared/templates/Subscription/SubscriptionElements.tsx index 665b24bc6..380f4f69c 100644 --- a/src/components/shared/templates/Subscription/SubscriptionElements.tsx +++ b/src/components/shared/templates/Subscription/SubscriptionElements.tsx @@ -240,16 +240,28 @@ export default function SubscriptionElements({ variant="filled" onClick={() => handleActivate(subscription.subscriptionId)} /> - + + + ) } else { return ( - subscription process + + subscription process + ) } } else { From e20576ddcef66e77d29158fef96db4d9a36ac5ea Mon Sep 17 00:00:00 2001 From: manojava-gk Date: Fri, 27 Sep 2024 10:54:08 +0530 Subject: [PATCH 09/14] fix(subscription): translation value update --- src/assets/locales/de/main.json | 2 +- src/assets/locales/en/main.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json index 6c9a37d3f..699e2ef69 100644 --- a/src/assets/locales/de/main.json +++ b/src/assets/locales/de/main.json @@ -1490,7 +1490,7 @@ "success": "Success", "pending": "Das Abonnement steht noch aus", "active": "Das Abonnement ist aktiv", - "process": "Subscription is in Process", + "process": "Das Abonnement ist in Bearbeitung", "tabs": { "request": "Request", "active": "Active", diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json index 6003187ba..627f5539b 100644 --- a/src/assets/locales/en/main.json +++ b/src/assets/locales/en/main.json @@ -1458,7 +1458,7 @@ "success": "Success", "pending": "Subscription is Pending", "active": "Subscription is Active", - "process": "Subscription is in Process", + "process": "Subscription is in Progress", "tabs": { "request": "Request", "active": "Active", From c250e0649b0e7b224df3e4e8290aced1392d6840 Mon Sep 17 00:00:00 2001 From: manojava-gk Date: Fri, 27 Sep 2024 11:14:14 +0530 Subject: [PATCH 10/14] fix(chor): update dependency file --- DEPENDENCIES | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 9bdc4eff1..ee294e91b 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -609,16 +609,16 @@ npm/npmjs/@emotion/babel-plugin/11.11.0, MIT, approved, #8386 npm/npmjs/@emotion/cache/11.11.0, MIT, approved, #8401 npm/npmjs/@emotion/hash/0.9.1, MIT, approved, #8394 npm/npmjs/@emotion/hash/0.9.2, MIT, approved, #8394 -npm/npmjs/@emotion/is-prop-valid/1.3.0, MIT, approved, clearlydefined +npm/npmjs/@emotion/is-prop-valid/1.3.0, MIT AND (BSD-2-Clause AND MIT), approved, #16339 npm/npmjs/@emotion/memoize/0.8.1, MIT, approved, #8408 npm/npmjs/@emotion/memoize/0.9.0, MIT, approved, clearlydefined npm/npmjs/@emotion/react/11.11.4, MIT AND (BSD-3-Clause AND MIT), approved, #8931 -npm/npmjs/@emotion/serialize/1.3.0, MIT, approved, clearlydefined +npm/npmjs/@emotion/serialize/1.3.0, MIT AND (BSD-2-Clause AND MIT), approved, #16340 npm/npmjs/@emotion/sheet/1.2.2, MIT, approved, #8389 npm/npmjs/@emotion/styled/11.11.5, MIT, approved, clearlydefined npm/npmjs/@emotion/unitless/0.9.0, MIT, approved, clearlydefined npm/npmjs/@emotion/use-insertion-effect-with-fallbacks/1.0.1, MIT, approved, #8419 -npm/npmjs/@emotion/utils/1.4.0, MIT, approved, clearlydefined +npm/npmjs/@emotion/utils/1.4.0, MIT AND (BSD-2-Clause AND MIT), approved, #16344 npm/npmjs/@emotion/weak-memoize/0.3.1, MIT, approved, #8402 npm/npmjs/@esbuild/aix-ppc64/0.20.2, MIT, approved, clearlydefined npm/npmjs/@esbuild/android-arm/0.20.2, Apache-2.0 AND MIT AND BSD-3-Clause AND (BSD-2-Clause AND BSD-3-Clause), approved, #15302 From 93e38a853fe0319b0088639ac1ee933fe3622d89 Mon Sep 17 00:00:00 2001 From: manojava-gk Date: Fri, 27 Sep 2024 13:44:08 +0530 Subject: [PATCH 11/14] fix(subscription): revert other ticket changes --- CHANGELOG.md | 2 -- src/features/admin/serviceApiSlice.ts | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb0d0fc2e..c4083027f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,8 +17,6 @@ - fixed overlay enabling on click of managed connectors(details) [#1142](https://github.com/eclipse-tractusx/portal-frontend/pull/1142) - **Connector Management** - fixed customer link selection and fixed resetting values [#1119](https://github.com/eclipse-tractusx/portal-frontend/pull/1119) -- **Technical User** - - Show proper error message on failure of tech user deletion[#1130](https://github.com/eclipse-tractusx/portal-frontend/pull/1130) ## 2.2.0-alpha.1 diff --git a/src/features/admin/serviceApiSlice.ts b/src/features/admin/serviceApiSlice.ts index 56b11ef62..4ef8b642d 100644 --- a/src/features/admin/serviceApiSlice.ts +++ b/src/features/admin/serviceApiSlice.ts @@ -130,6 +130,12 @@ export const apiSlice = createApi({ url: `/api/administration/serviceaccount/owncompany/serviceaccounts/${id}`, method: 'DELETE', }), + // Add an ESLint exception until there is a solution + // eslint-disable-next-line + transformErrorResponse: (error: any) => + error?.errors?.[ + 'Org.Eclipse.TractusX.Portal.Backend.Administration.Service' + ]?.[0] ?? i18next.t('error.deleteTechUserNotificationErrorDescription'), }), fetchServiceAccountList: builder.query< PaginResult, From d03a2adfa6c6633229f890a4a5f80f3258cb211f Mon Sep 17 00:00:00 2001 From: manojava-gk Date: Mon, 30 Sep 2024 11:37:41 +0530 Subject: [PATCH 12/14] fix(notes): update changelog notes --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4083027f..00e187838 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,8 @@ - updated technical user details with user type and service endpoint fields. Also, updated copy icon color for better view and made copy icon available only when value is available [#1137](https://github.com/eclipse-tractusx/portal-frontend/pull/1137) - **Company Subscriptions** - update API query parameters and fix tab UI scroll [#1131](https://github.com/eclipse-tractusx/portal-frontend/pull/1131) -- - **App & Service Subcription Managment** - - Search place holder text updated, Show only available offer names at the top and Implement Hover-Information on the Status Icon of serviceSubscription[#1130](https://github.com/eclipse-tractusx/portal-frontend/pull/1130) +- **App & Service Subcription Managment** + - updated search place holder text - showing only available offer names at the top - and implemented hover information on the status icon of service subscription [#1130](https://github.com/eclipse-tractusx/portal-frontend/pull/1130) ### Bugfixes From 017eb3b1161e840c6a2427be83fc20b8663285c3 Mon Sep 17 00:00:00 2001 From: manojava-gk Date: Tue, 1 Oct 2024 11:08:47 +0530 Subject: [PATCH 13/14] fix(chor): typo in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00e187838..18d35d697 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ - updated technical user details with user type and service endpoint fields. Also, updated copy icon color for better view and made copy icon available only when value is available [#1137](https://github.com/eclipse-tractusx/portal-frontend/pull/1137) - **Company Subscriptions** - update API query parameters and fix tab UI scroll [#1131](https://github.com/eclipse-tractusx/portal-frontend/pull/1131) -- **App & Service Subcription Managment** +- **App & Service Subscription Management** - updated search place holder text - showing only available offer names at the top - and implemented hover information on the status icon of service subscription [#1130](https://github.com/eclipse-tractusx/portal-frontend/pull/1130) ### Bugfixes From e019fa347e265c493483aae165506a18594e63a3 Mon Sep 17 00:00:00 2001 From: manojava-gk Date: Mon, 7 Oct 2024 23:15:01 +0530 Subject: [PATCH 14/14] fix(chor): update dependency file --- DEPENDENCIES | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index ee294e91b..3538e62bf 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -15,7 +15,7 @@ npm/npmjs/-/arg/4.1.3, MIT, approved, clearlydefined npm/npmjs/-/argparse/1.0.10, MIT, approved, #2174 npm/npmjs/-/argparse/2.0.1, Python-2.0, approved, CQ22954 npm/npmjs/-/aria-query/5.1.3, Apache-2.0, approved, clearlydefined -npm/npmjs/-/aria-query/5.3.0, Apache-2.0, approved, clearlydefined +npm/npmjs/-/aria-query/5.3.0, Apache-2.0, approved, #16427 npm/npmjs/-/array-buffer-byte-length/1.0.1, MIT, approved, #7548 npm/npmjs/-/array-includes/3.1.8, MIT, approved, #4577 npm/npmjs/-/array-union/2.1.0, MIT, approved, clearlydefined @@ -696,7 +696,7 @@ 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/@remix-run/router/1.15.3, MIT, approved, clearlydefined -npm/npmjs/@rollup/pluginutils/5.1.0, MIT, approved, clearlydefined +npm/npmjs/@rollup/pluginutils/5.1.0, MIT, approved, #16428 npm/npmjs/@rollup/rollup-android-arm-eabi/4.17.2, MIT, approved, clearlydefined npm/npmjs/@rollup/rollup-android-arm64/4.17.2, MIT, approved, clearlydefined npm/npmjs/@rollup/rollup-darwin-arm64/4.17.2, MIT, approved, clearlydefined