Admin tools: themed dashboard

services/web/modules/admin-tools/app/src/ProjectListController.mjs

@@ -4,21 +4,32 @@ import { fileURLToPath } from 'node:url'
 import { expressify } from '@overleaf/promise-utils'
 import logger from '@overleaf/logger'
 import Metrics from '@overleaf/metrics'
+import SessionManager from '../../../../app/src/Features/Authentication/SessionManager.mjs'
+import PrivilegeLevels from '../../../../app/src/Features/Authorization/PrivilegeLevels.mjs'
 import ProjectHelper from '../../../../app/src/Features/Project/ProjectHelper.mjs'
 import ProjectGetter from '../../../../app/src/Features/Project/ProjectGetter.mjs'
-import PrivilegeLevels from '../../../../app/src/Features/Authorization/PrivilegeLevels.mjs'
-import SessionManager from '../../../../app/src/Features/Authentication/SessionManager.mjs'
+import ProjectDeleter from '../../../../app/src/Features/Project/ProjectDeleter.mjs'
+import UserSettingsHelper from '../../../../app/src/Features/Project/UserSettingsHelper.mjs'
 import UserGetter from '../../../../app/src/Features/User/UserGetter.mjs'
-import { OError } from '../../../../app/src/Features/Errors/Errors.js'
 import { User } from '../../../../app/src/models/User.mjs'
 import { Project } from '../../../../app/src/models/Project.mjs'
 import { DeletedProject } from '../../../../app/src/models/DeletedProject.mjs'
-import ProjectDeleter from '../../../../app/src/Features/Project/ProjectDeleter.mjs'
+import { OError } from '../../../../app/src/Features/Errors/Errors.js'
 import HttpErrorHandler from '../../../../app/src/Features/Errors/HttpErrorHandler.mjs'
+import SplitTestHandler from '../../../../app/src/Features/SplitTests/SplitTestHandler.mjs'
 
 const __dirname = Path.dirname(fileURLToPath(import.meta.url))
 
