From 56f957c00803fc2b3e01973fe3122a86ea803183 Mon Sep 17 00:00:00 2001 From: Nikunj Maniya Date: Tue, 27 Aug 2024 12:00:02 +0530 Subject: [PATCH 1/5] fix: Set default option in Technical User setup in App Release Process, This will Resolve the issue of selection. --- .../basic/ReleaseProcess/TechnicalIntegration/index.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/components/shared/basic/ReleaseProcess/TechnicalIntegration/index.tsx b/src/components/shared/basic/ReleaseProcess/TechnicalIntegration/index.tsx index cfa7520e4..ea48514c5 100644 --- a/src/components/shared/basic/ReleaseProcess/TechnicalIntegration/index.tsx +++ b/src/components/shared/basic/ReleaseProcess/TechnicalIntegration/index.tsx @@ -143,7 +143,13 @@ export default function TechnicalIntegration() { ) useEffect(() => { - setTechUserProfiles(userProfiles) + if (userProfiles.length > 0) { + setTechUserProfiles(userProfiles) + } else { + // Set default value as "None" when user profiles don't have any roles + // Initially, value is "None" + setTechUserProfiles([technicalUserNone]) + } }, [userProfiles]) const defaultValues = { From 714bab6de40cdd09dd38ff9ec9cb9cae9044fdd0 Mon Sep 17 00:00:00 2001 From: Nikunj Maniya Date: Tue, 27 Aug 2024 12:02:15 +0530 Subject: [PATCH 2/5] fix: CHANGELOG.md file update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 473c78708..64b04bd45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ - removed unnecessary condition in semantic hub page's table [#979](https://github.com/eclipse-tractusx/portal-frontend/pull/979) - fixed unchanged text of button when user requests subscription [#985](https://github.com/eclipse-tractusx/portal-frontend/pull/985) - fixed height for "Admin Service Detail" page content [#1001](https://github.com/eclipse-tractusx/portal-frontend/pull/1001) +- fixed "None" selection issue in Technical Integration -> App Release Process [#1036](https://github.com/eclipse-tractusx/portal-frontend/issues/1036) ## 2.1.0 From 0097d1551dc8fe1dbfb601176006f36d2b7a204c Mon Sep 17 00:00:00 2001 From: Nikunj Maniya Date: Mon, 9 Sep 2024 10:58:11 +0530 Subject: [PATCH 3/5] fix: instead of if-else I have use ternary operator --- .../ReleaseProcess/TechnicalIntegration/index.tsx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/components/shared/basic/ReleaseProcess/TechnicalIntegration/index.tsx b/src/components/shared/basic/ReleaseProcess/TechnicalIntegration/index.tsx index 4b9b4d9dd..74b9e703d 100644 --- a/src/components/shared/basic/ReleaseProcess/TechnicalIntegration/index.tsx +++ b/src/components/shared/basic/ReleaseProcess/TechnicalIntegration/index.tsx @@ -143,13 +143,11 @@ export default function TechnicalIntegration() { ) useEffect(() => { - if (userProfiles.length > 0) { - setTechUserProfiles(userProfiles) - } else { - // Set default value as "None" when user profiles don't have any roles - // Initially, value is "None" - setTechUserProfiles([technicalUserNone]) - } + // Set default value as "None" when user profiles don't have any roles + // Initially, value is "None" + setTechUserProfiles( + userProfiles.length > 0 ? userProfiles : [technicalUserNone] + ) }, [userProfiles]) const defaultValues = { From 8c70dc36b8b623ff159f9291c95b6b3e71661d23 Mon Sep 17 00:00:00 2001 From: Nikunj Maniya Date: Mon, 9 Sep 2024 15:33:05 +0530 Subject: [PATCH 4/5] fix: Changelog.md modify --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bbc5b53e..7ef5b6a35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,8 @@ - Display technicalUserManagement button based on role validation [#1073](https://github.com/eclipse-tractusx/portal-frontend/pull/1073) - **OSP Consent form** - Display invited company name in OSP consent form (Previously hard coded with 'BMW') [#1083](https://github.com/eclipse-tractusx/portal-frontend/pull/1083) +- **Technical Integration** + - fixed "None" selection issue in Technical Integration -> App Release Process [#1036](https://github.com/eclipse-tractusx/portal-frontend/issues/1036) ## 2.2.0-RC2 @@ -100,7 +102,6 @@ - fixed height for "Admin Service Detail" page content [#1001](https://github.com/eclipse-tractusx/portal-frontend/pull/1001) - fixed onClick of "Overview My Apps" button in App Release Process screen [#1022](https://github.com/eclipse-tractusx/portal-frontend/issues/1022) - Fix 400 Bad Request error in App Access Management -> Add Role search filter [#1057](https://github.com/eclipse-tractusx/portal-frontend/issues/1057) -- fixed "None" selection issue in Technical Integration -> App Release Process [#1036](https://github.com/eclipse-tractusx/portal-frontend/issues/1036) ## 2.1.0 From 2aeb9d626337b626f324c9f5f578968c5034c845 Mon Sep 17 00:00:00 2001 From: Nikunj Maniya Date: Mon, 9 Sep 2024 15:35:26 +0530 Subject: [PATCH 5/5] fix: Changelog.md modified --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ef5b6a35..8635ed2dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,12 +39,11 @@ - 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) + - Fixed "None" selection issue in Technical Integration -> App Release Process [#1036](https://github.com/eclipse-tractusx/portal-frontend/issues/1036) - **Technical User Management** - Display technicalUserManagement button based on role validation [#1073](https://github.com/eclipse-tractusx/portal-frontend/pull/1073) - **OSP Consent form** - Display invited company name in OSP consent form (Previously hard coded with 'BMW') [#1083](https://github.com/eclipse-tractusx/portal-frontend/pull/1083) -- **Technical Integration** - - fixed "None" selection issue in Technical Integration -> App Release Process [#1036](https://github.com/eclipse-tractusx/portal-frontend/issues/1036) ## 2.2.0-RC2