@quillsql/react 2.12.46 → 2.12.48

package/dist/cjs/utils/astProcessing.js

@@ -5,7 +5,7 @@ const ast_1 = require("../components/ReportBuilder/ast");
 const convert_1 = require("../components/ReportBuilder/convert");
 const util_1 = require("../components/ReportBuilder/util");
 const constants_1 = require("./constants");
-const schema_1 = require("./schema");
+const tableProcessing_1 = require("./tableProcessing");
 function getSelectFromAST(ast) {
     if (Array.isArray(ast)) {
         return ast[0];
@@ -246,12 +246,15 @@ function getColumnsByTableFromASTAndSchema(ast, tables, tableAliasMap) {
                     const tableInfo = tables.find((tableInfo) => tableInfo.name === table);
                     if (!tableInfo)
                         continue;
-                    const columnNames = tableInfo.columns.map((column) => column.name);
+                    const columnNames = tableInfo.columns.map((column) => column.field);
                     if (columnNames.includes(column.value)) {
                         tableName = table;
                         break;
                     }
                 }
+                if (tableName === '') {
+                    return;
+                }
                 if (!referencedColumns[tableName]) {
                     referencedColumns[tableName] = [];
                 }
@@ -400,8 +403,9 @@ const fetchAndProcessASTFromPrompt = async (aiPrompt, schema, client, prevPivot,
         if (!tableInfo) {
             throw new Error('Table info not found');
         }
+        const uniqueValues = await (0, tableProcessing_1.getUniqueStringValues)(tableInfo.columns, processedName, client);
         newAst = (0, convert_1.convertUnaryToBinary)(newAst);
-        newAst = (0, util_1.removeNonSelectedTableReferences)(newAst, processedName, tableInfo.columns.map((col) => col.field));
+        newAst = (0, util_1.removeNonSelectedTableReferences)(newAst, processedName, tableInfo.columns.map((col) => col.field), uniqueValues);
         if (pivot) {
             newAst = (0, util_1.deepCopy)({ ...newAst, orderby: null, limit: null });
         }
@@ -455,14 +459,10 @@ const fetchASTFromQuillReport = async (report, client, schema) => {
         convertedAst = (0, convert_1.convertWildcardColumns)(convertedAst, schema); // must go before groupby
         convertedAst = (0, convert_1.convertBigQuery)(convertedAst);
         schemaInfo = schema;
-        if (!schemaInfo) {
-            const { schemaData } = await (0, schema_1.getSchemaInfoWithCustomFields)(client, 'rb');
-            schemaInfo = schemaData;
-        }
         processApostrophe(convertedAst, ['type', 'value']);
         convertedAst = (0, convert_1.convertBigQuery)(convertedAst);
         ({ ast: newAst, pivot: groupByPivot } = (0, convert_1.convertGroupBy)(convertedAst, schemaInfo, report.pivot ? report.pivot : undefined));
-        newAst = groupByPivot ? newAst : convertedAst;
+        newAst = convertedAst;
     }
     catch (e) {
         console.log(e);

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

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/utils/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,eAAO,MAAM,YAAY,EAAE,MAS1B,CAAC;AAEF,wBAAsB,WAAW,CAC/B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,eAAe,UAAQ,EACvB,YAAY,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC,MAAM,CAAC,CAwBjB"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/utils/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,eAAO,MAAM,YAAY,EAAE,MAU1B,CAAC;AAEF,wBAAsB,WAAW,CAC/B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,eAAe,UAAQ,EACvB,YAAY,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC,MAAM,CAAC,CAwBjB"}

package/dist/cjs/utils/client.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchClient = exports.EMPTY_CLIENT = void 0;
 exports.EMPTY_CLIENT = {
+    name: '',
     customerId: '',
     clientId: '',
     userId: '',

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

@@ -1 +1 @@
-{"version":3,"file":"columnProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/columnProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAOvD,UAAU,6CAA6C;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,oCAAoC;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,KAAK,2BAA2B,GAC5B,6CAA6C,GAC7C,oCAAoC,CAAC;AAEzC,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,2BAA2B,GACjC,cAAc,CAyGhB;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AA0DD,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAsBlE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAY5D;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,eAAO,MAAM,cAAc,WAAY,mBAAmB,UAsDzD,CAAC"}
+{"version":3,"file":"columnProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/columnProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,UAAU,6CAA6C;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,oCAAoC;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,KAAK,2BAA2B,GAC5B,6CAA6C,GAC7C,oCAAoC,CAAC;AAEzC,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,2BAA2B,GACjC,cAAc,CAgJhB;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AAsED,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAwDlE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAY5D;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,eAAO,MAAM,cAAc,WAAY,mBAAmB,UAsDzD,CAAC"}

package/dist/cjs/utils/columnProcessing.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getYAxisFields = exports.processColumnName = exports.convertFormatToJsType = exports.convertFieldTypeToJSType = exports.convertColumnInfoToColumnInternal = exports.convertPostgresColumn = void 0;
 const filterProcessing_1 = require("./filterProcessing");
+const textProcessing_1 = require("./textProcessing");
 function removeBigQuerySpecialChars(columnName) {
     return columnName.replaceAll('quill_forward_slash', '/');
 }
@@ -29,8 +30,12 @@ function convertPostgresColumn(field) {
         case 1114: // timestamp
             format = 'MMM_dd_yyyy';
             break;
+        case 114: // json
+        case 199: // json[]
         case 1186: // interval
         case 1043: // varchar
+        case 3802: // jsonb
+        case 3807: // jsonb[]
         default:
             format = 'string';
     }
@@ -47,6 +52,12 @@ function convertPostgresColumn(field) {
         case 23: // int4
             fieldType = 'int4';
             break;
+        case 114: // json
+            fieldType = 'json';
+            break;
+        case 199: // json[]
+            fieldType = 'json[]';
+            break;
         case 700: // float4
             fieldType = 'float4';
             break;
@@ -71,6 +82,18 @@ function convertPostgresColumn(field) {
         case 1114: // timestamp
             fieldType = 'timestamp';
             break;
+        case 2950: // uuid
+            fieldType = 'uuid';
+            break;
+        case 2951: // uuid[]
+            fieldType = 'uuid[]';
+            break;
+        case 3802: // jsonb
+            fieldType = 'jsonb';
+            break;
+        case 3807: // jsonb[]
+            fieldType = 'jsonb[]';
+            break;
         case 1043: // varchar
         default:
             fieldType = 'varchar';
@@ -87,6 +110,14 @@ function convertPostgresColumn(field) {
         case 1700: // numeric
             jsType = 'number';
             break;
+        case 114: // json
+        case 3802: // jsonb
+            jsType = 'object';
+            break;
+        case 199:
+        case 3807:
+            jsType = 'object[]';
+            break;
         case 1082: // date
         case 1083: // time
         case 1184: // timestamptz
@@ -95,11 +126,19 @@ function convertPostgresColumn(field) {
             jsType = 'date';
             break;
         case 1043: // varchar
+        case 2950: // uuid
+            jsType = 'string';
+            break;
+        case 2951: // uuid[]
+            jsType = 'string[]';
+            break;
         default:
             jsType = 'string';
     }
     return {
-        label: 'field' in field ? field.field : field.name,
+        label: 'field' in field
+            ? (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(field.field)
+            : (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(field.name),
         field: 'field' in field ? field.field : field.name,
         format,
         fieldType,
@@ -152,6 +191,10 @@ function fieldTypeToDataTypeID(fieldType) {
             return 21;
         case 'int4':
             return 23;
+        case 'json':
+            return 114;
+        case 'json[]':
+            return 199;
         case 'float4':
             return 700;
         case 'float8':
@@ -168,33 +211,73 @@ function fieldTypeToDataTypeID(fieldType) {
             return 1114;
         case 'interval':
             return 1186;
+        case 'uuid':
+            return 2950;
+        case 'uuid[]':
+            return 2951;
+        case 'jsonb':
+            return 3802;
+        case 'jsonb[]':
+            return 3807;
         case 'varchar':
         default:
             return 1043;
     }
 }
 function convertFieldTypeToJSType(fieldType) {
+    let jsType = '';
     switch (fieldType) {
         case 'bool':
-            return 'bool';
+            jsType = 'bool';
+            break;
         case 'int8':
         case 'int2':
         case 'int4':
         case 'float4':
         case 'float8':
         case 'numeric':
-            return 'number';
+            jsType = 'number';
+            break;
         case 'date':
         case 'time':
         case 'timestamptz':
         case 'timestamp':
-            return 'date';
+            jsType = 'date';
+            break;
+        case 'json':
+        case 'jsonb':
+        case 'json[]':
+        case 'jsonb[]':
+        case 'int2[]':
+        case 'int4[]':
+        case 'int8[]':
+        case 'float4[]':
+        case 'float8[]':
+        case 'text[]':
+        case 'char[]':
+        case 'bool[]':
+        case 'uuid[]':
+        case 'varchar[]':
+        case 'interval[]':
+        case 'numeric[]':
+        case 'bytea[]':
+        case 'cidr[]':
+        case 'inet[]':
+        case 'macaddr[]':
+        case 'date[]':
+        case 'timestamp[]':
+        case 'timestamptz[]':
+        case 'timetz[]':
+            jsType = 'object';
+            break;
         case 'interval':
         case 'varchar':
         case 'text':
+        case 'uuid':
         default:
-            return 'string';
+            jsType = 'string';
     }
+    return jsType;
 }
 exports.convertFieldTypeToJSType = convertFieldTypeToJSType;
 function convertFormatToJsType(column) {

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

@@ -1 +1 @@
-{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AA8E1C,wBAAsB,OAAO,CAC3B,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,EACf,UAAU,CAAC,EAAE,MAAM,gBA6IpB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBA6BhB;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,GAAG,GACb,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAmB5C"}
+{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AA8E1C,wBAAsB,OAAO,CAC3B,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,EACf,UAAU,CAAC,EAAE,MAAM,gBAgJpB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBA6BhB;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,GAAG,GACb,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAmB5C"}

package/dist/cjs/utils/dataFetcher.js

@@ -57,7 +57,7 @@ async function testSqlViewState(hostedRequestBody, client, referencedTables) {
                 },
             };
             getData(client, 'test-view', 'same-origin', brokenBody, cloudBody);
-            errorMessage = `SQL View Error: '${table}' is out of sync with datasource.`;
+            errorMessage = `Virtual Table Error: '${table}' is out of sync with datasource.`;
         }
     }));
     return errorMessage;
@@ -86,18 +86,22 @@ async function getData(client, cloudQueryEndpoint, noCred, hostedRequestBody, cl
                 ['query', 'patterns', 'item'].includes(hostedRequestBody.metadata.task)) {
                 const brokenReport = { ...responseJson };
                 let errorPrefix = 'Error: ';
-                let errorMessage = 'Failed to fetch chart';
+                let errorMessage = 'Failed to fetch report: ' + responseJson.error;
                 if (hostedRequestBody.metadata.task === 'query' ||
                     hostedRequestBody.metadata.task === 'patterns') {
                     errorPrefix = 'SQL Error: ';
                     errorMessage = errorPrefix + responseJson.error;
                 }
+                else if (responseJson.error?.includes('Virtual Table Error')) {
+                    errorMessage = responseJson.error;
+                }
                 let adminErrorMessage = undefined;
                 const processedData = fetchQuillData(brokenReport);
                 if (processedData &&
                     processedData.data &&
                     processedData.data.referencedTables) {
-                    adminErrorMessage = await testSqlViewState(hostedRequestBody, client, processedData.data.referencedTables);
+                    adminErrorMessage =
+                        (await testSqlViewState(hostedRequestBody, client, processedData.data.referencedTables)) ?? undefined;
                 }
                 return {
                     success: false,

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

@@ -1,4 +1,6 @@
 import { FieldTypes, Filter } from '../models/Filter';
+import { UniqueValuesByColumn } from '../models/Tables';
+import { FilterTreeNode } from './astFilterProcessing';
 export declare function findAndProcessDateFilter(filters: any[]): any;
 export declare function processFilterFromBackend(filter: any): any;
 export declare function updateFilter(filter: any, value?: any, comparison?: any): any;
@@ -7,4 +9,27 @@ export declare const getType: (t: string) => FieldTypes.String | FieldTypes.Numb
  * Returns a sentence to describe a Filter
  */
 export declare function filterSentence(filter: Filter): string;
+/**
+ * Function that flattens a tree of filters into an array
+ */
+export declare function generateFilterStack(filterTree: any): FilterTreeNode[];
+/**
+ * Given an array of Filters (presumed to be in in-order state), generate
+ * the corresponding Filter tree. Essentially the reverse of what traverseTree does
+ */
+export declare function filterStackToFilterTree(stack: any[]): FilterTreeNode | null;
+/**
+ * This function uses the baseAst and forms a SQL query using the a filters array
+ */
+export declare function buildQueryFromFilters(baseAst: any, filters: FilterTreeNode[], endpoint: string, client: any): Promise<{
+    success: boolean;
+    query?: string;
+    error?: string;
+}>;
+/**
+ * Helper function that converts a UniqueValuesByColumn interface to a string map
+ */
+export declare function uniqueValuesToStringMap(uniqueValues: UniqueValuesByColumn): {
+    [key: string]: string[];
+};
 //# sourceMappingURL=filterProcessing.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,UAAU,EACV,MAAM,EAEP,MAAM,kBAAkB,CAAC;AAG1B,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,GAAE,GAAU,EACjB,UAAU,GAAE,GAAU,OAuGvB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,iFAwDhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAwBrD"}
+{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,UAAU,EACV,MAAM,EAEP,MAAM,kBAAkB,CAAC;AAC1B,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,GAAE,GAAU,EACjB,UAAU,GAAE,GAAU,OAuGvB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,iFAwDhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAwBrD;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;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,oBAAoB,GAAG;IAC3E,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB,CASA"}

package/dist/cjs/utils/filterProcessing.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.filterSentence = exports.getType = exports.updateFilter = exports.processFilterFromBackend = exports.findAndProcessDateFilter = void 0;
+exports.uniqueValuesToStringMap = exports.buildQueryFromFilters = exports.filterStackToFilterTree = exports.generateFilterStack = exports.filterSentence = exports.getType = exports.updateFilter = exports.processFilterFromBackend = exports.findAndProcessDateFilter = void 0;
 const dateRangePickerUtils_1 = require("../DateRangePicker/dateRangePickerUtils");
 const Filter_1 = require("../models/Filter");
+const astFilterProcessing_1 = require("./astFilterProcessing");
 const textProcessing_1 = require("./textProcessing");
 function findAndProcessDateFilter(filters) {
     let dateFilter = filters.find((filter) => filter.filterType === 'date_range');
@@ -238,3 +239,122 @@ 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
+ */
+function generateFilterStack(filterTree) {
+    if (!filterTree) {
+        return [];
+    }
+    const tree = filterTree;
+    let filterStack = [];
+    /**
+     * Function that takes in a FilterTree and flattens it into an array using in order traversal
+     */
+    function traverseTree(node) {
+        if (!node) {
+            return;
+        }
+        if (node.leaf) {
+            filterStack.push(node);
+        }
+        else {
+            traverseTree(node.leftNode);
+            filterStack.push(node);
+            traverseTree(node.rightNode);
+        }
+    }
+    traverseTree(tree);
+    // Remove null (invalid) filters from filter stack
+    filterStack = filterStack.filter((filter) => {
+        return ((!filter.leaf &&
+            filter.rightNode &&
+            (!filter.rightNode.leaf || filter.rightNode.value)) ||
+            (filter.leaf && filter.value));
+    });
+    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
+ */
+function filterStackToFilterTree(stack) {
+    function buildTree(i) {
+        const newNode = {
+            leaf: false,
+            operator: null,
+            leftNode: null,
+            rightNode: null,
+        };
+        if (i >= stack.length) {
+            return null;
+        }
+        else if (stack[i].leaf) {
+            if (i < stack.length - 1) {
+                // more nodes later
+                newNode.operator = stack[i + 1].operator;
+                newNode.leftNode = {
+                    leaf: true,
+                    leftNode: null,
+                    rightNode: null,
+                    operator: null,
+                    value: stack[i].value,
+                };
+                newNode.rightNode = buildTree(i + 2);
+            }
+            else {
+                newNode.leaf = true;
+                newNode.value = stack[i].value;
+            }
+        }
+        return newNode;
+    }
+    return buildTree(0);
+}
+exports.filterStackToFilterTree = filterStackToFilterTree;
+/**
+ * This function uses the baseAst and forms a SQL query using the a filters array
+ */
+async function buildQueryFromFilters(baseAst, filters, endpoint, client) {
+    const subTree = filterStackToFilterTree(filters);
+    let whereNode = null;
+    if (subTree) {
+        whereNode = (0, astFilterProcessing_1.filterTreeToAst)(subTree, client.databaseType.toLowerCase());
+    }
+    const queryAst = { ...baseAst, where: whereNode };
+    try {
+        const response = await fetch(`${endpoint}/sqlify`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                ast: queryAst,
+                publicKey: client.publicKey,
+                useNewNodeSql: true,
+            }),
+        });
+        const data = await response.json();
+        const query = data.query;
+        return { success: true, query };
+    }
+    catch (error) {
+        return { success: false, error: `error: ${error.message}` };
+    }
+}
+exports.buildQueryFromFilters = buildQueryFromFilters;
+/**
+ * Helper function that converts a UniqueValuesByColumn interface to a string map
+ */
+function uniqueValuesToStringMap(uniqueValues) {
+    const fieldValues = {};
+    for (const field of Object.keys(uniqueValues)) {
+        fieldValues[field] = [];
+        for (const value of Object.keys(uniqueValues[field] ?? {})) {
+            fieldValues[field].push(value);
+        }
+    }
+    return fieldValues;
+}
+exports.uniqueValuesToStringMap = uniqueValuesToStringMap;

package/dist/cjs/utils/paginationProcessing.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.shouldSortInMemory = exports.shouldFetchMore = exports.DEFAULT_PAGINATION = void 0;
 exports.DEFAULT_PAGINATION = {
     page: 0,
-    rowsPerPage: 20,
-    rowsPerRequest: 500,
+    rowsPerPage: 10,
+    rowsPerRequest: 1000,
 };
 function shouldFetchMore(pagination, page, maxPage) {
     if (!pagination) {

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,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,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,MAAM,EACd,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,GAAG,EAChB,eAAe,CAAC,EAAE,GAAG;;;eAmMtB"}
+{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,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,MAAM,EACd,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,GAAG,EAChB,eAAe,CAAC,EAAE,GAAG;;;eAuMtB"}

package/dist/cjs/utils/pivotConstructor.js

@@ -56,8 +56,11 @@ async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilte
         };
         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;
+        const rows = resp?.queryResults?.[0]?.rows || [];
         if (pivot.columnField &&
             client.databaseType?.toLowerCase() === 'bigquery') {
             rows.forEach((row) => {
@@ -70,8 +73,8 @@ async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilte
                 });
             });
         }
-        const columns = resp.queryResults[0].fields
-            .map((field) => ({
+        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
@@ -143,8 +146,9 @@ 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()) &&
+        columns?.forEach((column) => {
+            if (column.label &&
+                ['null', 'undefined'].includes(column.label.toLowerCase()) &&
                 !pivot.valueField &&
                 pivot.aggregationType === 'count') {
                 column.label = 'Count';
@@ -152,7 +156,7 @@ async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilte
         });
         return {
             rows: rows,
-            columns: columns,
+            columns: columns ?? [],
         };
     }
 }

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

@@ -1,5 +1,6 @@
 import { Pivot } from '../models/Pivot';
 export declare function processColumnReference(column: string, databaseType: string, fallbackOnNull?: string, isPivotFieldAlias?: boolean): string;
+export declare function replaceSpacesWithUnderscores(column: string): string;
 export declare function generateCountQuery(fields: string[], query: string, databaseType: string): string;
 export declare function generateDistinctQuery(stringFields: string[], query: string, databaseType: string): string;
 export declare function generateMinMaxRangeQueries(columnFields: string[], query: string, databaseType: string): string;

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;AAmBxC,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,iBAAiB,CAAC,EAAE,OAAO,UA+B5B;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,UAUrB;AAsDD,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,CAyBpB"}
+{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAmBxC,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,iBAAiB,CAAC,EAAE,OAAO,UAmC5B;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAwDD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAmBrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAUrB;AAsDD,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,CAyBpB"}

package/dist/cjs/utils/queryConstructor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generatePivotQuery = exports.generateMinMaxRangeQueries = exports.generateDistinctQuery = exports.generateCountQuery = exports.processColumnReference = void 0;
+exports.generatePivotQuery = exports.generateMinMaxRangeQueries = exports.generateDistinctQuery = exports.generateCountQuery = exports.replaceSpacesWithUnderscores = exports.processColumnReference = void 0;
 const pivotProcessing_1 = require("./pivotProcessing");
 function processSingleQuotes(value, databaseType) {
     if (['postgresql', 'snowflake'].includes(databaseType.toLowerCase())) {
@@ -40,6 +40,10 @@ isPivotFieldAlias) {
         if (column === '' && fallbackOnNull) {
             return `${fallbackOnNull}`;
         }
+        // Wrap in single quotes if contains whitespace or special characters and no single quotes
+        if (column.match(/[^a-zA-Z0-9_]/) && !column.includes("'")) {
+            return `'${column}'`;
+        }
         return `${column}`;
     }
     const columnParts = column.split('.');
@@ -49,23 +53,36 @@ isPivotFieldAlias) {
     return `\`${replaceBigQuerySpecialCharacters(column)}\``;
 }
 exports.processColumnReference = processColumnReference;
+function replaceSpacesWithUnderscores(column) {
+    return column.replaceAll(' ', '_');
+}
+exports.replaceSpacesWithUnderscores = replaceSpacesWithUnderscores;
 function processInterval(interval, rowField, databaseType) {
     if (['postgresql', 'snowflake'].includes(databaseType.toLowerCase())) {
         return `(${processColumnReference(rowField, databaseType)} + INTERVAL '${interval}')`;
     }
+    else if (databaseType.toLowerCase() === 'mysql') {
+        return `(${processColumnReference(rowField, databaseType)} + INTERVAL ${interval})`;
+    }
     return `TIMESTAMP_ADD(${processColumnReference(rowField, databaseType)}, INTERVAL ${interval} )`;
 }
 function processDateTrunc(dateBucket, rowField, databaseType, comparisonInterval) {
     if (['postgresql', 'snowflake'].includes(databaseType.toLowerCase())) {
-        const date = comparisonInterval
+        const dateField = comparisonInterval
+            ? processInterval(comparisonInterval, rowField, databaseType)
+            : processColumnReference(rowField, databaseType);
+        return `date_trunc('${dateBucket}', ${dateField})`;
+    }
+    if (['mysql'].includes(databaseType.toLowerCase())) {
+        const dateField = comparisonInterval
             ? processInterval(comparisonInterval, rowField, databaseType)
             : processColumnReference(rowField, databaseType);
-        return `date_trunc('${dateBucket}', ${date})`;
+        return `extract(${dateBucket} from ${dateField})`;
     }
-    const date = comparisonInterval
+    const dateField = comparisonInterval
         ? processInterval(comparisonInterval, rowField, databaseType)
         : processColumnReference(rowField, databaseType);
-    return `TIMESTAMP_TRUNC(${date}, ${dateBucket})`;
+    return `TIMESTAMP_TRUNC(${dateField}, ${dateBucket})`;
 }
 function processValueField(aggType, databaseType, valueField) {
     if (aggType === 'min' ||
@@ -79,9 +96,18 @@ function processValueField(aggType, databaseType, valueField) {
         : `1 ELSE 0`;
 }
 function generateCountQuery(fields, query, databaseType) {
-    const countQuery = fields.map((field) => {
-        return `SELECT '${field}' AS ${processColumnReference('field', databaseType)}, COUNT(DISTINCT ${processColumnReference(field, databaseType)}) AS ${processColumnReference('count', databaseType)} FROM querytable`;
-    });
+    let countQuery = [];
+    switch (databaseType.toLowerCase()) {
+        case 'mysql':
+            countQuery = fields.map((field) => {
+                return `SELECT '${field}' AS ${processColumnReference('field', databaseType)}, COUNT(DISTINCT ${processColumnReference(field, databaseType)}) AS ${processColumnReference('count', databaseType)} FROM querytable`;
+            });
+            break;
+        default:
+            countQuery = fields.map((field) => {
+                return `SELECT '${field}' AS ${processColumnReference('field', databaseType)}, COUNT(DISTINCT ${processColumnReference(field, databaseType)}) AS ${processColumnReference('count', databaseType)} FROM querytable`;
+            });
+    }
     return (`WITH querytable AS (${query.replace(';', '')}) ` +
         countQuery.join(' UNION ALL '));
 }
@@ -123,15 +149,15 @@ function generateDistinctQueryMySQL(stringFields, query) {
     const distinctQueries = stringFields.map((field) => {
         return `
       SELECT '${field}' AS ${processColumnReference('field', 'mysql')}, 
-             JSON_ARRAYAGG(${field}) AS ${processColumnReference('string_values', 'mysql')}
-      FROM (SELECT DISTINCT ${field} FROM querytable) AS distinct_${field}`;
+             JSON_ARRAYAGG(\`${field}\`) AS ${processColumnReference('string_values', 'mysql')}
+      FROM (SELECT DISTINCT \`${field}\` FROM querytable) AS distinct_${replaceSpacesWithUnderscores(field)}`;
     });
     const distinctQuery = distinctQueries.join(' UNION ALL ');
     return `WITH querytable AS (${query.replace(';', '')}) ` + distinctQuery;
 }
 function generateDistinctQueryPostgres(stringFields, query) {
     const distinctQueries = stringFields.map((field) => {
-        return `SELECT '${field}' AS ${processColumnReference('field', 'postgresql')}, ARRAY_AGG(DISTINCT ${field}) AS ${processColumnReference('string_values', 'postgresql')} FROM querytable`;
+        return `SELECT '${field}' AS ${processColumnReference('field', 'postgresql')}, to_json(ARRAY_AGG(DISTINCT ${field})) AS ${processColumnReference('string_values', 'postgresql')} FROM querytable`;
     });
     const distinctQuery = distinctQueries.join(' UNION ALL ');
     return `WITH querytable AS (${query.replace(';', '')}) ` + distinctQuery;

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

@@ -27,6 +27,11 @@ export declare function fetchReport(reportId: string, client: Client, useReportT
     report: QuillReportInternal;
     error?: string;
 }>;
+export declare function saveReport({ report, dashboardItemId, client, }: {
+    report: any;
+    dashboardItemId?: string;
+    client: Client;
+}): Promise<any>;
 export declare const formatRowsFromReport: (report: any) => any;
 export declare function convertInternalReportToReport(report: QuillReportInternal): QuillReport;
 export declare const fetchReportBuilderDataFromAST: (baseAst: any, formData: any, schema: Table[], client: Client, pivot?: Pivot, previousFormData?: any, currentTable?: string, previousRelevant?: {