diff --git a/services/web/app/views/layout-react.pug b/services/web/app/views/layout-react.pug index f7a6a80bac..01570c8814 100644 --- a/services/web/app/views/layout-react.pug +++ b/services/web/app/views/layout-react.pug @@ -12,6 +12,7 @@ block append meta - const canDisplayAdminRedirect = canRedirectToAdminDomain() - const sessionUser = getSessionUser() - const staffAccess = sessionUser?.staffAccess + - const canDisplayProjectUrlLookup = hasFeature('saas') && canDisplayAdminMenu && hasAdminCapability('view-project-setting', false) - const canDisplaySplitTestMenu = hasFeature('saas') && ((canDisplayAdminMenu && hasAdminCapability('view-split-test')) || staffAccess?.splitTestMetrics || staffAccess?.splitTestManagement) - const canDisplaySurveyMenu = hasFeature('saas') && canDisplayAdminMenu && hasAdminCapability('manage-survey', false) - const canDisplayScriptLogMenu = hasFeature('saas') && hasAdminCapability('view-script-log', false) && canDisplayAdminMenu @@ -26,6 +27,7 @@ block append meta title: nav.title, canDisplayAdminMenu, canDisplayAdminRedirect, + canDisplayProjectUrlLookup, canDisplaySplitTestMenu, canDisplaySurveyMenu, canDisplayScriptLogMenu, diff --git a/services/web/app/views/layout/navbar-marketing.pug b/services/web/app/views/layout/navbar-marketing.pug index 42c0d49944..10e8b747ae 100644 --- a/services/web/app/views/layout/navbar-marketing.pug +++ b/services/web/app/views/layout/navbar-marketing.pug @@ -30,6 +30,7 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg( - var canDisplayAdminMenu = hasAdminAccess() - var canDisplayAdminRedirect = canRedirectToAdminDomain() + - var canDisplayProjectUrlLookup = hasFeature('saas') && canDisplayAdminMenu && hasAdminCapability('view-project-setting', false) - var canDisplaySplitTestMenu = hasFeature('saas') && ((canDisplayAdminMenu && hasAdminCapability('view-split-test')) || (getSessionUser() && getSessionUser().staffAccess && (getSessionUser().staffAccess.splitTestMetrics || getSessionUser().staffAccess.splitTestManagement))) - var canDisplaySurveyMenu = hasFeature('saas') && canDisplayAdminMenu && hasAdminCapability('manage-survey', false) - var canDisplayScriptLogMenu = hasFeature('saas') && hasAdminCapability('view-script-log', false) && canDisplayAdminMenu @@ -47,7 +48,7 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg( #navbar-main-collapse.navbar-collapse.collapse ul.nav.navbar-nav.navbar-right.ms-auto(role='menubar') - if canDisplayAdminMenu || canDisplayAdminRedirect || canDisplaySplitTestMenu + if canDisplayAdminMenu || canDisplayAdminRedirect || canDisplayProjectUrlLookup || canDisplaySplitTestMenu +nav-item.dropdown.subdued button.dropdown-toggle( aria-haspopup='true' @@ -64,6 +65,7 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg( if canDisplayAdminMenu +dropdown-menu-link-item(href='/admin') Manage Site +dropdown-menu-link-item(href='/admin/user') Manage Users + if canDisplayProjectUrlLookup +dropdown-menu-link-item(href='/admin/project') Project URL Lookup if canDisplayAdminRedirect +dropdown-menu-link-item(href=settings.adminUrl) Switch to Admin diff --git a/services/web/frontend/js/shared/components/navbar/admin-menu.tsx b/services/web/frontend/js/shared/components/navbar/admin-menu.tsx index 57087b98ba..94c57e1dfc 100644 --- a/services/web/frontend/js/shared/components/navbar/admin-menu.tsx +++ b/services/web/frontend/js/shared/components/navbar/admin-menu.tsx @@ -6,6 +6,7 @@ import { useSendProjectListMB } from '@/features/project-list/components/project export default function AdminMenu({ canDisplayAdminMenu, canDisplayAdminRedirect, + canDisplayProjectUrlLookup, canDisplaySplitTestMenu, canDisplaySurveyMenu, canDisplayScriptLogMenu, @@ -14,6 +15,7 @@ export default function AdminMenu({ DefaultNavbarMetadata, | 'canDisplayAdminMenu' | 'canDisplayAdminRedirect' + | 'canDisplayProjectUrlLookup' | 'canDisplaySplitTestMenu' | 'canDisplaySurveyMenu' | 'canDisplayScriptLogMenu' @@ -39,11 +41,13 @@ export default function AdminMenu({ Manage Users - - Project URL lookup - ) : null} + {canDisplayProjectUrlLookup ? ( + + Project URL lookup + + ) : null} {canDisplayAdminRedirect && adminUrl ? ( Switch to Admin diff --git a/services/web/frontend/js/shared/components/navbar/default-navbar.tsx b/services/web/frontend/js/shared/components/navbar/default-navbar.tsx index 4fb79817a7..a32a8ce40a 100644 --- a/services/web/frontend/js/shared/components/navbar/default-navbar.tsx +++ b/services/web/frontend/js/shared/components/navbar/default-navbar.tsx @@ -26,6 +26,7 @@ function DefaultNavbar( title, canDisplayAdminMenu, canDisplayAdminRedirect, + canDisplayProjectUrlLookup, canDisplaySplitTestMenu, canDisplaySurveyMenu, canDisplayScriptLogMenu, @@ -112,6 +113,7 @@ function DefaultNavbar(