@civicactions/cmsds-open-data-components 4.0.16-alpha.0 → 4.0.16-alpha.2

package/dist/main.js

@@ -3622,6 +3622,16 @@ const $eadd6431fddf4b6c$var$FilterItem = ({ id: id, condition: condition, index:
     }, [
         operator
     ]);
+    // Clear value when switching to an empty operator
+    const isEmptyOperator = operator === 'is_empty' || operator === 'not_empty';
+    (0, $hgUW1$useEffect)(()=>{
+        if (isEmptyOperator && value !== '') {
+            setValue('');
+            update(index, 'value', '');
+        }
+    }, [
+        isEmptyOperator
+    ]);
     (0, $hgUW1$useEffect)(()=>{
         if (value !== condition.value) {
             if (value) update(index, 'value', value);
@@ -3649,7 +3659,7 @@ const $eadd6431fddf4b6c$var$FilterItem = ({ id: id, condition: condition, index:
                 name: `${condition.key}_operator`,
                 onChange: (e)=>setOperator(e.target.value)
             }),
-            schema[id].fields[property].mysql_type === 'date' ? /*#__PURE__*/ (0, $hgUW1$jsxs)("div", {
+            isEmptyOperator ? /*#__PURE__*/ (0, $hgUW1$jsx)("div", {}) : schema[id].fields[property].mysql_type === 'date' ? /*#__PURE__*/ (0, $hgUW1$jsxs)("div", {
                 children: [
                     /*#__PURE__*/ (0, $hgUW1$jsx)("label", {
                         className: "ds-c-label",
@@ -3723,16 +3733,6 @@ var $2eec38d4d0dbf714$export$2e2bcd8739ae039 = $2eec38d4d0dbf714$var$ClearFilter
 function $6f4318b1e14124e5$var$updateQueryForDatastore(condition) {
     let cond = condition;
     delete cond.key;
-    if (cond.operator === 'is_empty') {
-        cond.operator = '=';
-        cond.value = '';
-        return cond;
-    }
-    if (cond.operator === 'not_empty') {
-        cond.operator = '<>';
-        cond.value = '';
-        return cond;
-    }
     if (cond.operator === '=' || cond.operator === '<>') {
         if (Array.isArray(cond.value)) cond.value = cond.value.join();
         cond.value = cond.value.replace(/(^\%+|\%+$)/gm, '');
@@ -5317,11 +5317,24 @@ const $1d3d480a9cfaabe0$var$useDatastore = (resourceId, rootAPIUrl, options, add
     const datasetID = additionalParams.datasetID;
     // Remove datasetID from params to avoid sending it to the API
     const { datasetID: _, ...restAdditionalParams } = additionalParams;
+    const apiConditions = conditions?.map((c)=>{
+        if (c.operator === 'is_empty') return {
+            ...c,
+            operator: '=',
+            value: ''
+        };
+        if (c.operator === 'not_empty') return {
+            ...c,
+            operator: '<>',
+            value: ''
+        };
+        return c;
+    });
     let params = {
         keys: keys,
         limit: limit,
         offset: offset,
-        conditions: conditions,
+        conditions: apiConditions,
         sorts: sort,
         properties: properties,
         groupings: groupings,