add changes

folio-org · Nov 7, 2023 · 5482526 · 5482526
1 parent 9879fa4
commit 5482526
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 50 deletions.
diff --git a/src/QueryBuilder/QueryBuilder/QueryBuilderModal/RepeatableFields/RepeatableFields.js b/src/QueryBuilder/QueryBuilder/QueryBuilderModal/RepeatableFields/RepeatableFields.js
@@ -14,7 +14,7 @@ import { QueryBuilderTitle } from '../../QueryBuilderTitle';
 import css from '../QueryBuilderModal.css';
 import { COLUMN_KEYS } from '../../../../constants/columnKeys';
 import { booleanOptions, getFieldOptions, getOperatorOptions, sourceTemplate } from '../../helpers/selectOptions';
-import { OPERATORS } from '../../../../constants/operators';
+import { BOOLEAN_OPERATORS } from '../../../../constants/operators';
 import { DataTypeInput } from '../DataTypeInput';
 
 export const RepeatableFields = ({ source, setSource, getParamsSource, columns }) => {
@@ -27,7 +27,7 @@ export const RepeatableFields = ({ source, setSource, getParamsSource, columns }
       ...res,
       {
         ...sourceTemplate(fieldOptions),
-        [COLUMN_KEYS.BOOLEAN]: { options: booleanOptions, current: OPERATORS.AND },
+        [COLUMN_KEYS.BOOLEAN]: { options: booleanOptions, current: BOOLEAN_OPERATORS.AND },
       },
     ]));
   };

diff --git a/src/QueryBuilder/QueryBuilder/helpers/query.js b/src/QueryBuilder/QueryBuilder/helpers/query.js
@@ -1,6 +1,6 @@
 import { COLUMN_KEYS } from '../../../constants/columnKeys';
 import { valueBuilder } from './valueBuilder';
-import { OPERATORS } from '../../../constants/operators';
+import { BOOLEAN_OPERATORS, OPERATORS } from '../../../constants/operators';
 import { getOperatorOptions } from './selectOptions';
 
 export const DEFAULT_PREVIEW_INTERVAL = 5000;
@@ -130,6 +130,47 @@ const getSourceFields = (field) => ({
   },
 }[field]);
 
+const getFormattedSourceField = async ({ item, intl, booleanOptions, fieldOptions, getParamsSource }) => {
+  const [field, query] = Object.entries(item)[0];
+  const mongoOperator = Object.keys(query)[0];
+  const mongoValue = query[mongoOperator];
+
+  const { operator, value } = getSourceFields(mongoOperator)(mongoValue);
+
+  if (operator && value) {
+    const boolean = BOOLEAN_OPERATORS.AND;
+    const fieldItem = fieldOptions.find(f => f.value === field);
+    const { dataType, values, source } = fieldItem;
+    const hasSourceOrValues = values || source;
+    let formattedValue;
+
+    if (Array.isArray(value) && source) {
+      const params = await getParamsSource?.({
+        entityTypeId: source?.entityTypeId,
+        columnName: source?.columnName,
+        searchValue: '',
+      });
+
+      formattedValue = value.map(val => params?.content?.find(param => param.value === val));
+    }
+
+    return {
+      boolean: { options: booleanOptions, current: boolean },
+      field: { options: fieldOptions, current: field, dataType },
+      operator: {
+        dataType,
+        options: getOperatorOptions({
+          dataType,
+          hasSourceOrValues,
+          intl,
+        }),
+        current: operator,
+      },
+      value: { current: formattedValue || value, source, options: values },
+    };
+  }
+};
+
 export const mongoQueryToSource = async ({
   initialValues,
   booleanOptions = [],
@@ -139,51 +180,21 @@ export const mongoQueryToSource = async ({
 }) => {
   if (!fieldOptions?.length) return [];
 
-  const target = [];
-  const andQuery = initialValues.$and || [];
-
-  for (const queryObj of andQuery) {
-    const [field, query] = Object.entries(queryObj)[0];
-    const mongoOperator = Object.keys(query)[0];
-    const mongoValue = query[mongoOperator];
-
-    const { operator, value } = getSourceFields(mongoOperator)(mongoValue);
-
-    if (operator && value) {
-      const boolean = OPERATORS.AND;
-      const fieldItem = fieldOptions.find(f => f.value === field);
-      const { dataType, values, source } = fieldItem;
-      const hasSourceOrValues = values || source;
-      let formattedValue;
-
-      if (Array.isArray(value) && source) {
-        const params = await getParamsSource?.({
-          entityTypeId: source?.entityTypeId,
-          columnName: source?.columnName,
-          searchValue: '',
-        });
-
-        formattedValue = value.map(item => params?.content?.find(param => param.value === item));
-      }
-
-      const item = {
-        boolean: { options: booleanOptions, current: boolean },
-        field: { options: fieldOptions, current: field, dataType },
-        operator: {
-          dataType,
-          options: getOperatorOptions({
-            dataType,
-            hasSourceOrValues,
-            intl,
-          }),
-          current: operator,
-        },
-        value: { current: formattedValue || value, source, options: values },
-      };
-
-      target.push(item);
-    }
+  const key = Object.keys(initialValues)[0];
+  const sharedArgs = { intl, booleanOptions, getParamsSource, fieldOptions };
+
+  // handle case when query contains boolean operators (AND, OR, etc.)
+  if (Object.values(BOOLEAN_OPERATORS).includes(key)) {
+    return initialValues[key].map((item) => getFormattedSourceField({
+      item,
+      ...sharedArgs,
+    }));
   }
 
-  return target;
+  return [
+    getFormattedSourceField({
+      item: initialValues,
+      ...sharedArgs,
+    }),
+  ];
 };
diff --git a/src/QueryBuilder/QueryBuilder/helpers/selectOptions.js b/src/QueryBuilder/QueryBuilder/helpers/selectOptions.js
@@ -1,5 +1,5 @@
 import { DATA_TYPES } from '../../../constants/dataTypes';
-import { OPERATORS } from '../../../constants/operators';
+import { BOOLEAN_OPERATORS, OPERATORS } from '../../../constants/operators';
 import { COLUMN_KEYS } from '../../../constants/columnKeys';
 
 const getOperatorsWithPlaceholder = (options, intl) => {
@@ -106,7 +106,7 @@ export const getFieldOptions = (options) => {
 };
 
 export const booleanOptions = [
-  { label: 'AND', value: OPERATORS.AND },
+  { label: 'AND', value: BOOLEAN_OPERATORS.AND },
 ];
 
 export const sourceTemplate = (fieldOptions = []) => ({

diff --git a/src/constants/operators.js b/src/constants/operators.js
@@ -9,5 +9,8 @@ export const OPERATORS = {
   NOT_IN: 'not in',
   CONTAINS: 'contains',
   STARTS_WITH: 'starts with',
+};
+
+export const BOOLEAN_OPERATORS = {
   AND: '$and',
 };