+function cleanupSession(req) {
+  // cleanup redirects at the end of the redirect chain
+  delete req.session.postCheckoutRedirect
+  delete req.session.postLoginRedirect
+  delete req.session.postOnboardingRedirect
+}
+
 async function manageProjectsPage(req, res, next) {
+  cleanupSession(req)
+
   const projectsBlobPending = _getProjects().catch(err => {
     logger.err({ err }, 'projects listing in background failed')
     return undefined
@@ -30,8 +41,24 @@ async function manageProjectsPage(req, res, next) {
     status: prefetchedProjectsBlob ? 'success' : 'error',
   })
 
+  const userId = SessionManager.getLoggedInUserId(req.session)
+  const user = await User.findById(userId, 'ace')
+
+  const userSettings = await UserSettingsHelper.buildUserSettings(
+    req,
+    res,
+    user
+  )
+
+  await SplitTestHandler.promises.getAssignment(
+    req,
+    res,
+    'themed-project-dashboard'
+  )
+
   res.render(Path.resolve(__dirname, '../views/manage-projects-react'), {
     title: 'Manage Projects',
+    userSettings,
     prefetchedProjectsBlob,
   })
 }

services/web/modules/admin-tools/app/src/UserListController.mjs

@@ -16,12 +16,14 @@ import OneTimeTokenHandler from '../../../../app/src/Features/Security/OneTimeTo
 import UserGetter from '../../../../app/src/Features/User/UserGetter.mjs'
 import UserUpdater from '../../../../app/src/Features/User/UserUpdater.mjs'
 import UserDeleter from '../../../../app/src/Features/User/UserDeleter.mjs'
+import UserSettingsHelper from '../../../../app/src/Features/Project/UserSettingsHelper.mjs'
 import ProjectDeleter from '../../../../app/src/Features/Project/ProjectDeleter.mjs'
 import OwnershipTransferHandler from '../../../../app/src/Features/Collaborators/OwnershipTransferHandler.mjs'
 import HttpErrorHandler from '../../../../app/src/Features/Errors/HttpErrorHandler.mjs'
 import ErrorController from '../../../../app/src/Features/Errors/ErrorController.mjs'
 import Errors, { OError } from '../../../../app/src/Features/Errors/Errors.js'
 import { db } from '../../../../app/src/infrastructure/mongodb.mjs'
+import SplitTestHandler from '../../../../app/src/Features/SplitTests/SplitTestHandler.mjs'
 
 const __dirname = Path.dirname(fileURLToPath(import.meta.url))
 
@@ -71,8 +73,6 @@ function cleanupSession(req) {
 async function manageUsersPage(req, res, next) {
   cleanupSession(req)
 
-  const userId = SessionManager.getLoggedInUserId(req.session)
-
   const usersBlobPending = _getUsers().catch(err => {
     logger.err({ err }, 'users listing in background failed')
     return undefined
@@ -84,8 +84,24 @@ async function manageUsersPage(req, res, next) {
     status: prefetchedUsersBlob ? 'success' : 'error',
   })
 
+  await SplitTestHandler.promises.getAssignment(
+    req,
+    res,
+    'themed-project-dashboard'
+  )
+
+  const userId = SessionManager.getLoggedInUserId(req.session)
+  const user = await User.findById(userId, 'ace')
+
+  const userSettings = await UserSettingsHelper.buildUserSettings(
+    req,
+    res,
+    user
+  )
+
   res.render(Path.resolve(__dirname, '../views/manage-users-react'), {
     title: 'Manage Users',
+    userSettings,
     prefetchedUsersBlob,
     availableAuthMethods,
     userDetailsUpdatedOnLogin,

services/web/modules/admin-tools/app/views/manage-projects-react.pug

@@ -15,6 +15,8 @@ block append meta
 		data-type='json'
 		content=prefetchedProjectsBlob
 	)
+	meta(name='ol-userSettings' data-type='json' content=userSettings)
+	meta(name='ol-overallThemes' data-type='json' content=overallThemes)
 	if suggestedLanguageSubdomainConfig
 		meta(
 			name='ol-suggestedLanguage'

services/web/modules/admin-tools/app/views/manage-users-react.pug

@@ -16,6 +16,8 @@ block append meta
 		data-type='json'
 		content=prefetchedUsersBlob
 	)
+	meta(name='ol-userSettings' data-type='json' content=userSettings)
+	meta(name='ol-overallThemes' data-type='json' content=overallThemes)
 	if suggestedLanguageSubdomainConfig
 		meta(
 			name='ol-suggestedLanguage'

services/web/modules/admin-tools/frontend/js/manage-projects-root.tsx

@@ -13,15 +13,15 @@ function ManageProjectsRoot() {
   if (!isReady) return null
 
   return (
-    <SplitTestProvider>
-      <UserSettingsProvider>
-        <UserListProvider>
-          <ProjectListProvider projectsOwnerId={null}>
+    <UserListProvider>
+      <ProjectListProvider projectsOwnerId={null}>
+        <SplitTestProvider>
+          <UserSettingsProvider>
             <ProjectListRoot />
-          </ProjectListProvider>
-        </UserListProvider>
-      </UserSettingsProvider>
-    </SplitTestProvider>
+          </UserSettingsProvider>
+        </SplitTestProvider>
+      </ProjectListProvider>
+    </UserListProvider>
   )
 }
 

services/web/modules/admin-tools/frontend/js/manage-users-root.tsx

@@ -28,15 +28,15 @@ function ManageUsersRoot() {
   if (!isReady) return null
 
   return (
-    <SplitTestProvider>
-      <UserSettingsProvider>
-        <UsersPageProvider>
-          <UserListProvider>
+    <UsersPageProvider>
+      <UserListProvider>
+        <SplitTestProvider>
+          <UserSettingsProvider>
             <UsersPageSelector />
-          </UserListProvider>
-        </UsersPageProvider>
-      </UserSettingsProvider>
-    </SplitTestProvider>
+          </UserSettingsProvider>
+        </SplitTestProvider>
+      </UserListProvider>
+    </UsersPageProvider>
   )
 }
 

services/web/modules/admin-tools/frontend/js/project-list/components/project-list-ds-nav.tsx

@@ -15,11 +15,13 @@ import DefaultNavbar from '@/shared/components/navbar/default-navbar'
 import Footer from '@/shared/components/footer/footer'
 import SidebarDsNav from './sidebar/sidebar-ds-nav'
 import overleafLogo from '@/shared/svgs/overleaf-a-ds-solution-mallard.svg'
+import overleafLogoDark from '@/shared/svgs/overleaf-a-ds-solution-mallard-dark.svg'
 import { getUserName } from '../util/user'
 import { useProjectListContext } from '../context/project-list-context'
 import { useUserIdentityContext } from '../../user-list/context/user-identity-context'
 import Pagination from '@/shared/components/pagination-cep'
 import ProjectListSummary from './project-list-summary'
+import { useActiveOverallTheme } from '@/shared/hooks/use-active-overall-theme'
 
 export function ProjectListDsNav() {
 
@@ -39,6 +41,7 @@ export function ProjectListDsNav() {
     totalPages,
   } = useProjectListContext()
   const { getUserNameById } = useUserIdentityContext()
+  const activeOverallTheme = useActiveOverallTheme('themed-project-dashboard')
 
   const userName = projectsOwnerId ? getUserNameById(projectsOwnerId) : t('all_users')
   const tableTopArea = (
@@ -59,7 +62,9 @@ export function ProjectListDsNav() {
       <div className="manage-projects-page">
         <DefaultNavbar
           {...navbarProps}
-          overleafLogo={overleafLogo}
+          overleafLogo={
+            activeOverallTheme === 'dark' ? overleafLogoDark : overleafLogo
+          }
           showCloseIcon
         />
       </div>

services/web/modules/admin-tools/frontend/js/project-list/components/project-list-summary.tsx

@@ -1,7 +1,14 @@
 import { useTranslation } from 'react-i18next'
-import OLFormSelect from '@/shared/components/ol/ol-form-select'
+import {
+  Dropdown,
+  DropdownMenu,
+  DropdownItem,
+  DropdownToggle,
+} from '@/shared/components/dropdown/dropdown-menu'
 import { useProjectListContext } from '../context/project-list-context'
 
+const OPTIONS = [20, 40, 80]
+
 export default function ProjectListSummary() {
   const {
     visibleProjects,
@@ -14,37 +21,40 @@ export default function ProjectListSummary() {
 
   return (
     <div className="text-center">
-      <p>
         <span aria-live="polite">
           {t('showing_x_out_of_n_projects', {
             x: visibleProjects.length,
             n: visibleProjects.length + hiddenProjectsCount,
           })}
         </span>
+
         <span className="mx-2">·</span>
+
         <span className="d-inline-flex gap-1">
-          <OLFormSelect
-            name="projects_per_page"
-            value={projectsPerPage}
-            onChange={(e) => setProjectsPerPage(Number(e.target.value))}
-            style={{
-              width: 'auto',
-              border: '1px solid #ccc',
-              background: 'var(--green-10)',
-              padding: '0 0.2rem',
-              boxShadow: 'none',
-              cursor: 'pointer',
-            }}
-          >
-            <option value={20}>20</option>
-            <option value={40}>40</option>
-            <option value={80}>80</option>
-          </OLFormSelect>
-          <span>
-            {t('per_page')}
-          </span>
+          <Dropdown>
+
+            <DropdownToggle
+              as="span"
+              className="entries-per-page-toggle"
+            >
+              {projectsPerPage}
+            </DropdownToggle>
+
+            <DropdownMenu>
+              {OPTIONS.map((value) => (
+                <DropdownItem
+                  key={value}
+                  active={value === projectsPerPage}
+                  onClick={() => setProjectsPerPage(value)}
+                >
+                  {value}
+                </DropdownItem>
+              ))}
+            </DropdownMenu>
+
+          </Dropdown>
+          <span>{t('per_page')}</span>
         </span>
-      </p>
     </div>
   )
 }

services/web/modules/admin-tools/frontend/js/project-list/components/sidebar/sidebar-ds-nav.tsx

@@ -27,7 +27,7 @@ function SidebarDsNav() {
   const { sessionUser } = getMeta('ol-navbar')
   const { containerRef, scrolledUp } = useScrolled()
   const themedDsNav = useFeatureFlag('themed-project-dashboard')
-  
+
   const { getUserNameById } = useUserIdentityContext()
   const { projectsOwnerId } = useProjectListContext() 
 

services/web/modules/admin-tools/frontend/js/user-list/components/user-list-ds-nav.tsx

@@ -17,7 +17,9 @@ import DefaultNavbar from '@/shared/components/navbar/default-navbar'
 import Footer from '@/shared/components/footer/footer'
 import SidebarDsNav from './sidebar/sidebar-ds-nav'
 import overleafLogo from '@/shared/svgs/overleaf-a-ds-solution-mallard.svg'
+import overleafLogoDark from '@/shared/svgs/overleaf-a-ds-solution-mallard-dark.svg'
 import CookieBanner from '@/shared/components/cookie-banner'
+import { useActiveOverallTheme } from '@/shared/hooks/use-active-overall-theme'
 import Pagination from '@/shared/components/pagination-cep'
 import UserListSummary from './user-list-summary'
 
@@ -36,6 +38,7 @@ export function UserListDsNav() {
     setCurrentPage,
     totalPages,
   } = useUserListContext()
+  const activeOverallTheme = useActiveOverallTheme('themed-project-dashboard')
 
   const tableTopArea = (
     <div className="pt-2 pb-3 d-md-none d-flex gap-2">
@@ -54,7 +57,9 @@ export function UserListDsNav() {
     <div className="user-ds-nav-page website-redesign">
       <DefaultNavbar
         {...navbarProps}
-        overleafLogo={overleafLogo}
+        overleafLogo={
+          activeOverallTheme === 'dark' ? overleafLogoDark : overleafLogo
+        }
         showCloseIcon
       />
       <div className="user-list-wrapper">

services/web/modules/admin-tools/frontend/js/user-list/components/user-list-summary.tsx

@@ -1,7 +1,14 @@
 import { useTranslation } from 'react-i18next'
-import OLFormSelect from '@/shared/components/ol/ol-form-select'
+import {
+  Dropdown,
+  DropdownMenu,
+  DropdownItem,
+  DropdownToggle,
+} from '@/shared/components/dropdown/dropdown-menu'
 import { useUserListContext } from '../context/user-list-context'
 
+const OPTIONS = [20, 40, 80]
+
 export default function UserListSummary() {
   const {
     visibleUsers,
@@ -9,42 +16,45 @@ export default function UserListSummary() {
     usersPerPage,
     setUsersPerPage,
   } = useUserListContext()
-
   const { t } = useTranslation()
 
   return (
     <div className="text-center">
-      <p>
         <span aria-live="polite">
           {t('showing_x_out_of_n_users', {
             x: visibleUsers.length,
             n: visibleUsers.length + hiddenUsersCount,
           })}
         </span>
+
         <span className="mx-2">·</span>
+
         <span className="d-inline-flex gap-1">
-          <OLFormSelect
-            name="users_per_page"
-            value={usersPerPage}
-            onChange={(e) => setUsersPerPage(Number(e.target.value))}
-            style={{
-              width: 'auto',
-              border: '1px solid #ccc',
-              background: 'var(--green-10)',
-              padding: '0 0.2rem',
-              boxShadow: 'none',
-              cursor: 'pointer',
-            }}
-          >
-            <option value={20}>20</option>
-            <option value={40}>40</option>
-            <option value={80}>80</option>
-          </OLFormSelect>
-          <span>
-            {t('per_page')}
-          </span>
+          <Dropdown>
+
+            <DropdownToggle
+              as="span"
+              className="entries-per-page-toggle"
+            >
+              {usersPerPage}
+            </DropdownToggle>
+
+            <DropdownMenu>
+              {OPTIONS.map((value) => (
+                <DropdownItem
+                  key={value}
+                  active={value === usersPerPage}
+                  onClick={() => setUsersPerPage(value)}
+                >
+                  {value}
+                </DropdownItem>
+              ))}
+            </DropdownMenu>
+
+          </Dropdown>
+
+          <span>{t('per_page')}</span>
         </span>
-      </p>
     </div>
   )
 }