@quillsql/react 2.13.7 → 2.13.9

package/dist/cjs/utils/filterProcessing.js

@@ -1,6 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uniqueValuesToStringMap = exports.buildQueryFromFilters = exports.filterStackToFilterTree = exports.generateFilterStack = exports.filterSentence = exports.getType = exports.updateFilter = exports.processFilterFromBackend = exports.findAndProcessDateFilter = void 0;
+exports.getType = void 0;
+exports.findAndProcessDateFilter = findAndProcessDateFilter;
+exports.processFilterFromBackend = processFilterFromBackend;
+exports.updateFilter = updateFilter;
+exports.filterSentence = filterSentence;
+exports.generateFilterStack = generateFilterStack;
+exports.filterStackToFilterTree = filterStackToFilterTree;
+exports.buildQueryFromFilters = buildQueryFromFilters;
+exports.uniqueValuesToStringMap = uniqueValuesToStringMap;
 const dateRangePickerUtils_1 = require("../DateRangePicker/dateRangePickerUtils");
 const Filter_1 = require("../models/Filter");
 const astFilterProcessing_1 = require("./astFilterProcessing");
@@ -23,7 +31,6 @@ function findAndProcessDateFilter(filters) {
         endDate: new Date(dateFilter.values[1]),
     };
 }
-exports.findAndProcessDateFilter = findAndProcessDateFilter;
 function isValidDate(date) {
     return !isNaN(Date.parse(date));
 }
@@ -45,7 +52,6 @@ function processFilterFromBackend(filter) {
     }
     return filter;
 }
-exports.processFilterFromBackend = processFilterFromBackend;
 function updateFilter(filter, value = null, comparison = null, dashboardName) {
     //for dateObjects only, since values are arrays for dateObjects
     const { ...filterWithoutSelectedValue } = filter;
@@ -79,8 +85,10 @@ function updateFilter(filter, value = null, comparison = null, dashboardName) {
                     return {
                         label: elem.label,
                         value: elem.value,
-                        startDate: dateRangePickerUtils_1.PRIMARY_RANGE[elem.value].start,
-                        endDate: dateRangePickerUtils_1.PRIMARY_RANGE[elem.value].end,
+                        startDate: (dateRangePickerUtils_1.PRIMARY_RANGE[elem.value] ??
+                            dateRangePickerUtils_1.PRIMARY_RANGE['LAST_30_DAYS']).startDate,
+                        endDate: (dateRangePickerUtils_1.PRIMARY_RANGE[elem.value] ??
+                            dateRangePickerUtils_1.PRIMARY_RANGE['LAST_30_DAYS']).endDate,
                     };
                 }
                 return {
@@ -95,15 +103,15 @@ function updateFilter(filter, value = null, comparison = null, dashboardName) {
             (filter.comparison && filter.comparisonRange.value !== 'NO_COMPARISON')) {
             const key = comparison?.value || filter.comparisonRange.value;
             let primaryRange = {
-                start: value ? value.startDate : filter.startDate,
-                end: value ? value.endDate : filter.endDate,
+                startDate: value ? value.startDate : filter.startDate,
+                endDate: value ? value.endDate : filter.endDate,
             };
             if (value && value.preset) {
                 primaryRange = (0, dateRangePickerUtils_1.getRangeFromPresetOptions)(value.preset, presetsOptions);
             }
             return {
-                startDate: primaryRange.start,
-                endDate: primaryRange.end,
+                startDate: primaryRange.startDate,
+                endDate: primaryRange.endDate,
                 filterType: 'date_range',
                 label: 'Date',
                 field: 'date_range',
@@ -111,8 +119,9 @@ function updateFilter(filter, value = null, comparison = null, dashboardName) {
                 options: filter.options,
                 comparison: true,
                 comparisonRange: {
-                    startDate: dateRangePickerUtils_1.COMPARISON_RANGE[key](primaryRange)?.start,
-                    endDate: dateRangePickerUtils_1.COMPARISON_RANGE[key](primaryRange)?.end,
+                    startDate: dateRangePickerUtils_1.COMPARISON_RANGE[key](primaryRange)
+                        ?.startDate,
+                    endDate: dateRangePickerUtils_1.COMPARISON_RANGE[key](primaryRange)?.endDate,
                     value: key,
                 },
                 dashboardName: name,
@@ -122,14 +131,14 @@ function updateFilter(filter, value = null, comparison = null, dashboardName) {
             const primaryRange = value && value.preset
                 ? (0, dateRangePickerUtils_1.getRangeFromPresetOptions)(value.preset, presetsOptions)
                 : {
-                    start: value?.startDate || filter.startDate,
-                    end: value?.endDate || filter.endDate,
+                    startDate: value?.startDate || filter.startDate,
+                    endDate: value?.endDate || filter.endDate,
                 };
             return {
                 ...filter,
                 preset: filter.preset,
-                startDate: primaryRange.start,
-                endDate: primaryRange.end,
+                startDate: primaryRange.startDate,
+                endDate: primaryRange.endDate,
                 filterType: 'date_range',
                 field: 'date_range',
                 options: filter.options,
@@ -139,7 +148,6 @@ function updateFilter(filter, value = null, comparison = null, dashboardName) {
         }
     }
 }
-exports.updateFilter = updateFilter;
 // Function to translate field type to "string", "numeric", or "date"
 const getType = (t) => {
     // strip any size numbers at the end
@@ -162,7 +170,7 @@ const getType = (t) => {
         case 'longtext':
         case 'longblob':
         case 'text':
-            return Filter_1.FieldTypes.String;
+            return Filter_1.FieldType.String;
         case 'numeric':
         case 'bit':
         case 'tinybit':
@@ -180,7 +188,7 @@ const getType = (t) => {
         case 'smallmoney':
         case 'money':
         case 'real':
-            return Filter_1.FieldTypes.Number;
+            return Filter_1.FieldType.Number;
         case 'date':
         case 'datetime':
         case 'datetime2':
@@ -190,12 +198,12 @@ const getType = (t) => {
         case 'timestamptz':
         case 'time':
         case 'year':
-            return Filter_1.FieldTypes.Date;
+            return Filter_1.FieldType.Date;
         case 'bool':
         case 'boolean':
-            return Filter_1.FieldTypes.Boolean;
+            return Filter_1.FieldType.Boolean;
         default:
-            return Filter_1.FieldTypes.String;
+            return Filter_1.FieldType.String;
     }
 };
 exports.getType = getType;
@@ -204,7 +212,7 @@ exports.getType = getType;
  */
 function filterSentence(filter) {
     let value = '';
-    if (filter.filterType == Filter_1.FilterNames.NullFilter) {
+    if (filter.filterType == Filter_1.FilterType.NullFilter) {
         return `${(0, textProcessing_1.snakeAndCamelCaseToTitleCase)(filter.field)} ${filter.operator}`;
     }
     else if (filter.value === null || filter.value === undefined) {
@@ -232,7 +240,6 @@ function filterSentence(filter) {
     }
     return `${(0, textProcessing_1.snakeAndCamelCaseToTitleCase)(filter.field)} ${filter.operator}${filter.operator === 'is' || filter.operator === 'is not' ? ' one of' : ''} ${value}`;
 }
-exports.filterSentence = filterSentence;
 /**
  * Function that flattens a tree of filters into an array
  */
@@ -268,7 +275,6 @@ function generateFilterStack(filterTree) {
     });
     return filterStack;
 }
-exports.generateFilterStack = generateFilterStack;
 /**
  * Given an array of Filters (presumed to be in in-order state), generate
  * the corresponding Filter tree. Essentially the reverse of what traverseTree does
@@ -306,7 +312,6 @@ function filterStackToFilterTree(stack) {
     }
     return buildTree(0);
 }
-exports.filterStackToFilterTree = filterStackToFilterTree;
 /**
  * This function uses the baseAst and forms a SQL query using the a filters array
  */
@@ -337,7 +342,6 @@ async function buildQueryFromFilters(baseAst, filters, endpoint, client) {
         return { success: false, error: `error: ${error.message}` };
     }
 }
-exports.buildQueryFromFilters = buildQueryFromFilters;
 /**
  * Helper function that converts a UniqueValuesByColumn interface to a string map
  */
@@ -351,4 +355,3 @@ function uniqueValuesToStringMap(uniqueValues) {
     }
     return fieldValues;
 }
-exports.uniqueValuesToStringMap = uniqueValuesToStringMap;

package/dist/cjs/utils/getDomain.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = getDomain;
 /**
  * Calculates the adjusted domain for numeric values in the specified fields of the given data.
  * @param data - The data containing numeric fields.
@@ -31,7 +32,6 @@ function getDomain(data, fields) {
     }
     return fuzzyRound(Math.min(minValue, 0), maxValue);
 }
-exports.default = getDomain;
 // Rounds the range to 4 equally-spaced increments of nice,round numbers.
 function fuzzyRound(min, max) {
     const range = parseFloat((max - min).toPrecision(1));

package/dist/cjs/utils/logging.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.internalLog = void 0;
+exports.internalLog = internalLog;
 /* eslint-disable no-undef */
 function internalLog(message, ...optionalParams) {
     if (process.env.QUILL_ENV === 'development') {
@@ -8,4 +8,3 @@ function internalLog(message, ...optionalParams) {
         console.log(completeMessage);
     }
 }
-exports.internalLog = internalLog;

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

@@ -1,2 +1,2 @@
-export declare function mergeComparisonRange(resp: any): void;
+export declare function mergeComparisonRange(resp: any): any;
 //# sourceMappingURL=merge.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/utils/merge.ts"],"names":[],"mappings":"AAAA,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,QAI7C"}
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/utils/merge.ts"],"names":[],"mappings":"AAAA,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,GAAG,GAAG,CAInD"}

package/dist/cjs/utils/merge.js

@@ -1,22 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeComparisonRange = void 0;
+exports.mergeComparisonRange = mergeComparisonRange;
 function mergeComparisonRange(resp) {
     if (resp.chartType === 'table')
-        return;
-    mergeForwards(resp);
+        return resp;
+    return mergeForwards(resp);
     // mergeBackwards(resp); // uncomment to switch back and forth
 }
-exports.mergeComparisonRange = mergeComparisonRange;
 function mergeForwards(resp) {
     const compRows = resp.compareRows;
-    let j = 0;
-    for (let i = 0; i < resp.rows.length; i++) {
-        if (j < compRows.length) {
-            for (const [key, value] of Object.entries(compRows[j])) {
-                resp.rows[i][`comparison_${key}`] = value;
+    if (!compRows)
+        return resp;
+    const newRows = resp.rows.map((row, i) => {
+        if (i < compRows.length) {
+            const compRow = compRows[i];
+            const newRow = { ...row };
+            for (const [key, value] of Object.entries(compRow)) {
+                newRow[`comparison_${key}`] = value;
             }
+            return newRow;
         }
-        j++;
-    }
+        return row;
+    });
+    return { ...resp, rows: newRows };
 }

package/dist/cjs/utils/monacoConfig.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateSuggestionsByDatasource = exports.generateSuggestionsBySchema = exports.QUILL_LANGUAGE = void 0;
+exports.QUILL_LANGUAGE = void 0;
+exports.generateSuggestionsBySchema = generateSuggestionsBySchema;
+exports.generateSuggestionsByDatasource = generateSuggestionsByDatasource;
 const queryConstructor_1 = require("./queryConstructor");
 exports.QUILL_LANGUAGE = {
     monarchTokensProvider: {
@@ -300,7 +302,6 @@ function generateSuggestionsBySchema(schema, monaco, range, databaseType) {
     }, []);
     return suggestions;
 }
-exports.generateSuggestionsBySchema = generateSuggestionsBySchema;
 function generateSuggestionsByDatasource(monaco, range, databaseType) {
     if (!databaseType) {
         return GENERIC_DATASOURCE_SUGGESTIONS(monaco, range);
@@ -321,4 +322,3 @@ function generateSuggestionsByDatasource(monaco, range, databaseType) {
             return GENERIC_DATASOURCE_SUGGESTIONS(monaco, range);
     }
 }
-exports.generateSuggestionsByDatasource = generateSuggestionsByDatasource;

package/dist/cjs/utils/paginationProcessing.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shouldSortInMemory = exports.shouldFetchMore = exports.DEFAULT_PAGINATION = void 0;
+exports.DEFAULT_PAGINATION = void 0;
+exports.shouldFetchMore = shouldFetchMore;
+exports.shouldSortInMemory = shouldSortInMemory;
 exports.DEFAULT_PAGINATION = {
     page: 0,
     rowsPerPage: 10,
@@ -17,7 +19,6 @@ function shouldFetchMore(pagination, page, maxPage) {
         pagination.rowsPerRequest);
     return pageInterval > previousPageInterval;
 }
-exports.shouldFetchMore = shouldFetchMore;
 function shouldSortInMemory(pagination, rowCount, isPivot) {
     if (isPivot) {
         return true;
@@ -27,4 +28,3 @@ function shouldSortInMemory(pagination, rowCount, isPivot) {
     }
     return false;
 }
-exports.shouldSortInMemory = shouldSortInMemory;

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

@@ -1,8 +1,8 @@
 import { QuillProviderClient } from '../models/Client';
 import { Pivot } from '../models/Pivot';
 import { QuillReportInternal } from '../models/Report';
-export declare function generatePivotWithSQL(pivot: Pivot, report: QuillReportInternal, client: QuillProviderClient, dateBucket?: string, dateFilter?: any, distinctStrings?: any): Promise<{
-    rows: any;
-    columns: any;
-} | undefined>;
+export declare function generatePivotWithSQL(pivot: Pivot, report: QuillReportInternal, client: QuillProviderClient, dateBucket?: string, dateFilter?: any, distinctStrings?: any, rowLimit?: number): Promise<{
+    rows: any[];
+    columns: any[];
+}>;
 //# sourceMappingURL=pivotConstructor.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAOvD,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;;;eAuMtB"}
+{"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"}

package/dist/cjs/utils/pivotConstructor.js

@@ -1,28 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generatePivotWithSQL = void 0;
-const ChartBuilder_1 = require("../ChartBuilder");
-const ast_1 = require("../components/ReportBuilder/ast");
+exports.generatePivotWithSQL = generatePivotWithSQL;
 const PivotModal_1 = require("../internals/ReportBuilder/PivotModal");
 const columnProcessing_1 = require("./columnProcessing");
 const dataFetcher_1 = require("./dataFetcher");
 const dates_1 = require("./dates");
 const queryConstructor_1 = require("./queryConstructor");
 const textProcessing_1 = require("./textProcessing");
-async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilter, distinctStrings) {
-    if (dateFilter && dateFilter.startDate) {
-        dateFilter.start = dateFilter.startDate;
-        dateFilter.end = dateFilter.endDate;
-        if (dateFilter.comparisonRange && dateFilter.comparisonRange.startDate) {
-            dateFilter.comparisonRange.start = dateFilter.comparisonRange.startDate;
-            dateFilter.comparisonRange.end = dateFilter.comparisonRange.endDate;
-        }
-    }
+const valueFormatter_1 = require("./valueFormatter");
+async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilter, distinctStrings, rowLimit) {
     let comparisonInterval = undefined;
     if (dateFilter && dateFilter.comparisonRange) {
         comparisonInterval = (0, dates_1.getComparisonInterval)({
-            startDate: dateFilter.comparisonRange.start,
-            endDate: dateFilter.comparisonRange.end,
+            startDate: dateFilter.comparisonRange.startDate,
+            endDate: dateFilter.comparisonRange.endDate,
         }, dateBucket);
     }
     if (pivot.rowField && !pivot.rowFieldType) {
@@ -35,129 +26,115 @@ async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilte
         distinctStringValues = distinctValues.map((value) => value.toString());
     }
     if (!report.itemQuery) {
-        return undefined;
+        throw Error('No item query found in report');
     }
-    const sqlQuery = (0, queryConstructor_1.generatePivotQuery)(pivot, report.itemQuery, client.databaseType || 'postgresql', comparisonInterval, distinctStrings ? distinctStrings : distinctStringValues, dateBucket);
-    if (sqlQuery && report.rows.length > 0) {
-        const hostedBody = {
-            metadata: {
-                preQueries: [sqlQuery],
-                task: 'query',
-                orgId: client.organizationId || '*',
-                clientId: client.publicKey,
-                databaseType: client?.databaseType,
-                getCustomFields: false,
-                runQueryConfig: {
-                    overridePost: true,
-                    convertDatatypes: true,
-                },
-                useNewNodeSql: true,
+    const sqlQuery = (0, queryConstructor_1.generatePivotQuery)(pivot, report.itemQuery, client.databaseType || 'postgresql', comparisonInterval, distinctStrings ? distinctStrings : distinctStringValues, dateBucket, rowLimit);
+    if (!sqlQuery || report.rows.length == 0) {
+        throw 'No rows found in report';
+    }
+    const hostedBody = {
+        metadata: {
+            preQueries: [sqlQuery],
+            task: 'query',
+            orgId: client.organizationId || '*',
+            clientId: client.publicKey,
+            databaseType: client?.databaseType,
+            getCustomFields: false,
+            runQueryConfig: {
+                overridePost: true,
+                convertDatatypes: true,
             },
-        };
-        const cloudBody = { ...hostedBody };
-        const resp = await (0, dataFetcher_1.getData)(client, 'query', 'same-origin', hostedBody, cloudBody, 'POST', 'fetch-pivot');
-        if (resp.success === false) {
-            console.error('Error:', resp.errorMessage); // surface to devs
-        }
-        // With our current design we have to remove the second row field but leave the first for comparison purposes.
-        const rows = resp?.queryResults?.[0]?.rows || [];
-        if (pivot.columnField &&
-            client.databaseType?.toLowerCase() === 'bigquery') {
-            rows.forEach((row) => {
-                Object.keys(row).forEach((key) => {
-                    const processedKey = (0, columnProcessing_1.processColumnName)(key);
-                    if (processedKey !== key) {
-                        row[processedKey] = row[key];
-                        delete row[key];
-                    }
-                });
+            useNewNodeSql: true,
+        },
+    };
+    const cloudBody = { ...hostedBody };
+    const resp = await (0, dataFetcher_1.getData)(client, 'query', 'same-origin', hostedBody, cloudBody, 'POST', 'fetch-pivot');
+    if (resp.success === false) {
+        throw resp.errorMessage;
+    }
+    // With our current design we have to remove the second row field but leave the first for comparison purposes.
+    const rows = pivot.rowField
+        ? (resp?.queryResults?.[0]?.rows || []).map((row) => !row[pivot.rowField] ? { ...row, [pivot.rowField]: '-' } : row)
+        : resp?.queryResults?.[0]?.rows || [];
+    if (pivot.columnField && client.databaseType?.toLowerCase() === 'bigquery') {
+        rows.forEach((row) => {
+            Object.keys(row).forEach((key) => {
+                const processedKey = (0, columnProcessing_1.processColumnName)(key);
+                if (processedKey !== key) {
+                    row[processedKey] = row[key];
+                    delete row[key];
+                }
             });
+        });
+    }
+    const columns = resp?.queryResults?.[0]?.fields
+        ?.map((field) => ({
+        field: (0, columnProcessing_1.processColumnName)(field.name),
+        label: (0, textProcessing_1.snakeCaseToTitleCase)((0, columnProcessing_1.processColumnName)(field.name.replace('comparison_', 'comparison '))),
+        format: field.name === pivot.rowField
+            ? 'string'
+            : (pivot.valueFieldType ?? 'whole_number'),
+    }))
+        .filter((field, index) => field.field !== 'comparison_' + pivot.rowField || index === 0)
+        .sort((a, b) => {
+        if (a.field === pivot.rowField) {
+            return -1;
         }
-        const columns = resp?.queryResults?.[0]?.fields
-            ?.map((field) => ({
-            field: (0, columnProcessing_1.processColumnName)(field.name),
-            label: (0, textProcessing_1.snakeCaseToTitleCase)((0, columnProcessing_1.processColumnName)(field.name.replace('comparison_', 'comparison '))),
-            format: field.name === pivot.rowField
-                ? 'string'
-                : (pivot.valueFieldType ?? 'whole_number'),
-        }))
-            .filter((field, index) => field.field !== 'comparison_' + pivot.rowField || index === 0)
-            .sort((a, b) => {
-            if (a.field === pivot.rowField) {
-                return -1;
-            }
-            if (b.field === pivot.rowField) {
-                return 1;
-            }
-            return 0;
+        if (b.field === pivot.rowField) {
+            return 1;
+        }
+        return 0;
+    });
+    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[pivot.rowField || ''].value
+                : row[pivot.rowField || ''], undefined, dateBucket);
         });
+        // add a row for each date in the range that doesn't have a value
         if (pivot.rowField &&
-            !['string', 'varchar'].includes(pivot.rowFieldType || '')) {
-            rows.forEach((row) => {
-                row[pivot.rowField || ''] = (0, PivotModal_1.getDateString)(row[pivot.rowField || ''], undefined, dateBucket);
-            });
-            // add a row for each date in the range that doesn't have a value
-            if (pivot.rowField &&
-                pivot.rowFieldType &&
-                !['string', 'varchar'].includes(pivot.rowFieldType) &&
-                dateFilter) {
-                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.start ?? dateFilter.startDate; date <= dateFilter.end; date = new Date(date.getTime() + 24 * 60 * 60 * 1000)) {
-                    const formattedDate = (0, PivotModal_1.getDateString)(date.toDateString(), undefined, dateBucket);
-                    if (!dateSet.has(formattedDate)) {
-                        const newRow = {};
-                        newRow[pivot.rowField] = formattedDate;
-                        rows.push(newRow);
-                        dateSet.add(formattedDate);
-                    }
-                    // order the rows by the date field
-                    rows.sort((a, b) => {
-                        return new Date(a[pivot.rowField || '']) <
-                            new Date(b[pivot.rowField || ''])
-                            ? -1
-                            : 1;
-                    });
+            pivot.rowFieldType &&
+            !['string', 'varchar'].includes(pivot.rowFieldType) &&
+            dateFilter) {
+            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.toDateString(), undefined, dateBucket);
+                if (!dateSet.has(formattedDate)) {
+                    const newRow = {};
+                    newRow[pivot.rowField] = formattedDate;
+                    rows.push(newRow);
+                    dateSet.add(formattedDate);
                 }
+                // order the rows by the date field
+                rows.sort((a, b) => {
+                    return (0, valueFormatter_1.compareValues)(a, b, pivot.rowField ?? '');
+                });
             }
         }
-        if (pivot.sort) {
-            rows.sort((a, b) => {
-                if (pivot.sortDirection === 'ASC') {
-                    if (ChartBuilder_1.dateFormatOptions.includes(pivot.sortFieldType ?? '')) {
-                        // @ts-ignore
-                        return new Date(a[pivot.sortField]) - new Date(b[pivot.sortField]);
-                    }
-                    else if ((0, ast_1.isNumericColumnType)(pivot.sortFieldType)) {
-                        return a[pivot.sortField] - b[pivot.sortField];
-                    }
-                    return a[pivot.sortField].localeCompare(b[pivot.sortField]);
-                }
-                else {
-                    if (ChartBuilder_1.dateFormatOptions.includes(pivot.sortFieldType ?? '')) {
-                        // @ts-ignore
-                        return new Date(b[pivot.sortField]) - new Date(a[pivot.sortField]);
-                    }
-                    else if ((0, ast_1.isNumericColumnType)(pivot.sortFieldType)) {
-                        return b[pivot.sortField] - a[pivot.sortField];
-                    }
-                    return b[pivot.sortField].localeCompare(a[pivot.sortField]);
-                }
-            });
-        }
-        // for the case of count agg on no value field
-        columns?.forEach((column) => {
-            if (column.label &&
-                ['null', 'undefined'].includes(column.label.toLowerCase()) &&
-                !pivot.valueField &&
-                pivot.aggregationType === 'count') {
-                column.label = 'Count';
+    }
+    if (pivot.sort) {
+        rows.sort((a, b) => {
+            if (pivot.sortDirection === 'ASC') {
+                return (0, valueFormatter_1.compareValues)(a, b, pivot.sortField ?? '');
+            }
+            else {
+                return (0, valueFormatter_1.compareValues)(b, a, pivot.sortField ?? '');
             }
         });
-        return {
-            rows: rows,
-            columns: columns ?? [],
-        };
     }
+    // for the case of count agg on no value field
+    columns?.forEach((column) => {
+        if (column.label &&
+            ['null', 'undefined'].includes(column.label.toLowerCase()) &&
+            !pivot.valueField &&
+            pivot.aggregationType === 'count') {
+            column.label = 'Count';
+        }
+    });
+    return {
+        rows: rows,
+        columns: columns ?? [],
+    };
 }
-exports.generatePivotWithSQL = generatePivotWithSQL;

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

@@ -1 +1 @@
-{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAIxD,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,EAAE,GACxB,MAAM,CAuCR;AAkBD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,WA0BxC;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,EAAE,oBAAoB;;;;EAqDnC;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,eAAe,EAAE;IACf,SAAS,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,GAAG,CAAC;IAClB,WAAW,EAAE,GAAG,CAAC;CAClB,GACA,KAAK,CAqCP;AAED,eAAO,MAAM,eAAe,WAAY,GAAG,SAAS,KAAK,YA8BxD,CAAC"}
+{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAIxD,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,EAAE,GACxB,MAAM,CAuCR;AAkBD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,WA0BxC;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,EAAE,oBAAoB;;;;EAsDnC;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,eAAe,EAAE;IACf,SAAS,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,GAAG,CAAC;IAClB,WAAW,EAAE,GAAG,CAAC;CAClB,GACA,KAAK,CA8BP;AAED,eAAO,MAAM,eAAe,WAAY,GAAG,SAAS,KAAK,YA8BxD,CAAC"}