@quillsql/react 2.13.27 → 2.13.28

package/dist/cjs/components/Dashboard/DashboardFilter.js

@@ -7,7 +7,7 @@ const dateRangePickerUtils_1 = require("../../DateRangePicker/dateRangePickerUti
 const QuillDateRangePicker_1 = require("../../DateRangePicker/QuillDateRangePicker");
 const QuillMultiSelect_1 = require("../QuillMultiSelect");
 const QuillSelect_1 = require("../QuillSelect");
-function DashboardFilter({ filter, onChangeFilter, SelectComponent = QuillSelect_1.QuillSelectComponent, MultiSelectComponent = QuillMultiSelect_1.QuillMultiSelectComponent, DateRangePickerComponent = QuillDateRangePicker_1.QuillDateRangePicker, theme, isLoading, disabled, }) {
+function DashboardFilter({ filter, onChangeFilter, SelectComponent = QuillSelect_1.QuillSelectComponent, MultiSelectComponent = QuillMultiSelect_1.QuillMultiSelectComponent, DateRangePickerComponent = QuillDateRangePicker_1.QuillDateRangePicker, theme, isLoading, disabled, containerStyle, }) {
     const preset = (0, react_1.useMemo)(() => {
         if (('preset' in filter || 'primaryRange' in filter) &&
             'startDate' in filter &&
@@ -27,79 +27,79 @@ function DashboardFilter({ filter, onChangeFilter, SelectComponent = QuillSelect
         }
         return '';
     }, [filter]);
-    if (!filter.options && !isLoading && !(filter.filterType === 'date_range')) {
-        return null;
-    }
+    // if (!filter.options && !isLoading && !(filter.filterType === 'date_range')) {
+    //   return null;
+    // }
     if (filter.filterType === 'string') {
         if (filter.stringFilterType === 'multiselect') {
-            return ((0, jsx_runtime_1.jsx)(MultiSelectComponent, { label: filter.label, value: filter.values ?? [], onChange: (e) => {
-                    if (e.target.value === '' ||
-                        (Array.isArray(e.target.value) && e.target.value.length === 0)) {
-                        onChangeFilter(filter, undefined);
-                        return;
-                    }
-                    let jsonValue = e.target.value;
-                    if (typeof e.target.value === 'string') {
-                        jsonValue = e.target.value.split(',');
-                    }
-                    onChangeFilter(filter, jsonValue);
+            return ((0, jsx_runtime_1.jsx)("div", { style: containerStyle, children: (0, jsx_runtime_1.jsx)(MultiSelectComponent, { label: filter.label, value: filter.values ?? [], onChange: (e) => {
+                        if (e.target.value === '' ||
+                            (Array.isArray(e.target.value) && e.target.value.length === 0)) {
+                            onChangeFilter(filter, undefined);
+                            return;
+                        }
+                        let jsonValue = e.target.value;
+                        if (typeof e.target.value === 'string') {
+                            jsonValue = e.target.value.split(',');
+                        }
+                        onChangeFilter(filter, jsonValue);
+                    }, options: [
+                        ...(filter.options
+                            ? filter.options.map((elem) => ({
+                                label: elem[filter.labelField],
+                                value: elem[filter.field],
+                            }))
+                            : []),
+                    ], width: 200, isLoading: isLoading, disabled: disabled }) }));
+        }
+        return ((0, jsx_runtime_1.jsx)("div", { style: containerStyle, children: (0, jsx_runtime_1.jsx)(SelectComponent, { label: filter.label, value: filter.selectedValue, onChange: (e) => {
+                    onChangeFilter(filter, e.target.value);
                 }, options: [
                     ...(filter.options
                         ? filter.options.map((elem) => ({
-                            label: elem[filter.labelField],
-                            value: elem[filter.field],
+                            label: elem[filter.labelField] ?? elem[filter.field] ?? '',
+                            value: elem[filter.field] ?? '',
                         }))
                         : []),
-                ], width: 200, isLoading: isLoading, disabled: disabled }));
-        }
-        return ((0, jsx_runtime_1.jsx)(SelectComponent, { label: filter.label, value: filter.selectedValue, onChange: (e) => {
-                onChangeFilter(filter, e.target.value);
-            }, options: [
-                ...(filter.options
-                    ? filter.options.map((elem) => ({
-                        label: elem[filter.labelField] ?? elem[filter.field] ?? '',
-                        value: elem[filter.field] ?? '',
-                    }))
-                    : []),
-            ], width: 200, isLoading: isLoading, disabled: disabled }));
+                ], width: 200, isLoading: isLoading, disabled: disabled }) }));
     }
     else if (filter.filterType === 'date_range') {
-        return ((0, jsx_runtime_1.jsxs)("div", { style: {
-                display: 'flex',
-                flexDirection: 'row',
-                alignItems: 'flex-end',
-                flexWrap: 'wrap',
-            }, children: [(0, jsx_runtime_1.jsx)(DateRangePickerComponent, { label: filter.label, dateRange: { startDate: filter.startDate, endDate: filter.endDate }, preset: preset, onChangeDateRange: (value) => {
-                        onChangeFilter(filter, {
-                            startDate: value.startDate,
-                            endDate: value.endDate,
-                        });
-                    }, onChangePreset: (e) => {
-                        onChangeFilter(filter, { preset: e.target.value });
-                    }, presetOptions: filter.options?.map((option) => {
-                        return { label: option.label, value: option.value };
-                    }) ?? [], selectWidth: 200, disabled: disabled }), filter.comparison && ((0, jsx_runtime_1.jsxs)("div", { style: {
-                        display: 'flex',
-                        flexDirection: 'row',
-                        alignItems: 'center',
-                    }, children: [(0, jsx_runtime_1.jsx)("div", { style: {
-                                paddingLeft: 16,
-                                paddingRight: 12,
-                                color: theme?.secondaryTextColor,
-                                fontFamily: theme?.fontFamily,
-                                fontSize: 14,
-                                display: 'flex',
-                                alignItems: 'center',
-                                flex: 1,
-                                whiteSpace: 'nowrap',
-                                minWidth: 80,
-                                justifyContent: 'center',
-                            }, children: "compared to" }), (0, jsx_runtime_1.jsx)(SelectComponent, { value: filter.comparisonRange?.value ?? 'NO_COMPARISON', onChange: (e) => {
-                                onChangeFilter(filter, undefined, dateRangePickerUtils_1.COMPARISON_OPTIONS.find((option) => option.value === e.target.value));
-                            }, options: dateRangePickerUtils_1.COMPARISON_OPTIONS.map((compareOption) => ({
-                                value: compareOption.value,
-                                label: compareOption.text,
-                            })), width: 200, hideEmptyOption: true })] }))] }));
+        return ((0, jsx_runtime_1.jsx)("div", { style: containerStyle, children: (0, jsx_runtime_1.jsxs)("div", { style: {
+                    display: 'flex',
+                    flexDirection: 'row',
+                    alignItems: 'flex-end',
+                    flexWrap: 'wrap',
+                }, children: [(0, jsx_runtime_1.jsx)(DateRangePickerComponent, { label: filter.label, dateRange: { startDate: filter.startDate, endDate: filter.endDate }, preset: preset, onChangeDateRange: (value) => {
+                            onChangeFilter(filter, {
+                                startDate: value.startDate,
+                                endDate: value.endDate,
+                            });
+                        }, onChangePreset: (e) => {
+                            onChangeFilter(filter, { preset: e.target.value });
+                        }, presetOptions: filter.options?.map((option) => {
+                            return { label: option.label, value: option.value };
+                        }) ?? [], selectWidth: 200, disabled: disabled }), filter.comparison && ((0, jsx_runtime_1.jsxs)("div", { style: {
+                            display: 'flex',
+                            flexDirection: 'row',
+                            alignItems: 'center',
+                        }, children: [(0, jsx_runtime_1.jsx)("div", { style: {
+                                    paddingLeft: 16,
+                                    paddingRight: 12,
+                                    color: theme?.secondaryTextColor,
+                                    fontFamily: theme?.fontFamily,
+                                    fontSize: 14,
+                                    display: 'flex',
+                                    alignItems: 'center',
+                                    flex: 1,
+                                    whiteSpace: 'nowrap',
+                                    minWidth: 80,
+                                    justifyContent: 'center',
+                                }, children: "compared to" }), (0, jsx_runtime_1.jsx)(SelectComponent, { value: filter.comparisonRange?.value ?? 'NO_COMPARISON', onChange: (e) => {
+                                    onChangeFilter(filter, undefined, dateRangePickerUtils_1.COMPARISON_OPTIONS.find((option) => option.value === e.target.value));
+                                }, options: dateRangePickerUtils_1.COMPARISON_OPTIONS.map((compareOption) => ({
+                                    value: compareOption.value,
+                                    label: compareOption.text,
+                                })), width: 200, hideEmptyOption: true })] }))] }) }));
     }
     return null;
 }

package/dist/cjs/components/Dashboard/DataLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DataLoader.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAajD,OAAO,EACL,oBAAoB,EAErB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA0BtE,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,YAAY,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACnE,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAuFF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,WAAW,EACX,oBAAoB,EAAE,2BAA2B,EACjD,UAAkB,GACnB,EAAE;IACD,IAAI,EAAE,mBAAmB,CAAC;IAC1B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,CAAC,EACT,SAAS,EACT,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,IAAI,GACL,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;CACzC,GAAG,GAAG,CAAC,OAAO,CAqUd;AAED,KAAK,YAAY,GAAG;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,eAAe,4FAQzB;IACD,IAAI,EAAE,mBAAmB,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,CAClB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,UAAU,KACf,YAAY,CAAC;IAClB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,CAAC,EACT,SAAS,EACT,KAAK,EACL,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,iBAAiB,GAClB,EAAE,yBAAyB,KAAK,GAAG,CAAC,OAAO,CAAC;CAC9C,KAAG,GAAG,CAAC,OAqKP,CAAC"}
+{"version":3,"file":"DataLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DataLoader.tsx"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAajD,OAAO,EACL,oBAAoB,EAErB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA0BtE,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,YAAY,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACnE,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAsJF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,WAAW,EACX,oBAAoB,EAAE,2BAA2B,EACjD,UAAkB,GACnB,EAAE;IACD,IAAI,EAAE,mBAAmB,CAAC;IAC1B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,CAAC,EACT,SAAS,EACT,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,IAAI,GACL,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;CACzC,GAAG,GAAG,CAAC,OAAO,CAgVd;AAED,KAAK,YAAY,GAAG;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,eAAe,4FAQzB;IACD,IAAI,EAAE,mBAAmB,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,CAClB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,UAAU,KACf,YAAY,CAAC;IAClB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,CAAC,EACT,SAAS,EACT,KAAK,EACL,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,iBAAiB,GAClB,EAAE,yBAAyB,KAAK,GAAG,CAAC,OAAO,CAAC;CAC9C,KAAG,GAAG,CAAC,OAmKP,CAAC"}

package/dist/cjs/components/Dashboard/DataLoader.js

@@ -11,7 +11,7 @@ const Context_1 = require("../../Context");
 const report_1 = require("../../utils/report");
 const paginationProcessing_1 = require("../../utils/paginationProcessing");
 const tableProcessing_1 = require("../../utils/tableProcessing");
-const Chart_1 = require("../../Chart");
+// import { didFiltersChange } from '../../Chart';
 const merge_1 = require("../../utils/merge");
 const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
 const constructReportFromItem = (item) => {
@@ -94,10 +94,47 @@ function userFilterValuesEquivalent(filters1, filters2) {
     }
     return true;
 }
+function tenantsEquivalent(tenants1, tenants2) {
+    if (!tenants1 && !tenants2) {
+        return true;
+    }
+    if (tenants1?.length !== tenants2?.length) {
+        return false;
+    }
+    if (!tenants1 || !tenants2) {
+        return false;
+    }
+    // The two tenant arrays aren't necessarily in the same order
+    // we can build two dictionaries of [foreignKey, tenantIds] and compare them
+    // if they are arrays of strings or numbers, we can just compare them directly
+    if ((typeof tenants1[0] === 'string' && typeof tenants2[0] === 'string') ||
+        (typeof tenants1[0] === 'number' && typeof tenants2[0] === 'number')) {
+        return (0, fast_deep_equal_1.default)(tenants1, tenants2);
+    }
+    if ((typeof tenants1[0] === 'string' && typeof tenants2[0] !== 'string') ||
+        (typeof tenants1[0] === 'number' && typeof tenants2[0] !== 'number')) {
+        return false;
+    }
+    const mappedTenants1 = tenants1.reduce((acc, tenant) => {
+        acc[tenant.tenantField] = tenant.tenantIds;
+        return acc;
+    }, {});
+    const mappedTenants2 = tenants2.reduce((acc, tenant) => {
+        acc[tenant.tenantField] = tenant.tenantIds;
+        return acc;
+    }, {});
+    for (const key in mappedTenants1) {
+        if (!(0, fast_deep_equal_1.default)(mappedTenants1[key], mappedTenants2[key])) {
+            return false;
+        }
+    }
+    return true;
+}
 function DataLoader({ item, children, filters, userFilters, additionalProcessing: defaultAdditionalProcessing, reportMode = false, }) {
     const [client] = (0, react_1.useContext)(Context_1.ClientContext);
     const [dashboard, dispatch] = (0, react_1.useContext)(Context_1.DashboardContext);
     const { dashboardFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
+    const { tenants, flags } = (0, react_1.useContext)(Context_1.TenantContext);
     const { reports, reportsDispatch, fetchIndividualReport } = (0, react_1.useContext)(Context_1.ReportsContext);
     const { reportFilters } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
     const contextFilters = () => {
@@ -106,7 +143,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
             : Object.values(dashboardFilters[item.dashboardName] ?? {}).map((f) => f.filter);
     };
     const [schemaData] = (0, react_1.useContext)(Context_1.SchemaDataContext);
-    const [loading, setLoading] = (0, react_1.useState)(!(reportMode ? reports : dashboard)[item.id]);
+    const [loading, setLoading] = (0, react_1.useState)(true);
     const [error, setError] = (0, react_1.useState)(undefined);
     const [previousPage, setPreviousPage] = (0, react_1.useState)(0);
     const [additionalProcessing, setAdditionalProcessing] = (0, react_1.useState)(defaultAdditionalProcessing);
@@ -123,6 +160,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
         reportFilters,
         dashboardFilters,
     ]);
+    const previousTenants = (0, react_1.useRef)(null);
     const previousFilters = (0, react_1.useRef)(null);
     const previousUserFilters = (0, react_1.useRef)(null);
     const [rowCountIsLoading, setRowCountIsLoading] = (0, react_1.useState)(false);
@@ -134,6 +172,8 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
     const updateTableRowsAbortController = (0, react_1.useRef)(null);
     const fetchRowCount = async (processing) => {
         if (!client || !filters) {
+            if (!rowCountAbortController.current)
+                return;
             return;
         }
         const fetchReportRowCountRequestId = rowCountRequestId.current + 1;
@@ -142,7 +182,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
         rowCountAbortController.current?.abort();
         rowCountAbortController.current = new AbortController();
         try {
-            const rowCount = await (0, report_1.fetchReportRowCount)(item.id, client, true, filters.concat(userFilters ?? []), processing, schemaData.customFields, rowCountAbortController.current.signal);
+            const rowCount = await (0, report_1.fetchReportRowCount)(item.id, client, tenants, flags, true, filters.concat(userFilters ?? []), processing, schemaData.customFields, rowCountAbortController.current.signal);
             rowCountAbortController.current = null;
             if (rowCount) {
                 if (reportMode) {
@@ -168,6 +208,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
         }
         finally {
             if (fetchReportRowCountRequestId === rowCountRequestId.current) {
+                rowCountAbortController.current = null;
                 setRowCountIsLoading(false);
             }
         }
@@ -190,16 +231,21 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
     };
     const onSortChange = (sort) => {
         const report = (reportMode ? reports : dashboard)[item.id];
-        if ((0, paginationProcessing_1.shouldSortInMemory)(additionalProcessing.page ?? paginationProcessing_1.DEFAULT_PAGINATION, report?.rowCount)) {
+        if ((0, paginationProcessing_1.shouldSortInMemory)(additionalProcessing.page ?? paginationProcessing_1.DEFAULT_PAGINATION, report?.rowCount) ||
+            report?.pivot) {
             return;
         }
-        const updatedProcessing = { page: additionalProcessing.page, sort };
-        fetchReportHelper(additionalProcessing);
+        const updatedProcessing = {
+            page: { ...additionalProcessing.page, page: 0 },
+            sort,
+        };
         updateTableRows(updatedProcessing, true);
         setPreviousPage(0);
     };
     const updateTableRows = async (processing, resetRows = false) => {
         if (!client) {
+            if (!updateTableRowsAbortController.current)
+                setLoading(false);
             return;
         }
         if (!loading) {
@@ -210,7 +256,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
                 updateTableRowsAbortController.current?.abort();
                 updateTableRowsAbortController.current = new AbortController();
                 const updatedProcessing = { ...additionalProcessing, ...processing };
-                const paginatedRows = await (0, tableProcessing_1.fetchResultsByReport)(item.id, client, updatedProcessing, filters.concat(userFilters ?? []), schemaData.customFields, true, undefined, updateTableRowsAbortController.current.signal);
+                const paginatedRows = await (0, tableProcessing_1.fetchResultsByReport)(item.id, client, tenants, updatedProcessing, filters.concat(userFilters ?? []), schemaData.customFields, true, undefined, updateTableRowsAbortController.current.signal);
                 updateTableRowsAbortController.current = null;
                 if (paginatedRows.error) {
                     throw new Error('Error fetching chart');
@@ -251,6 +297,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
             }
             finally {
                 if (fetchUpdateTableRowsRequestId === updateTableRowsRequestId.current) {
+                    updateTableRowsAbortController.current = null;
                     setLoading(false);
                 }
             }
@@ -258,13 +305,8 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
     };
     const fetchReportHelper = async (processing) => {
         if (!client || !filters) {
-            return;
-        }
-        const tempReport = (reportMode ? reports : dashboard)[item.id];
-        if (tempReport &&
-            !(0, Chart_1.didFiltersChange)(tempReport, filters) &&
-            userFilterValuesEquivalent(userFilters ?? [], previousUserFilters.current ?? []) &&
-            !tempReport.triggerReload) {
+            if (!rowsAbortController.current)
+                setLoading(false);
             return;
         }
         setLoading(true);
@@ -283,11 +325,9 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
                 catch (e) {
                     setError(e.message ?? 'Error fetching report');
                 }
-                rowsAbortController.current = null;
             }
             else {
-                const { report: fetchedReport, error } = await (0, report_1.fetchReport)(item.id, client, true, filters.concat(userFilters ?? []), processing, undefined, schemaData.customFields, true, false, rowsAbortController.current.signal);
-                rowsAbortController.current = null;
+                const { report: fetchedReport, error } = await (0, report_1.fetchReport)(item.id, client, tenants, flags, true, filters.concat(userFilters ?? []), processing, undefined, schemaData.customFields, true, false, rowsAbortController.current.signal);
                 dispatch({
                     type: 'ADD_DASHBOARD_ITEM',
                     id: item.id,
@@ -312,25 +352,31 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
         }
         finally {
             if (fetchRowsRequestId === rowsRequestId.current) {
+                rowsAbortController.current = null;
                 setLoading(false);
             }
         }
     };
+    // TODO: this is getting ridiculous
+    // we should be fetching this data directly when mutating filters/tenants rather than using a magical effect
     (0, react_1.useEffect)(() => {
-        if (!filters) {
-            return;
-        }
         if ((previousFilters.current ||
             (reportMode ? reports : dashboard)[item.id]?.rows?.length) &&
             filterValuesEquivalent(previousFilters.current ?? contextFilters(), filters) &&
-            userFilterValuesEquivalent(previousUserFilters.current ?? [], userFilters ?? [])) {
+            userFilterValuesEquivalent(previousUserFilters.current ?? [], userFilters ?? []) &&
+            // !didFiltersChange(dashboard[item.id], filters) &&
+            tenantsEquivalent(previousTenants.current ?? [], tenants ?? [])) {
+            if (!rowsAbortController.current)
+                setLoading(false);
             previousFilters.current = filters;
             return;
         }
         previousFilters.current = filters;
+        previousUserFilters.current = userFilters ?? [];
+        previousTenants.current = tenants ?? null;
         setPreviousPage(0);
         fetchReportHelper(additionalProcessing);
-    }, [filters, userFilters, item.id]);
+    }, [filters, userFilters, item.id, tenants]);
     (0, react_1.useEffect)(() => {
         const tempReport = (reportMode ? reports : dashboard)[item.id];
         if (tempReport?.triggerReload) {
@@ -357,18 +403,20 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
     const { dashboardFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
     const { reports, fetchIndividualReport } = (0, react_1.useContext)(Context_1.ReportsContext);
     const { reportFilters } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
+    const { tenants, flags } = (0, react_1.useContext)(Context_1.TenantContext);
     const contextFilters = () => {
         return reportMode
             ? Object.values(reportFilters[item.id] ?? {}).map((f) => f.filter)
             : Object.values(dashboardFilters[item.dashboardName] ?? {}).map((f) => f.filter);
     };
-    const [loading, setLoading] = (0, react_1.useState)(!(reportMode ? reports : dashboard)[item.id]);
+    const [loading, setLoading] = (0, react_1.useState)(true);
     const [error, setError] = (0, react_1.useState)(undefined);
     const [client] = (0, react_1.useContext)(Context_1.ClientContext);
     const [schemaData] = (0, react_1.useContext)(Context_1.SchemaDataContext);
     const previousFilters = (0, react_1.useRef)(null);
     const previousUserFilters = (0, react_1.useRef)(null);
     const previousDateBucket = (0, react_1.useRef)(undefined);
+    const previousTenants = (0, react_1.useRef)(null);
     const fetchReportAbortController = (0, react_1.useRef)(null);
     const rowsRequestId = (0, react_1.useRef)(0);
     const chartReport = (0, react_1.useMemo)(() => {
@@ -384,14 +432,8 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
     ]);
     const fetchReportHelper = async (useReportTask = true) => {
         if (!client || !filters) {
-            return;
-        }
-        const tempReport = (reportMode ? reports : dashboard)[item.id];
-        if (tempReport &&
-            !(0, Chart_1.didFiltersChange)(tempReport, filters) &&
-            userFilterValuesEquivalent(userFilters ?? [], previousUserFilters.current ?? []) &&
-            dateBucket === previousDateBucket.current &&
-            !tempReport.triggerReload) {
+            if (!fetchReportAbortController.current)
+                setLoading(false);
             return;
         }
         const fetchRowsRequestId = rowsRequestId.current + 1;
@@ -413,14 +455,12 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
                 catch (e) {
                     setError(e.message ?? 'Error fetching report');
                 }
-                fetchReportAbortController.current = null;
             }
             else {
-                const { report, error } = await (0, report_1.fetchReport)(item.id, client, useReportTask, filters.concat(userFilters ?? []), {
+                const { report, error } = await (0, report_1.fetchReport)(item.id, client, tenants, flags, useReportTask, filters.concat(userFilters ?? []), {
                     ...additionalProcessing,
                     ...(item.pivot ? {} : { page: paginationProcessing_1.DEFAULT_PAGINATION }),
                 }, dateBucket, schemaData.customFields, undefined, undefined, fetchReportAbortController.current.signal);
-                fetchReportAbortController.current = null;
                 dispatch({
                     type: 'ADD_DASHBOARD_ITEM',
                     id: item.id,
@@ -442,6 +482,7 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
         }
         finally {
             if (fetchRowsRequestId === rowsRequestId.current) {
+                fetchReportAbortController.current = null;
                 setLoading(false);
             }
         }
@@ -454,10 +495,16 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
             (reportMode ? reports : dashboard)[item.id]?.rows?.length) &&
             filterValuesEquivalent(previousFilters.current ?? contextFilters(), filters) &&
             userFilterValuesEquivalent(previousUserFilters.current ?? [], userFilters ?? []) &&
+            tenantsEquivalent(tenants ?? [], previousTenants.current ?? []) &&
             previousDateBucket.current === dateBucket) {
             previousFilters.current = filters;
+            if (!fetchReportAbortController.current)
+                setLoading(false);
             return;
         }
+        previousDateBucket.current = dateBucket;
+        previousUserFilters.current = userFilters ?? [];
+        previousTenants.current = tenants ?? null;
         previousFilters.current = filters;
         fetchReportHelper();
     }, [filters, userFilters, item.id, dateBucket]);

package/dist/cjs/components/Dashboard/MetricComponent.js

@@ -68,7 +68,7 @@ function QuillMetricComponent({ report, onClick, error, isLoading, }) {
                                 color: theme?.secondaryTextColor,
                                 maxWidth: '100%',
                                 width: '100%',
-                            } })) : report.rows?.length === 0 ||
+                            } })) : !report?.rows?.[0] ||
                             report.rows[0][report.xAxisField] === null ? ((0, jsx_runtime_1.jsx)("div", { style: {
                                 display: 'flex',
                                 flex: '1 0 auto',
@@ -106,7 +106,7 @@ function QuillMetricComponent({ report, onClick, error, isLoading, }) {
                                             gap: 4,
                                             alignItems: 'baseline',
                                             marginRight: 'auto',
-                                        }, children: [(0, jsx_runtime_1.jsx)("span", { children: (report.rows.length > 0 &&
+                                        }, children: [(0, jsx_runtime_1.jsx)("span", { children: (report?.rows?.[0] &&
                                                     report.rows[0][report.xAxisField]) ??
                                                     0 }), dateFilter?.comparison && ((0, jsx_runtime_1.jsx)("span", { style: {
                                                     fontSize: 13,
@@ -127,7 +127,7 @@ function QuillMetricComponent({ report, onClick, error, isLoading, }) {
                                                     fontWeight: '500',
                                                     fontFamily: theme?.fontFamily,
                                                     color: theme?.secondaryTextColor,
-                                                }, children: (report.rows.length > 0 &&
+                                                }, children: (report?.rows?.[0] &&
                                                     report.rows[0][`comparison_${report.xAxisField}`]) ??
                                                     0 }), (0, jsx_runtime_1.jsx)("span", { style: {
                                                     fontSize: 13,

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

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAG1D,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,GAAG,EAAE,EACd,SAAS,EAAE,GAAG,EAAE,GACf;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAiCnC;AAED,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,GAAG,EAAE,EACnB,MAAM,EAAE,mBAAmB,EAC3B,aAAa,EAAE,GAAG,GACjB,OAAO,CAAC,GAAG,CAAC,CAiDd"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAK1D,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,GAAG,EAAE,EACd,SAAS,EAAE,GAAG,EAAE,GACf;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAiCnC;AAED,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,GAAG,EAAE,EACnB,MAAM,EAAE,mBAAmB,EAC3B,aAAa,EAAE,GAAG,GACjB,OAAO,CAAC,GAAG,CAAC,CAmDd"}

package/dist/cjs/components/Dashboard/util.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateTemplatesAgainstFilters = validateTemplatesAgainstFilters;
 exports.addTemplatesToDashboard = addTemplatesToDashboard;
 const dataFetcher_1 = require("../../utils/dataFetcher");
+// WARNING: all of this template code is stale and PROBABLY BROKEN
 function validateTemplatesAgainstFilters(filters, templates) {
     let error = '';
     filters.every((filter) => {
@@ -40,13 +41,16 @@ function validateTemplatesAgainstFilters(filters, templates) {
 }
 async function addTemplatesToDashboard(name, newTemplates, client, dashboardData) {
     try {
-        const { publicKey, organizationId } = client;
+        const { publicKey, tenants } = client;
+        if (tenants) {
+            // need to implement a way to specify report tenant id
+            throw new Error('Adding from template not yet supported for tenants');
+        }
         const hostedBody = {
             metadata: {
                 dashboardName: name,
                 task: 'add-from-template',
                 clientId: publicKey,
-                orgId: organizationId || '*',
                 templateReportIds: newTemplates.map((template) => template._id),
             },
         };

package/dist/cjs/components/QuillMultiSelectWithCombo.d.ts

@@ -2,7 +2,7 @@ import { MultiSelectComponentProps } from './UiComponents';
 /**
  * A robust select component that implements the new minimal Select interface.
  */
-export declare function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, value, isLoading, disabled, }: MultiSelectComponentProps): import("react/jsx-runtime").JSX.Element;
+export declare function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, value, isLoading, disabled, emptyLabel, }: MultiSelectComponentProps): import("react/jsx-runtime").JSX.Element;
 export declare const ListboxTextInput: ({ value, onChange, placeholder, }: {
     value: string;
     onChange: (e: string) => void;

package/dist/cjs/components/QuillMultiSelectWithCombo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QuillMultiSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillMultiSelectWithCombo.tsx"],"names":[],"mappings":"AACA,OAAO,EAAkB,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAiC3E;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,EACjD,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,EACL,KAAK,EACL,SAAS,EACT,QAAQ,GACT,EAAE,yBAAyB,2CAge3B;AAED,eAAO,MAAM,gBAAgB,sCAI1B;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;CACrB,4CAwDA,CAAC"}
+{"version":3,"file":"QuillMultiSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillMultiSelectWithCombo.tsx"],"names":[],"mappings":"AACA,OAAO,EAAkB,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAW3E;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,EACjD,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,EACL,KAAK,EACL,SAAS,EACT,QAAQ,EACR,UAAU,GACX,EAAE,yBAAyB,2CAif3B;AAED,eAAO,MAAM,gBAAgB,sCAI1B;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;CACrB,4CAwDA,CAAC"}

package/dist/cjs/components/QuillMultiSelectWithCombo.js

@@ -30,25 +30,10 @@ const hooks_1 = require("../hooks");
 const UiComponents_1 = require("./UiComponents");
 const react_1 = __importStar(require("react"));
 const Context_1 = require("../Context");
-/**
- * Helper function for displaying option labels
- */
-function displaySelectedOptionLabels({ options, value, }) {
-    if (!value || !value.length) {
-        return 'Select';
-    }
-    const matchingOptions = options.filter((elem) => value.includes(elem.value));
-    if (matchingOptions.length !== value.length) {
-        return value.join(', ');
-    }
-    return matchingOptions
-        .map((elem) => elem.label ?? '-')
-        .join(', ');
-}
 /**
  * A robust select component that implements the new minimal Select interface.
  */
-function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, value, isLoading, disabled, }) {
+function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, value, isLoading, disabled, emptyLabel, }) {
     const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
     const [selectedOptions, setSelectedOptions] = (0, react_1.useState)([]);
     const [showModal, setShowModal] = (0, react_1.useState)(false);
@@ -74,6 +59,18 @@ function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, v
         }))
             .concat(options);
     }, [value, options]);
+    const selectedOptionsLabel = (0, react_1.useMemo)(() => {
+        if (!value || !value.length) {
+            return 'Select';
+        }
+        const matchingOptions = options.filter((elem) => value.includes(elem.value));
+        if (matchingOptions.length !== value.length) {
+            return value.join(', ');
+        }
+        return matchingOptions
+            .map((elem) => elem.label ?? '-')
+            .join(', ');
+    }, [options, value]);
     const [selectAllCheckboxState, setSelectAllCheckboxState] = (0, react_1.useState)((() => {
         if (value.length === 0) {
             return CheckboxState.UNSELECTED;
@@ -204,7 +201,7 @@ function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, v
                             width: '100%',
                             textAlign: 'left',
                             zIndex: 1,
-                        }, children: displaySelectedOptionLabels({ options, value }) }), (0, jsx_runtime_1.jsx)("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 20 20", fill: "currentColor", "aria-hidden": "true", "data-slot": "icon", height: 20, width: 20, style: { minHeight: 20, minWidth: 20 }, children: (0, jsx_runtime_1.jsx)("path", { fillRule: "evenodd", d: "M5.22 8.22a.75.75 0 0 1 1.06 0L10 11.94l3.72-3.72a.75.75 0 1 1 1.06 1.06l-4.25 4.25a.75.75 0 0 1-1.06 0L5.22 9.28a.75.75 0 0 1 0-1.06Z", clipRule: "evenodd" }) })] }), showModal && ((0, jsx_runtime_1.jsxs)("div", { style: {
+                        }, children: selectedOptionsLabel }), (0, jsx_runtime_1.jsx)("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 20 20", fill: "currentColor", "aria-hidden": "true", "data-slot": "icon", height: 20, width: 20, style: { minHeight: 20, minWidth: 20 }, children: (0, jsx_runtime_1.jsx)("path", { fillRule: "evenodd", d: "M5.22 8.22a.75.75 0 0 1 1.06 0L10 11.94l3.72-3.72a.75.75 0 1 1 1.06 1.06l-4.25 4.25a.75.75 0 0 1-1.06 0L5.22 9.28a.75.75 0 0 1 0-1.06Z", clipRule: "evenodd" }) })] }), showModal && ((0, jsx_runtime_1.jsxs)("div", { style: {
                     position: 'absolute',
                     width: '100%',
                     display: 'flex',
@@ -259,7 +256,9 @@ function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, v
                                     whiteSpace: 'nowrap',
                                     overflow: 'hidden',
                                     cursor: 'default',
-                                }, children: exceedsLimit ? 'Too many options' : 'No options available' })] })), !exceedsLimit && !isLoading ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [searchQuery === '' && potentialOptions.length > 0 && ((0, jsx_runtime_1.jsxs)("button", { style: {
+                                }, children: exceedsLimit
+                                    ? 'Too many options'
+                                    : (emptyLabel ?? 'No options available') })] })), !exceedsLimit && !isLoading ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [searchQuery === '' && potentialOptions.length > 0 && ((0, jsx_runtime_1.jsxs)("button", { style: {
                                     display: 'flex',
                                     alignItems: 'center',
                                     padding: 8,

package/dist/cjs/components/QuillTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QuillTable.d.ts","sourceRoot":"","sources":["../../../src/components/QuillTable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAG/D,OAAO,EAAE,oBAAoB,EAAyB,MAAM,gBAAgB,CAAC;AAE7E,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IACrC,0BAA0B,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC1E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CACrE;AAED,UAAU,wBAAyB,SAAQ,mBAAmB;IAC5D,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,QAAQ,EACR,iBAAiB,EACjB,OAAO,EACP,SAAS,EACT,WAAW,EACX,IAAI,EACJ,qBAA4B,EAC5B,cAAc,EACd,SAAS,EACT,gBAAwC,EACxC,WAAgB,EAChB,eAA8B,EAC9B,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,WAAW,GACZ,EAAE,wBAAwB,2CAse1B"}
+{"version":3,"file":"QuillTable.d.ts","sourceRoot":"","sources":["../../../src/components/QuillTable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAG/D,OAAO,EAAE,oBAAoB,EAAyB,MAAM,gBAAgB,CAAC;AAE7E,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IACrC,0BAA0B,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC1E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CACrE;AAED,UAAU,wBAAyB,SAAQ,mBAAmB;IAC5D,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,QAAQ,EACR,iBAAiB,EACjB,OAAO,EACP,SAAS,EACT,WAAW,EACX,IAAI,EACJ,qBAA4B,EAC5B,cAAc,EACd,SAAS,EACT,gBAAwC,EACxC,WAAgB,EAChB,eAA8B,EAC9B,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,WAAW,GACZ,EAAE,wBAAwB,2CA8e1B"}

package/dist/cjs/components/QuillTable.js

@@ -42,7 +42,15 @@ function QuillTable({ rows, rowCount, rowCountIsLoading, columns, isLoading, cur
         }
         setIsPaginating(false);
         setInitialLoad(false);
-    }, [currentPage, rows, sortColumn, sortDirection, columns, rowCount]);
+    }, [
+        currentPage,
+        rows,
+        sortColumn,
+        sortDirection,
+        columns,
+        rowCount,
+        isLoading,
+    ]);
     (0, react_1.useEffect)(() => {
         if (rows.length <= currentPage * rowsPerPage) {
             onPageChange && onPageChange(0);

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

@@ -1 +1 @@
-{"version":3,"file":"FilterModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/FilterModal.tsx"],"names":[],"mappings":"AAIA,OAAO,EACL,cAAc,EAId,QAAQ,EAMT,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,UAAU,gBAAgB;IACxB,MAAM,CAAC,EAAE;QAAE,OAAO,EAAE,cAAc,EAAE,CAAA;KAAE,CAAC;IACvC,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,cAAc,EACZ;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,GACzB;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;SAAE,CAAA;KAAE,CAAC;IACnD,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,qBAAqB,CAAC,EAAE,kBAAkB,CAAC;IAC3C,cAAc,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;IACjD,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,kBAAkB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC7C,wBAAwB,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACpD,oBAAoB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;CAChD;AAQD,KAAK,kBAAkB,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,EAAE,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,MAAM,EACN,MAAM,EACN,cAAc,EACd,uBAAuB,EACvB,qBAAqB,EACrB,cAAc,EACd,cAAc,EACd,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,wBAAwB,EACxB,oBAAoB,GACrB,EAAE,gBAAgB,kDA41BlB"}
+{"version":3,"file":"FilterModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/FilterModal.tsx"],"names":[],"mappings":"AAIA,OAAO,EACL,cAAc,EAId,QAAQ,EAMT,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,UAAU,gBAAgB;IACxB,MAAM,CAAC,EAAE;QAAE,OAAO,EAAE,cAAc,EAAE,CAAA;KAAE,CAAC;IACvC,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,cAAc,EACZ;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,GACzB;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;SAAE,CAAA;KAAE,CAAC;IACnD,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,qBAAqB,CAAC,EAAE,kBAAkB,CAAC;IAC3C,cAAc,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;IACjD,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,kBAAkB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC7C,wBAAwB,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACpD,oBAAoB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;CAChD;AAQD,KAAK,kBAAkB,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,EAAE,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,MAAM,EACN,MAAM,EACN,cAAc,EACd,uBAAuB,EACvB,qBAAqB,EACrB,cAAc,EACd,cAAc,EACd,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,wBAAwB,EACxB,oBAAoB,GACrB,EAAE,gBAAgB,kDAi3BlB"}