From fefa69ea3b3f4dce2ee25ac2fdafd0a0a95c143b Mon Sep 17 00:00:00 2001 From: Orel Tsaraf Date: Fri, 16 Aug 2024 19:00:21 +0300 Subject: [PATCH 1/5] Add config checkbox to show/hide redirect URLs on Homepage --- .clabot | 2 +- client/src/pages/config/users/configman.jsx | 12 +++++++++++- client/src/pages/home/index.jsx | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.clabot b/.clabot index d929a4f3..066b13a3 100644 --- a/.clabot +++ b/.clabot @@ -1,4 +1,4 @@ { - "contributors": ["azukaar", "jwr1", "Jogai", "InterN0te", "catmandx", "revam", "Kawanaao", "davis4acca", "george-radu-cs", "BearTS", "lilkidsuave", "ryan-schubert"], + "contributors": ["azukaar", "jwr1", "Jogai", "InterN0te", "catmandx", "revam", "Kawanaao", "davis4acca", "george-radu-cs", "BearTS", "lilkidsuave", "ryan-schubert", "orelgs"], "message": "We require contributors to sign our [Contributor License Agreement](https://github.com/azukaar/Cosmos-Server/blob/master/cla.md). In order for us to review and merge your code, add yourself to the .clabot file as contributor, as a way of signing the CLA." } diff --git a/client/src/pages/config/users/configman.jsx b/client/src/pages/config/users/configman.jsx index a66bf188..551878f6 100644 --- a/client/src/pages/config/users/configman.jsx +++ b/client/src/pages/config/users/configman.jsx @@ -127,6 +127,7 @@ const ConfigManagement = () => { Background: config && config.HomepageConfig && config.HomepageConfig.Background, Expanded: config && config.HomepageConfig && config.HomepageConfig.Expanded, + ShowRedirect: config && config.HomepageConfig && config.HomepageConfig.ShowRedirect, PrimaryColor: config && config.ThemeConfig && config.ThemeConfig.PrimaryColor, SecondaryColor: config && config.ThemeConfig && config.ThemeConfig.SecondaryColor, @@ -216,7 +217,8 @@ const ConfigManagement = () => { HomepageConfig: { ...config.HomepageConfig, Background: values.Background, - Expanded: values.Expanded + Expanded: values.Expanded, + ShowRedirect: values.ShowRedirect }, ThemeConfig: { ...config.ThemeConfig, @@ -472,6 +474,14 @@ const ConfigManagement = () => { formik={formik} /> + + + + diff --git a/client/src/pages/home/index.jsx b/client/src/pages/home/index.jsx index 5235f416..336c05cc 100644 --- a/client/src/pages/home/index.jsx +++ b/client/src/pages/home/index.jsx @@ -467,7 +467,7 @@ const HomePage = () => { )} {config && servApps && routes.map((route) => { - let skip = route.Mode == "REDIRECT"; + let skip = route.Mode == "REDIRECT" && (!coStatus || !coStatus.homepage.ShowRedirect); let containerName; let container; if (route.Mode == "SERVAPP") { From 9e3eeba86365e8e6e273374ea9b5a5d3381a3577 Mon Sep 17 00:00:00 2001 From: Orel Tsaraf Date: Tue, 20 Aug 2024 03:32:30 +0300 Subject: [PATCH 2/5] Return to normal --- client/src/pages/config/users/configman.jsx | 12 +----------- client/src/pages/home/index.jsx | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/client/src/pages/config/users/configman.jsx b/client/src/pages/config/users/configman.jsx index 551878f6..a66bf188 100644 --- a/client/src/pages/config/users/configman.jsx +++ b/client/src/pages/config/users/configman.jsx @@ -127,7 +127,6 @@ const ConfigManagement = () => { Background: config && config.HomepageConfig && config.HomepageConfig.Background, Expanded: config && config.HomepageConfig && config.HomepageConfig.Expanded, - ShowRedirect: config && config.HomepageConfig && config.HomepageConfig.ShowRedirect, PrimaryColor: config && config.ThemeConfig && config.ThemeConfig.PrimaryColor, SecondaryColor: config && config.ThemeConfig && config.ThemeConfig.SecondaryColor, @@ -217,8 +216,7 @@ const ConfigManagement = () => { HomepageConfig: { ...config.HomepageConfig, Background: values.Background, - Expanded: values.Expanded, - ShowRedirect: values.ShowRedirect + Expanded: values.Expanded }, ThemeConfig: { ...config.ThemeConfig, @@ -474,14 +472,6 @@ const ConfigManagement = () => { formik={formik} /> - - - - diff --git a/client/src/pages/home/index.jsx b/client/src/pages/home/index.jsx index 336c05cc..5235f416 100644 --- a/client/src/pages/home/index.jsx +++ b/client/src/pages/home/index.jsx @@ -467,7 +467,7 @@ const HomePage = () => { )} {config && servApps && routes.map((route) => { - let skip = route.Mode == "REDIRECT" && (!coStatus || !coStatus.homepage.ShowRedirect); + let skip = route.Mode == "REDIRECT"; let containerName; let container; if (route.Mode == "SERVAPP") { From 6f7ead6128b8494bd9e315d4e03f2540edaab0d2 Mon Sep 17 00:00:00 2001 From: Orel Tsaraf Date: Tue, 20 Aug 2024 03:58:13 +0300 Subject: [PATCH 3/5] URL Setup - Auto check HideFromDashboard on URL mode change --- client/src/pages/config/routes/routeman.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/src/pages/config/routes/routeman.jsx b/client/src/pages/config/routes/routeman.jsx index 4ee7faa4..2b1fee59 100644 --- a/client/src/pages/config/routes/routeman.jsx +++ b/client/src/pages/config/routes/routeman.jsx @@ -199,6 +199,9 @@ const RouteManagement = ({ routeConfig, routeNames, config, TargetContainer, noC ["SPA", "Single Page Application"], ["REDIRECT", "Redirection"] ]} + onChange={() => { + formik.setFieldValue("HideFromDashboard", formik.values.Mode === "REDIRECT"); + }} /> From f098e4c40cd358259414eac4e03de0982e42aea5 Mon Sep 17 00:00:00 2001 From: Orel Tsaraf Date: Tue, 20 Aug 2024 03:59:32 +0300 Subject: [PATCH 4/5] URL not skipped by route mode anymore - only by HideFromDashboard --- client/src/pages/home/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/pages/home/index.jsx b/client/src/pages/home/index.jsx index 5235f416..ce7176dd 100644 --- a/client/src/pages/home/index.jsx +++ b/client/src/pages/home/index.jsx @@ -467,7 +467,7 @@ const HomePage = () => { )} {config && servApps && routes.map((route) => { - let skip = route.Mode == "REDIRECT"; + let skip = false; let containerName; let container; if (route.Mode == "SERVAPP") { From d4a2be14e9444df1f2ef7f10ae7391e6ac4e869f Mon Sep 17 00:00:00 2001 From: Orel Tsaraf Date: Wed, 21 Aug 2024 20:37:10 +0300 Subject: [PATCH 5/5] Remove unnecessary variable skip --- client/src/pages/home/index.jsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/client/src/pages/home/index.jsx b/client/src/pages/home/index.jsx index ce7176dd..03f4345d 100644 --- a/client/src/pages/home/index.jsx +++ b/client/src/pages/home/index.jsx @@ -467,7 +467,6 @@ const HomePage = () => { )} {config && servApps && routes.map((route) => { - let skip = false; let containerName; let container; if (route.Mode == "SERVAPP") { @@ -479,10 +478,7 @@ const HomePage = () => { // } } - if (route.HideFromDashboard) - skip = true; - - return !skip && coStatus && (coStatus.homepage.Expanded ? + return !route.HideFromDashboard && coStatus && (coStatus.homepage.Expanded ?