Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UIPFU-77 - refine filter group conditional rendering. #251

Merged
merged 12 commits into from
Jan 19, 2024
Merged

UIPFU-77 - refine filter group conditional rendering. #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0024421
UIPFU-77 - Add 'User assignment status' filter group
Terala-Priyanka Jan 10, 2024
b2d41d4
UIPFU-77 - Update change log
Terala-Priyanka Jan 10, 2024
5b390ff
UIPFU-77 - yarn.lock
Terala-Priyanka Jan 10, 2024
a309cc4
UIPFU-77 - update test script
Terala-Priyanka Jan 10, 2024
e5287a2
UIPFU-77 - refine complexity
Terala-Priyanka Jan 10, 2024
a7bba68
UIPFU-77 - cleanup
Terala-Priyanka Jan 10, 2024
5ad35b6
UIPFU-77 - add comments
Terala-Priyanka Jan 10, 2024
a016d97
UIPFU-77 - fix review comments
Terala-Priyanka Jan 11, 2024
a3adb92
UIPFU-77 - fix review comments
Terala-Priyanka Jan 11, 2024
16e11ee
UIPFU-fix review comments
Terala-Priyanka Jan 12, 2024
359bca4
UIPFU-77 - refine filter group conditional rendering
Terala-Priyanka Jan 19, 2024
ed139b0
Merge branch 'master' into UIPFU-77
Terala-Priyanka Jan 19, 2024
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
4 changes: 2 additions & 2 deletions src/UserSearchContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ const compileQuery = template(
);

export function buildQuery(queryParams, pathComponents, resourceData, logger, props) {
const filters = props.initialSelectedUsers ? filterConfigWithUserAssignedStatus : filterConfig;
const updatedResourceData = props.initialSelectedUsers && resourceData?.query?.filters?.includes(UAS) ? updateResourceData(resourceData) : resourceData;
const filters = Object.keys(props.initialSelectedUsers).length ? filterConfigWithUserAssignedStatus : filterConfig;
const updatedResourceData = Object.keys(props.initialSelectedUsers).length && resourceData?.query?.filters?.includes(UAS) ? updateResourceData(resourceData) : resourceData;

return makeQueryFunction(
'cql.allRecords=1',
Expand Down
2 changes: 1 addition & 1 deletion src/UserSearchView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ class UserSearchView extends React.Component {
isSelected = ({ item }) => Boolean(this.state.checkedMap[item.id]);

getFilterConfig = () => {
if (this.props.initialSelectedUsers) {
if (Object.keys(this.props.initialSelectedUsers).length) {
return filterConfigWithUserAssignedStatus;
}
return filterConfig;
Expand Down
Loading