UISACQCOMP-194 Update filters to support central ordering search (#801)

* UISACQCOMP-194 Update filters to support central ordering search * add invalid reference argument to the getHoldingLocationName fn
folio-org · Jul 31, 2024 · d4faea1 · d4faea1
1 parent 29517b8
commit d4faea1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/lib/FieldHolding/utils.js b/lib/FieldHolding/utils.js
@@ -5,12 +5,16 @@ export const getCallNumber = ({ callNumber = '', callNumberPrefix = '', callNumb
   `${callNumberPrefix}${callNumber}${callNumberSuffix}`.trim()
 );
 
-export const getHoldingLocationName = (holding = {}, locationsMap = {}) => {
+export const getHoldingLocationName = (
+  holding = {},
+  locationsMap = {},
+  invalidReferenceMessage = <FormattedMessage id="stripes-acq-components.invalidReference" />,
+) => {
   const callNumberLabel = getCallNumber(holding);
   const separator = callNumberLabel ? ' > ' : '';
   const locationName = locationsMap[holding.permanentLocationId]?.name;
 
-  return locationName ? `${locationName}${separator}${callNumberLabel}` : <FormattedMessage id="stripes-acq-components.invalidReference" />;
+  return locationName ? `${locationName}${separator}${callNumberLabel}` : invalidReferenceMessage;
 };
 
 export const getHoldingOptions = (holdings = [], locationsMap = {}) => (

diff --git a/lib/LocationFilter/LocationFilter.js b/lib/LocationFilter/LocationFilter.js
@@ -22,6 +22,7 @@ const LocationFilter = ({
   locations = [],
   onChange,
   disabled = false,
+  tenantId,
 }) => {
   const intl = useIntl();
 
@@ -82,6 +83,7 @@ const LocationFilter = ({
         searchButtonStyle="link"
         crossTenant={crossTenant}
         disabled={disabled || isLoading}
+        tenantId={tenantId}
       />
     </FilterAccordion>
   );
@@ -98,6 +100,7 @@ LocationFilter.propTypes = {
   locations: PropTypes.arrayOf(PropTypes.object),
   name: PropTypes.string.isRequired,
   onChange: PropTypes.func.isRequired,
+  tenantId: PropTypes.string,
 };
 
 export default LocationFilter;
diff --git a/lib/LocationFilter/LocationFilterContainer.js b/lib/LocationFilter/LocationFilterContainer.js
@@ -12,11 +12,15 @@ const LocationFilterContainer = ({
   labelId,
   onChange,
   disabled,
+  tenantId,
 }) => {
   const {
     locations,
     isLoading,
-  } = useLocationsQuery({ consortium: crossTenant });
+  } = useLocationsQuery({
+    consortium: crossTenant,
+    tenantId,
+  });
 
   return (
     <LocationFilter
@@ -30,6 +34,7 @@ const LocationFilterContainer = ({
       labelId={labelId}
       locations={locations}
       onChange={onChange}
+      tenantId={tenantId}
     />
   );
 };
@@ -43,6 +48,7 @@ LocationFilterContainer.propTypes = {
   labelId: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
   onChange: PropTypes.func.isRequired,
+  tenantId: PropTypes.string,
 };
 
 export default LocationFilterContainer;
diff --git a/lib/OrganizationFilter/PluggableOrganizationFilter.js b/lib/OrganizationFilter/PluggableOrganizationFilter.js
@@ -21,7 +21,7 @@ const PluggableOrganizationFilter = ({
   onChange,
   tenantId,
 }) => {
-  const [selectedOrganization, setSelectedOrganization] = useState({});
+  const [selectedOrganization, setSelectedOrganization] = useState();
 
   useOrganization(activeFilters?.[0], {
     tenantId,
@@ -54,7 +54,7 @@ const PluggableOrganizationFilter = ({
         aria-label={label}
         marginBottom0
         type="text"
-        value={(activeFilters && activeFilters[0] && selectedOrganization.name) || ''}
+        value={(activeFilters && activeFilters[0] && selectedOrganization?.name) || ''}
         disabled
       />