style: Rename atTypeValues to categoryValues

Deprecated atTypeValues (but still in place anyway. Use categoryValues instead
folio-org · Oct 21, 2024 · abb83ee · abb83ee
1 parent 620caab
commit abb83ee
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/lib/DocumentFilter/DocumentFilter.js b/lib/DocumentFilter/DocumentFilter.js
@@ -16,13 +16,21 @@ import DocumentFilterForm from './DocumentFilterForm';
 
 const DocumentFilter = ({
   activeFilters,
-  atTypeValues = [],
+  atTypeValues = [], // DEPRECATED
+  categoryValues = [], // Use this instead of atTypeValues
   filterLabel,
   filterModalProps = {},
   filterHandlers,
   filterName = 'docs'
 }) => {
-  // atTypeValues are only passed for SupplementaryDocumentFilter
+  let categoryValuesToUse = categoryValues;
+  if (categoryValuesToUse.length === 0 && atTypeValues.length !== 0) {
+    // eslint-disable-next-line no-console
+    console.error('atTypeValues have been deprecated from Ramsons. Use categoryValues instead');
+    categoryValuesToUse = atTypeValues;
+  }
+
+  // categoryValues are only passed for SupplementaryDocumentFilter
   const [editingFilters, setEditingFilters] = useState(false);
   const openEditModal = () => setEditingFilters(true);
   const closeEditModal = () => setEditingFilters(false);
@@ -120,7 +128,7 @@ const DocumentFilter = ({
         </Layout>
       )}
       <DocumentFilterForm
-        atTypeValues={atTypeValues}
+        categoryValues={categoryValuesToUse}
         editingFilters={editingFilters}
         filterModalProps={filterModalProps}
         filterName={filterName}
@@ -137,7 +145,7 @@ const DocumentFilter = ({
 
 DocumentFilter.propTypes = {
   activeFilters: PropTypes.object,
-  atTypeValues: PropTypes.arrayOf(PropTypes.object),
+  categoryValues: PropTypes.arrayOf(PropTypes.object),
   filterHandlers: PropTypes.object,
 };
 

diff --git a/lib/DocumentFilter/DocumentFilterField.js b/lib/DocumentFilter/DocumentFilterField.js
@@ -6,7 +6,7 @@ import { FormattedMessage } from 'react-intl';
 import DocumentFilterRule from './DocumentFilterRule';
 
 const DocumentFilterField = ({
-  atTypeValues,
+  categoryValues,
   filterName,
   index,
   name
@@ -20,7 +20,7 @@ const DocumentFilterField = ({
       <DocumentFilterRule
         key={ruleFieldName}
         ariaLabelledby={`selected-document-item-name-${index}`}
-        atTypeValues={atTypeValues}
+        categoryValues={categoryValues}
         filterName={filterName}
         index={ruleFieldIndex}
         name={ruleFieldName}

diff --git a/lib/DocumentFilter/DocumentFilterFieldArray.js b/lib/DocumentFilter/DocumentFilterFieldArray.js
@@ -13,11 +13,11 @@ import { FormattedMessage } from 'react-intl';
 import DocumentFilterField from './DocumentFilterField';
 
 const propTypes = {
-  atTypeValues: PropTypes.arrayOf(PropTypes.object),
+  categoryValues: PropTypes.arrayOf(PropTypes.object),
 };
 
 const DocumentFilterFieldArray = ({
-  atTypeValues,
+  categoryValues,
   filterName
 }) => {
   const {
@@ -66,7 +66,7 @@ const DocumentFilterFieldArray = ({
                 marginBottom0={index !== fields.length - 1}
               >
                 <DocumentFilterField
-                  atTypeValues={atTypeValues}
+                  categoryValues={categoryValues}
                   fields={fields}
                   filterName={filterName}
                   index={index}

diff --git a/lib/DocumentFilter/DocumentFilterForm.js b/lib/DocumentFilter/DocumentFilterForm.js
@@ -6,7 +6,7 @@ import { FormattedMessage } from 'react-intl';
 import DocumentFilterFieldArray from './DocumentFilterFieldArray';
 
 const DocumentFilterForm = ({
-  atTypeValues,
+  categoryValues,
   editingFilters,
   filterModalProps,
   filterName,
@@ -36,7 +36,7 @@ const DocumentFilterForm = ({
         onSubmit={onSubmit}
       >
         <DocumentFilterFieldArray
-          atTypeValues={atTypeValues}
+          categoryValues={categoryValues}
           filterName={filterName}
         />
       </FormModal>
@@ -45,7 +45,7 @@ const DocumentFilterForm = ({
 };
 
 DocumentFilterForm.propTypes = {
-  atTypeValues: PropTypes.arrayOf(PropTypes.object),
+  categoryValues: PropTypes.arrayOf(PropTypes.object),
   editingFilters: PropTypes.bool,
   filterModalProps: PropTypes.object.isRequired,
   filterName: PropTypes.string.isRequired,

diff --git a/lib/DocumentFilter/DocumentFilterRule.js b/lib/DocumentFilter/DocumentFilterRule.js
@@ -17,7 +17,7 @@ import DocumentFilterRuleConstants from './DocumentFilterRuleConstants';
 
 const DocumentFilterRule = ({
   ariaLabelledby,
-  atTypeValues,
+  categoryValues,
   filterName,
   index,
   name,
@@ -28,7 +28,7 @@ const DocumentFilterRule = ({
 
   const { operators, attributes } = DocumentFilterRuleConstants({
     filterName,
-    ifCategory: atTypeValues.length > 0
+    ifCategory: categoryValues.length > 0
   });
 
   return (