UIPFU-77 - refine filter group conditional rendering

folio-org · Jan 19, 2024 · 359bca4 · 359bca4
1 parent 16e11ee
commit 359bca4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/UserSearchContainer.js b/src/UserSearchContainer.js
@@ -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',

diff --git a/src/UserSearchView.js b/src/UserSearchView.js
@@ -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;