feat: allow multiple filter values

decaporg · Nov 14, 2024 · e507ff3 · e507ff3
1 parent 022dbe5
commit e507ff3
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 4 deletions.
diff --git a/packages/decap-cms-core/src/__tests__/backend.spec.js b/packages/decap-cms-core/src/__tests__/backend.spec.js
@@ -95,6 +95,33 @@ describe('Backend', () => {
       expect(result.length).toBe(1);
     });
 
+    it('filters multiple values', () => {
+      const result = backend.filterEntries(
+        {
+          entries: [
+            {
+              data: {
+                testField: 'one',
+              },
+            },
+            {
+              data: {
+                testField: 'two',
+              },
+            },
+            {
+              data: {
+                testField: 'three',
+              },
+            },
+          ],
+        },
+        Map({ field: 'testField', value: ['one', 'two'] }),
+      );
+
+      expect(result.length).toBe(2);
+    });
+
     it('filters list values', () => {
       const result = backend.filterEntries(
         {

diff --git a/packages/decap-cms-core/src/backend.ts b/packages/decap-cms-core/src/backend.ts
@@ -1351,12 +1351,39 @@ export class Backend {
   }
 
   filterEntries(collection: { entries: EntryValue[] }, filterRule: FilterRule) {
+    let filterValues = filterRule.get('value');
+
+    if (filterValues.toJS) {
+      filterValues = filterValues.toJS();
+    }
+
+    if (!Array.isArray(filterValues)) {
+      filterValues = [filterValues];
+    }
+
+    const fieldName = filterRule.get('field');
+
     return collection.entries.filter(entry => {
-      const fieldValue = entry.data[filterRule.get('field')];
+      const fieldValue = entry.data[fieldName];
+
+      let fieldValues = [];
+
       if (Array.isArray(fieldValue)) {
-        return fieldValue.includes(filterRule.get('value'));
+        fieldValues = fieldValue;
+      } else {
+        fieldValues = [fieldValue];
       }
-      return fieldValue === filterRule.get('value');
+
+      let found = false;
+
+      for (const filterValue of filterValues) {
+        if (fieldValues.includes(filterValue)) {
+          found = true;
+          break;
+        }
+      }
+
+      return found;
     });
   }
 }

diff --git a/packages/decap-cms-core/src/types/redux.ts b/packages/decap-cms-core/src/types/redux.ts
@@ -565,7 +565,7 @@ export type EntryField = StaticallyTypedRecord<{
 export type EntryFields = List<EntryField>;
 
 export type FilterRule = StaticallyTypedRecord<{
-  value: string;
+  value: string | List<string>;
   field: string;
 }>;