@quillsql/react 2.12.29 → 2.12.30

package/dist/cjs/utils/filterProcessing.js

@@ -28,8 +28,8 @@ function processFilterFromBackend(filter, rows) {
     if (filter.filterType === 'date_range') {
         return {
             ...filter,
-            startDate: new Date(filter.startDate),
-            endDate: new Date(filter.endDate),
+            startDate: filter.startDate ? new Date(filter.startDate) : undefined,
+            endDate: filter.endDate ? new Date(filter.endDate) : undefined,
             options: dateRangePickerUtils_1.defaultOptionsV2,
             comparisonRange: {
                 ...filter.comparisonRange,
@@ -53,12 +53,12 @@ function processFilterFromBackend(filter, rows) {
 exports.processFilterFromBackend = processFilterFromBackend;
 function updateFilter(filter, value = null, comparison = null) {
     //for dateObjects only, since values are arrays for dateObjects
-    const { selectedValue: _, operator, ...filterWithoutSelectedValue } = filter; // _ is a throwaway variable
+    const { ...filterWithoutSelectedValue } = filter;
     if (filter.filterType === 'string') {
         let selectedValue = {};
         if (value) {
             if (filter.stringFilterType === 'multiselect') {
-                const parsedValue = JSON.parse(value);
+                const parsedValue = value;
                 if (parsedValue.length === 0) {
                     selectedValue = { values: [] };
                 }

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

@@ -1 +1 @@
-{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../../src/utils/logging.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,cAAc,EAAE,GAAG,EAAE,QAKpE"}
+{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../../src/utils/logging.ts"],"names":[],"mappings":"AACA,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,cAAc,EAAE,GAAG,EAAE,QAKpE"}

package/dist/cjs/utils/logging.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.internalLog = void 0;
+/* eslint-disable no-undef */
 function internalLog(message, ...optionalParams) {
     if (process.env.QUILL_ENV === 'development') {
         const completeMessage = `Quill: ${message}: ${optionalParams.join('\n')}`;

package/dist/cjs/utils/merge.js

@@ -20,24 +20,3 @@ function mergeForwards(resp) {
         j++;
     }
 }
-// eslint-disable-next-line no-unused-vars
-function mergeBackwards(resp) {
-    const compRows = resp.compareRows;
-    let j = compRows.length - 1;
-    for (let i = resp.rows.length - 1; i >= 0; i--) {
-        if (j >= 0) {
-            for (const [key, value] of Object.entries(compRows[j])) {
-                resp.rows[i][`comparison_${key}`] = value;
-            }
-        }
-        j--;
-    }
-    while (j >= 0) {
-        const obj = {};
-        for (const [key, value] of Object.entries(compRows[j])) {
-            obj[`comparison_${key}`] = value;
-        }
-        resp.rows.push(obj);
-        j--;
-    }
-}

package/dist/cjs/utils/{monacoAutocomplete.d.ts → monacoConfig.d.ts}

@@ -5,9 +5,10 @@ interface CompletionItem {
     kind: number;
     insertText: string;
     insertTextRules: number;
-    range: any;
+    range: Range;
     detail?: string;
 }
+export declare const QUILL_LANGUAGE: any;
 export declare function generateSuggestionsBySchema(schema: any[], monaco: Monaco, range: Range, databaseType: string): CompletionItem[];
 export declare function generateSuggestionsByDatasource(monaco: Monaco, range: Range, databaseType: string): {
     label: string;
@@ -17,4 +18,4 @@ export declare function generateSuggestionsByDatasource(monaco: Monaco, range: R
     range: Range;
 }[];
 export {};
-//# sourceMappingURL=monacoAutocomplete.d.ts.map
+//# sourceMappingURL=monacoConfig.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"monacoConfig.d.ts","sourceRoot":"","sources":["../../../src/utils/monacoConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAGtC,UAAU,cAAc;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,cAAc,EAAE,GAmJ5B,CAAC;AAyJF,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,GAAG,EAAE,EACb,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,MAAM,GACnB,cAAc,EAAE,CA2BlB;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,MAAM;;;;;;IAoBrB"}

package/dist/cjs/utils/monacoConfig.js

@@ -0,0 +1,324 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateSuggestionsByDatasource = exports.generateSuggestionsBySchema = exports.QUILL_LANGUAGE = void 0;
+const queryConstructor_1 = require("./queryConstructor");
+exports.QUILL_LANGUAGE = {
+    monarchTokensProvider: {
+        defaultToken: '',
+        tokenPostfix: '.pgsql',
+        keywords: [
+            'SELECT',
+            'select',
+            'FROM',
+            'fromt',
+            'WHERE',
+            'where',
+            'IF',
+            'if',
+            'THEN',
+            'then',
+            'ELSE',
+            'ELSIF',
+            'CASE',
+            'case',
+            'WHEN',
+            'when',
+            'NULL',
+            'null',
+            'TRUE',
+            'true',
+            'FALSE',
+            'false',
+            'AS',
+            'as',
+            'LEFT',
+            'left',
+            'INNER',
+            'inner',
+            'JOIN',
+            'join',
+        ],
+        operators: [
+            '=',
+            '<',
+            '>',
+            '<=',
+            '>=',
+            '<>',
+            '!=',
+            '!',
+            '&&',
+            '||',
+            '++',
+            '--',
+            '+',
+            '-',
+            '*',
+            '/',
+            '%',
+            '<<',
+            '>>',
+            '&',
+            '|',
+            '^',
+            '~',
+            '::',
+        ],
+        symbols: '[=><!~?:&|+\\-*\\/\\^%]+',
+        tokenizer: {
+            root: [
+                [
+                    /[a-zA-Z_$][\w$]*/,
+                    {
+                        cases: {
+                            '@keywords': 'keyword',
+                            '@default': 'identifier',
+                        },
+                    },
+                ],
+                { include: '@whitespace' },
+                ['[{}()\\[\\]]', '@brackets'],
+                ['[<>](?!@symbols)', '@brackets'],
+                [
+                    '@symbols',
+                    {
+                        cases: {
+                            '@operators': 'operator',
+                            '@default': '',
+                        },
+                    },
+                ],
+                ['\\d*\\.\\d+([eE][\\-+]?\\d+)?', 'number.float'],
+                ['\\d+', 'number'],
+                ['[;,.]', 'delimiter'],
+                ["'([^'\\\\]|\\\\.)*$", 'string.invalid'],
+                ["'", 'string', '@string'],
+            ],
+            whitespace: [
+                ['[ \\t\\r\\n]+', ''],
+                ['--.*$', 'comment'],
+                ['\\/\\*', 'comment', '@comment'],
+            ],
+            comment: [
+                ['[^\\/*]+', 'comment'],
+                ['\\*\\/', 'comment', '@pop'],
+                ['[\\/*]', 'comment'],
+            ],
+            string: [
+                ["[^\\\\']+", 'string'],
+                ['\\\\.', 'string.escape'],
+                ["'", 'string', '@pop'],
+                ['"[^\\\\"]*"', 'string'],
+                ['"', 'string', '@dblString'],
+            ],
+            dblString: [
+                ['[^\\\\"]+', 'string'],
+                ['\\\\.', 'string.escape'],
+                ['"', 'string', '@pop'],
+            ],
+        },
+    },
+    languageConfiguration: {
+        comments: {
+            lineComment: '--',
+            blockComment: ['/*', '*/'],
+        },
+        brackets: [
+            ['{', '}'],
+            ['[', ']'],
+            ['(', ')'],
+        ],
+        autoClosingPairs: [
+            { open: '{', close: '}' },
+            { open: '[', close: ']' },
+            { open: '(', close: ')' },
+            { open: "'", close: "'" },
+        ],
+        surroundingPairs: [
+            { open: '{', close: '}' },
+            { open: '[', close: ']' },
+            { open: '(', close: ')' },
+            { open: '"', close: '"' },
+            { open: "'", close: "'" },
+        ],
+    },
+};
+const GENERIC_DATASOURCE_SUGGESTIONS = (monaco, range) => {
+    return [
+        {
+            label: 'SELECT',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'SELECT',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'FROM',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'FROM',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'JOIN',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'JOIN',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'LEFT JOIN',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'LEFT JOIN',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'INNER JOIN',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'INNER JOIN',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'MAX',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'MAX',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'MIN',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'MIN',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'ON',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'ON',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'WHERE',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'WHERE',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'LIMIT',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'LIMIT',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'GROUP BY',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'GROUP BY',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'ORDER BY',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'ORDER BY',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+    ];
+};
+const POSTGRES_DATASOURCE_SUGGESTIONS = (monaco, range) => {
+    return [
+        {
+            label: 'EXTRACT',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'EXTRACT',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'TO_TIMESTAMP',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'TO_TIMESTAMP',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'CURRENT_DATE',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'CURRENT_DATE',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+        {
+            label: 'CURRENT_TIMESTAMP',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'CURRENT_TIMESTAMP',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+    ];
+};
+const BIGQUERY_DATASOURCE_SUGGESTIONS = (monaco, range) => {
+    return [
+        {
+            label: 'TO_TIMESTAMP',
+            kind: monaco.languages.CompletionItemKind.Keyword,
+            insertText: 'TO_TIMESTAMP',
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        },
+    ];
+};
+function generateSuggestionsBySchema(schema, monaco, range, databaseType) {
+    const suggestions = [];
+    schema.forEach((table) => {
+        const curSuggestion = {
+            label: table.name,
+            kind: monaco.languages.CompletionItemKind.Field,
+            insertText: `${(0, queryConstructor_1.processColumnReference)(table.name, databaseType).replaceAll('`', '')}`,
+            insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+            range,
+        };
+        suggestions.push(curSuggestion);
+        table.columns.forEach((column) => {
+            const insertText = `${(0, queryConstructor_1.processColumnReference)(column.name, databaseType).replaceAll('`', '')}`;
+            const curSuggestion = {
+                label: column.name,
+                kind: monaco.languages.CompletionItemKind.Field,
+                insertText,
+                detail: table.name,
+                insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+                range,
+            };
+            suggestions.push(curSuggestion);
+        });
+    }, []);
+    return suggestions;
+}
+exports.generateSuggestionsBySchema = generateSuggestionsBySchema;
+function generateSuggestionsByDatasource(monaco, range, databaseType) {
+    if (!databaseType) {
+        return GENERIC_DATASOURCE_SUGGESTIONS(monaco, range);
+    }
+    switch (databaseType.toLowerCase()) {
+        case 'snowflake':
+        case 'postgresql':
+            return [
+                ...POSTGRES_DATASOURCE_SUGGESTIONS(monaco, range),
+                ...GENERIC_DATASOURCE_SUGGESTIONS(monaco, range),
+            ];
+        case 'bigquery':
+            return [
+                ...BIGQUERY_DATASOURCE_SUGGESTIONS(monaco, range),
+                ...GENERIC_DATASOURCE_SUGGESTIONS(monaco, range),
+            ];
+        default:
+            return GENERIC_DATASOURCE_SUGGESTIONS(monaco, range);
+    }
+}
+exports.generateSuggestionsByDatasource = generateSuggestionsByDatasource;

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

@@ -0,0 +1,5 @@
+import { Pagination } from '../models/Pagination';
+export declare const DEFAULT_PAGINATION: Pagination;
+export declare function shouldFetchMore(pagination: Pagination, page: number, maxPage: number): boolean;
+export declare function shouldSortInMemory(pagination: Pagination, rowCount?: number, isPivot?: boolean): boolean;
+//# sourceMappingURL=paginationProcessing.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"paginationProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/paginationProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,eAAO,MAAM,kBAAkB,EAAE,UAIhC,CAAC;AAEF,wBAAgB,eAAe,CAC7B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,WAehB;AAED,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,UAAU,EACtB,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,OAAO,WASlB"}

package/dist/cjs/utils/paginationProcessing.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shouldSortInMemory = exports.shouldFetchMore = exports.DEFAULT_PAGINATION = void 0;
+exports.DEFAULT_PAGINATION = {
+    page: 0,
+    rowsPerPage: 20,
+    rowsPerRequest: 500,
+};
+function shouldFetchMore(pagination, page, maxPage) {
+    if (!pagination) {
+        return false;
+    }
+    const indexAdjustedPage = page;
+    const pageInterval = Math.floor((indexAdjustedPage * pagination.rowsPerPage) / pagination.rowsPerRequest);
+    const indexAdjustedPreviousPage = maxPage;
+    const previousPageInterval = Math.floor((indexAdjustedPreviousPage * pagination.rowsPerPage) /
+        pagination.rowsPerRequest);
+    return pageInterval > previousPageInterval;
+}
+exports.shouldFetchMore = shouldFetchMore;
+function shouldSortInMemory(pagination, rowCount, isPivot) {
+    if (isPivot) {
+        return true;
+    }
+    if (!rowCount || rowCount < pagination.rowsPerRequest) {
+        return true;
+    }
+    return false;
+}
+exports.shouldSortInMemory = shouldSortInMemory;

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

@@ -1 +1 @@
-{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAiB,MAAM,uCAAuC,CAAC;AAO7E,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,GAAG,EACX,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,GAAG,EAChB,eAAe,CAAC,EAAE,GAAG;;;eAsKtB"}
+{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAiB,MAAM,uCAAuC,CAAC;AAO7E,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,GAAG,EACX,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,GAAG,EAChB,eAAe,CAAC,EAAE,GAAG;;;eAkLtB"}

package/dist/cjs/utils/pivotConstructor.js

@@ -48,6 +48,7 @@ async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilte
                     overridePost: true,
                     convertDatatypes: true,
                 },
+                useNewNodeSql: true,
             },
         };
         const cloudBody = { ...hostedBody };
@@ -131,6 +132,14 @@ async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilte
                 }
             });
         }
+        // for the case of count agg on no value field
+        columns.forEach((column) => {
+            if (['null', 'undefined'].includes(column.label.toLowerCase()) &&
+                !pivot.valueField &&
+                pivot.aggregationType === 'count') {
+                column.label = 'Count';
+            }
+        });
         return {
             rows: rows,
             columns: columns,

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

@@ -1 +1 @@
-{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAC9D,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAG3D,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,EAAE,GACxB,MAAM,CAsCR;AAkBD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,WAgBxC;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE;;;;EAsCvC;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"}
+{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,EAAE,GACxB,MAAM,CAsCR;AAkBD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,WA0BxC;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE;;;;EAsCvC;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"}

package/dist/cjs/utils/pivotProcessing.js

@@ -49,10 +49,16 @@ function isValidPivot(pivot) {
     if (pivot.rowField && pivot.aggregationType === 'count') {
         return true;
     }
-    else if (pivot.rowField && pivot.valueField && pivot.aggregationType) {
+    else if (pivot.rowField &&
+        pivot.valueField &&
+        pivot.aggregationType &&
+        !pivot.columnField) {
         return true;
     }
-    else if (pivot.valueField && pivot.aggregationType) {
+    else if (pivot.valueField &&
+        pivot.aggregationType &&
+        !pivot.columnField &&
+        !pivot.rowField) {
         return true;
     }
     else if (pivot.rowField &&
@@ -65,10 +71,10 @@ function isValidPivot(pivot) {
 }
 exports.isValidPivot = isValidPivot;
 function getPossiblePivotFieldOptions(columns, uniqueValues) {
-    let rowFields = [];
-    let columnFields = [];
-    let valueFields = [];
-    for (let column of columns) {
+    const rowFields = [];
+    const columnFields = [];
+    const valueFields = [];
+    for (const column of columns) {
         // row fields can be dates or strings
         if (valueFormatter_1.DATE_FORMAT_TYPES.includes(column.format)) {
             rowFields.push(column.field);

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,uCAAuC,CAAC;AAmB9D,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAa1E;AA4CD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAUrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UASrB;AAED,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,GAClB,MAAM,GAAG,SAAS,CAwBpB"}
+{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAmB9D,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAa1E;AAgDD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAUrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UASrB;AAED,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,GAClB,MAAM,GAAG,SAAS,CAwBpB"}

package/dist/cjs/utils/queryConstructor.js

@@ -50,7 +50,9 @@ function processDateTrunc(dateBucket, rowField, databaseType, comparisonInterval
     return `TIMESTAMP_TRUNC(${date}, ${dateBucket})`;
 }
 function processValueField(aggType, databaseType, valueField) {
-    if (aggType === 'min' || aggType === 'max')
+    if (aggType === 'min' ||
+        aggType === 'max' ||
+        aggType?.toLowerCase() === 'average')
         return `${processColumnReference(valueField, databaseType)} ELSE null`;
     if (aggType === 'count')
         return `1 ELSE 0`;
@@ -144,7 +146,6 @@ function create2DDatePivotQuery(pivot, itemQueries, columnFieldValues, databaseT
         return undefined;
     }
     const rowField = pivot.rowField;
-    const valueField = pivot.valueField;
     const columnField = pivot.columnField;
     const caseWhens = columnFieldValues.map((column) => {
         return `${processAggType(pivot.aggregationType, true)}(CASE WHEN qt.${processColumnReference(columnField, databaseType)} = '${processSingleQuotes(column, databaseType)}' THEN ${processValueField(pivot.aggregationType, databaseType, pivot.valueField)} END) AS ${processColumnReference(column, databaseType)}`;
@@ -212,7 +213,7 @@ function create1DDatePivotQuery(pivot, itemQueries, dateBucket = 'month', databa
 }
 function createAggregationValuePivot(pivot, itemQueries, databaseType) {
     const valueField = pivot.valueField;
-    let aggregationType = processAggType(pivot.aggregationType);
+    const aggregationType = processAggType(pivot.aggregationType);
     if (!pivot.valueField)
         return undefined;
     const compareCTE = itemQueries[1]

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

@@ -0,0 +1,7 @@
+import { AdditionalProcessing } from './tableProcessing';
+export declare function fetchReport(reportId: string, client: any, useReportTask?: boolean, filters?: any[], additionalProcessing?: AdditionalProcessing, dateBucket?: string, customFields?: any): Promise<{
+    report: any;
+    error?: string;
+}>;
+export declare const formatRowsFromReport: (report: any) => any;
+//# sourceMappingURL=report.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/utils/report.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,EACX,aAAa,UAAO,EACpB,OAAO,GAAE,GAAG,EAAO,EACnB,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,GAAG,GACjB,OAAO,CAAC;IAAE,MAAM,EAAE,GAAG,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAsF1C;AAED,eAAO,MAAM,oBAAoB,WAAY,GAAG,QAe/C,CAAC"}

package/dist/cjs/utils/report.js

@@ -0,0 +1,93 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatRowsFromReport = exports.fetchReport = void 0;
+const dashboard_1 = require("./dashboard");
+const dataFetcher_1 = require("./dataFetcher");
+const error_1 = require("./error");
+const errorProcessing_1 = require("./errorProcessing");
+const logging_1 = require("./logging");
+const merge_1 = require("./merge");
+const valueFormatter_1 = require("./valueFormatter");
+async function fetchReport(reportId, client, useReportTask = true, filters = [], additionalProcessing, dateBucket, customFields) {
+    let reportInfo = undefined;
+    let errorMessage = undefined;
+    try {
+        // Remove extra fields on each filter so we don't confuse the backend.
+        const hostedBody = {
+            metadata: {
+                reportId,
+                dashboardItemId: reportId,
+                orgId: client.customerId || '*',
+                clientId: client.publicKey,
+                task: useReportTask ? 'report' : 'item',
+                databaseType: client.databaseType,
+                filters: filters,
+                customFields,
+                additionalProcessing,
+                useNewNodeSql: true,
+            },
+        };
+        const cloudBody = {
+            id: reportId,
+            filters: filters,
+            useNewNodeSql: true,
+        };
+        const resp = await (0, dataFetcher_1.getData)(client, 'itempost', 'omit', hostedBody, cloudBody, 'POST', 'fetch-data');
+        (0, errorProcessing_1.processFilterErrorList)(resp);
+        const dashboardItem = { ...resp, filtersApplied: filters };
+        if (resp.errorMessage) {
+            throw new error_1.DataLoadError(resp?.errorMessage, { ...resp, useReportTask });
+        }
+        if (resp.compareRows) {
+            (0, merge_1.mergeComparisonRange)(resp);
+        }
+        reportInfo = await (0, dashboard_1.cleanDashboardItem)(dashboardItem, filters, client, dateBucket);
+        if (additionalProcessing) {
+            reportInfo.pagination = additionalProcessing.page;
+            reportInfo.sort = additionalProcessing.sort;
+        }
+    }
+    catch (error) {
+        if (error instanceof error_1.DataLoadError) {
+            if (error.data.useReportTask) {
+                (0, logging_1.internalLog)('USING ITEM AS BACKUP');
+                const { report, error } = await fetchReport(reportId, client, false, filters, additionalProcessing, dateBucket, customFields);
+                reportInfo = report;
+                errorMessage = error;
+            }
+            else {
+                reportInfo = {
+                    ...error.data.data,
+                    id: error.data.data._id,
+                    error: error.message,
+                    adminError: error.data.adminErrorMessage,
+                };
+                errorMessage = error.message;
+            }
+        }
+        else {
+            reportInfo = {
+                id: reportId,
+                rows: [],
+                columns: [],
+            };
+            errorMessage = error.message;
+        }
+    }
+    return { report: reportInfo, error: errorMessage };
+}
+exports.fetchReport = fetchReport;
+const formatRowsFromReport = (report) => {
+    return report.rows.map((row) => {
+        return report.columns.reduce((formattedRow, column) => {
+            // Apply the format function to each field in the row
+            const formattedValue = (0, valueFormatter_1.quillFormat)({
+                value: row[column.field],
+                format: column.format,
+            });
+            formattedRow[column.field] = formattedValue;
+            return formattedRow;
+        }, {});
+    });
+};
+exports.formatRowsFromReport = formatRowsFromReport;

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AAuBA,eAAO,MAAM,kBAAkB,WAAkB,GAAG,oCA6EnD,CAAC;AAEF,eAAO,MAAM,6BAA6B,WAChC,GAAG;;;EA2CZ,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AAkDA,eAAO,MAAM,kBAAkB,WAAkB,GAAG,oCA+EnD,CAAC;AAEF,eAAO,MAAM,6BAA6B,WAChC,GAAG;;;EA6CZ,CAAC"}