From 4b94a41e4fb9f452af3d04614963613ce329bfc0 Mon Sep 17 00:00:00 2001 From: Miquel Adell Date: Tue, 21 May 2024 14:26:36 +0200 Subject: [PATCH 1/3] add redirection for CSY --- src/data/logic/redirection.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/data/logic/redirection.ts b/src/data/logic/redirection.ts index 26a7766..c64b7c9 100644 --- a/src/data/logic/redirection.ts +++ b/src/data/logic/redirection.ts @@ -79,6 +79,8 @@ const AMR_EGASP_VISUALIZER = "M2jd9QXVWou"; const AMR_AMC_ADMIN = "sVbZXz6W0oQ"; const AMR_EGASP_ADMIN = "txu7PyLyeld"; +const CSY_USERS = "y4eVE0uT9yz"; + const AMR_COUNTRY_GROUPS = [ AMR_AMC_DATA_CAPTURE, AMR_AMC_VISUALIZER, @@ -326,6 +328,8 @@ export const handleRedirection = async ( const isGLASSCountryUser = shouldRedirect(userGroupIds, AMR_COUNTRY_GROUPS); const isGLASSAdmin = shouldRedirect(userGroupIds, [AMR_AMC_ADMIN, AMR_AMR_ADMIN, AMR_EGASP_ADMIN]); + const redirectToCSY = shouldRedirect(userGroupIds, [CSY_USERS]); + const redirectToNHWAAdmin = !isAdminUserGroup && (isNHWAAdmin || (isNHWAGlobalTeam && isNHWADataManager)); const redirectToHomePage = isMALRegionalUser || (isAMRAMRUser && !isAMRUser) || (isAMRUser && !isAMRAMRUser); @@ -352,6 +356,7 @@ export const handleRedirection = async ( configurations, redirectToNHWAAdmin, redirectToGLASS, + redirectToCSY, redirectToAMRAMRHq, redirectToAMRAMRRegional, showAvailableLandingPages, @@ -371,6 +376,7 @@ export const handleRedirection = async ( configurations: [fallbackConfig], redirectToNHWAAdmin, redirectToGLASS, + redirectToCSY, redirectToAMRAMRHq, redirectToAMRAMRRegional, showAvailableLandingPages, From 887817244bdc88519e1c26423752b9ac6c5927d8 Mon Sep 17 00:00:00 2001 From: Miquel Adell Date: Thu, 23 May 2024 10:01:18 +0200 Subject: [PATCH 2/3] WIP: Add constants and code to redirect csy users to new home page --- package.json | 2 +- src/data/logic/redirection.ts | 6 ++---- src/webapp/pages/app/App.tsx | 2 ++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ed6f129..a386afd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "est-landing-page", "description": "EyeSeeTea Landing Page for WHO", - "version": "0.5.11", + "version": "0.5.12", "license": "GPL-3.0", "author": "EyeSeeTea team", "homepage": ".", diff --git a/src/data/logic/redirection.ts b/src/data/logic/redirection.ts index c64b7c9..3b8cd55 100644 --- a/src/data/logic/redirection.ts +++ b/src/data/logic/redirection.ts @@ -328,11 +328,11 @@ export const handleRedirection = async ( const isGLASSCountryUser = shouldRedirect(userGroupIds, AMR_COUNTRY_GROUPS); const isGLASSAdmin = shouldRedirect(userGroupIds, [AMR_AMC_ADMIN, AMR_AMR_ADMIN, AMR_EGASP_ADMIN]); - const redirectToCSY = shouldRedirect(userGroupIds, [CSY_USERS]); + const isCSYUser = shouldRedirect(userGroupIds, [CSY_USERS]); const redirectToNHWAAdmin = !isAdminUserGroup && (isNHWAAdmin || (isNHWAGlobalTeam && isNHWADataManager)); - const redirectToHomePage = isMALRegionalUser || (isAMRAMRUser && !isAMRUser) || (isAMRUser && !isAMRAMRUser); + const redirectToHomePage = isMALRegionalUser || (isAMRAMRUser && !isAMRUser) || (isAMRUser && !isAMRAMRUser) || isCSYUser; const redirectToGLASS = !isGLASSAdmin && isGLASSCountryUser; @@ -356,7 +356,6 @@ export const handleRedirection = async ( configurations, redirectToNHWAAdmin, redirectToGLASS, - redirectToCSY, redirectToAMRAMRHq, redirectToAMRAMRRegional, showAvailableLandingPages, @@ -376,7 +375,6 @@ export const handleRedirection = async ( configurations: [fallbackConfig], redirectToNHWAAdmin, redirectToGLASS, - redirectToCSY, redirectToAMRAMRHq, redirectToAMRAMRRegional, showAvailableLandingPages, diff --git a/src/webapp/pages/app/App.tsx b/src/webapp/pages/app/App.tsx index 0f2d8d7..a1e506a 100644 --- a/src/webapp/pages/app/App.tsx +++ b/src/webapp/pages/app/App.tsx @@ -48,6 +48,7 @@ const App = ({ api }: { api: D2Api }) => { const apiVersion = getMajorVersion(version); const options = await handleRedirection(baseUrl, apiVersion, user, config, glassDashboardIds); + console.log("options",options); if (options) { if (options.redirectToNHWAAdmin) window.location.hash = "/nhwa-admins"; if (options.redirectToGLASS) { @@ -57,6 +58,7 @@ const App = ({ api }: { api: D2Api }) => { if (options.redirectToAMRAMRHq) window.location.hash = "/amr-amr-hq"; if (options.redirectToAMRAMRRegional) window.location.hash = "/amr-amr-regional"; if (options.showAvailableLandingPages) window.location.hash = "/"; + if (options.redirectToHomePage) { const homePageAppPath = "/api/apps/Homepage-App/index.html#/"; goToExternalUrl(baseUrl + homePageAppPath); From 4477c8b1665f96596afcbbc52453e26fbd364a89 Mon Sep 17 00:00:00 2001 From: deeonwuli Date: Fri, 24 May 2024 09:55:16 +0100 Subject: [PATCH 3/3] fix: redirect csy users to home page app --- src/data/logic/redirection.ts | 7 ++++--- src/webapp/pages/app/App.tsx | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/data/logic/redirection.ts b/src/data/logic/redirection.ts index 3b8cd55..451f610 100644 --- a/src/data/logic/redirection.ts +++ b/src/data/logic/redirection.ts @@ -329,10 +329,11 @@ export const handleRedirection = async ( const isGLASSAdmin = shouldRedirect(userGroupIds, [AMR_AMC_ADMIN, AMR_AMR_ADMIN, AMR_EGASP_ADMIN]); const isCSYUser = shouldRedirect(userGroupIds, [CSY_USERS]); - + const redirectToNHWAAdmin = !isAdminUserGroup && (isNHWAAdmin || (isNHWAGlobalTeam && isNHWADataManager)); - const redirectToHomePage = isMALRegionalUser || (isAMRAMRUser && !isAMRUser) || (isAMRUser && !isAMRAMRUser) || isCSYUser; + const redirectToHomePage = + isMALRegionalUser || (isAMRAMRUser && !isAMRUser) || (isAMRUser && !isAMRAMRUser) || isCSYUser; const redirectToGLASS = !isGLASSAdmin && isGLASSCountryUser; @@ -349,7 +350,7 @@ export const handleRedirection = async ( ); const username = user.name; - if (configurations.length > 0 || isMALRegionalUser || isGLASSCountryUser) { + if (configurations.length > 0 || isMALRegionalUser || isGLASSCountryUser || isCSYUser) { return { username, userGroupIds, diff --git a/src/webapp/pages/app/App.tsx b/src/webapp/pages/app/App.tsx index a1e506a..0f2d8d7 100644 --- a/src/webapp/pages/app/App.tsx +++ b/src/webapp/pages/app/App.tsx @@ -48,7 +48,6 @@ const App = ({ api }: { api: D2Api }) => { const apiVersion = getMajorVersion(version); const options = await handleRedirection(baseUrl, apiVersion, user, config, glassDashboardIds); - console.log("options",options); if (options) { if (options.redirectToNHWAAdmin) window.location.hash = "/nhwa-admins"; if (options.redirectToGLASS) { @@ -58,7 +57,6 @@ const App = ({ api }: { api: D2Api }) => { if (options.redirectToAMRAMRHq) window.location.hash = "/amr-amr-hq"; if (options.redirectToAMRAMRRegional) window.location.hash = "/amr-amr-regional"; if (options.showAvailableLandingPages) window.location.hash = "/"; - if (options.redirectToHomePage) { const homePageAppPath = "/api/apps/Homepage-App/index.html#/"; goToExternalUrl(baseUrl + homePageAppPath);