@civicactions/cmsds-open-data-components 4.0.15 → 4.0.16-alpha.1

package/dist/main.js

@@ -2776,13 +2776,31 @@ const $7264a673914aa746$export$5f89a5ae87bc48e1 = [
     {
         label: 'Less Than',
         value: '<'
+    },
+    {
+        label: 'Is Empty',
+        value: 'is_empty'
+    },
+    {
+        label: 'Not Empty',
+        value: 'not_empty'
     }
 ];
 function $7264a673914aa746$export$d243819c3ad678fb(operatorValue) {
     const operator = $7264a673914aa746$export$5f89a5ae87bc48e1.find((op)=>op.value === operatorValue);
     return operator ? operator.label : operatorValue; // Return original value if not found
 }
-function $7264a673914aa746$export$2b9377795161999(type) {
+function $7264a673914aa746$export$2b9377795161999(type, enableEmptyFilters = false) {
+    const emptyOptions = enableEmptyFilters ? [
+        {
+            label: 'Is Empty',
+            value: 'is_empty'
+        },
+        {
+            label: 'Not Empty',
+            value: 'not_empty'
+        }
+    ] : [];
     switch(type){
         case 'text':
         case 'string':
@@ -2806,7 +2824,8 @@ function $7264a673914aa746$export$2b9377795161999(type) {
                 {
                     label: 'Or',
                     value: 'in'
-                }
+                },
+                ...emptyOptions
             ];
         case 'date':
             return [
@@ -2825,7 +2844,8 @@ function $7264a673914aa746$export$2b9377795161999(type) {
                 {
                     label: 'Less Than',
                     value: '<'
-                }
+                },
+                ...emptyOptions
             ];
         default:
             // These 2 should be safe for all data types
@@ -2837,7 +2857,8 @@ function $7264a673914aa746$export$2b9377795161999(type) {
                 {
                     label: 'Is Not',
                     value: '<>'
-                }
+                },
+                ...emptyOptions
             ];
     }
 }
@@ -3552,7 +3573,7 @@ function $eadd6431fddf4b6c$var$getStartDate(condition, schema, id) {
     }
     return new Date();
 }
