Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions src/authz-module/hooks/useQuerySettings.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ describe('useQuerySettings', () => {
sortBy: [{ id: 'username', desc: false }],
filters: [
{ id: 'role', value: ['admin', 'editor'] },
{ id: 'fullName', value: 'john' },
{ id: 'username', value: 'john' },
],
};

Expand Down Expand Up @@ -268,7 +268,7 @@ describe('useQuerySettings', () => {
sortBy: [{ id: 'userRole', desc: true }],
filters: [
{ id: 'role', value: ['admin', 'editor', 'viewer'] },
{ id: 'fullName', value: '[email protected]' },
{ id: 'username', value: '[email protected]' },
{ id: 'otherFilter', value: 'ignored' }, // Should be ignored
{ id: 'org', value: ['org1', 'org2'] },
{ id: 'scope', value: ['scope1', 'scope2'] },
Expand Down Expand Up @@ -327,7 +327,7 @@ describe('useQuerySettings', () => {
pageIndex: 0,
sortBy: [],
filters: [
{ id: 'fullName', value: ' ' }, // Whitespace only
{ id: 'username', value: ' ' }, // Whitespace only
],
};

Expand Down Expand Up @@ -376,7 +376,7 @@ describe('useQuerySettings', () => {
pageSize: 10,
pageIndex: 0,
sortBy: [],
filters: [{ id: 'fullName', value: 'john' }],
filters: [{ id: 'username', value: 'john' }],
});
});

Expand All @@ -388,7 +388,7 @@ describe('useQuerySettings', () => {
pageSize: 10,
pageIndex: 0,
sortBy: [],
filters: [{ id: 'fullName', value: 'jane' }],
filters: [{ id: 'username', value: 'jane' }],
});
});

Expand Down
2 changes: 1 addition & 1 deletion src/authz-module/hooks/useQuerySettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const useQuerySettings = (
setQuerySettings((prevSettings) => {
// Extract filters
const rolesFilter = tableFilters.filters?.find((filter) => filter.id === 'role')?.value?.join(',') ?? '';
const searchFilter = tableFilters.filters?.find((filter) => filter.id === 'fullName')?.value ?? '';
const searchFilter = tableFilters.filters?.find((filter) => filter.id === 'username')?.value ?? '';
const organizationsFilter = tableFilters.filters?.find((filter) => filter.id === 'org')?.value?.join(',') ?? '';
const scopesFilter = tableFilters.filters?.find((filter) => filter.id === 'scope')?.value?.join(',') ?? '';

Expand Down
4 changes: 2 additions & 2 deletions src/authz-module/team-members/TeamMembersTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ const TeamMembersTable = ({ presetScope }: TeamMembersTableProps) => {
columns={
[
{
id: 'fullName',
id: 'username',
Header: intl.formatMessage(messages['authz.team.members.table.column.name.title']),
accessor: 'fullName',
accessor: 'username',
Cell: NameCell,
filter: 'text',
Filter: TextFilter,
Expand Down