From 12bec29361381691e57a2dab64eb7e91b3d8f87c Mon Sep 17 00:00:00 2001 From: Arturo Reuschenbach Puncernau Date: Thu, 14 Nov 2024 12:02:37 +0100 Subject: [PATCH 1/3] fix(greenhouse): add support_group only if supportGroups exists and is an array --- apps/greenhouse/src/hooks/useApi.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/greenhouse/src/hooks/useApi.js b/apps/greenhouse/src/hooks/useApi.js index 8ed52ecec..f9a7b9896 100644 --- a/apps/greenhouse/src/hooks/useApi.js +++ b/apps/greenhouse/src/hooks/useApi.js @@ -47,7 +47,9 @@ const useApi = () => { // temporary fix to forward initialFilters to the Plugins until middleware is implemented const appProps = { username: authData?.parsed?.fullName } appProps.initialFilters = { - support_group: authData?.parsed?.supportGroups?.map((group) => group), + ...(Array.isArray(authData?.parsed?.supportGroups) && { + support_group: authData.parsed.supportGroups.map((group) => group), + }), } const newConf = createPluginConfig({ From 75b689141868215038eb0c2d5a19f1078c6663d9 Mon Sep 17 00:00:00 2001 From: Arturo Reuschenbach Puncernau Date: Thu, 14 Nov 2024 12:03:44 +0100 Subject: [PATCH 2/3] chore(greenhouse): add changeset --- .changeset/curly-owls-rush.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/curly-owls-rush.md diff --git a/.changeset/curly-owls-rush.md b/.changeset/curly-owls-rush.md new file mode 100644 index 000000000..0a9106ba2 --- /dev/null +++ b/.changeset/curly-owls-rush.md @@ -0,0 +1,5 @@ +--- +"@cloudoperators/juno-app-greenhouse": patch +--- + +add support_group only if supportGroups exists and is an array From 5d7de4973cff4e8d79cdd0f46156b7835a6b92cf Mon Sep 17 00:00:00 2001 From: Arturo Reuschenbach Puncernau Date: Thu, 14 Nov 2024 14:03:39 +0100 Subject: [PATCH 3/3] chore(greenhouse): improve code and converting groups to string --- apps/greenhouse/src/hooks/useApi.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/apps/greenhouse/src/hooks/useApi.js b/apps/greenhouse/src/hooks/useApi.js index f9a7b9896..c84b65e1c 100644 --- a/apps/greenhouse/src/hooks/useApi.js +++ b/apps/greenhouse/src/hooks/useApi.js @@ -45,11 +45,16 @@ const useApi = () => { const url = conf.status?.uiApplication?.url // temporary fix to forward initialFilters to the Plugins until middleware is implemented - const appProps = { username: authData?.parsed?.fullName } - appProps.initialFilters = { - ...(Array.isArray(authData?.parsed?.supportGroups) && { - support_group: authData.parsed.supportGroups.map((group) => group), - }), + // Extract username and support group information for appProps + const appProps = { + username: authData?.parsed?.fullName, + } + + // Conditionally add initialFilters if supportGroups exists and is an array + if (Array.isArray(authData?.parsed?.supportGroups)) { + appProps.initialFilters = { + support_group: authData.parsed.supportGroups.map((group) => String(group)), + } } const newConf = createPluginConfig({