@quillsql/react 2.12.45 → 2.12.47

package/dist/cjs/components/ReportBuilder/FilterModal.js

@@ -13,32 +13,20 @@ const filterProcessing_1 = require("../../utils/filterProcessing");
  * Modal for adding, editing, and deleting Filters
  */
 function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, onSubmitFilter, onDeleteFilter, ButtonComponent, SelectComponent, TextInputComponent, SecondaryButtonComponent, MultiSelectComponent, }) {
-    const [field, setField] = (0, react_1.useState)(filter ? filter.field : '');
+    const [field, setField] = (0, react_1.useState)('');
     const [fieldOptions, setFieldOptions] = (0, react_1.useState)([]);
     const [fieldValues, setFieldValues] = (0, react_1.useState)([]);
-    const [type, setType] = (0, react_1.useState)(filter ? filter.filterType : '');
-    const [value, setValue] = (0, react_1.useState)(filter
-        ? filter.filterType === 'date-filter'
-            ? filter.value.value
-            : filter.value
-        : undefined);
-    const [selectedOptions, setSelectedOptions] = (0, react_1.useState)(filter && filter.filterType === 'string-in-filter'
-        ? filter.value.map((val) => {
-            return { label: val, value: val };
-        })
-        : []);
-    const [operator, setOperator] = (0, react_1.useState)(filter ? filter.operator : '');
+    const [type, setType] = (0, react_1.useState)('');
+    const [value, setValue] = (0, react_1.useState)(undefined);
+    const [selectedOptions, setSelectedOptions] = (0, react_1.useState)([]);
+    const [operator, setOperator] = (0, react_1.useState)('');
     const [operatorOptions, setOperatorOptions] = (0, react_1.useState)([]);
-    const [unit, setUnit] = (0, react_1.useState)(filter && filter.filterType === 'date-filter' ? filter.value.unit : '');
+    const [unit, setUnit] = (0, react_1.useState)('');
     const [unitOptions, setUnitOptions] = (0, react_1.useState)([]);
-    const [startDate, setStartDate] = (0, react_1.useState)(filter && filter.value?.startDate
-        ? filter.value.startDate.substring(0, 10)
-        : (0, date_fns_1.startOfToday)().toISOString().substring(0, 10));
-    const [endDate, setEndDate] = (0, react_1.useState)(filter && filter.value?.endDate
-        ? filter.value.endDate.substring(0, 10)
-        : (0, date_fns_1.startOfToday)().toISOString().substring(0, 10));
+    const [startDate, setStartDate] = (0, react_1.useState)((0, date_fns_1.startOfToday)().toISOString().substring(0, 10));
+    const [endDate, setEndDate] = (0, react_1.useState)((0, date_fns_1.startOfToday)().toISOString().substring(0, 10));
     const [filterInitialized, setFilterInitialized] = (0, react_1.useState)(false);
-    const [table, setTable] = (0, react_1.useState)('');
+    const [table, setTable] = (0, react_1.useState)(undefined);
     // Define all supported operator options for each field type
     const allOperatorOptions = {
         [Filter_1.FieldTypes.Number]: [
@@ -82,6 +70,20 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
     // Effect hook to initialize or update fieldValues based on selected field
     (0, react_1.useEffect)(() => {
         if (filter) {
+            setField(filter.field);
+            onFieldChange(filter.field, fieldOptions);
+            setType(filter.filterType);
+            onTypeChange(filter.filterType);
+            setValue(filter.filterType === 'date-filter' ? filter.value.value : filter.value);
+            setOperator(filter.operator);
+            onOperatorChange(filter.operator);
+            setUnit(filter.filterType === 'date-filter' ? filter.value.unit : '');
+            setStartDate(filter.value?.startDate
+                ? filter.value.startDate.substring(0, 10)
+                : (0, date_fns_1.startOfToday)().toISOString().substring(0, 10));
+            setEndDate(filter.value?.endDate
+                ? filter.value.endDate.substring(0, 10)
+                : (0, date_fns_1.startOfToday)().toISOString().substring(0, 10));
             if (filter.filterType === 'string-in-filter') {
                 setSelectedOptions(filter.value.map((val) => {
                     return { label: val, value: val };
@@ -102,33 +104,14 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
             setFieldOptions(fo);
             if (!filter && fo.length > 0 && fo[0]) {
                 setField(fo[0].name);
+                onFieldChange(fo[0].name, fo);
             }
-        }
-    }, [schema]);
-    // Effect hook to update UI when field selection changes
-    (0, react_1.useEffect)(() => {
-        if (field !== '') {
-            const selectedOption = fieldOptions.find((option) => option.name === field);
-            if (selectedOption) {
-                const fv = getFieldValues(selectedOption.name, selectedOption.table);
-                setFieldValues(fv);
-                if (!selectedOptions.every((item) => fv
-                    .map((v) => v.toLowerCase())
-                    .includes(item.value.toLowerCase()))) {
-                    setSelectedOptions([]);
-                }
-                setType((0, filterProcessing_1.getType)(selectedOption.type));
-                setTable(selectedOption.table);
+            else {
+                onFieldChange(field !== '' ? field : filter?.field ?? '', fo);
             }
         }
-        else {
-            setType('');
-            setFieldValues([]);
-            setSelectedOptions([]);
-        }
-    }, [field, fieldOptions]);
-    // Effect hook to update operator options based on selected field type
-    (0, react_1.useEffect)(() => {
+    }, [schema]);
+    function onTypeChange(type) {
         if (type) {
             const options = customOperatorOptions?.[type] ?? allOperatorOptions[type];
             if (options) {
@@ -137,18 +120,22 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
                     switch (type) {
                         case 'string':
                             setOperator(Filter_1.StringOperator.Is);
+                            onOperatorChange(Filter_1.StringOperator.Is);
                             setValue('');
                             break;
                         case 'date':
                             setOperator(Filter_1.DateOperator.InTheLast);
+                            onOperatorChange(Filter_1.DateOperator.InTheLast);
                             setValue('90');
                             break;
                         case 'number':
                             setOperator(Filter_1.NumberOperator.EqualTo);
+                            onOperatorChange(Filter_1.NumberOperator.EqualTo);
                             setValue('0');
                             break;
                         case 'boolean':
                             setOperator(Filter_1.BoolOperator.EqualTo);
+                            onOperatorChange(Filter_1.BoolOperator.EqualTo);
                             setValue(true);
                             break;
                     }
@@ -161,31 +148,94 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
         else {
             setOperatorOptions([]);
             setOperator('');
-            setType('');
+            onOperatorChange('');
         }
-    }, [type]);
-    // Effect hook to update UI when operator selection changes
-    (0, react_1.useEffect)(() => {
+    }
+    function onOperatorChange(operator) {
         if (operator === '') {
             setValue('');
         }
         if (typeof value !== 'string' &&
             typeof value !== 'number' &&
             typeof value !== 'boolean' &&
-            operator !== Filter_1.DateOperator.Custom) {
+            operator !== Filter_1.DateOperator.Custom &&
+            (filterInitialized || !filter)) {
             setValue('');
         }
+        else if (type === Filter_1.FieldTypes.Date &&
+            [
+                Filter_1.DateOperator.GreaterThan,
+                Filter_1.DateOperator.GreaterThanOrEqualTo,
+                Filter_1.DateOperator.EqualTo,
+                Filter_1.DateOperator.LessThan,
+                Filter_1.DateOperator.LessThanOrEqualTo,
+                Filter_1.DateOperator.NotEqualTo,
+            ].includes(operator) &&
+            !(0, date_fns_1.isValid)((0, date_fns_1.parse)(value, 'yyyy-mm-dd', new Date())) &&
+            (filterInitialized || !filter)) {
+            setValue((0, date_fns_1.startOfToday)().toISOString().substring(0, 10));
+        }
+        else if (type === Filter_1.FieldTypes.Date &&
+            [
+                Filter_1.DateOperator.InTheLast,
+                Filter_1.DateOperator.InTheCurrent,
+                Filter_1.DateOperator.InThePrevious,
+            ].includes(operator) &&
+            (value === '' || (typeof value !== 'number' && isNaN(Number(value)))) &&
+            (filterInitialized || !filter)) {
+            setValue('90');
+        }
         const options = getUnits(operator);
         setUnitOptions(options);
-        if (!options || !options.includes(unit)) {
+        if (unit === '' && options.length > 0) {
+            setUnit(Filter_1.TimeUnit.Day);
+        }
+        else if (!options || !options.includes(unit)) {
             setUnit('');
         }
-    }, [operator]);
-    (0, react_1.useEffect)(() => {
-        if (!filter && unitOptions.length > 0) {
-            setUnit(Filter_1.TimeUnit.Day);
+    }
+    function onFieldChange(field, fieldOptions) {
+        if (field !== '') {
+            const selectedOption = fieldOptions.find((option) => option.name === field);
+            if (selectedOption) {
+                const fieldValues = getFieldValues(selectedOption.name, selectedOption.table);
+                if (filterInitialized || !filter) {
+                    if (!selectedOptions.every((item) => fieldValues
+                        .map((v) => v.toLowerCase())
+                        .includes(item.value.toLowerCase()))) {
+                        setSelectedOptions([]);
+                    }
+                }
+                else {
+                    const preSelected = Array.isArray(filter.value)
+                        ? filter.value.map((val) => {
+                            return { label: val, value: val };
+                        })
+                        : [];
+                    // if a filter comes with invalid choices, include them anyway
+                    const valuesSet = new Set(fieldValues.map((v) => v.toLowerCase()));
+                    preSelected.forEach((option) => {
+                        if (!valuesSet.has(option.value.toLowerCase())) {
+                            valuesSet.add(option.value.toLowerCase());
+                            fieldValues.push(option.value);
+                        }
+                    });
+                }
+                setFieldValues(fieldValues);
+                setType((0, filterProcessing_1.getType)(selectedOption.type));
+                onTypeChange((0, filterProcessing_1.getType)(selectedOption.type));
+                if (selectedOption.table !== '') {
+                    setTable(selectedOption.table);
+                }
+            }
         }
-    }, [unitOptions]);
+        else {
+            setType('');
+            onTypeChange('');
+            setFieldValues([]);
+            setSelectedOptions([]);
+        }
+    }
     // Function that returns the list of units used for certain DateOperators
     const getUnits = (operator) => {
         switch (operator) {
@@ -230,7 +280,17 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
     // Handler for operator selection change
     const handleOperatorChange = (event) => {
         const newOp = event.target.value;
-        setOperator(newOp);
+        if (typeof newOp === 'string') {
+            setOperator(newOp);
+            onOperatorChange(newOp);
+        }
+    };
+    const handleFieldChange = (event) => {
+        const newField = event.target.value;
+        if (typeof newField === 'string' && newField !== field) {
+            setField(newField);
+            onFieldChange(newField, fieldOptions);
+        }
     };
     // Handler for date range selection
     const handleDateRangeSelect = (date) => {
@@ -243,6 +303,7 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
             }
         }
         setOperator(Filter_1.DateOperator.Custom);
+        onOperatorChange(Filter_1.DateOperator.Custom);
     };
     // Handler for form submission
     const handleSubmit = () => {
@@ -260,7 +321,9 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
                 switch (operator) {
                     case Filter_1.DateOperator.InTheLast:
                     case Filter_1.DateOperator.InThePrevious:
-                        if (typeof value !== 'number' && isNaN(Number(value))) {
+                        if (value === undefined ||
+                            value === '' ||
+                            (typeof value !== 'number' && isNaN(Number(value)))) {
                             alert('Please specify a valid number');
                             return;
                         }
@@ -368,7 +431,7 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
                         });
                         break;
                     default:
-                        if (typeof value !== 'string') {
+                        if (typeof value !== 'string' || value === '') {
                             alert('Please specify a valid string');
                             return;
                         }
@@ -446,6 +509,9 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
     const handleDelete = () => {
         onDeleteFilter();
     };
+    if (filter && !filterInitialized) {
+        return null; // prevent flashing
+    }
     return ((0, jsx_runtime_1.jsxs)("div", { style: {
             display: 'flex',
             flexDirection: 'column',
@@ -461,7 +527,7 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
                         gap: '20px',
                         flexDirection: 'row',
                         width: '100%',
-                    }, children: [(0, jsx_runtime_1.jsx)("div", { style: { display: 'flex', gap: 20 }, children: (0, jsx_runtime_1.jsx)(SelectComponent, { value: field, width: 200, onChange: (event) => setField(event.target.value), options: [
+                    }, children: [(0, jsx_runtime_1.jsx)("div", { style: { display: 'flex', gap: 20 }, children: (0, jsx_runtime_1.jsx)(SelectComponent, { value: field, width: 200, onChange: handleFieldChange, options: [
                                     ...fieldOptions.map((option) => ({
                                         value: option.name,
                                         label: option.table !== ''
@@ -476,33 +542,33 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
                                             ? `${operator} one of`
                                             : operator,
                                     })),
-                                ] }) })), (0, jsx_runtime_1.jsx)("div", { style: { display: 'flex', gap: 20 }, children: (() => {
-                                switch (operator) {
-                                    case Filter_1.BoolOperator.EqualTo:
-                                    case Filter_1.BoolOperator.NotEqualTo:
-                                    case Filter_1.StringOperator.IsExactly:
-                                    case Filter_1.StringOperator.IsNotExactly:
-                                    case Filter_1.StringOperator.Contains:
-                                    case Filter_1.NumberOperator.EqualTo:
-                                    case Filter_1.NumberOperator.NotEqualTo:
-                                    case Filter_1.NumberOperator.GreaterThan:
-                                    case Filter_1.NumberOperator.LessThan:
-                                    case Filter_1.NumberOperator.GreaterThanOrEqualTo:
-                                    case Filter_1.NumberOperator.LessThanOrEqualTo:
-                                        if (type === 'boolean') {
-                                            return ((0, jsx_runtime_1.jsx)(SelectComponent, { value: value, width: 200, onChange: (event) => setValue(event.target.value), options: [
+                                ] }) })), (() => {
+                            switch (operator) {
+                                case Filter_1.BoolOperator.EqualTo:
+                                case Filter_1.BoolOperator.NotEqualTo:
+                                case Filter_1.StringOperator.IsExactly:
+                                case Filter_1.StringOperator.IsNotExactly:
+                                case Filter_1.StringOperator.Contains:
+                                case Filter_1.NumberOperator.EqualTo:
+                                case Filter_1.NumberOperator.NotEqualTo:
+                                case Filter_1.NumberOperator.GreaterThan:
+                                case Filter_1.NumberOperator.LessThan:
+                                case Filter_1.NumberOperator.GreaterThanOrEqualTo:
+                                case Filter_1.NumberOperator.LessThanOrEqualTo:
+                                    if (type === 'boolean') {
+                                        return ((0, jsx_runtime_1.jsx)("div", { style: { display: 'flex', gap: 20 }, children: (0, jsx_runtime_1.jsx)(SelectComponent, { value: value, width: 200, onChange: (event) => setValue(event.target.value), options: [
                                                     { value: true, label: 'true' },
                                                     { value: false, label: 'false' },
-                                                ] }));
-                                        }
-                                        else {
-                                            return ((0, jsx_runtime_1.jsx)(TextInputComponent, { value: value, width: 120, onChange: (event) => {
+                                                ] }) }));
+                                    }
+                                    else {
+                                        return ((0, jsx_runtime_1.jsx)("div", { style: { display: 'flex', gap: 20 }, children: (0, jsx_runtime_1.jsx)(TextInputComponent, { value: value, width: 120, onChange: (event) => {
                                                     setValue(event.target.value);
-                                                } }));
-                                        }
-                                    case Filter_1.StringOperator.Is:
-                                    case Filter_1.StringOperator.IsNot:
-                                        return ((0, jsx_runtime_1.jsx)(MultiSelectComponent, { options: fieldValues.map((v) => {
+                                                } }) }));
+                                    }
+                                case Filter_1.StringOperator.Is:
+                                case Filter_1.StringOperator.IsNot:
+                                    return ((0, jsx_runtime_1.jsx)("div", { style: { display: 'flex', gap: 20 }, children: (0, jsx_runtime_1.jsx)(MultiSelectComponent, { options: fieldValues.map((v) => {
                                                 return { value: v.toLowerCase(), label: v };
                                             }), width: 200, value: selectedOptions.map((val) => val.value.toLowerCase()), onChange: (e) => {
                                                 if (e.target.value === '') {
@@ -520,9 +586,9 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
                                                     };
                                                 });
                                                 setSelectedOptions(jsonValue);
-                                            } }));
-                                    case Filter_1.DateOperator.Custom:
-                                        return ((0, jsx_runtime_1.jsx)(QuillDateRangePicker_1.QuillDateRangePicker, { dateRange: {
+                                            } }) }));
+                                case Filter_1.DateOperator.Custom:
+                                    return ((0, jsx_runtime_1.jsx)("div", { style: { display: 'flex', gap: 20 }, children: (0, jsx_runtime_1.jsx)(QuillDateRangePicker_1.QuillDateRangePicker, { dateRange: {
                                                 startDate: startDate
                                                     ? new Date(startDate + 'T00:00:00')
                                                     : (0, date_fns_1.startOfToday)(),
@@ -534,37 +600,35 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
                                                     from: value.startDate,
                                                     to: value.endDate,
                                                 });
-                                            } }));
-                                    case Filter_1.DateOperator.InTheLast:
-                                    case Filter_1.DateOperator.InThePrevious:
-                                        return ((0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex', flexDirection: 'row' }, children: [(0, jsx_runtime_1.jsx)(TextInputComponent, { value: value, width: 120, onChange: (event) => {
-                                                        setValue(event.target.value);
-                                                    } }), unitOptions.length > 0 && ((0, jsx_runtime_1.jsx)("div", { style: { marginLeft: '10px', marginRight: '10px' }, children: (0, jsx_runtime_1.jsx)(SelectComponent, { value: unit, width: 200, onChange: (event) => setUnit(event.target.value), options: [
-                                                            // { value: 'Select', label: 'Select' },
-                                                            ...unitOptions.map((unit) => ({
-                                                                value: unit,
-                                                                label: `${unit}${value && value !== '1' && value !== 1
-                                                                    ? 's'
-                                                                    : ''}`,
-                                                            })),
-                                                        ] }) }))] }));
-                                    case Filter_1.DateOperator.InTheCurrent:
-                                        return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: unitOptions.length > 0 && ((0, jsx_runtime_1.jsx)("div", { style: { marginLeft: '10px', marginRight: '10px' }, children: (0, jsx_runtime_1.jsx)(SelectComponent, { value: unit, width: 200, onChange: (event) => setUnit(event.target.value), options: [
+                                            } }) }));
+                                case Filter_1.DateOperator.InTheLast:
+                                case Filter_1.DateOperator.InThePrevious:
+                                    return ((0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex', flexDirection: 'row' }, children: [(0, jsx_runtime_1.jsx)(TextInputComponent, { value: value, width: 120, onChange: (event) => {
+                                                    setValue(event.target.value);
+                                                } }), unitOptions.length > 0 && ((0, jsx_runtime_1.jsx)("div", { style: { marginLeft: '10px' }, children: (0, jsx_runtime_1.jsx)(SelectComponent, { value: unit, width: 200, onChange: (event) => setUnit(event.target.value), options: [
                                                         // { value: 'Select', label: 'Select' },
                                                         ...unitOptions.map((unit) => ({
                                                             value: unit,
-                                                            label: `${unit}${operator !== Filter_1.DateOperator.InTheCurrent &&
-                                                                value &&
-                                                                value !== '1' &&
-                                                                value !== 1
-                                                                ? 's'
-                                                                : ''}`,
+                                                            label: `${unit}${value && value !== '1' && value !== 1 ? 's' : ''}`,
                                                         })),
-                                                    ] }) })) }));
-                                    default:
-                                        return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {});
-                                }
-                            })() })] }) }), (0, jsx_runtime_1.jsx)("div", { style: {
+                                                    ] }) }))] }));
+                                case Filter_1.DateOperator.InTheCurrent:
+                                    return ((0, jsx_runtime_1.jsx)("div", { style: { display: 'flex', gap: 20 }, children: unitOptions.length > 0 && ((0, jsx_runtime_1.jsx)(SelectComponent, { value: unit, width: 200, onChange: (event) => setUnit(event.target.value), options: [
+                                                // { value: 'Select', label: 'Select' },
+                                                ...unitOptions.map((unit) => ({
+                                                    value: unit,
+                                                    label: `${unit}${operator !== Filter_1.DateOperator.InTheCurrent &&
+                                                        value &&
+                                                        value !== '1' &&
+                                                        value !== 1
+                                                        ? 's'
+                                                        : ''}`,
+                                                })),
+                                            ] })) }));
+                                default:
+                                    return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {});
+                            }
+                        })()] }) }), (0, jsx_runtime_1.jsx)("div", { style: {
                     display: 'flex',
                     flexDirection: 'row',
                     justifyContent: 'flex-end',

package/dist/cjs/components/ReportBuilder/convert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/convert.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,IAAI,GAAG,EACpB,GAAG,EAOJ,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAQ5C,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAuBlE;AAGD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,QAahB;AAGD,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,QAalB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,CAoDpD;AAUD;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,YAAY,EAAE,KAAK,EAAE,GACpB,GAAG,CAAC,MAAM,CA8BZ;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,gBAkBrE;AAmID,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,UAAU,EAAE,cAAc,EAAE,GAC3B,KAAK,GAAG,IAAI,CAmFd;AA+BD;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,GAAG,EACR,YAAY,EAAE,KAAK,EAAE,EACrB,SAAS,CAAC,EAAE,KAAK;;;;;;EAwFlB;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,OAyNtE;AAID,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAY1E;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,OA+C5C"}
+{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/convert.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,IAAI,GAAG,EACpB,GAAG,EAOJ,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAQ5C,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAuBlE;AAGD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,QAahB;AAGD,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,QAalB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,CAoDpD;AAUD;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,YAAY,EAAE,KAAK,EAAE,GACpB,GAAG,CAAC,MAAM,CA8BZ;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,gBAkBrE;AAmID,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,UAAU,EAAE,cAAc,EAAE,GAC3B,KAAK,GAAG,IAAI,CAmFd;AA+BD;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,GAAG,EACR,YAAY,EAAE,KAAK,EAAE,EACrB,SAAS,CAAC,EAAE,KAAK;;;;;;EAuFlB;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,OAyNtE;AAID,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAY1E;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,OA+C5C"}

package/dist/cjs/components/ReportBuilder/convert.js

@@ -413,8 +413,7 @@ function convertGroupBy(ast, schemaTables, prevPivot) {
                 const existingCol = columnAlreadyExists(prevPivot.columnField);
                 newColumns.push(existingCol ?? (0, util_1.generateColumnExpr)(prevPivot.columnField));
             }
-            ast.columns = newColumns;
-            return { pivot: prevPivot, ast };
+            return { pivot: prevPivot, ast: { ...ast, columns: newColumns } };
         }
         pivot = convertASTToPivotData(ast, columns);
         if (pivot && Object.keys(pivot).length === 0) {

package/dist/cjs/components/ReportBuilder/ui.d.ts

@@ -2,6 +2,8 @@ import { ReactNode } from 'react';
 import { SidebarComponentProps, ContainerComponentProps } from '../UiComponents';
 import { Filter } from '../../models/Filter';
 import { ColumnInternal } from '../../models/Columns';
+import { FilterTreeNode } from '../../utils/astFilterProcessing';
+import { Client } from '../../models/Client';
 /**
  * This file is a collection of basic UI components that conform to the shape
  * expected by the Report Builder. Where possible, we use our existing
@@ -108,6 +110,12 @@ export interface FilterPopoverWrapperProps {
     FilterTagComponent: any;
     FilterModal: any;
     fieldValuesMap: any;
+    priorFilters?: FilterTreeNode[];
+    columns?: ColumnInternal[];
+    client?: Client;
+    customFields?: any;
+    baseAst?: any;
+    endpoint?: string;
     customOperatorOptions?: any;
     ButtonComponent: any;
     SecondaryButtonComponent: any;
@@ -118,5 +126,5 @@ export interface FilterPopoverWrapperProps {
     handleFilterSave: (filter: Filter) => void;
     containerStyle?: any;
 }
-export declare const FilterPopoverWrapper: ({ schema, filter, filterLabel, index, FilterTagComponent, FilterModal, fieldValuesMap, customOperatorOptions, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, handleFilterDelete, handleFilterSave, containerStyle, }: FilterPopoverWrapperProps) => import("react/jsx-runtime").JSX.Element;
+export declare const FilterPopoverWrapper: ({ schema, filter, filterLabel, index, FilterTagComponent, FilterModal, fieldValuesMap, priorFilters, columns, client, customFields, baseAst, endpoint, customOperatorOptions, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, handleFilterDelete, handleFilterSave, containerStyle, }: FilterPopoverWrapperProps) => import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=ui.d.ts.map

package/dist/cjs/components/ReportBuilder/ui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/ui.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/ui.tsx"],"names":[],"mappings":"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"}

package/dist/cjs/components/ReportBuilder/ui.js

@@ -11,6 +11,9 @@ const QuillTable_1 = __importDefault(require("../QuillTable"));
 const Context_1 = require("../../Context");
 const util_1 = require("./util");
 const csv_1 = require("../../utils/csv");
+const paginationProcessing_1 = require("../../utils/paginationProcessing");
+const filterProcessing_1 = require("../../utils/filterProcessing");
+const tableProcessing_1 = require("../../utils/tableProcessing");
 /**
  * This file is a collection of basic UI components that conform to the shape
  * expected by the Report Builder. Where possible, we use our existing
@@ -62,7 +65,7 @@ exports.QuillSecondaryButton = QuillSecondaryButton;
 // TODO: remove this, I think it is unused.
 const QuillReportBuilderTable = ({ rows, columns, error, ...props }) => {
     const reformattedColumns = columns.map((c) => ({ label: c, field: c }));
-    return ((0, jsx_runtime_1.jsx)("div", { style: { height: '100%', overflow: 'auto' }, children: (0, jsx_runtime_1.jsx)(QuillTable_1.default, { rows: rows, columns: reformattedColumns, rowsPerPage: 10, hideCSVDownloadButton: rows?.length > 0, downloadCSV: () => (0, csv_1.downloadCSV)({ rows, fields: reformattedColumns, name: 'my_report' }), emptyStateLabel: error || 'No results', ...props }) }));
+    return ((0, jsx_runtime_1.jsx)("div", { style: { height: '100%', overflow: 'auto' }, children: (0, jsx_runtime_1.jsx)(QuillTable_1.default, { rows: rows, columns: reformattedColumns, rowsPerPage: paginationProcessing_1.DEFAULT_PAGINATION.rowsPerPage, hideCSVDownloadButton: rows?.length > 0, downloadCSV: () => (0, csv_1.downloadCSV)({ rows, fields: reformattedColumns, name: 'my_report' }), emptyStateLabel: error || 'No results', ...props }) }));
 };
 exports.QuillReportBuilderTable = QuillReportBuilderTable;
 exports.QuillTag = (0, react_1.forwardRef)(({ label, onClick, children, onClickDelete, hideDelete = false }, forwardedRef) => {
@@ -392,12 +395,43 @@ const AddFilterPopover = ({ onSave, Button, renderNode, activeEditItem, }) => {
                 }, children: (0, jsx_runtime_1.jsx)(Button, { onClick: handleOnClick, label: 'Add filter' }) })] }));
 };
 exports.AddFilterPopover = AddFilterPopover;
-const FilterPopoverWrapper = ({ schema, filter, filterLabel, index, FilterTagComponent, FilterModal, fieldValuesMap, customOperatorOptions, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, handleFilterDelete, handleFilterSave, containerStyle, }) => {
+const FilterPopoverWrapper = ({ schema, filter, filterLabel, index, FilterTagComponent, FilterModal, fieldValuesMap, priorFilters, columns, client, customFields, baseAst, endpoint, customOperatorOptions, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, handleFilterDelete, handleFilterSave, containerStyle, }) => {
     const [isOpen, setIsOpen] = (0, react_1.useState)(false);
+    const [uniqueValues, setUniqueValues] = (0, react_1.useState)(undefined);
+    // Use a ref to store the previous value of priorFilters
+    const prevFiltersRef = (0, react_1.useRef)('');
+    (0, react_1.useEffect)(() => {
+        const currentFiltersString = JSON.stringify(priorFilters);
+        if (currentFiltersString !== prevFiltersRef.current) {
+            prevFiltersRef.current = currentFiltersString;
+            if (priorFilters) {
+                getFieldValuesMapByFilters(priorFilters);
+            }
+        }
+    }, [priorFilters]);
+    // This function retrieves the appropriate unique values given a set of filters
+    async function getFieldValuesMapByFilters(filters) {
+        if (!columns || !client || !endpoint || !baseAst) {
+            return;
+        }
+        else {
+            const { query, success, error } = await (0, filterProcessing_1.buildQueryFromFilters)(baseAst, filters, endpoint, client);
+            if (success && query) {
+                const { uniqueStrings } = await (0, tableProcessing_1.getRelevantInfoFromQuery)(columns, client, query, customFields);
+                const fieldValues = uniqueStrings && Object.keys(uniqueStrings).length !== 0
+                    ? (0, filterProcessing_1.uniqueValuesToStringMap)(uniqueStrings)
+                    : fieldValuesMap; // Fallback in case Promise comes up empty
+                setUniqueValues(fieldValues);
+            }
+            else if (error) {
+                console.error(error);
+            }
+        }
+    }
     function handleClickDelete() {
         handleFilterDelete(index);
     }
-    return ((0, jsx_runtime_1.jsx)("div", { style: containerStyle, children: (0, jsx_runtime_1.jsx)(FilterTagComponent, { isOpen: isOpen, popoverTitle: "Edit Filter", filterLabel: filterLabel, onClickDelete: handleClickDelete, setIsOpen: setIsOpen, popoverChildren: (0, jsx_runtime_1.jsx)(FilterModal, { schema: schema, filter: filter, fieldValuesMap: fieldValuesMap, customOperatorOptions: customOperatorOptions, onSubmitFilter: (filter) => {
+    return ((0, jsx_runtime_1.jsx)("div", { style: containerStyle, children: (0, jsx_runtime_1.jsx)(FilterTagComponent, { isOpen: isOpen, popoverTitle: "Edit Filter", filterLabel: filterLabel, onClickDelete: handleClickDelete, setIsOpen: setIsOpen, popoverChildren: (0, jsx_runtime_1.jsx)(FilterModal, { schema: schema, filter: filter, fieldValuesMap: uniqueValues ?? fieldValuesMap, customOperatorOptions: customOperatorOptions, onSubmitFilter: (filter) => {
                     handleFilterSave(filter);
                     setIsOpen(false);
                 }, onDeleteFilter: handleClickDelete, ButtonComponent: ButtonComponent, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, SecondaryButtonComponent: SecondaryButtonComponent ?? undefined, MultiSelectComponent: MultiSelectComponent }) }) }));

package/dist/cjs/components/ReportBuilder/util.d.ts

@@ -69,7 +69,11 @@ export declare const getDateFilterInfo: (node: any) => {
     intervalType: any;
     intervalPaths: any;
 };
-export declare function removeNonSelectedTableReferences(ast: any, table: string, columns: string[]): any;
+export declare function removeNonSelectedTableReferences(ast: any, table: string, columns: string[], uniqueValues: {
+    [column: string]: {
+        [value: string]: boolean;
+    };
+} | null): any;
 export declare function allNumericNodesValidInTree(node: any): boolean;
 export declare function isIdColumn(columnName?: string): boolean | "" | undefined;
 export declare function getCustomSentence(node: any, databaseType: string): string | null;

package/dist/cjs/components/ReportBuilder/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/util.ts"],"names":[],"mappings":"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"}