@zengenti/contensis-react-base 3.0.0-beta.29 → 3.0.0-beta.32

package/cjs/search.js

@@ -882,7 +882,7 @@ const fieldExpression = (field, value, operator = 'equalTo', weight) => {
     // to generate expressions that are combined with an 'or' operator
     return [contensisCoreApi.Op.or(...field.map(fieldId => fieldExpression(fieldId, value, operator, weight)).flat())];
   if (operator === 'between') return between(field, value);
-  if (Array.isArray(value)) return equalToOrIn(field, value, operator);else return !weight ? [contensisCoreApi.Op[operator](field, value, undefined, undefined)] : [contensisCoreApi.Op[operator](field, value, undefined, undefined).weight(weight)];
+  if (Array.isArray(value)) return equalToOrIn(field, value, operator);else return !weight ? equalToOrIn(field, value, operator) : [equalToOrIn(field, value, operator)[0].weight(weight)];
 };
 const contentTypeIdExpression = (contentTypeIds, webpageTemplates, assetTypes) => {
   const expressions = [];
@@ -1008,12 +1008,24 @@ const equalToOrIn = (field, value, operator = 'equalTo') => {
     }))];
   }
 
-  return [];
+  switch (operator) {
+    case 'between':
+    case 'distanceWithin':
+      // Not implemented
+      return [contensisCoreApi.Op.equalTo(field, value)];
+
+    case 'freeText':
+      // TODO: Potentially needs further implementation of new options
+      return [contensisCoreApi.Op[operator](field, value, false, undefined)];
+
+    default:
+      return [contensisCoreApi.Op[operator](field, value)];
+  }
 };
 
 const between = (field, value) => {
   const handle = betweenValue => {
-    const valArr = betweenValue.split('-');
+    const valArr = betweenValue.split('--');
 
     if (valArr.length > 1) {
       const [minimum, maximum] = betweenValue.split('-');
@@ -2263,7 +2275,7 @@ var reducers = (config => {
       case APPLY_CONFIG:
         {
           state = addConfigToState(state, action);
-          return;
+          return state;
         }
 
       case CLEAR_FILTERS: