@quillsql/react 2.13.20 → 2.13.22

package/dist/cjs/hooks/useQuill.js

@@ -13,17 +13,9 @@ const useQuill = (reportId, pagination) => {
     const [dashboard] = (0, react_1.useContext)(Context_1.DashboardContext);
     const { dashboardFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
     const { reportFilters, reportFiltersDispatch } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
-    const specificDashboardFilters = (0, react_1.useMemo)(() => {
-        if (!reportId)
-            return [];
-        const dashboardName = reports[reportId]?.dashboardName;
-        if (!dashboardName)
-            return [];
-        return Object.values(dashboardFilters[dashboardName] ?? {}).map((f) => f.filter);
-    }, [dashboardFilters, reportId, dashboard]);
     const specificReportFilters = (0, react_1.useMemo)(() => {
         if (!reportId)
-            return [];
+            return null;
         return Object.values(reportFilters[reportId] ?? []).map((f) => f.filter);
     }, [reportFilters, reportId]);
     const [schemaData] = (0, react_1.useContext)(Context_1.SchemaDataContext);
@@ -33,7 +25,7 @@ const useQuill = (reportId, pagination) => {
     const [previousPage, setPreviousPage] = (0, react_1.useState)(0);
     const processedReport = (0, react_1.useMemo)(() => {
         return reportId && (reports[reportId] || dashboard[reportId])
-            ? (0, report_1.convertInternalReportToReport)((0, merge_1.mergeComparisonRange)(reports[reportId] || dashboard[reportId]), specificReportFilters)
+            ? (0, report_1.convertInternalReportToReport)((0, merge_1.mergeComparisonRange)(reports[reportId] || dashboard[reportId]), specificReportFilters ?? [], 'useQuill')
             : undefined;
     }, [
         reportId,
@@ -140,16 +132,9 @@ const useQuill = (reportId, pagination) => {
             setLoading(false);
             return;
         }
-        if (specificDashboardFilters.length && !specificReportFilters.length) {
-            reportFiltersDispatch({
-                type: 'ADD_REPORT_FILTERS',
-                id: curReportId,
-                data: Object.values(dashboardFilters[curReportId] ?? []),
-            });
-        }
         setLoading(true);
         try {
-            await fetchIndividualReport(curReportId, 'useQuill', true, specificReportFilters, [], additionalProcessing);
+            await fetchIndividualReport(curReportId, 'useQuill', true, specificReportFilters || [], [], additionalProcessing);
         }
         catch (error) {
             setError(error.message ?? 'Error fetching report');
@@ -159,15 +144,32 @@ const useQuill = (reportId, pagination) => {
         }
     };
     (0, react_1.useEffect)(() => {
-        if (reportId) {
+        if (reportId && specificReportFilters) {
             fetchReportHelper(reportId, {
                 page: pagination,
             });
         }
-    }, [reportId]);
+        // if we don't have report filters, we need set those
+        if (reportId && !specificReportFilters) {
+            // should always resolve to some dashboard name given that spacificDashboardFilters is not empty
+            const dashboardName = reportId && reports[reportId]
+                ? reports[reportId].dashboardName
+                : '';
+            reportFiltersDispatch({
+                type: 'ADD_REPORT_FILTERS',
+                id: reportId,
+                data: dashboardName
+                    ? Object.values(dashboardFilters[dashboardName] ?? {})
+                    : [],
+            });
+        }
+    }, [reportId, specificReportFilters]);
     return {
         data: processedReport ?? null,
-        loading,
+        loading: !reportId
+            || (reports[reportId] || dashboard[reportId])?.loadingRows
+            || !processedReport?.rows
+            || loading,
         error,
         fetchMore,
         setSort,

package/dist/cjs/hooks/useReport.d.ts

@@ -0,0 +1,12 @@
+import { QuillReportInternal } from '../models/Report';
+import { DashboardFilter, Filter } from '../models/Filter';
+export declare const useReports: () => {
+    reloadFilteredReports: (predicate: (report: QuillReportInternal) => boolean) => void;
+};
+export declare const useReport: (reportId: string) => {
+    reload: (overrideFilters: {
+        filters: DashboardFilter[];
+        editedFilterLabel?: string;
+    }, customFilters?: Filter[], initiator?: "Chart" | "useQuill" | "useExport") => Promise<void>;
+};
+//# sourceMappingURL=useReport.d.ts.map

package/dist/cjs/hooks/useReport.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useReport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useReport.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAuB,eAAe,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEhF,eAAO,MAAM,UAAU;uCAYR,CAAC,MAAM,EAAE,mBAAmB,KAAK,OAAO;CAYtD,CAAC;AAIF,eAAO,MAAM,SAAS,aAAc,MAAM;8BAIrB;QACf,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B,kBACc,MAAM,EAAE,cACZ,OAAO,GAAG,UAAU,GAAG,WAAW;CAmChD,CAAC"}

package/dist/cjs/hooks/useReport.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useReport = exports.useReports = void 0;
+const react_1 = require("react");
+const Context_1 = require("../Context");
+const Filter_1 = require("../models/Filter");
+const useReports = () => {
+    const [dashboard, dispatch] = (0, react_1.useContext)(Context_1.DashboardContext);
+    const reloadReport = (id) => {
+        dispatch({
+            type: 'UPDATE_DASHBOARD_ITEM',
+            id: id,
+            data: { triggerReload: true },
+        });
+    };
+    const reloadFilteredReports = (predicate) => {
+        for (const id in dashboard) {
+            if (predicate(dashboard[id])) {
+                reloadReport(id);
+            }
+        }
+    };
+    return {
+        reloadFilteredReports,
+    };
+};
+exports.useReports = useReports;
+// Exposes context operations with the "Report" scope
+// Not meant to be customer facing
+const useReport = (reportId) => {
+    const { loadFiltersForReport } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
+    const { reports, reportsDispatch } = (0, react_1.useContext)(Context_1.ReportsContext);
+    const reload = async (overrideFilters, customFilters = [], initiator = 'Chart') => {
+        // Set loading member on the report to true
+        reportsDispatch({
+            type: 'UPDATE_REPORT',
+            id: reportId,
+            data: { loadingRows: true },
+        });
+        // Pull the date filter out of the override filters, process it, and append it to the filters
+        const dateFilter = overrideFilters.filters.find((f) => f.filterType === 'date_range');
+        loadFiltersForReport(reportId, initiator, [
+            ...(dateFilter
+                ? [
+                    {
+                        ...dateFilter,
+                        dateField: [reports[reportId]?.dateField],
+                    },
+                ]
+                : []),
+            ...(overrideFilters.filters.filter((f) => f.filterType !== 'date_range') ?? []),
+        ], overrideFilters.editedFilterLabel, customFilters.map(Filter_1.convertCustomFilter));
+    };
+    return { reload };
+};
+exports.useReport = useReport;

package/dist/cjs/index.d.ts

@@ -14,7 +14,8 @@ export type { ReportBuilderProps } from './ReportBuilder';
 export { default as ChartEditor } from './ChartEditor';
 export type { ChartEditorProps } from './ChartEditor';
 export { quillFormat as format } from './utils/valueFormatter';
-export { useDashboard, useReports, useDashboards } from './hooks/useDashboard';
+export { useDashboard, useDashboards } from './hooks/useDashboard';
+export { useReports } from './hooks/useReport';
 export { useQuill } from './hooks/useQuill';
 export { useExport } from './hooks/useExport';
 export { useMemoizedRows } from './hooks/useFormat';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAChF,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,YAAY,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACxE,YAAY,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,YAAY,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,WAAW,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,YAAY,EACV,uBAAuB,EACvB,oBAAoB,EACpB,0BAA0B,EAC1B,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,EACpB,mBAAmB,EACnB,kBAAkB,EAClB,MAAM,EACN,mBAAmB,EACnB,WAAW,GACZ,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,0BAA0B,EAC1B,6BAA6B,EAC7B,4BAA4B,EAC5B,2BAA2B,EAC3B,yBAAyB,EACzB,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AACvC,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,YAAY,EACV,6BAA6B,EAC7B,qBAAqB,EACrB,SAAS,GACV,MAAM,wCAAwC,CAAC;AAChD,YAAY,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EACL,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,UAAU,GACX,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAChF,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,YAAY,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACxE,YAAY,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,YAAY,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,WAAW,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,YAAY,EACV,uBAAuB,EACvB,oBAAoB,EACpB,0BAA0B,EAC1B,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,EACpB,mBAAmB,EACnB,kBAAkB,EAClB,MAAM,EACN,mBAAmB,EACnB,WAAW,GACZ,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,0BAA0B,EAC1B,6BAA6B,EAC7B,4BAA4B,EAC5B,2BAA2B,EAC3B,yBAAyB,EACzB,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AACvC,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,YAAY,EACV,6BAA6B,EAC7B,qBAAqB,EACrB,SAAS,GACV,MAAM,wCAAwC,CAAC;AAChD,YAAY,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EACL,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,UAAU,GACX,MAAM,iBAAiB,CAAC"}

package/dist/cjs/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FilterType = exports.NumberOperator = exports.DateOperator = exports.NullOperator = exports.StringOperator = exports.Calculation = exports.ThemeContext = exports.downloadCSV = exports.useVirtualTables = exports.useAskQuill = exports.useMemoizedRows = exports.useExport = exports.useQuill = exports.useDashboards = exports.useReports = exports.useDashboard = exports.format = exports.ChartEditor = exports.ReportBuilder = exports.SchemaListComponent = exports.SQLEditor = exports.Table = exports.Chart = exports.QuillProvider = exports.Dashboard = void 0;
+exports.FilterType = exports.NumberOperator = exports.DateOperator = exports.NullOperator = exports.StringOperator = exports.Calculation = exports.ThemeContext = exports.downloadCSV = exports.useVirtualTables = exports.useAskQuill = exports.useMemoizedRows = exports.useExport = exports.useQuill = exports.useReports = exports.useDashboards = exports.useDashboard = exports.format = exports.ChartEditor = exports.ReportBuilder = exports.SchemaListComponent = exports.SQLEditor = exports.Table = exports.Chart = exports.QuillProvider = exports.Dashboard = void 0;
 // src/index.ts
 var Dashboard_1 = require("./Dashboard");
 Object.defineProperty(exports, "Dashboard", { enumerable: true, get: function () { return __importDefault(Dashboard_1).default; } });
@@ -24,8 +24,9 @@ var valueFormatter_1 = require("./utils/valueFormatter");
 Object.defineProperty(exports, "format", { enumerable: true, get: function () { return valueFormatter_1.quillFormat; } });
 var useDashboard_1 = require("./hooks/useDashboard");
 Object.defineProperty(exports, "useDashboard", { enumerable: true, get: function () { return useDashboard_1.useDashboard; } });
-Object.defineProperty(exports, "useReports", { enumerable: true, get: function () { return useDashboard_1.useReports; } });
 Object.defineProperty(exports, "useDashboards", { enumerable: true, get: function () { return useDashboard_1.useDashboards; } });
+var useReport_1 = require("./hooks/useReport");
+Object.defineProperty(exports, "useReports", { enumerable: true, get: function () { return useReport_1.useReports; } });
 var useQuill_1 = require("./hooks/useQuill");
 Object.defineProperty(exports, "useQuill", { enumerable: true, get: function () { return useQuill_1.useQuill; } });
 var useExport_1 = require("./hooks/useExport");

package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts.map

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

package/dist/cjs/internals/ReportBuilder/PivotModal.js

@@ -987,6 +987,7 @@ function getDateString(value, dateRange, dateBucket) {
         field: 'date',
         // @ts-ignore
         fields: [{ field: 'date', format }],
+        dateRange,
     });
 }
 function isDateField(fieldType) {

package/dist/cjs/utils/dataProcessing.js

@@ -98,8 +98,8 @@ const getPointToPointPercentageChange = (data) => {
                 start: minDate,
                 end: maxDate,
             });
-            const minDateBucket = (0, PivotModal_1.getDateString)(minDate.toISOString().split('T')[0], undefined, dateBucket);
-            const maxDateBucket = (0, PivotModal_1.getDateString)(maxDate.toISOString().split('T')[0], undefined, dateBucket);
+            const minDateBucket = (0, PivotModal_1.getDateString)(minDate.toISOString(), undefined, dateBucket);
+            const maxDateBucket = (0, PivotModal_1.getDateString)(maxDate.toISOString(), undefined, dateBucket);
             const minDateRows = data.rows.filter((row) => {
                 const rowValue = row[dateField];
                 if (rowValue) {

package/dist/cjs/utils/filterProcessing.d.ts

@@ -1,4 +1,4 @@
-import { FieldType, InternalFilter, DashboardFilter, DashboardDateFilter } from '../models/Filter';
+import { FieldType, InternalFilter, DashboardDateFilter, Filter, DashboardFilter } from '../models/Filter';
 import { QuillReport } from '../models/Report';
 import { UniqueValuesByColumn } from '../models/Tables';
 import { FilterTreeNode } from './astFilterProcessing';
@@ -27,6 +27,7 @@ export declare function buildQueryFromFilters(baseAst: any, filters: FilterTreeN
     query?: string;
     error?: string;
 }>;
+export declare function applyCustomFilterToDashDateFilter(customDateFilter: Filter, dashboardDateFilter: DashboardDateFilter): DashboardDateFilter;
 export declare function mergeCustomFilters(filters: DashboardFilter[], customFilters: InternalFilter[]): any[];
 export declare function filtersAreEquivalent(filters1?: InternalFilter[], filters2?: InternalFilter[]): boolean;
 /**

package/dist/cjs/utils/filterProcessing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,SAAS,EACT,cAAc,EAEd,eAAe,EAEf,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAmB,MAAM,uBAAuB,CAAC;AAGxE,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAoB5D;AAMD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,GAAG,OAkBnD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,GAAG,EACX,KAAK,EAAE,GAAU,EACjB,UAAU,EAAE,GAAU,EACtB,aAAa,EAAE,MAAM,OAmGtB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,6EAwDhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAwB7D;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,GAAG,GAAG,cAAc,EAAE,CAoCrE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,GAAG,EAAE,yBAgCnD;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,cAAc,EAAE,EACzB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA2B/D;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,eAAe,EAAE,EAC1B,aAAa,EAAE,cAAc,EAAE,GAC9B,GAAG,EAAE,CAsCP;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,cAAc,EAAE,EAC3B,QAAQ,CAAC,EAAE,cAAc,EAAE,GAC1B,OAAO,CA+BT;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,oBAAoB,GAAG;IAC3E,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB,CASA;AAED,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,WAClB,WAAW,EAAE,iBACP,MAAM,KACpB,CAAC,mBAAmB,GAAG;IAAE,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GAAG,SAqDpD,CAAC"}
+{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,SAAS,EACT,cAAc,EAGd,mBAAmB,EACnB,MAAM,EAEN,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAmB,MAAM,uBAAuB,CAAC;AAGxE,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAoB5D;AAMD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,GAAG,OAkBnD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,GAAG,EACX,KAAK,EAAE,GAAU,EACjB,UAAU,EAAE,GAAU,EACtB,aAAa,EAAE,MAAM,OAmGtB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,6EAwDhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAwB7D;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,GAAG,GAAG,cAAc,EAAE,CAoCrE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,GAAG,EAAE,yBAgCnD;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,cAAc,EAAE,EACzB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA2B/D;AAED,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,mBAAmB,GACvC,mBAAmB,CAoJrB;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,eAAe,EAAE,EAC1B,aAAa,EAAE,cAAc,EAAE,GAC9B,GAAG,EAAE,CAyCP;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,cAAc,EAAE,EAC3B,QAAQ,CAAC,EAAE,cAAc,EAAE,GAC1B,OAAO,CA+BT;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,oBAAoB,GAAG;IAC3E,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB,CASA;AAED,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,WAClB,WAAW,EAAE,iBACP,MAAM,KACpB,CAAC,mBAAmB,GAAG;IAAE,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GAAG,SAqDpD,CAAC"}

package/dist/cjs/utils/filterProcessing.js

@@ -8,11 +8,12 @@ exports.filterSentence = filterSentence;
 exports.generateFilterStack = generateFilterStack;
 exports.filterStackToFilterTree = filterStackToFilterTree;
 exports.buildQueryFromFilters = buildQueryFromFilters;
+exports.applyCustomFilterToDashDateFilter = applyCustomFilterToDashDateFilter;
 exports.mergeCustomFilters = mergeCustomFilters;
 exports.filtersAreEquivalent = filtersAreEquivalent;
 exports.uniqueValuesToStringMap = uniqueValuesToStringMap;
+const date_fns_1 = require("date-fns");
 const dateRangePickerUtils_1 = require("../DateRangePicker/dateRangePickerUtils");
-// import { Client, QuillProviderClient } from '../models/Client';
 const Filter_1 = require("../models/Filter");
 const astFilterProcessing_1 = require("./astFilterProcessing");
 const textProcessing_1 = require("./textProcessing");
@@ -345,36 +346,181 @@ async function buildQueryFromFilters(baseAst, filters, endpoint, client) {
         return { success: false, error: `error: ${error.message}` };
     }
 }
+function applyCustomFilterToDashDateFilter(customDateFilter, dashboardDateFilter) {
+    if (customDateFilter.filterType === Filter_1.FilterType.DateCustomFilter &&
+        customDateFilter.value &&
+        typeof customDateFilter.value === 'object' &&
+        'startDate' in customDateFilter.value &&
+        'endDate' in customDateFilter.value) {
+        const startDate = customDateFilter.value.startDate;
+        const endDate = customDateFilter.value.endDate;
+        return {
+            ...dashboardDateFilter,
+            startDate: new Date(startDate),
+            endDate: new Date(endDate),
+        };
+    }
+    else if (customDateFilter.filterType === Filter_1.FilterType.DateFilter &&
+        customDateFilter.value &&
+        typeof customDateFilter.value === 'object' &&
+        'value' in customDateFilter.value &&
+        'unit' in customDateFilter.value) {
+        const { value, unit } = customDateFilter.value;
+        let processedUnit;
+        let processedValue = value;
+        switch (unit) {
+            case Filter_1.TimeUnit.Day:
+                processedUnit = 'days';
+                break;
+            case Filter_1.TimeUnit.Week:
+                processedUnit = 'weeks';
+                break;
+            case Filter_1.TimeUnit.Month:
+                processedUnit = 'months';
+                break;
+            case Filter_1.TimeUnit.Year:
+                processedUnit = 'years';
+                break;
+            case Filter_1.TimeUnit.Hour:
+                processedUnit = 'hours';
+                break;
+            case Filter_1.TimeUnit.Quarter:
+                processedUnit = 'months';
+                processedValue *= 3;
+                break;
+        }
+        switch (customDateFilter.operator) {
+            case Filter_1.DateOperator.InTheLast:
+                return {
+                    ...dashboardDateFilter,
+                    startDate: (0, date_fns_1.sub)(new Date(), { [processedUnit]: processedValue }),
+                    endDate: new Date(),
+                };
+            // This represents the previous period compared to the current period.
+            // For instance, if the current period is the last 30 days, the previous period would be the 30 days before that.
+            case Filter_1.DateOperator.InThePrevious:
+                return {
+                    ...dashboardDateFilter,
+                    startDate: (0, date_fns_1.sub)(new Date(), { [processedUnit]: processedValue * 2 }),
+                    endDate: (0, date_fns_1.sub)(new Date(), { [processedUnit]: processedValue }),
+                };
+            // This represents the current period, and value is always 0.
+            // For instance if today was the 5th of August, the current month would be from the 1st to the 5th of August.
+            case Filter_1.DateOperator.InTheCurrent:
+                switch (unit) {
+                    case Filter_1.TimeUnit.Day:
+                        return {
+                            ...dashboardDateFilter,
+                            startDate: (0, date_fns_1.startOfDay)(new Date()),
+                            endDate: (0, date_fns_1.endOfDay)(new Date()),
+                        };
+                    case Filter_1.TimeUnit.Week:
+                        return {
+                            ...dashboardDateFilter,
+                            startDate: (0, date_fns_1.sub)(new Date(), { days: new Date().getDay() }),
+                            endDate: new Date(),
+                        };
+                    case Filter_1.TimeUnit.Month:
+                        return {
+                            ...dashboardDateFilter,
+                            startDate: new Date(new Date().getFullYear(), new Date().getMonth(), 1),
+                            endDate: new Date(),
+                        };
+                    case Filter_1.TimeUnit.Year:
+                        return {
+                            ...dashboardDateFilter,
+                            startDate: new Date(new Date().getFullYear(), 0, 1),
+                            endDate: new Date(),
+                        };
+                    case Filter_1.TimeUnit.Quarter:
+                        return {
+                            ...dashboardDateFilter,
+                            startDate: new Date(new Date().getFullYear(), Math.floor(new Date().getMonth() / 3) * 3, 1),
+                            endDate: new Date(),
+                        };
+                    case Filter_1.TimeUnit.Hour:
+                        return {
+                            ...dashboardDateFilter,
+                            startDate: new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate(), new Date().getHours()),
+                            endDate: new Date(),
+                        };
+                }
+                break;
+            default:
+                return dashboardDateFilter;
+        }
+    }
+    else if (customDateFilter.filterType === Filter_1.FilterType.DateComparisonFilter &&
+        customDateFilter.value &&
+        typeof customDateFilter.value === 'string') {
+        const parsedDate = (0, date_fns_1.parse)(customDateFilter.value, 'yyyy-mm-dd', new Date());
+        switch (customDateFilter.operator) {
+            case Filter_1.DateOperator.GreaterThanOrEqualTo:
+                return {
+                    ...dashboardDateFilter,
+                    startDate: parsedDate,
+                    endDate: undefined,
+                };
+            case Filter_1.DateOperator.LessThanOrEqualTo:
+                return {
+                    ...dashboardDateFilter,
+                    startDate: undefined,
+                    endDate: parsedDate,
+                };
+            case Filter_1.DateOperator.LessThan:
+                return {
+                    ...dashboardDateFilter,
+                    startDate: undefined,
+                    endDate: (0, date_fns_1.sub)(parsedDate, { days: 1 }),
+                };
+            case Filter_1.DateOperator.GreaterThan:
+                return {
+                    ...dashboardDateFilter,
+                    startDate: (0, date_fns_1.sub)(parsedDate, { days: 1 }),
+                    endDate: undefined,
+                };
+            case Filter_1.DateOperator.EqualTo:
+                return {
+                    ...dashboardDateFilter,
+                    startDate: parsedDate,
+                    endDate: parsedDate,
+                };
+            default: return dashboardDateFilter;
+        }
+    }
+    return dashboardDateFilter;
+}
 function mergeCustomFilters(filters, customFilters) {
-    const customDateFilters = customFilters.filter((filter) => filter.filterType === Filter_1.FilterType.DateCustomFilter);
+    const customDateFilters = customFilters.filter((filter) => filter.filterType === Filter_1.FilterType.DateCustomFilter || filter.filterType === Filter_1.FilterType.DateFilter || filter.filterType === Filter_1.FilterType.DateComparisonFilter);
     if (customDateFilters.length === 0) {
         return filters.concat(customFilters);
     }
     const withoutDate = filters.filter((filter) => filter.filterType !== Filter_1.DashboardFilterType.Date);
     const customWithoutDate = customFilters.filter((filter) => filter.filterType !== Filter_1.FilterType.DateCustomFilter);
-    const startDate = customDateFilters[0]?.value.startDate;
-    const endDate = customDateFilters[0]?.value.endDate;
+    const withDate = filters.find((filter) => filter.filterType === Filter_1.DashboardFilterType.Date);
     return withoutDate
         .concat([
-        {
-            filterType: Filter_1.DashboardFilterType.Date,
-            label: 'Date',
-            field: customDateFilters[0].field,
-            table: customDateFilters[0].table,
-            options: undefined,
-            primaryRange: {
-                label: 'Custom',
-                value: 'custom',
-            },
-            dashboardName: 'none',
-            presetRanges: [],
-            preset: {
-                label: 'Custom',
-                value: 'custom',
+        withDate
+            ? applyCustomFilterToDashDateFilter(customDateFilters[0], withDate)
+            : {
+                filterType: Filter_1.DashboardFilterType.Date,
+                label: 'Date',
+                field: customDateFilters[0].field,
+                table: customDateFilters[0].table,
+                options: dateRangePickerUtils_1.defaultOptionsV2,
+                primaryRange: {
+                    label: 'Last 30 Days',
+                    value: 'LAST_30_DAYS',
+                },
+                dashboardName: 'none',
+                presetRanges: dateRangePickerUtils_1.defaultOptionsV2,
+                preset: {
+                    label: 'Last 30 Days',
+                    value: 'LAST_30_DAYS',
+                },
+                startDate: new Date(customDateFilters[0].value.startDate),
+                endDate: new Date(customDateFilters[0].value.endDate),
             },
-            startDate: new Date(startDate),
-            endDate: new Date(endDate),
-        },
     ])
         .concat(customWithoutDate);
 }

package/dist/cjs/utils/pivotConstructor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,mBAAmB,EAC3B,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,GAAG,EAChB,eAAe,CAAC,EAAE,GAAG,EACrB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAAC,OAAO,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC,CAoL1C"}
+{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,mBAAmB,EAC3B,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,GAAG,EAChB,eAAe,CAAC,EAAE,GAAG,EACrB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAAC,OAAO,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC,CAgO1C"}

package/dist/cjs/utils/pivotConstructor.js

@@ -73,7 +73,9 @@ async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilte
         label: (0, textProcessing_1.snakeCaseToTitleCase)((0, columnProcessing_1.processColumnName)(field.name.replace('comparison_', 'comparison '))),
         format: field.name === pivot.rowField
             ? 'string'
-            : (pivot.valueFieldType ?? 'whole_number'),
+            : (pivot.valueFieldType ?? pivot.aggregationType === 'percentage')
+                ? 'percentage'
+                : 'whole_number',
     }))
         .filter((field, index) => field.field !== 'comparison_' + pivot.rowField || index === 0)
         .sort((a, b) => {
@@ -88,9 +90,26 @@ async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilte
     if (pivot.rowField &&
         !['string', 'varchar'].includes(pivot.rowFieldType || '')) {
         rows.forEach((row) => {
-            row[pivot.rowField || ''] = (0, PivotModal_1.getDateString)(typeof row[pivot.rowField || ''] === 'object' // BigQuery
+            row.__quillRawDate = typeof row[pivot.rowField || ''] === 'object' // BigQuery
                 ? row[pivot.rowField || ''].value
-                : row[pivot.rowField || ''], undefined, dateBucket);
+                : row[pivot.rowField || ''];
+            let value = typeof row[pivot.rowField || ''] === 'object' // BigQuery
+                ? row[pivot.rowField || ''].value
+                : row[pivot.rowField || ''];
+            if (dateBucket === 'week' && dateFilter) {
+                const rowDate = new Date(value);
+                // check if row value is within dateFilter, else push it to within the date filter
+                if (rowDate < dateFilter.startDate) {
+                    value = dateFilter.startDate.toISOString();
+                }
+                else if (rowDate > dateFilter.endDate) {
+                    value = dateFilter.endDate.toISOString();
+                }
+            }
+            const dateString = (0, PivotModal_1.getDateString)(value, dateFilter
+                ? { start: dateFilter.startDate, end: dateFilter.endDate }
+                : undefined, dateBucket);
+            row[pivot.rowField || ''] = dateString;
         });
         // add a row for each date in the range that doesn't have a value
         if (pivot.rowField &&
@@ -100,27 +119,38 @@ async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilte
             const dateSet = new Set(rows.map((row) => row[pivot.rowField || '']));
             // create a loop that will go through each formatted date and add a row if it doesn't exist going to the current date
             for (let date = dateFilter.startDate; date <= dateFilter.endDate; date = new Date(date.getTime() + 24 * 60 * 60 * 1000)) {
-                const formattedDate = (0, PivotModal_1.getDateString)(date.toISOString().split('T')[0], undefined, dateBucket);
+                const formattedDate = (0, PivotModal_1.getDateString)(date.toISOString(), { start: dateFilter.startDate, end: dateFilter.endDate }, dateBucket);
                 if (!dateSet.has(formattedDate)) {
                     const newRow = {};
                     newRow[pivot.rowField] = formattedDate;
+                    newRow.__quillRawDate = date.toISOString();
                     rows.push(newRow);
                     dateSet.add(formattedDate);
                 }
-                // order the rows by the date field
-                // rows.sort((a: any, b: any) => {
-                //   return compareValues(a, b, pivot.rowField ?? '');
-                // });
             }
         }
+        // sort the rows by date
+        rows.sort((a, b) => {
+            if (a.__quillRawDate < b.__quillRawDate) {
+                return -1;
+            }
+            if (a.__quillRawDate > b.__quillRawDate) {
+                return 1;
+            }
+            return 0;
+        });
+        // remove the raw date field
+        // rows.forEach((row: any) => {
+        //   delete row.__quillRawDate;
+        // });
     }
     if (pivot.sort) {
         rows.sort((a, b) => {
             if (pivot.sortDirection === 'ASC') {
-                return (0, valueFormatter_1.compareValues)(a, b, pivot.sortField ?? '');
+                return (0, valueFormatter_1.compareValues)(a, b, pivot.sortField || '');
             }
             else {
-                return (0, valueFormatter_1.compareValues)(b, a, pivot.sortField ?? '');
+                return (0, valueFormatter_1.compareValues)(b, a, pivot.sortField || '');
             }
         });
     }
@@ -133,6 +163,13 @@ async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilte
             column.label = 'Count';
         }
     });
+    // If a numeric column field is not present add it with a value of 0
+    const numericColumns = columns?.filter((column) => column.format === 'whole_number' || column.format === 'percentage');
+    rows.forEach((row) => {
+        numericColumns?.forEach((column) => {
+            row[column.field] = row[column.field] ?? 0;
+        });
+    });
     return {
         rows: rows,
         columns: columns ?? [],

package/dist/cjs/utils/queryConstructor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAoBxC,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,uBAAuB,CAAC,EAAE,OAAO,EACjC,sBAAsB,CAAC,EAAE,OAAO,UAqEjC;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAwDD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAsBrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAYrB;AAiDD,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAarB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,GAAG,SAAS,CAgCpB"}
+{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAoBxC,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,uBAAuB,CAAC,EAAE,OAAO,EACjC,sBAAsB,CAAC,EAAE,OAAO,UAqEjC;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAwDD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAsBrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAYrB;AAiDD,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAcrB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,GAAG,SAAS,CAgCpB"}

package/dist/cjs/utils/queryConstructor.js

@@ -191,11 +191,12 @@ function generateDistinctQuerySnowflake(stringFields, query) {
 }
 function generateMinMaxRangeQueries(columnFields, query, databaseType) {
     const max = databaseType.toLowerCase() === 'snowflake' ? 'GREATEST' : 'MAX';
+    const min = databaseType.toLowerCase() === 'snowflake' ? 'LEAST' : 'MIN';
     const distinctQueries = columnFields.map((field) => {
         const wrappedField = ['postgresql'].includes(databaseType.toLowerCase())
             ? `"${field}"`
             : field;
-        return `SELECT '${field}' AS field, MIN(${wrappedField}) AS min_range, ${max}(${wrappedField}) AS max_range FROM querytable`;
+        return `SELECT '${field}' AS field, ${min}(${wrappedField}) AS min_range, ${max}(${wrappedField}) AS max_range FROM querytable`;
     });
     const distinctQuery = distinctQueries.join(' UNION ALL ');
     return `WITH querytable AS (${query.replace(';', '')}) ` + distinctQuery;
@@ -578,5 +579,5 @@ function createAggregationValuePivot(pivot, itemQueries, databaseType, rowLimit)
       quill_qt_agg AS (SELECT ${aggregationType}(${valueAlias}) as ${processColumnReference(`${valueField}`, databaseType)} FROM quill_alias)
       ${compareCTE} ${aliasCTE} ${compareAggregation}
       SELECT * FROM quill_qt_agg qt
-      ${joinQuery}${rowLimit ? ` LIMIT ${rowLimit}` : ''}`;
+      ${joinQuery} ${rowLimit ? ` LIMIT ${rowLimit}` : ''}`;
 }

package/dist/cjs/utils/report.d.ts

@@ -46,7 +46,7 @@ export declare function saveReport({ report, dashboardItemId, client, }: {
     client: QuillProviderClient;
 }): Promise<any>;
 export declare const formatRowsFromReport: (report: any) => any;
-export declare function convertInternalReportToReport(report: QuillReportInternal, dashboardFilters: DashboardFilter[]): QuillReport;
+export declare function convertInternalReportToReport(report: QuillReportInternal, dashboardFilters: DashboardFilter[], initiator?: string): QuillReport;
 export declare const fetchReportBuilderDataFromAST: (baseAst: any, formData: any, schema: Table[], client: QuillProviderClient, pivot?: Pivot, previousFormData?: any, currentTable?: string, previousRelevant?: {
     uniqueStrings: UniqueValuesByTable;
     dateRanges: DateRangesByColumn;