-const $eadd6431fddf4b6c$var$FilterItem = ({ id: id, condition: condition, index: index, update: update, remove: remove, propertyOptions: propertyOptions, schema: schema, className: className = '' })=>{
+const $eadd6431fddf4b6c$var$FilterItem = ({ id: id, condition: condition, index: index, update: update, remove: remove, propertyOptions: propertyOptions, schema: schema, className: className = '', enableEmptyFilters: enableEmptyFilters })=>{
     const [operator, setOperator] = (0, $hgUW1$useState)(condition.operator);
     const [property, setProperty] = (0, $hgUW1$useState)(condition.property);
     const [value, setValue] = (0, $hgUW1$useState)(condition.value);
@@ -3621,7 +3642,7 @@ const $eadd6431fddf4b6c$var$FilterItem = ({ id: id, condition: condition, index:
                 onChange: (e)=>setProperty(e.target.value)
             }),
             /*#__PURE__*/ (0, $hgUW1$jsx)((0, $hgUW1$Dropdown), {
-                options: (0, $7264a673914aa746$export$2b9377795161999)(schema[id].fields[property].mysql_type),
+                options: (0, $7264a673914aa746$export$2b9377795161999)(schema[id].fields[property].mysql_type, enableEmptyFilters),
                 className: "ds-u-padding-x--0",
                 value: operator,
                 label: "Condition",
@@ -3718,7 +3739,7 @@ function $6f4318b1e14124e5$var$updateQueryForDatastore(condition) {
     return cond;
 }
 const $6f4318b1e14124e5$var$FilterDataset = ()=>{
-    const { distribution: distribution, resource: resource, customColumns: customColumns = [] } = (0, $hgUW1$useContext)((0, $43a30d745a7bbc86$export$2e2bcd8739ae039));
+    const { distribution: distribution, resource: resource, customColumns: customColumns = [], enableEmptyFilters: enableEmptyFilters } = (0, $hgUW1$useContext)((0, $43a30d745a7bbc86$export$2e2bcd8739ae039));
     const { setPage: setPage } = (0, $hgUW1$useContext)((0, $ee0d4d4f34048447$export$f814ea079e65d8fe));
     if (!resource) return null;
     const customColumnHeaders = (0, $7264a673914aa746$export$8049e8f40a9bdfb8)(customColumns, resource.columns, resource.schema[distribution.identifier]);
@@ -3741,7 +3762,7 @@ const $6f4318b1e14124e5$var$FilterDataset = ()=>{
             {
                 property: fields[0],
                 value: '',
-                operator: (0, $7264a673914aa746$export$2b9377795161999)(schema[id].fields[fields[0]].mysql_type)[0].value,
+                operator: (0, $7264a673914aa746$export$2b9377795161999)(schema[id].fields[fields[0]].mysql_type, enableEmptyFilters)[0].value,
                 key: Date.now().toString()
             }
         ]);
@@ -3758,7 +3779,7 @@ const $6f4318b1e14124e5$var$FilterDataset = ()=>{
             {
                 property: fields[0],
                 value: '',
-                operator: (0, $7264a673914aa746$export$2b9377795161999)(schema[id].fields[fields[0]].mysql_type)[0].value,
+                operator: (0, $7264a673914aa746$export$2b9377795161999)(schema[id].fields[fields[0]].mysql_type, enableEmptyFilters)[0].value,
                 key: Date.now().toString()
             }
         ]);
@@ -3792,14 +3813,14 @@ const $6f4318b1e14124e5$var$FilterDataset = ()=>{
     };
     const submitConditions = ()=>{
         // only update the data conditions when "Apply filters" is pressed
-        const submitConditions = queryConditions.filter((oc)=>{
+        const filteredConditions = queryConditions.filter((oc)=>{
             if (oc.property) return oc;
             return false;
-        }).map((oc)=>{
+        });
+        const completeConditions = conditionsReadyToSubmit(filteredConditions).map((oc)=>{
             let cond = Object.assign({}, oc);
             return $6f4318b1e14124e5$var$updateQueryForDatastore(cond);
         });
-        const completeConditions = conditionsReadyToSubmit(submitConditions);
         if (completeConditions.length) {
             setConditions(completeConditions);
             setPage(1);
@@ -3818,7 +3839,8 @@ const $6f4318b1e14124e5$var$FilterDataset = ()=>{
         };
         const completeConditions = conditions.filter((condition)=>{
             if (condition) {
-                if (!isEmpty(condition.property) && !isEmpty(condition.operator) && !isEmpty(condition.value)) return condition;
+                const isEmptyOperator = condition.operator === 'is_empty' || condition.operator === 'not_empty';
+                if (!isEmpty(condition.property) && !isEmpty(condition.operator) && (isEmptyOperator || !isEmpty(condition.value))) return condition;
             }
         });
         return completeConditions;
@@ -3863,9 +3885,9 @@ const $6f4318b1e14124e5$var$FilterDataset = ()=>{
                             children: [
                                 /*#__PURE__*/ (0, $hgUW1$jsx)("span", {
                                     className: "dkan-dataset-toolbar-button-label",
-                                    children: conditions.length > 0 ? `Edit Filters` : 'Filter Dataset'
+                                    children: conditions && conditions.length > 0 ? `Edit Filters` : 'Filter Dataset'
                                 }),
-                                conditions.length > 0 && ` (${conditions.length})`
+                                conditions && conditions.length > 0 && ` (${conditions.length})`
                             ]
                         })
                     ]
@@ -3946,7 +3968,8 @@ const $6f4318b1e14124e5$var$FilterDataset = ()=>{
                                                         propertyOptions: propertyOptions,
                                                         update: updateCondition,
                                                         remove: removeCondition,
-                                                        className: index !== 0 ? "ds-u-border-top--1" : "ds-u-border--0"
+                                                        className: index !== 0 ? "ds-u-border-top--1" : "ds-u-border--0",
+                                                        enableEmptyFilters: enableEmptyFilters
                                                     }, qf.key))
                                             }),
                                             /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
@@ -4247,7 +4270,7 @@ const $85f8ff1ff89899c7$var$DataTableToolbar = ({ resource: resource, id: id, co
                                 children: [
                                     conditions.length > 0 ? conditions.map((condition, index)=>/*#__PURE__*/ (0, $hgUW1$jsx)((0, $c5b172e8d1a8197c$export$2e2bcd8739ae039), {
                                             iconClass: "far fa-filter",
-                                            text: `"${condition.property}" ${(0, $7264a673914aa746$export$d243819c3ad678fb)(condition.operator).toLowerCase()} ${condition.value}`,
+                                            text: `"${condition.property}" ${(0, $7264a673914aa746$export$d243819c3ad678fb)(condition.operator).toLowerCase()}${condition.value === '' ? '' : ` ${condition.value}`}`,
                                             onClick: ()=>{
                                                 removeCondition(index);
                                             }
@@ -5284,11 +5307,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,
@@ -6428,7 +6464,7 @@ const $a0f13962e513caa1$var$getDataDictionary = (dataDictionaryUrl)=>{
         dataDictionaryLoading: isPending
     };
 };
-const $a0f13962e513caa1$var$Dataset = ({ id: id, rootUrl: rootUrl, customColumns: customColumns, setDatasetTitle: setDatasetTitle, customMetadataMapping: customMetadataMapping, apiPageUrl: apiPageUrl = "/api", dataDictionaryUrl: dataDictionaryUrl, borderlessTabs: borderlessTabs = false, defaultPageSize: defaultPageSize = 25, dataDictionaryCSV: dataDictionaryCSV = false, dataDictionaryBanner: dataDictionaryBanner = false, disableTableControls: disableTableControls = false, hideDataDictionary: hideDataDictionary = false, customDescription: customDescription, updateAriaLive: updateAriaLive, showRowLimitNotice: showRowLimitNotice = false })=>{
+const $a0f13962e513caa1$var$Dataset = ({ id: id, rootUrl: rootUrl, customColumns: customColumns, setDatasetTitle: setDatasetTitle, customMetadataMapping: customMetadataMapping, apiPageUrl: apiPageUrl = "/api", dataDictionaryUrl: dataDictionaryUrl, borderlessTabs: borderlessTabs = false, defaultPageSize: defaultPageSize = 25, dataDictionaryCSV: dataDictionaryCSV = false, dataDictionaryBanner: dataDictionaryBanner = false, disableTableControls: disableTableControls = false, hideDataDictionary: hideDataDictionary = false, customDescription: customDescription, updateAriaLive: updateAriaLive, showRowLimitNotice: showRowLimitNotice = false, enableEmptyFilters: enableEmptyFilters = false })=>{
     const options = location.search ? {
         ...(0, $hgUW1$qs).parse(location.search, {
             ignoreQueryPrefix: true
@@ -6586,7 +6622,8 @@ const $a0f13962e513caa1$var$Dataset = ({ id: id, rootUrl: rootUrl, customColumns
                                             rootUrl: rootUrl,
                                             customColumns: customColumns,
                                             dataDictionaryBanner: dataDictionaryBanner && displayDataDictionaryTab,
-                                            datasetTableControls: !disableTableControls
+                                            datasetTableControls: !disableTableControls,
+                                            enableEmptyFilters: enableEmptyFilters
                                         },
                                         children: /*#__PURE__*/ (0, $hgUW1$jsx)((0, $39bc4d98030a5599$export$2e2bcd8739ae039), {})
                                     }) : /*#__PURE__*/ (0, $hgUW1$jsx)("p", {