From cd7b77d58ab86f988821d6ce59ee4e8bbb3bb0ea Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 12 Nov 2020 16:50:31 -0500 Subject: [PATCH 1/6] Disable the Customize Setup link on setup page 4 --- app/hub/Views/SideNavigationView/SideNavigationView.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/hub/Views/SideNavigationView/SideNavigationView.jsx b/app/hub/Views/SideNavigationView/SideNavigationView.jsx index 1e26d995c..5fc0dcc28 100644 --- a/app/hub/Views/SideNavigationView/SideNavigationView.jsx +++ b/app/hub/Views/SideNavigationView/SideNavigationView.jsx @@ -29,8 +29,10 @@ const { GHOSTERY_BASE_URL } = globals; * @return {JSX} JSX of the Navigation Menu Item */ function _renderMenuItem(item, disableNav) { + // Disable the link that leads to a blank screen on custom setup page 4 in ticket GH-2216 + const isSetupPageFour = window.location.href.indexOf('setup/4') > -1; const linkClassNames = ClassNames('flex-container align-middle', { - disabled: disableNav, + disabled: disableNav || (item.href.substring(1) === 'setup' && isSetupPageFour) }); return ( From ff6770586a43b55c1f29bad71bfb3d9635161fde Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 12 Nov 2020 17:08:02 -0500 Subject: [PATCH 2/6] Refactor code --- app/hub/Views/SideNavigationView/SideNavigationView.jsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/hub/Views/SideNavigationView/SideNavigationView.jsx b/app/hub/Views/SideNavigationView/SideNavigationView.jsx index 5fc0dcc28..d8f003275 100644 --- a/app/hub/Views/SideNavigationView/SideNavigationView.jsx +++ b/app/hub/Views/SideNavigationView/SideNavigationView.jsx @@ -29,10 +29,11 @@ const { GHOSTERY_BASE_URL } = globals; * @return {JSX} JSX of the Navigation Menu Item */ function _renderMenuItem(item, disableNav) { - // Disable the link that leads to a blank screen on custom setup page 4 in ticket GH-2216 - const isSetupPageFour = window.location.href.indexOf('setup/4') > -1; + // Disable the sidebar link that leads to a blank screen on custom setup page 4 (GH-2216) + const shouldDisableSetupLink = window.location.href.indexOf('setup/4') > -1 && (item.href.substring(1) === 'setup'); + const linkClassNames = ClassNames('flex-container align-middle', { - disabled: disableNav || (item.href.substring(1) === 'setup' && isSetupPageFour) + disabled: disableNav || shouldDisableSetupLink }); return ( From 3094f8c36d7570addad9cd37d297dee19b5ba756 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 12 Nov 2020 17:53:44 -0500 Subject: [PATCH 3/6] Add parenthesis --- app/hub/Views/SideNavigationView/SideNavigationView.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/hub/Views/SideNavigationView/SideNavigationView.jsx b/app/hub/Views/SideNavigationView/SideNavigationView.jsx index d8f003275..3701e7d12 100644 --- a/app/hub/Views/SideNavigationView/SideNavigationView.jsx +++ b/app/hub/Views/SideNavigationView/SideNavigationView.jsx @@ -30,7 +30,7 @@ const { GHOSTERY_BASE_URL } = globals; */ function _renderMenuItem(item, disableNav) { // Disable the sidebar link that leads to a blank screen on custom setup page 4 (GH-2216) - const shouldDisableSetupLink = window.location.href.indexOf('setup/4') > -1 && (item.href.substring(1) === 'setup'); + const shouldDisableSetupLink = (window.location.href.indexOf('setup/4') > -1) && (item.href.substring(1) === 'setup'); const linkClassNames = ClassNames('flex-container align-middle', { disabled: disableNav || shouldDisableSetupLink From 29500bf1b4953158e1594797ff66e716569c6834 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 13 Nov 2020 16:22:54 -0500 Subject: [PATCH 4/6] Revert disabling customize setup link --- app/hub/Views/SideNavigationView/SideNavigationView.jsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/hub/Views/SideNavigationView/SideNavigationView.jsx b/app/hub/Views/SideNavigationView/SideNavigationView.jsx index 3701e7d12..39c8d830d 100644 --- a/app/hub/Views/SideNavigationView/SideNavigationView.jsx +++ b/app/hub/Views/SideNavigationView/SideNavigationView.jsx @@ -29,11 +29,8 @@ const { GHOSTERY_BASE_URL } = globals; * @return {JSX} JSX of the Navigation Menu Item */ function _renderMenuItem(item, disableNav) { - // Disable the sidebar link that leads to a blank screen on custom setup page 4 (GH-2216) - const shouldDisableSetupLink = (window.location.href.indexOf('setup/4') > -1) && (item.href.substring(1) === 'setup'); - const linkClassNames = ClassNames('flex-container align-middle', { - disabled: disableNav || shouldDisableSetupLink + disabled: disableNav }); return ( From 55dd1902b12929b4c0d03f5e73e4a7d8f4aadc13 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 13 Nov 2020 16:25:39 -0500 Subject: [PATCH 5/6] Keep sidebar links disabled in entire setup flow --- .../Views/SideNavigationView/SideNavigationViewContainer.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/hub/Views/SideNavigationView/SideNavigationViewContainer.jsx b/app/hub/Views/SideNavigationView/SideNavigationViewContainer.jsx index 6ba4f00fa..82bb1b391 100644 --- a/app/hub/Views/SideNavigationView/SideNavigationViewContainer.jsx +++ b/app/hub/Views/SideNavigationView/SideNavigationViewContainer.jsx @@ -52,7 +52,7 @@ class SideNavigationViewContainer extends Component { */ render() { const { user, location } = this.props; - const disableRegEx = /^(\/setup(?!\/4$))|(\/tutorial(?!\/6$))/; + const disableRegEx = /^(\/setup)|(\/tutorial(?!\/6$))/; const menuItems = ah ? [ { href: '/home', icon: 'home', text: t('hub_side_navigation_home') }, From 3e34fdddaf85fde10c3502e52eb121433ce170d0 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 13 Nov 2020 16:29:00 -0500 Subject: [PATCH 6/6] Add comma --- app/hub/Views/SideNavigationView/SideNavigationView.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/hub/Views/SideNavigationView/SideNavigationView.jsx b/app/hub/Views/SideNavigationView/SideNavigationView.jsx index 39c8d830d..1e26d995c 100644 --- a/app/hub/Views/SideNavigationView/SideNavigationView.jsx +++ b/app/hub/Views/SideNavigationView/SideNavigationView.jsx @@ -30,7 +30,7 @@ const { GHOSTERY_BASE_URL } = globals; */ function _renderMenuItem(item, disableNav) { const linkClassNames = ClassNames('flex-container align-middle', { - disabled: disableNav + disabled: disableNav, }); return (