Merge pull request #198 from folio-org/MODFQMMGR-548

MODFQMMGR-548: Refactor array handling to treat arrays as JSONB
folio-org · Dec 16, 2024 · a1661ef · a1661ef
2 parents e46fed8 + f7cff81
commit a1661ef
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/src/QueryBuilder/QueryBuilder/helpers/selectOptions.js b/src/QueryBuilder/QueryBuilder/helpers/selectOptions.js
@@ -86,8 +86,9 @@ export const getOperatorOptions = ({
     case DATA_TYPES.NumberType:
       return getOperatorsWithPlaceholder(extendedLogicalOperators(), intl);
 
-    case DATA_TYPES.ArrayType:
-      return getOperatorsWithPlaceholder(ArrayOperators(), intl);
+    case DATA_TYPES.ArrayType:  
+    case DATA_TYPES.JsonbArrayType:
+        return getOperatorsWithPlaceholder(ArrayOperators(), intl);
 
     case DATA_TYPES.DateType:
       return getOperatorsWithPlaceholder(extendedLogicalOperators(), intl);

diff --git a/src/QueryBuilder/QueryBuilder/helpers/selectOptions.test.js b/src/QueryBuilder/QueryBuilder/helpers/selectOptions.test.js
@@ -241,6 +241,25 @@ describe('select options', () => {
       });
     });
 
+    it('should return operators with placeholder for jsonb array type', () => {
+      const options = getOperatorOptions({
+        dataType: DATA_TYPES.JsonbArrayType,
+        hasSourceOrValues: false,
+        intl: intlMock,
+      });
+
+      expectFn({
+        options,
+        operators: [
+          { label: OPERATORS_LABELS.CONTAINS_ALL, value: OPERATORS.CONTAINS_ALL },
+          { label: OPERATORS_LABELS.NOT_CONTAINS_ALL, value: OPERATORS.NOT_CONTAINS_ALL },
+          { label: OPERATORS_LABELS.CONTAINS_ANY, value: OPERATORS.CONTAINS_ANY },
+          { label: OPERATORS_LABELS.NOT_CONTAINS_ANY, value: OPERATORS.NOT_CONTAINS_ANY },
+          { label: OPERATORS_LABELS.EMPTY, value: OPERATORS.EMPTY },
+        ],
+      });
+    });
+
     it('should return operators with placeholder for enum type', () => {
       const options = getOperatorOptions({
         dataType: DATA_TYPES.EnumType,

diff --git a/src/constants/dataTypes.js b/src/constants/dataTypes.js
@@ -10,4 +10,5 @@ export const DATA_TYPES = {
   EnumType: 'enumType',
   ObjectType: 'objectType',
   ArrayType: 'arrayType',
+  JsonbArrayType: 'jsonbArrayType',
 };