ERM-3332

folio-org · Oct 21, 2024 · bd1658e · bd1658e
1 parent 78c03a7
commit bd1658e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/lib/DocumentFilter/DocumentFilter.js b/lib/DocumentFilter/DocumentFilter.js
@@ -14,7 +14,7 @@ import {
 
 import DocumentFilterForm from './DocumentFilterForm';
 
-const DocumentFilter = ({ activeFilters, atTypeValues = [], filterHandlers }) => {
+const DocumentFilter = ({ activeFilters, atTypeValues = [], filterHandlers, filterName = }) => {
   // atTypeValues are only passed for SupplementaryDocumentFilter
   const filterType = atTypeValues.length > 0 ? 'supplementaryDocuments' : 'documents';
   const [editingFilters, setEditingFilters] = useState(false);

diff --git a/lib/DocumentFilter/DocumentFilterRule.js b/lib/DocumentFilter/DocumentFilterRule.js
@@ -25,7 +25,9 @@ const DocumentFilterRule = ({
 }) => {
   const intl = useIntl();
 
-  const { operators, attributes } = DocumentFilterRuleConstants(atTypeValues.length > 0);
+  const { operators, attributes } = DocumentFilterRuleConstants({
+    filterName: atTypeValues.length > 0 ? 'supplementaryDocs' : 'docs'
+  });
   return (
     <Row key={name}>
       <Col xs={2}>

diff --git a/lib/DocumentFilter/DocumentFilterRuleConstants.js b/lib/DocumentFilter/DocumentFilterRuleConstants.js
@@ -1,8 +1,7 @@
 import { useIntl } from 'react-intl';
 
-const DocumentFilterRuleConstants = (useSupplementaryDocs) => {
+const DocumentFilterRuleConstants = ({filterName = 'docs'}) => {
   const intl = useIntl();
-  const docType = useSupplementaryDocs ? 'supplementaryDocs' : 'docs';
 
   const operators = [
     { label: '', value: '' },
@@ -24,35 +23,35 @@ const DocumentFilterRuleConstants = (useSupplementaryDocs) => {
     { label: '', value: '' },
     {
       label: intl.formatMessage({ id: 'stripes-erm-components.doc.name' }),
-      value: `${docType}.name`,
+      value: `${filterName}.name`,
     },
     {
       label: intl.formatMessage({ id: 'stripes-erm-components.doc.note' }),
-      value: `${docType}.note`,
+      value: `${filterName}.note`,
     },
     {
       label: intl.formatMessage({ id: 'stripes-erm-components.doc.location' }),
-      value: `${docType}.location`,
+      value: `${filterName}.location`,
     },
     {
       label: intl.formatMessage({ id: 'stripes-erm-components.doc.url' }),
-      value: `${docType}.url`,
+      value: `${filterName}.url`,
     },
     {
       label: intl.formatMessage({ id: 'stripes-erm-components.contentType' }),
-      value: `${docType}.fileUpload.fileContentType`,
+      value: `${filterName}.fileUpload.fileContentType`,
     },
     {
       label: intl.formatMessage({ id: 'stripes-erm-components.fuf.filename' }),
-      value: `${docType}.fileUpload.fileName`,
+      value: `${filterName}.fileUpload.fileName`,
     },
   ];
 
   // Include additional line specific to supplementaryDocs
   if (useSupplementaryDocs) {
     attributes.splice(3, 0, {
       label: intl.formatMessage({ id: 'stripes-erm-components.doc.category' }),
-      value: `${docType}.atType.value`,
+      value: `${filterName}.atType.value`,
     });
   }