Merge branch 'develop' into SWAP-4929-user-officer-experiment-table-filter

jekabs-karklins · yoganandaness · commit 0003da9ba997 · 2025-10-28T18:46:04.000+01:00
diff --git a/apps/backend/src/datasources/stfc/StfcUserDataSource.ts b/apps/backend/src/datasources/stfc/StfcUserDataSource.ts
@@ -587,7 +587,7 @@ export class StfcUserDataSource implements UserDataSource {
         offset: offset,
         userRole: undefined,
         subtractUsers: subtractUsers,
-        orderDirection: 'asc',
+        sortDirection: 'asc',
       });
 
       if (users[0]) {
@@ -609,18 +609,22 @@ export class StfcUserDataSource implements UserDataSource {
 
   async getPreviousCollaborators(
     userId: number,
-    filter?: string,
     first?: number,
     offset?: number,
-    userRole?: number,
+    sortField?: string,
+    sortDirection?: string,
+    searchText?: string,
+    userRole?: UserRole,
     subtractUsers?: [number]
   ): Promise<{ totalCount: number; users: BasicUserDetails[] }> {
     const dbUsers: BasicUserDetails[] = (
       await postgresUserDataSource.getPreviousCollaborators(
         userId,
-        filter,
         first,
         offset,
+        sortField,
+        sortDirection,
+        searchText,
         undefined,
         subtractUsers
       )
diff --git a/apps/e2e/cypress/e2e/invites.cy.ts b/apps/e2e/cypress/e2e/invites.cy.ts
@@ -101,8 +101,8 @@ context('Invites tests', () => {
         .should('be.enabled')
         .click();
 
-      cy.get('.MuiChip-label').should('not.exist');
       cy.get('[data-cy="co-proposers"]').contains(lastName);
+      cy.get('[data-cy="invites-chips"]').should('not.exist');
     });
 
     it('Should not be able to invite email already invited on proposal', function () {
@@ -370,7 +370,9 @@ context('Invites tests', () => {
         `${randomSearch}{enter}`
       );
 
-      cy.get('.MuiChip-label').should('not.exist');
+      cy.get('[data-cy="participant-selector"] .MuiChip-label').should(
+        'not.exist'
+      );
     });
   });
 
@@ -410,7 +412,9 @@ context('Invites tests', () => {
         .should('be.enabled')
         .click();
 
-      cy.get('.MuiChip-label').should('not.exist');
+      cy.get('[data-cy="participant-selector"] .MuiChip-label').should(
+        'not.exist'
+      );
       cy.get('[data-cy="co-proposers"]').contains(lastName);
     });
 
@@ -435,7 +439,9 @@ context('Invites tests', () => {
       cy.get('[data-cy="invite-user-autocomplete"]').type('{enter}');
       cy.get('[role=presentation]').contains(`No results found for "${email}"`);
       cy.get('[data-cy="invite-user-submit-button"]').should('be.disabled');
-      cy.get('.MuiChip-label').should('not.exist');
+      cy.get('[data-cy="participant-selector"] .MuiChip-label').should(
+        'not.exist'
+      );
     });
 
     it('Should not be able to add duplicate co-proposer in modal', () => {
@@ -465,7 +471,7 @@ context('Invites tests', () => {
         .should('be.enabled')
         .click();
 
-      cy.get('[data-cy="add-participant-button"]').click();
+      cy.get('[data-cy="add-participant-button"]').click({ force: true });
 
       cy.get('[data-cy="invite-user-autocomplete"]').type(email);
       cy.get('[role=presentation]')
diff --git a/apps/e2e/cypress/e2e/personalInformation.cy.ts b/apps/e2e/cypress/e2e/personalInformation.cy.ts
@@ -55,7 +55,9 @@ context('Personal information tests', () => {
       cy.login('user1');
       cy.visit('/');
 
-      cy.get('[data-cy="active-user-profile"]').click();
+      cy.get('[data-cy="profile-page-btn"]').click();
+
+      cy.get('[data-cy="manage-account-button"]').click();
 
       cy.get("[name='firstname']").clear().type(newFirstName);
 
diff --git a/apps/e2e/cypress/e2e/visits.cy.ts b/apps/e2e/cypress/e2e/visits.cy.ts
@@ -273,7 +273,11 @@ context('visits tests', () => {
       cy.finishedLoading();
       cy.get('[name=email]').type('david@teleworm.us{enter}');
       cy.finishedLoading();
-      cy.contains('Beckley').parent().find('[type=checkbox]').click();
+      cy.get('[data-cy=co-proposers]')
+        .contains('Beckley')
+        .parent()
+        .find('[type=checkbox]')
+        .click();
       cy.get('[data-cy=assign-selected-users]').click();
 
       // specify team lead
diff --git a/apps/frontend/src/components/AppToolbar/AccountActionButton.tsx b/apps/frontend/src/components/AppToolbar/AccountActionButton.tsx
@@ -1,8 +1,9 @@
-import { ExitToApp } from '@mui/icons-material';
+import { ExitToApp, ManageAccounts } from '@mui/icons-material';
 import AccountCircle from '@mui/icons-material/AccountCircle';
 import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
 import SupervisedUserCircleIcon from '@mui/icons-material/SupervisedUserCircle';
 import SwitchAccountOutlinedIcon from '@mui/icons-material/SwitchAccountOutlined';
+import { Chip, Divider } from '@mui/material';
 import Badge from '@mui/material/Badge';
 import Box from '@mui/material/Box';
 import Button from '@mui/material/Button';
@@ -12,26 +13,37 @@ import IconButton from '@mui/material/IconButton';
 import Menu from '@mui/material/Menu';
 import MenuItem from '@mui/material/MenuItem';
 import Tooltip from '@mui/material/Tooltip';
-import React, { useContext, useEffect, useState } from 'react';
-import { useSearchParams } from 'react-router-dom';
+import React, { useContext, useEffect, useMemo, useState } from 'react';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 
 import ImpersonateButton from 'components/common/ImpersonateButton';
 import StyledDialog from 'components/common/StyledDialog';
 import UOLoader from 'components/common/UOLoader';
+import { SettingsContext } from 'context/SettingsContextProvider';
 import { UserContext } from 'context/UserContextProvider';
+import { SettingsId } from 'generated/sdk';
 import { getUniqueArrayBy } from 'utils/helperFunctions';
 
+import ProfileInfo from './ProfileInfo';
 import RoleSelection from './RoleSelection';
 
 const AccountActionButton = () => {
+  const navigate = useNavigate();
   const [isLoggingOut, setIsLoggingOut] = useState(false);
   const [show, setShow] = useState(false);
-  const { roles, handleLogout, impersonatingUserId } = useContext(UserContext);
+  const { user } = useContext(UserContext);
+  const settingsContext = useContext(SettingsContext);
+  const { roles, currentRole, handleLogout, impersonatingUserId } =
+    useContext(UserContext);
   const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
-
   const [searchParams, setSearchParams] = useSearchParams();
-
   const hasMultipleRoles = getUniqueArrayBy(roles, 'id').length > 1;
+  const humanReadableActiveRole = useMemo(
+    () =>
+      roles.find(({ shortCode }) => shortCode.toUpperCase() === currentRole)
+        ?.title ?? 'Unknown',
+    [roles, currentRole]
+  );
 
   useEffect(() => {
     if (searchParams.get('selectRoles')) {
@@ -46,6 +58,10 @@ const AccountActionButton = () => {
 
   const isUserImpersonated = typeof impersonatingUserId === 'number';
 
+  const externalProfileLink = settingsContext.settingsMap.get(
+    SettingsId.PROFILE_PAGE_LINK
+  )?.settingsValue;
+
   const handleClick = (event: React.MouseEvent<HTMLButtonElement>) => {
     setAnchorEl(event.currentTarget);
   };
@@ -63,6 +79,15 @@ const AccountActionButton = () => {
     });
   };
 
+  const handleManageAccountClick = () => {
+    handleClose();
+    if (externalProfileLink) {
+      window.open(externalProfileLink, '_blank', 'noopener,noreferrer');
+    } else {
+      navigate(`/ProfilePage/${user.id}`);
+    }
+  };
+
   return (
     <>
       <StyledDialog
@@ -121,6 +146,18 @@ const AccountActionButton = () => {
           open={Boolean(anchorEl)}
           onClose={handleClose}
         >
+          <ProfileInfo />
+          <Divider style={{ marginBottom: '7px' }} />
+          <MenuItem
+            onClick={handleManageAccountClick}
+            disabled={isLoggingOut}
+            data-cy="manage-account-button"
+          >
+            <Box paddingRight={1} paddingTop={1}>
+              <ManageAccounts />
+            </Box>
+            Manage account
+          </MenuItem>
           {hasMultipleRoles && (
             <MenuItem
               onClick={() => {
@@ -132,7 +169,26 @@ const AccountActionButton = () => {
               <Box paddingRight={1} paddingTop={1}>
                 <SupervisedUserCircleIcon />
               </Box>
-              Roles
+              <Box
+                sx={{
+                  display: 'flex',
+                  justifyContent: 'space-between',
+                  alignItems: 'center',
+                  flex: 1,
+                }}
+              >
+                <Box>Roles</Box>
+                <Chip
+                  label={humanReadableActiveRole}
+                  color="primary"
+                  size="small"
+                  sx={{
+                    fontSize: '10px',
+                    height: 'inherit',
+                    lineHeight: 2,
+                  }}
+                />
+              </Box>
             </MenuItem>
           )}
           {isUserImpersonated && (
diff --git a/apps/frontend/src/components/AppToolbar/AppToolbar.tsx b/apps/frontend/src/components/AppToolbar/AppToolbar.tsx
@@ -1,19 +1,17 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 import MenuIcon from '@mui/icons-material/Menu';
+import { Box } from '@mui/material';
 import AppBar from '@mui/material/AppBar';
-import Box from '@mui/material/Box';
 import IconButton from '@mui/material/IconButton';
-import MuiLink from '@mui/material/Link';
 import { useTheme } from '@mui/material/styles';
 import Toolbar from '@mui/material/Toolbar';
 import Typography from '@mui/material/Typography';
 import useMediaQuery from '@mui/material/useMediaQuery';
 import PropTypes from 'prop-types';
-import React, { useContext, useMemo, useEffect, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { Link, useLocation } from 'react-router-dom';
 
 import { SettingsContext } from 'context/SettingsContextProvider';
-import { UserContext } from 'context/UserContextProvider';
 import { SettingsId } from 'generated/sdk';
 
 import AccountActionButton from './AccountActionButton';
@@ -44,18 +42,6 @@ const AppToolbar = ({ open, handleDrawerOpen, header }: AppToolbarProps) => {
     setLogo('/images/' + logoFilename);
   }, [logoFilename]);
 
-  const { user, roles, currentRole } = useContext(UserContext);
-  const settingsContext = useContext(SettingsContext);
-  const humanReadableActiveRole = useMemo(
-    () =>
-      roles.find(({ shortCode }) => shortCode.toUpperCase() === currentRole)
-        ?.title ?? 'Unknown',
-    [roles, currentRole]
-  );
-  const externalProfileLink = settingsContext.settingsMap.get(
-    SettingsId.PROFILE_PAGE_LINK
-  )?.settingsValue;
-
   return (
     <AppBar
       position="fixed"
@@ -80,75 +66,36 @@ const AppToolbar = ({ open, handleDrawerOpen, header }: AppToolbarProps) => {
       }}
     >
       <Toolbar>
-        <IconButton
-          edge="start"
-          color="inherit"
-          aria-label="Open drawer"
-          onClick={handleDrawerOpen}
-          sx={{
-            marginRight: 15,
-            ...(open && { display: isTabletOrMobile ? 'inline-flex' : 'none' }),
-          }}
-          data-cy="open-drawer"
-        >
-          <MenuIcon />
-        </IconButton>
-        {(!isTabletOrMobile || !isPortraitMode) && logo && (
-          <Link className={'header-logo-container'} to="/">
-            <img src={logo} alt="Institution logo" className={'header-logo'} />
-          </Link>
-        )}
-        {(!isTabletOrMobile || !isPortraitMode) && (
-          <Typography
-            component="h1"
-            variant="h6"
+        <Box sx={{ display: 'flex', flexGrow: 1, alignItems: 'center' }}>
+          <IconButton
+            edge="start"
             color="inherit"
-            noWrap
-            sx={{ flexGrow: 1 }}
+            aria-label="Open drawer"
+            onClick={handleDrawerOpen}
+            sx={{
+              ...(open && {
+                marginRight: '220px',
+                display: isTabletOrMobile ? 'inline-flex' : 'none',
+              }),
+            }}
+            data-cy="open-drawer"
           >
-            {location.pathname === '/' ? 'Dashboard' : header}
-          </Typography>
-        )}
-        <Box sx={{ marginLeft: 'auto', margin: theme.spacing(0, 0.5) }}>
-          Logged in as{' '}
-          {externalProfileLink ? (
-            <MuiLink
-              href={externalProfileLink}
-              target="_blank"
-              rel="noreferrer"
-              sx={{
-                color: theme.palette.common.white,
-                textDecoration: 'none',
-                borderBottom: '1px dashed',
-                borderBottomColor: theme.palette.common.white,
-                padding: '3px',
-                '&:hover': {
-                  textDecoration: 'none',
-                },
-              }}
-            >
-              {user.email}
-            </MuiLink>
-          ) : (
-            <MuiLink
-              data-cy="active-user-profile"
-              component={Link}
-              to={`/ProfilePage/${user.id}`}
-              sx={{
-                color: theme.palette.common.white,
-                textDecoration: 'none',
-                borderBottom: '1px dashed',
-                borderBottomColor: theme.palette.common.white,
-                padding: '3px',
-                '&:hover': {
-                  textDecoration: 'none',
-                },
-              }}
-            >
-              {user.email}
-            </MuiLink>
+            <MenuIcon />
+          </IconButton>
+          {(!isTabletOrMobile || !isPortraitMode) && logo && (
+            <Link className={'header-logo-container'} to="/">
+              <img
+                src={logo}
+                alt="Institution logo"
+                className={'header-logo'}
+              />
+            </Link>
+          )}
+          {(!isTabletOrMobile || !isPortraitMode) && (
+            <Typography component="h1" variant="h6" color="inherit" noWrap>
+              {location.pathname === '/' ? 'Dashboard' : header}
+            </Typography>
           )}
-          {roles.length > 1 && ` (${humanReadableActiveRole})`}
         </Box>
         <AccountActionButton />
       </Toolbar>
diff --git a/apps/frontend/src/components/AppToolbar/ProfileInfo.tsx b/apps/frontend/src/components/AppToolbar/ProfileInfo.tsx
diff --git a/apps/frontend/src/components/proposal/ParticipantSelector.tsx b/apps/frontend/src/components/proposal/ParticipantSelector.tsx
