Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
41cc95f
Create search bar for people table
ellen-wright Apr 10, 2026
8aeb773
add styling to search bar
ellen-wright Apr 13, 2026
605ee25
remove extra sapcing
ellen-wright Apr 13, 2026
347d88a
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright Apr 13, 2026
cd8c03c
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright Apr 15, 2026
905513e
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright Apr 29, 2026
50a4257
add e2e test
ellen-wright May 6, 2026
649268c
Merge branch '1546-add-custom-search-bar-for-people-table' of https:/…
ellen-wright May 6, 2026
b3d5906
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright May 6, 2026
0627b44
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
yoganandaness May 11, 2026
f97143f
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright May 14, 2026
3661ec3
Add label to TextField for tests
ellen-wright May 14, 2026
19c93f8
Add test fix
ellen-wright May 14, 2026
8a3c34e
remove test error
ellen-wright May 14, 2026
cc2e908
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
yoganandaness May 19, 2026
9d812ac
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright May 26, 2026
a479efb
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright May 26, 2026
2b88560
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright May 27, 2026
b5a1580
Add fix for eventlog e2e test
ellen-wright May 28, 2026
2fabe30
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright May 28, 2026
2642c6f
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright May 29, 2026
d15bb31
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright Jun 2, 2026
4f5eb94
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright Jun 3, 2026
6cb6b74
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright Jun 4, 2026
88f3a23
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright Jun 5, 2026
0a14cad
Change FAP search test for people table
ellen-wright Jun 8, 2026
3dea563
Merge branch '1546-add-custom-search-bar-for-people-table' of https:/…
ellen-wright Jun 8, 2026
235eb61
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright Jun 8, 2026
b06a8f7
Hide custom search for FAP review modal
ellen-wright Jun 10, 2026
6a2e2d3
Merge branch '1546-add-custom-search-bar-for-people-table' of https:/…
ellen-wright Jun 10, 2026
ab0cbb0
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright Jun 10, 2026
4b6d4a9
Allow use of both searches
ellen-wright Jun 10, 2026
373e265
Merge branch '1546-add-custom-search-bar-for-people-table' of https:/…
ellen-wright Jun 10, 2026
0e5af6e
Fix FAP people table test
ellen-wright Jun 10, 2026
b8277ef
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright Jun 10, 2026
58b5d43
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright Jun 11, 2026
b99a271
Add FAP search for new people table search bar for e2e
ellen-wright Jun 11, 2026
00f8660
Merge branch '1546-add-custom-search-bar-for-people-table' of https:/…
ellen-wright Jun 11, 2026
6ea016a
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright Jun 12, 2026
c7879d1
Specify user name in fap e2e test
ellen-wright Jun 12, 2026
dcf57c7
Merge branch '1546-add-custom-search-bar-for-people-table' of https:/…
ellen-wright Jun 12, 2026
d3b73ee
Change enter buttton press e2e tests
ellen-wright Jun 12, 2026
fa1518c
Remove unecessary test check
ellen-wright Jun 12, 2026
ecb5ed7
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright Jun 15, 2026
cc63c77
Remove test - check for github actions
ellen-wright Jun 23, 2026
bcf335f
Merge branch '1546-add-custom-search-bar-for-people-table' of https:/…
ellen-wright Jun 23, 2026
f202654
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright Jun 23, 2026
910effc
Add wait to eventlog test
ellen-wright Jun 23, 2026
2085ace
Merge branch '1546-add-custom-search-bar-for-people-table' of https:/…
ellen-wright Jun 23, 2026
d1e3f4e
Edit eventlog test to match people table
ellen-wright Jun 23, 2026
737fb60
Merge branch 'develop' into 1546-add-custom-search-bar-for-people-table
ellen-wright Jun 24, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions apps/e2e/cypress/e2e/eventLogs.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,37 +67,38 @@ context('Event log tests', () => {
id: user.id,
firstname: newFirstName,
userTitle: 'Dr.',
lastname: 'Doe',
lastname: user.lastName,
institutionId: 1,
email: faker.internet.email(),
});
}).then(() => {
cy.login('officer');
cy.visit('/People');

cy.login('officer');
cy.visit('/People');

cy.finishedLoading();
cy.finishedLoading();

cy.get('[aria-label="Search"]').type(user.lastName);
cy.get('[data-cy="people-search"]').type(user.lastName);
cy.realPress('Enter');

cy.contains(user.firstName)
.parent()
.find('button[aria-label="Edit user"]')
.click();
cy.contains(user.lastName)
.parent()
.find('button[aria-label="Edit user"]')
.click();

cy.get("[name='firstname']").should('have.value', newFirstName);
cy.get("[name='firstname']").should('have.value', newFirstName);

cy.get('[role="tab"]').contains('Logs').click();
cy.get('[role="tab"]').contains('Logs').click();

cy.get('[data-cy="event-logs-table"]').as('eventLogsTable');
cy.get('@eventLogsTable')
.find('tr[level="0"]')
.last()
.as('eventLogsTableLastRow');
cy.get('[data-cy="event-logs-table"]').as('eventLogsTable');
cy.get('@eventLogsTable')
.find('tr[level="0"]')
.last()
.as('eventLogsTableLastRow');

cy.get('@eventLogsTableLastRow').invoke('text').as('lastRowText');
cy.get('@eventLogsTableLastRow').invoke('text').as('lastRowText');

cy.get('@lastRowText').should('contain', 'USER_UPDATED');
cy.get('@lastRowText').should('contain', updateProfileDate);
cy.get('@lastRowText').should('contain', 'USER_UPDATED');
cy.get('@lastRowText').should('contain', updateProfileDate);
});
});

it('If user impersonates someone, it reflects in the action logs', () => {
Expand Down
11 changes: 8 additions & 3 deletions apps/e2e/cypress/e2e/generalFaps.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ context('General facility access panel tests', () => {
this.skip();
}
cy.contains('People').click();
searchMuiTableAsync(fapMembers.chair.lastName);
cy.get('[data-cy="people-search"]').type(fapMembers.chair.lastName);
cy.realPress('Enter');
cy.get('[aria-label="Edit user"]').click();
cy.get('[cy-data="user-page"]').contains('Settings').click();
cy.contains('Add role').click();
Expand All @@ -82,9 +83,13 @@ context('General facility access panel tests', () => {
variant: 'success',
});
cy.contains('People').click();
cy.get('[data-cy="people-search"]').type(fapMembers.secretary.lastName);
cy.realPress('Enter');
cy.contains(fapMembers.secretary.lastName)
.parent()
.find('button[aria-label="Edit user"]')
.click();

searchMuiTableAsync(fapMembers.secretary.lastName);
cy.get('[aria-label="Edit user"]').click();
cy.get('[cy-data="user-page"]').contains('Settings').click();
cy.contains('Add role').click();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ const AssignFapMemberToProposalModal = ({
isLoading={loadingMembers}
columns={columns}
search
customSearch={false}
onUpdate={(members: FapAssignedMember[]) =>
assignMembersToFapProposals(
members,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ const PeopleSelectorModal = ({
invitationUserRole: invitationUserRole || userRole,
setPrincipalInvestigator: setPrincipalInvestigator,
search: true,
customSearch: false,
};

const peopleTablesProps = {
Expand Down
3 changes: 2 additions & 1 deletion apps/frontend/src/components/user/PeoplePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ export default function PeoplePage() {
}}
selection={false}
showInvitationButtons
search
search={false}
customSearch={true}
onRemove={(user: { id: number }) =>
api({
toastSuccessMessage: 'User removed successfully!',
Expand Down
Loading
Loading