@quillsql/react 2.13.1 → 2.13.2

package/dist/cjs/Dashboard.js

@@ -55,6 +55,7 @@ const TemplateMetricComponent_1 = __importDefault(require("./components/Dashboar
 const TemplateTableComponent_1 = __importDefault(require("./components/Dashboard/TemplateTableComponent"));
 const DashboardTemplate_1 = __importDefault(require("./components/Dashboard/DashboardTemplate"));
 const Filter_2 = require("./models/Filter");
+const paginationProcessing_1 = require("./utils/paginationProcessing");
 const defaultChartContainerStyles = {
     display: 'flex',
     width: '100%',
@@ -110,15 +111,15 @@ const sortByOrdering = (a, b) => {
  * ### API Reference
  * @see https://docs.quillsql.com/components/dashboard
  */
-function Dashboard({ name, hidden = false, SelectComponent = QuillSelectWithCombo_1.QuillSelectComponentWithCombo, MultiSelectComponent = QuillMultiSelectWithCombo_1.QuillMultiSelectComponentWithCombo, ModalComponent = UiComponents_1.QuillModalComponent, ButtonComponent = UiComponents_1.MemoizedButton, SecondaryButtonComponent = UiComponents_1.MemoizedSecondaryButton, FilterTagComponent = ui_1.QuillFilterPopover, PopoverComponent = UiComponents_1.MemoizedPopover, TextInputComponent = UiComponents_1.QuillTextInput, EmptyDashboardComponent = UiComponents_1.QuillEmptyDashboardComponent, DateRangePickerComponent = QuillDateRangePicker_1.QuillDateRangePicker, MetricComponent = MetricComponent_1.default, ChartComponent = ChartComponent_1.default, TableComponent = TableComponent_1.default, TemplateMetricComponent = TemplateMetricComponent_1.default, TemplateChartComponent = TemplateChartComponent_1.default, TemplateTableComponent = TemplateTableComponent_1.default, DashboardSectionComponent = DashboardSection_1.default, DashboardSectionContainerComponent = DashboardSectionContainer_1.default, FilterContainerComponent = UiComponents_1.QuillFilterContainerComponent, DashboardLoadingComponent = UiComponents_1.QuillLoadingDashboardComponent, ErrorComponent = ChartError_1.QuillChartErrorWithAction, onClickReport, hoverActions, onChangeLoading, hideFilters, hideXAxis = false, hideYAxis = false, hideCartesianGrid = false, comparisonLineStyle = 'solid', containerStyle, className, chartContainerStyle = defaultChartContainerStyles, filters, onClickChartElement, dateBucket, additionalProcessing, hideAdminErrors = true, templateDashboardName, }) {
+function Dashboard({ name, hidden = false, SelectComponent = QuillSelectWithCombo_1.QuillSelectComponentWithCombo, MultiSelectComponent = QuillMultiSelectWithCombo_1.QuillMultiSelectComponentWithCombo, ModalComponent = UiComponents_1.QuillModalComponent, ButtonComponent = UiComponents_1.MemoizedButton, SecondaryButtonComponent = UiComponents_1.MemoizedSecondaryButton, FilterTagComponent = ui_1.QuillFilterPopover, PopoverComponent = UiComponents_1.MemoizedPopover, TextInputComponent = UiComponents_1.QuillTextInput, EmptyDashboardComponent = UiComponents_1.QuillEmptyDashboardComponent, DateRangePickerComponent = QuillDateRangePicker_1.QuillDateRangePicker, MetricComponent = MetricComponent_1.default, ChartComponent = ChartComponent_1.default, TableComponent = TableComponent_1.default, TemplateMetricComponent = TemplateMetricComponent_1.default, TemplateChartComponent = TemplateChartComponent_1.default, TemplateTableComponent = TemplateTableComponent_1.default, DashboardSectionComponent = DashboardSection_1.default, DashboardSectionContainerComponent = DashboardSectionContainer_1.default, FilterContainerComponent = UiComponents_1.QuillFilterContainerComponent, DashboardLoadingComponent = UiComponents_1.QuillLoadingDashboardComponent, ErrorComponent = ChartError_1.QuillChartErrorWithAction, onClickReport, hoverActions, onChangeLoading, hideFilters, hideXAxis = false, hideYAxis = false, hideCartesianGrid = false, comparisonLineStyle = 'solid', containerStyle, className, chartContainerStyle = defaultChartContainerStyles, 
+// TODO: do something with these custom filters
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+filters, onClickChartElement, dateBucket, additionalProcessing, hideAdminErrors = true, templateDashboardName, pagination = { rowsPerPage: 10, rowsPerRequest: 50 }, }) {
     const { isLoading, data, isDashboardFilterLoading, dashboardFilters: populatedDashboardFilters, reload, } = (0, useDashboard_1.useDashboard)(name);
     const [client, isClientLoading] = (0, react_1.useContext)(Context_1.ClientContext);
     const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
-    const [initialLoad, setInitialLoad] = (0, react_1.useState)(true);
     const { dispatch: dashboardFiltersDispatch } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
     const [schemaData] = (0, react_1.useContext)(Context_1.SchemaDataContext);
-    const [filterSchemaIsLoaded, setFilterSchemaIsLoaded] = (0, react_1.useState)(false);
-    const [filterSchema, setFilterSchema] = (0, react_1.useState)({ columns: [] }); // Schema to be passed into FilterModal
     const [fieldValuesMap, setFieldValuesMap] = (0, react_1.useState)({}); // Mapping of unique values per field, used in string filter 'in' and 'not in'
     const [referencedTables, setReferencedTables] = (0, react_1.useState)([]); // Intersection of tables referenced in the dashboard
     const [fieldValuesIsLoaded, setFieldValuesIsLoaded] = (0, react_1.useState)(false);
@@ -183,11 +184,6 @@ function Dashboard({ name, hidden = false, SelectComponent = QuillSelectWithComb
             Filter_1.NullOperator.IsNull,
         ],
     };
-    (0, react_1.useEffect)(() => {
-        if (!data)
-            return;
-        onDashboardDataChange(data, schemaData.schema);
-    }, [data, filters, schemaData.schema]);
     // Go through all columns in the referenced tables and get the unique values to use in fieldValuesMap
     (0, react_1.useEffect)(() => {
         const fetchData = async () => {
@@ -212,22 +208,18 @@ function Dashboard({ name, hidden = false, SelectComponent = QuillSelectWithComb
             fetchData();
         }
     }, [referencedTables]);
-    // Get the relevant information from the dashboard and schema to pass to FilterModal
-    const updateFilterSchema = (sections, schema) => {
-        if (!sections || !schema || schema.length === 0) {
-            return;
+    const filterSchema = (0, react_1.useMemo)(() => {
+        if (!data?.sections ||
+            !schemaData.schema ||
+            schemaData.schema.length === 0) {
+            return { columns: [] };
         }
-        setFilterSchemaIsLoaded(false);
+        const sections = data?.sections;
+        const schema = schemaData.schema;
         // find intersection of all referenced tables
-        const tables = Object.keys(sections)
-            .map((section) => {
-            return sections[section].map((chart) => {
-                return chart.referencedTables;
-            });
-        })
-            .reduce((accumulator, currentArray) => {
-            return accumulator.concat(currentArray);
-        }, []);
+        const tables = Object.values(sections)
+            .flatMap((section) => section.map((chart) => chart.referencedTables))
+            .flat();
         if (tables && tables.length > 0) {
             let intersection = new Set(tables[0]);
             for (let i = 1; i < tables.length; ++i) {
@@ -251,23 +243,13 @@ function Dashboard({ name, hidden = false, SelectComponent = QuillSelectWithComb
                 .reduce((accumulator, currentArray) => {
                 return accumulator.concat(currentArray);
             }, []);
-            setFilterSchema({ columns });
+            return { columns };
         }
         else {
-            setFilterSchema({ columns: [] });
+            return { columns: [] };
         }
-        setFilterSchemaIsLoaded(true);
-    };
-    const onDashboardDataChange = (resp, schema) => {
-        // setDashboardSections(resp.sections ?? {});
-        updateFilterSchema(resp.sections, schema);
-        setInitialLoad(false);
-    };
-    const handleOnClickDashboardItem = (elem) => {
-        if (onClickReport) {
-            onClickReport({ ...elem, _id: elem.id });
-        }
-    };
+    }, [data?.sections, schemaData.schema]);
+    const handleOnClickDashboardItem = (elem) => onClickReport && onClickReport({ ...elem, _id: elem.id });
     const updateFilter = (filter, value = null, comparison = null) => {
         if (!populatedDashboardFilters)
             return;
@@ -380,10 +362,10 @@ function Dashboard({ name, hidden = false, SelectComponent = QuillSelectWithComb
         }));
     };
     (0, react_1.useEffect)(() => {
-        if (onChangeLoading) {
-            onChangeLoading(isLoading || initialLoad);
+        if (onChangeLoading && isLoading) {
+            onChangeLoading(isLoading);
         }
-    }, [isLoading, initialLoad, onChangeLoading]);
+    }, [isLoading, onChangeLoading]);
     if (!isLoading &&
         (Object.keys(data?.sections ?? {}).length === 0 ||
             Object.values(data?.sections ?? {})[0]?.length === 0)) {
@@ -394,7 +376,6 @@ function Dashboard({ name, hidden = false, SelectComponent = QuillSelectWithComb
     }
     return ((0, jsx_runtime_1.jsxs)("div", { className: className, ...(0, styles_1.styleToProps)(containerStyle), children: [data &&
                 data.customFiltersEnabled &&
-                filterSchemaIsLoaded &&
                 !hideAdminErrors &&
                 !hideFilters &&
                 data &&
@@ -465,13 +446,19 @@ function Dashboard({ name, hidden = false, SelectComponent = QuillSelectWithComb
                                         textAlign: 'left',
                                         marginTop: 12,
                                     }, children: section })] })), metrics(data.sections, section, sortByOrdering).length > 0 && ((0, jsx_runtime_1.jsx)(DashboardSectionComponent, { section: "metrics", children: metrics(data.sections, section, sortByOrdering).map((item, index) => {
-                                return ((0, jsx_runtime_1.jsx)(DataLoader_1.default, { item: item, filters: populatedDashboardFilters, children: ({ isLoading, error, data, }) => ((0, jsx_runtime_1.jsx)(MetricComponent, { error: error, isLoading: isLoading, report: data, onClick: !isLoading && onClickReport
+                                return ((0, jsx_runtime_1.jsx)(DataLoader_1.default, { item: item, filters: populatedDashboardFilters, additionalProcessing: {
+                                        page: paginationProcessing_1.DEFAULT_PAGINATION,
+                                        last: additionalProcessing?.last,
+                                    }, children: ({ isLoading, error, data, }) => ((0, jsx_runtime_1.jsx)(MetricComponent, { error: error, isLoading: isLoading, report: data, onClick: !isLoading && onClickReport
                                             ? () => handleOnClickDashboardItem({
                                                 ...item,
                                                 ...data,
                                             })
                                             : () => { }, hoverActions: hoverActions }, item.name + '' + index)) }, `metric${index}`));
-                            }) })), charts(data.sections, section, sortByOrdering).length > 0 && ((0, jsx_runtime_1.jsx)(DashboardSectionComponent, { section: "charts", children: charts(data.sections, section, sortByOrdering).map((item, index) => ((0, jsx_runtime_1.jsx)(DataLoader_1.ChartDataLoader, { item: item, dateBucket: dateBucket, additionalProcessing: additionalProcessing, filters: populatedDashboardFilters, children: ({ isLoading, data, error, dateBucket, }) => ((0, jsx_runtime_1.jsx)(ChartComponent, { report: data, error: error, onClick: () => {
+                            }) })), charts(data.sections, section, sortByOrdering).length > 0 && ((0, jsx_runtime_1.jsx)(DashboardSectionComponent, { section: "charts", children: charts(data.sections, section, sortByOrdering).map((item, index) => ((0, jsx_runtime_1.jsx)(DataLoader_1.ChartDataLoader, { item: item, dateBucket: dateBucket, additionalProcessing: {
+                                    page: pagination,
+                                    last: additionalProcessing?.last,
+                                }, filters: populatedDashboardFilters, children: ({ isLoading, data, error, dateBucket, }) => ((0, jsx_runtime_1.jsx)(ChartComponent, { report: data, error: error, onClick: () => {
                                         if (!isLoading && onClickReport) {
                                             handleOnClickDashboardItem({
                                                 ...item,
@@ -483,7 +470,10 @@ function Dashboard({ name, hidden = false, SelectComponent = QuillSelectWithComb
                                             height: 300,
                                         } })) : ((0, jsx_runtime_1.jsx)(Chart_1.ChartDisplay, { reportId: data.id, config: data, loading: isLoading, containerStyle: chartContainerStyle, colors: theme.chartColors?.length
                                             ? theme.chartColors
-                                            : undefined, scrollable: false, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid, comparisonLineStyle: comparisonLineStyle, onClickChartElement: onClickChartElement })) }, item.name + '' + index)) }, `chart${index}`))) })), tables(data.sections, section, sortByOrdering).length > 0 && ((0, jsx_runtime_1.jsx)(DashboardSectionComponent, { section: "tables", children: tables(data.sections, section, sortByOrdering).map((item, index) => ((0, jsx_runtime_1.jsx)(DataLoader_1.default, { item: item, filters: populatedDashboardFilters, children: ({ isLoading, error, onPageChange, onSortChange, data, rowCount, rowCountIsLoading, }) => ((0, jsx_runtime_1.jsx)(TableComponent, { report: data, isLoading: isLoading, error: error, onClick: !isLoading && onClickReport
+                                            : undefined, scrollable: false, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid, comparisonLineStyle: comparisonLineStyle, onClickChartElement: onClickChartElement })) }, item.name + '' + index)) }, `chart${index}`))) })), tables(data.sections, section, sortByOrdering).length > 0 && ((0, jsx_runtime_1.jsx)(DashboardSectionComponent, { section: "tables", children: tables(data.sections, section, sortByOrdering).map((item, index) => ((0, jsx_runtime_1.jsx)(DataLoader_1.default, { item: item, filters: populatedDashboardFilters, additionalProcessing: {
+                                    page: pagination,
+                                    last: additionalProcessing?.last,
+                                }, children: ({ isLoading, error, onPageChange, onSortChange, data, rowCount, rowCountIsLoading, }) => ((0, jsx_runtime_1.jsx)(TableComponent, { report: data, isLoading: isLoading, error: error, onClick: !isLoading && onClickReport
                                         ? () => handleOnClickDashboardItem({
                                             ...item,
                                             ...data,

package/dist/cjs/Table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Table.d.ts","sourceRoot":"","sources":["../../src/Table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EACZ,WAAW,EACX,SAAS,EAIV,MAAM,OAAO,CAAC;AAcf,OAAO,EACL,yBAAyB,EAEzB,oBAAoB,EACrB,MAAM,2BAA2B,CAAC;AAuBnC,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAwDD;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,IAAI,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,CAAC;IAEhC;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,OAAO,CAAC,EAAE;QACR,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf,EAAE,CAAC;IAEJ;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC,qEAAqE;IACrE,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IAEzB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IAErC,oDAAoD;IACpD,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAE/D,0DAA0D;IAC1D,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE,yBAAyB,KAAK,GAAG,CAAC,OAAO,CAAC;IAEzE,+DAA+D;IAC/D,wBAAwB,CAAC,EAAE,CAAC,EAC1B,SAAS,EACT,KAAK,EACL,aAAa,EACb,MAAM,EACN,WAAW,EACX,iBAAiB,EACjB,cAAc,GACf,EAAE;QACD,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,EAAE;YAAE,SAAS,EAAE,IAAI,CAAC;YAAC,OAAO,EAAE,IAAI,CAAA;SAAE,CAAC;QAC9C,aAAa,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAClD,iBAAiB,EAAE,CAAC,EAClB,SAAS,EACT,OAAO,GACR,EAAE;YACD,SAAS,EAAE,IAAI,CAAC;YAChB,OAAO,EAAE,IAAI,CAAC;SACf,KAAK,IAAI,CAAC;QACX,cAAc,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;KACjE,KAAK,GAAG,CAAC,OAAO,CAAC;IAElB,wEAAwE;IACxE,wBAAwB,CAAC,EAAE,CAAC,EAC1B,QAAQ,GACT,EAAE;QACD,QAAQ,EAAE,SAAS,CAAC;KACrB,KAAK,GAAG,CAAC,OAAO,CAAC;IAElB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CACtC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,QAAA,MAAM,KAAK,UAAW,UAAU,mDAsC/B,CAAC;AAmSF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"Table.d.ts","sourceRoot":"","sources":["../../src/Table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EACZ,WAAW,EACX,SAAS,EAIV,MAAM,OAAO,CAAC;AAcf,OAAO,EACL,yBAAyB,EAEzB,oBAAoB,EACrB,MAAM,2BAA2B,CAAC;AAuBnC,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAwDD;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,IAAI,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,CAAC;IAEhC;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,OAAO,CAAC,EAAE;QACR,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf,EAAE,CAAC;IAEJ;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC,qEAAqE;IACrE,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IAEzB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IAErC,oDAAoD;IACpD,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAE/D,0DAA0D;IAC1D,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE,yBAAyB,KAAK,GAAG,CAAC,OAAO,CAAC;IAEzE,+DAA+D;IAC/D,wBAAwB,CAAC,EAAE,CAAC,EAC1B,SAAS,EACT,KAAK,EACL,aAAa,EACb,MAAM,EACN,WAAW,EACX,iBAAiB,EACjB,cAAc,GACf,EAAE;QACD,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,EAAE;YAAE,SAAS,EAAE,IAAI,CAAC;YAAC,OAAO,EAAE,IAAI,CAAA;SAAE,CAAC;QAC9C,aAAa,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAClD,iBAAiB,EAAE,CAAC,EAClB,SAAS,EACT,OAAO,GACR,EAAE;YACD,SAAS,EAAE,IAAI,CAAC;YAChB,OAAO,EAAE,IAAI,CAAC;SACf,KAAK,IAAI,CAAC;QACX,cAAc,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;KACjE,KAAK,GAAG,CAAC,OAAO,CAAC;IAElB,wEAAwE;IACxE,wBAAwB,CAAC,EAAE,CAAC,EAC1B,QAAQ,GACT,EAAE;QACD,QAAQ,EAAE,SAAS,CAAC;KACrB,KAAK,GAAG,CAAC,OAAO,CAAC;IAElB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CACtC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,QAAA,MAAM,KAAK,UAAW,UAAU,mDAyC/B,CAAC;AAsSF,eAAe,KAAK,CAAC"}

package/dist/cjs/Table.js

@@ -52,8 +52,9 @@ const Table = (props) => {
     const data = props;
     const [dashboard] = (0, react_1.useContext)(Context_1.DashboardContext);
     const [client] = (0, react_1.useContext)(Context_1.ClientContext);
+    const [page, setPage] = (0, react_1.useState)(0);
     if ('rows' in data && 'columns' in data) {
-        return ((0, jsx_runtime_1.jsx)(QuillTable_1.default, { hideCSVDownloadButton: data.hideCSVDownloadButton, columns: data.columns, rows: data.rows, className: data.className, containerStyle: data.containerStyle, LoadingComponent: data.LoadingComponent, isLoading: data.isLoading, downloadCSV: data.downloadCSV }));
+        return ((0, jsx_runtime_1.jsx)(QuillTable_1.default, { hideCSVDownloadButton: data.hideCSVDownloadButton, columns: data.columns, rows: data.rows, className: data.className, containerStyle: data.containerStyle, LoadingComponent: data.LoadingComponent, isLoading: data.isLoading, downloadCSV: data.downloadCSV, currentPage: page, onPageChange: setPage }));
     }
     if (!client) {
         return null;
@@ -71,12 +72,14 @@ const ChartUpdater = ({ reportId, containerStyle, className, dashboardContext, c
     const [filterUpdateIndex, setFilterUpdateIndex] = (0, react_1.useState)(0);
     const [previousPage, setPreviousPage] = (0, react_1.useState)(1);
     const [rowCount, setRowCount] = (0, react_1.useState)(0);
+    const [currentPage, setCurrentPage] = (0, react_1.useState)(0);
     const { reportFiltersDispatch, reportFilters } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
     const [currentProcessing, setCurrentProcessing] = (0, react_1.useState)({
         page: pagination,
     });
     const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
     const onPageChange = (page) => {
+        setCurrentPage(page);
         if (currentProcessing.page &&
             page > previousPage &&
             (0, paginationProcessing_1.shouldFetchMore)(paginationProcessing_1.DEFAULT_PAGINATION, page, previousPage)) {
@@ -217,6 +220,6 @@ const ChartUpdater = ({ reportId, containerStyle, className, dashboardContext, c
                                 updateIndex: filterUpdateIndex + 1,
                             },
                         });
-                    }, theme: theme, SelectComponent: SelectComponent, MultiSelectComponent: MultiSelectComponent, DateRangePickerComponent: DateRangePickerComponent }, index))) })), (0, jsx_runtime_1.jsx)(QuillTable_1.default, { hideCSVDownloadButton: hideCSVDownloadButton, columns: columns ?? [], rows: rows ?? [], containerStyle: containerStyle, className: className, LoadingComponent: LoadingComponent, sort: currentProcessing.sort, isLoading: loading || initialLoad, downloadCSV: downloadCSV, onPageChange: onPageChange, onSortChange: onSortChange, rowCount: rowCount })] }));
+                    }, theme: theme, SelectComponent: SelectComponent, MultiSelectComponent: MultiSelectComponent, DateRangePickerComponent: DateRangePickerComponent }, index))) })), (0, jsx_runtime_1.jsx)(QuillTable_1.default, { hideCSVDownloadButton: hideCSVDownloadButton, columns: columns ?? [], rows: rows ?? [], containerStyle: containerStyle, className: className, LoadingComponent: LoadingComponent, sort: currentProcessing.sort, isLoading: loading || initialLoad, downloadCSV: downloadCSV, onPageChange: onPageChange, onSortChange: onSortChange, rowCount: rowCount, currentPage: currentPage })] }));
 };
 exports.default = Table;

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

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 import { QuillReport } from '../../models/Report';
 import { QuillTheme } from '../../QuillProvider';
+import { AdditionalProcessing } from '../../utils/tableProcessing';
 export type DataLoaderChildProps = {
     isLoading: boolean;
     error?: string;
@@ -13,9 +14,10 @@ export type DataLoaderChildProps = {
     rowCount?: number;
     rowCountIsLoading?: boolean;
 };
-export default function DataLoader({ item, children, filters, }: {
-    item: any;
+export default function DataLoader({ item, children, filters, additionalProcessing: defaultAdditionalProcessing, }: {
+    item: QuillReport;
     filters: any[] | null;
+    additionalProcessing: AdditionalProcessing;
     children: ({ isLoading, error, onPageChange, onSortChange, data, }: DataLoaderChildProps) => JSX.Element;
 }): JSX.Element;
 type ColorMapType = {
@@ -37,10 +39,10 @@ export type ChartDataLoaderChildProps = {
     rowCountIsLoading?: boolean;
 };
 export declare const ChartDataLoader: ({ item, children, dateBucket, additionalProcessing, filters, }: {
-    item: any;
+    item: QuillReport;
     dateBucket?: string | undefined;
     mapColorsToFields?: ((_report: QuillReport, _theme: QuillTheme) => ColorMapType) | undefined;
-    additionalProcessing?: any;
+    additionalProcessing: AdditionalProcessing;
     filters: any[] | null;
     children: ({ isLoading, error, data, dateBucket, rowCount, rowCountIsLoading, }: ChartDataLoaderChildProps) => JSX.Element;
 }) => JSX.Element;

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":";AAOA,OAAO,EAAE,WAAW,EAAuB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAoCjD,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;AAEF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,QAAQ,EACR,OAAO,GACR,EAAE;IACD,IAAI,EAAE,GAAG,CAAC;IACV,OAAO,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IACtB,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,CAqNd;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;UAOpB,GAAG;;mCAGE,WAAW,UACZ,UAAU,KACf,YAAY;2BACM,GAAG;aACjB,GAAG,EAAE,GAAG,IAAI;qFAQlB,yBAAyB,KAAK,WAAW;MAC1C,WA4EH,CAAC"}
+{"version":3,"file":"DataLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DataLoader.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,WAAW,EAAuB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAajD,OAAO,EACL,oBAAoB,EAErB,MAAM,6BAA6B,CAAC;AAuBrC,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;AAkCF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,oBAAoB,EAAE,2BAA2B,GAClD,EAAE;IACD,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IACtB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,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,CAyLd;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;UAOpB,WAAW;;mCAGN,WAAW,UACZ,UAAU,KACf,YAAY;0BACK,oBAAoB;aACjC,GAAG,EAAE,GAAG,IAAI;qFAQlB,yBAAyB,KAAK,WAAW;MAC1C,WAmFH,CAAC"}

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

@@ -28,38 +28,67 @@ const constructReportFromItem = (item) => {
         filtersApplied: item.filtersApplied,
     };
 };
-function DataLoader({ item, children, filters, }) {
+function filterValuesEquivalent(filters1, filters2) {
+    if (filters1.length !== filters2.length) {
+        return false;
+    }
+    // The two filters arrays aren't necessarily in the same order
+    // we can build two dictionaries of [label, filter] and compare them
+    const mappedFilters1 = filters1.reduce((acc, filter) => {
+        acc[filter.label] = filter;
+        return acc;
+    }, {});
+    const mappedFilters2 = filters2.reduce((acc, filter) => {
+        acc[filter.label] = filter;
+        return acc;
+    }, {});
+    for (const key in mappedFilters1) {
+        if (mappedFilters1[key].selectedValue !==
+            mappedFilters2[key]?.selectedValue ||
+            mappedFilters1[key].values !== mappedFilters2[key]?.values ||
+            mappedFilters1[key].field !== mappedFilters2[key]?.field ||
+            mappedFilters1[key].label !== mappedFilters2[key]?.label ||
+            mappedFilters1[key].table !== mappedFilters2[key]?.table ||
+            mappedFilters1[key].filterType !== mappedFilters2[key]?.filterType ||
+            mappedFilters1[key].startDate !== mappedFilters2[key]?.startDate ||
+            mappedFilters1[key].endDate !== mappedFilters2[key]?.endDate) {
+            return false;
+        }
+    }
+    return true;
+}
+function DataLoader({ item, children, filters, additionalProcessing: defaultAdditionalProcessing, }) {
     const [client] = (0, react_1.useContext)(Context_1.ClientContext);
     const [dashboard, dispatch] = (0, react_1.useContext)(Context_1.DashboardContext);
     const [schemaData] = (0, react_1.useContext)(Context_1.SchemaDataContext);
     const [loading, setLoading] = (0, react_1.useState)(false);
     const [error, setError] = (0, react_1.useState)(undefined);
     const [previousPage, setPreviousPage] = (0, react_1.useState)(0);
-    const [report, setReport] = (0, react_1.useState)(dashboard[item._id] ?? constructReportFromItem(item));
-    const [additionalProcessing, setAdditionProcessing] = (0, react_1.useState)({
-        page: paginationProcessing_1.DEFAULT_PAGINATION,
-    });
+    const [report, setReport] = (0, react_1.useState)(dashboard[item.id] ?? constructReportFromItem(item));
+    const [additionalProcessing, setAdditionProcessing] = (0, react_1.useState)(defaultAdditionalProcessing);
     const previousFilters = (0, react_1.useRef)(null);
-    const [rowCount, setRowCount] = (0, react_1.useState)(dashboard[item._id]?.rowCount ?? 0);
+    const [rowCount, setRowCount] = (0, react_1.useState)(dashboard[item.id]?.rowCount ?? 0);
     const [rowCountIsLoading, setRowCountIsLoading] = (0, react_1.useState)(false);
     const fetchRowCount = async (processing) => {
         if (!client || !filters) {
             return;
         }
         setRowCountIsLoading(true);
-        const rowCount = await (0, report_1.fetchReportRowCount)(item._id, client, true, filters, processing, schemaData.customFields);
-        dispatch({
-            type: 'UPDATE_DASHBOARD_ITEM',
-            id: item._id,
-            data: { rowCount },
-        });
-        setRowCount(rowCount);
+        const rowCount = await (0, report_1.fetchReportRowCount)(item.id, client, true, filters, processing, schemaData.customFields);
+        if (rowCount) {
+            dispatch({
+                type: 'UPDATE_DASHBOARD_ITEM',
+                id: item.id,
+                data: { rowCount },
+            });
+            setRowCount(rowCount);
+        }
         setRowCountIsLoading(false);
     };
     const onPageChange = (page) => {
         if (additionalProcessing &&
             additionalProcessing.page &&
-            (0, paginationProcessing_1.shouldFetchMore)(paginationProcessing_1.DEFAULT_PAGINATION, page, previousPage)) {
+            (0, paginationProcessing_1.shouldFetchMore)(additionalProcessing.page, page, previousPage)) {
             const newPagination = { ...additionalProcessing.page, page };
             const updatedProcessing = {
                 ...additionalProcessing,
@@ -89,7 +118,7 @@ function DataLoader({ item, children, filters, }) {
             setLoading(true);
             try {
                 const updatedProcessing = { ...additionalProcessing, ...processing };
-                const paginatedRows = await (0, tableProcessing_1.fetchResultsByReport)(report.id, client, updatedProcessing, filters, schemaData.customFields);
+                const paginatedRows = await (0, tableProcessing_1.fetchResultsByReport)(report.id, client, updatedProcessing, filters, schemaData.customFields, true);
                 if (paginatedRows.error) {
                     throw new Error('Error fetching chart');
                 }
@@ -111,26 +140,26 @@ function DataLoader({ item, children, filters, }) {
         if (!client || !filters) {
             return;
         }
-        if (dashboard[item._id] &&
-            !(0, Chart_1.didFiltersChange)(dashboard[item._id], filters) &&
+        if (dashboard[item.id] &&
+            !(0, Chart_1.didFiltersChange)(dashboard[item.id], filters) &&
             !loading &&
             // @ts-ignore
-            !dashboard[item._id].triggerReload) {
+            !dashboard[item.id].triggerReload) {
             setLoading(false);
             const convertedReport = (0, report_1.convertInternalReportToReport)(
             // @ts-ignore
-            dashboard[item._id]);
+            dashboard[item.id]);
             setReport(convertedReport);
             return;
         }
         setLoading(true);
-        const { report: fetchedReport, error } = await (0, report_1.fetchReport)(item._id, client, true, filters, processing, undefined, schemaData.customFields);
-        fetchRowCount(processing);
+        const { report: fetchedReport, error } = await (0, report_1.fetchReport)(item.id, client, true, filters, processing, undefined, schemaData.customFields, true);
         dispatch({
             type: 'ADD_DASHBOARD_ITEM',
-            id: item._id,
-            data: { ...fetchedReport, triggerReload: false },
+            id: item.id,
+            data: { ...fetchedReport, triggerReload: false, rowCount: 0 }, // rowCount 0 indicates it's still loading if row length is nonzero
         });
+        fetchRowCount(processing);
         const convertedReport = (0, report_1.convertInternalReportToReport)(fetchedReport);
         setReport(convertedReport);
         setAdditionProcessing(processing);
@@ -146,50 +175,22 @@ function DataLoader({ item, children, filters, }) {
             return;
         }
         previousFilters.current = filters;
+        setPreviousPage(0);
         fetchReportHelper(additionalProcessing);
-    }, [filters, item._id]);
-    function filterValuesEquivalent(filters1, filters2) {
-        if (filters1.length !== filters2.length) {
-            return false;
-        }
-        // The two filters arrays aren't necessarily in the same order
-        // we can build two dictionaries of [label, filter] and compare them
-        const mappedFilters1 = filters1.reduce((acc, filter) => {
-            acc[filter.label] = filter;
-            return acc;
-        }, {});
-        const mappedFilters2 = filters2.reduce((acc, filter) => {
-            acc[filter.label] = filter;
-            return acc;
-        }, {});
-        for (const key in mappedFilters1) {
-            if (mappedFilters1[key].selectedValue !==
-                mappedFilters2[key]?.selectedValue ||
-                mappedFilters1[key].values !== mappedFilters2[key]?.values ||
-                mappedFilters1[key].field !== mappedFilters2[key]?.field ||
-                mappedFilters1[key].label !== mappedFilters2[key]?.label ||
-                mappedFilters1[key].table !== mappedFilters2[key]?.table ||
-                mappedFilters1[key].filterType !== mappedFilters2[key]?.filterType ||
-                mappedFilters1[key].startDate !== mappedFilters2[key]?.startDate ||
-                mappedFilters1[key].endDate !== mappedFilters2[key]?.endDate) {
-                return false;
-            }
-        }
-        return true;
-    }
+    }, [filters, item.id]);
     (0, react_1.useEffect)(() => {
         // @ts-ignore
-        if (dashboard[item._id] && dashboard[item._id].triggerReload) {
+        if (dashboard[item.id] && dashboard[item.id].triggerReload) {
             fetchReportHelper(additionalProcessing);
         }
-    }, [dashboard[item._id]]);
+    }, [dashboard[item.id]]);
     return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: children({
             isLoading: loading,
             error,
             onPageChange,
             onSortChange,
             data: report,
-            rowCount,
+            rowCount: report.pivot ? report.rowCount : rowCount,
             rowCountIsLoading,
         }) }));
 }
@@ -202,36 +203,37 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
     const [loading, setLoading] = (0, react_1.useState)(false);
     const [error, setError] = (0, react_1.useState)(undefined);
     const [localDateBucket, setLocalDateBucket] = (0, react_1.useState)(undefined);
-    const [localAdditionalProcessing, setLocalAdditionalProcessing] = (0, react_1.useState)();
-    const [report, setReport] = (0, react_1.useState)(dashboard[item._id] ?? constructReportFromItem(item));
+    const [report, setReport] = (0, react_1.useState)(dashboard[item.id] ?? constructReportFromItem(item));
     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 fetchReportHelper = async (useReportTask = true) => {
         if (!client || !filters) {
             return;
         }
-        const tempReport = dashboard[item._id];
+        const tempReport = dashboard[item.id];
         if (tempReport &&
             !(0, Chart_1.didFiltersChange)(tempReport, filters) &&
             !tempReport.triggerReload &&
-            dateBucket === localDateBucket &&
-            additionalProcessing?.last === localAdditionalProcessing?.last) {
+            dateBucket === localDateBucket) {
             setLoading(false);
             const convertedReport = (0, report_1.convertInternalReportToReport)(tempReport);
             setReport(convertedReport);
             return;
         }
         setLoading(true);
-        const { report, error } = await (0, report_1.fetchReport)(item._id, client, useReportTask, filters, additionalProcessing, dateBucket, schemaData.customFields);
+        const { report, error } = await (0, report_1.fetchReport)(item.id, client, useReportTask, filters, {
+            ...additionalProcessing,
+            ...(item.pivot ? {} : { page: paginationProcessing_1.DEFAULT_PAGINATION }),
+        }, dateBucket, schemaData.customFields);
         dispatch({
             type: 'ADD_DASHBOARD_ITEM',
-            id: item._id,
+            id: item.id,
             data: { ...report, triggerReload: false },
         });
         const convertedReport = (0, report_1.convertInternalReportToReport)(report);
         setReport(convertedReport);
         setLocalDateBucket(dateBucket);
-        setLocalAdditionalProcessing(additionalProcessing);
         setError(error);
         setLoading(false);
     };
@@ -239,15 +241,20 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
         if (!filters) {
             return;
         }
+        if (previousFilters.current &&
+            filterValuesEquivalent(previousFilters.current, filters)) {
+            return;
+        }
+        previousFilters.current = filters;
         setInitialLoad(false);
         fetchReportHelper();
-    }, [filters, item._id, dateBucket, additionalProcessing]);
+    }, [filters, item.id, dateBucket]);
     (0, react_1.useEffect)(() => {
-        const tempReport = dashboard[item._id];
+        const tempReport = dashboard[item.id];
         if (tempReport && tempReport.triggerReload) {
             fetchReportHelper();
         }
-    }, [dashboard[item._id]]);
+    }, [dashboard[item.id]]);
     return children({
         isLoading: loading || initialLoad,
         data: report,

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

@@ -1 +1 @@
-{"version":3,"file":"TableComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/TableComponent.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAKlD,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,MAAM,EACN,OAAO,EACP,SAAS,EACT,KAAK,EACL,QAAQ,EACR,iBAAiB,EACjB,YAAY,EACZ,YAAY,GACb,EAAE;IACD,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,IAAI,CAAC;IACxC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,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,GAAG,GAAG,CAAC,OAAO,CA0Fd"}
+{"version":3,"file":"TableComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/TableComponent.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAKlD,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,MAAM,EACN,OAAO,EACP,SAAS,EACT,KAAK,EACL,QAAQ,EACR,iBAAiB,EACjB,YAAY,EACZ,YAAY,GACb,EAAE;IACD,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,IAAI,CAAC;IACxC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,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,GAAG,GAAG,CAAC,OAAO,CAkGd"}

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

@@ -15,11 +15,17 @@ function QuillTableComponent({ report, onClick, isLoading, error, rowCount, rowC
     const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
     const [initialLoad, setInitialLoad] = (0, react_1.useState)(true);
     const { downloadCSV } = (0, useExport_1.useExport)(report?.id);
+    const [page, setPage] = (0, react_1.useState)(0);
     (0, react_1.useEffect)(() => {
         if (!isLoading) {
             setInitialLoad(false);
         }
     }, [isLoading]);
+    (0, react_1.useEffect)(() => {
+        if (rowCountIsLoading) {
+            setPage(0);
+        }
+    }, [rowCountIsLoading]);
     return ((0, jsx_runtime_1.jsxs)("div", { style: { cursor: error || !onClick ? 'default' : 'pointer' }, onClick: () => onClick && onClick(report), children: [(0, jsx_runtime_1.jsx)("div", { style: {
                     display: 'flex',
                     flexDirection: 'row',
@@ -52,8 +58,9 @@ function QuillTableComponent({ report, onClick, isLoading, error, rowCount, rowC
                     downloadCSV();
                 }, onPageChange: (page) => {
                     onPageChange && onPageChange(page);
+                    setPage(page);
                 }, onSortChange: (sort) => {
                     onSortChange && onSortChange(sort);
-                }, currentPage: report?.pagination?.page, sort: report?.sort }))] }, report?.name));
+                }, currentPage: report?.pagination?.page ?? page, sort: report?.sort }))] }, report?.name));
 }
 exports.default = QuillTableComponent;

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

@@ -8,7 +8,7 @@ export interface TableComponentProps {
         label: string;
         field: string;
     }[];
-    currentPage?: number;
+    currentPage: number;
     sort?: {
         field: string;
         direction: string;

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,CAAC,EAAE,MAAM,CAAC;IACrB,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,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,GACb,EAAE,mBAAmB,2CAwdrB"}
+{"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,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,GACb,EAAE,mBAAmB,2CA+drB"}