@quillsql/react 2.12.41 → 2.12.43

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

@@ -1,5 +1,6 @@
 import { Monaco } from '@monaco-editor/react';
 import { Range } from 'monaco-editor';
+import { Table } from '../models/Tables';
 interface CompletionItem {
     label: string;
     kind: number;
@@ -9,7 +10,7 @@ interface CompletionItem {
     detail?: string;
 }
 export declare const QUILL_LANGUAGE: any;
-export declare function generateSuggestionsBySchema(schema: any[], monaco: Monaco, range: Range, databaseType: string): CompletionItem[];
+export declare function generateSuggestionsBySchema(schema: Table[], monaco: Monaco, range: Range, databaseType: string): CompletionItem[];
 export declare function generateSuggestionsByDatasource(monaco: Monaco, range: Range, databaseType: string): {
     label: string;
     kind: import("monaco-editor").languages.CompletionItemKind;

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

@@ -1 +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"}
+{"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;AAEtC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAGzC,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,KAAK,EAAE,EACf,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

@@ -286,9 +286,9 @@ function generateSuggestionsBySchema(schema, monaco, range, databaseType) {
         };
         suggestions.push(curSuggestion);
         table.columns.forEach((column) => {
-            const insertText = `${(0, queryConstructor_1.processColumnReference)(column.name, databaseType).replaceAll('`', '')}`;
+            const insertText = `${(0, queryConstructor_1.processColumnReference)(column.field, databaseType).replaceAll('`', '')}`;
             const curSuggestion = {
-                label: column.name,
+                label: column.field,
                 kind: monaco.languages.CompletionItemKind.Field,
                 insertText,
                 detail: table.name,

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

@@ -1,6 +1,7 @@
+import { Client } from '../models/Client';
 import { Pivot } from '../models/Pivot';
 import { QuillReportInternal } from '../models/Report';
-export declare function generatePivotWithSQL(pivot: Pivot, report: QuillReportInternal, client: any, dateBucket?: string, dateFilter?: any, distinctStrings?: any): Promise<{
+export declare function generatePivotWithSQL(pivot: Pivot, report: QuillReportInternal, client: Client, dateBucket?: string, dateFilter?: any, distinctStrings?: any): Promise<{
     rows: any;
     columns: any;
 } | undefined>;

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,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,GAAG,EACX,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,GAAG,EAChB,eAAe,CAAC,EAAE,GAAG;;;eAgMtB"}
+{"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"}

package/dist/cjs/utils/pivotConstructor.js

@@ -37,7 +37,7 @@ async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilte
     if (!report.itemQuery) {
         return undefined;
     }
-    const sqlQuery = (0, queryConstructor_1.generatePivotQuery)(pivot, report.itemQuery, client.databaseType, comparisonInterval, distinctStrings ? distinctStrings : distinctStringValues, dateBucket);
+    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: {
@@ -58,7 +58,8 @@ async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilte
         const resp = await (0, dataFetcher_1.getData)(client, 'query', 'same-origin', hostedBody, cloudBody, 'POST', 'fetch-pivot');
         // 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') {
+        if (pivot.columnField &&
+            client.databaseType?.toLowerCase() === 'bigquery') {
             rows.forEach((row) => {
                 Object.keys(row).forEach((key) => {
                     const processedKey = (0, columnProcessing_1.processColumnName)(key);

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;;;;EA4CnC;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;;;;EA6CnC;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"}

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

@@ -1,5 +1,5 @@
 import { Pivot } from '../models/Pivot';
-export declare function processColumnReference(column: string, databaseType: string, fallbackOnNull?: string): string;
+export declare function processColumnReference(column: string, databaseType: string, fallbackOnNull?: string, isPivotFieldAlias?: boolean): 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,UAiBxB;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"}
+{"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"}

package/dist/cjs/utils/queryConstructor.js

@@ -16,7 +16,9 @@ function processAggType(aggType, hasColumnField = false) {
 function replaceBigQuerySpecialCharacters(column) {
     return column.replaceAll('/', 'quill_forward_slash');
 }
-function processColumnReference(column, databaseType, fallbackOnNull) {
+function processColumnReference(column, databaseType, fallbackOnNull, 
+// for mysql, we only want to use double quotes for pivot column field aliases
+isPivotFieldAlias) {
     if (['postgresql', 'snowflake'].includes(databaseType.toLowerCase())) {
         const columnParts = column.split('.');
         if (columnParts.length > 1) {
@@ -27,6 +29,19 @@ function processColumnReference(column, databaseType, fallbackOnNull) {
         }
         return `"${column}"`;
     }
+    if (['mysql'].includes(databaseType.toLowerCase())) {
+        if (isPivotFieldAlias) {
+            return `"${column}"`;
+        }
+        const columnParts = column.split('.');
+        if (columnParts.length > 1) {
+            return `${columnParts[0]}.${columnParts[1]}`;
+        }
+        if (column === '' && fallbackOnNull) {
+            return `${fallbackOnNull}`;
+        }
+        return `${column}`;
+    }
     const columnParts = column.split('.');
     if (columnParts.length > 1) {
         return `\`${columnParts[0]}\`.\`${columnParts[1]}\``;
@@ -72,13 +87,55 @@ function generateCountQuery(fields, query, databaseType) {
 }
 exports.generateCountQuery = generateCountQuery;
 function generateDistinctQuery(stringFields, query, databaseType) {
+    switch (databaseType.toLowerCase()) {
+        case 'mysql':
+            return generateDistinctQueryMySQL(stringFields, query);
+        case 'postgresql':
+            return generateDistinctQueryPostgres(stringFields, query);
+        default:
+            return generateDistinctQueryDefault(stringFields, query, databaseType);
+    }
+}
+exports.generateDistinctQuery = generateDistinctQuery;
+function generateDistinctQueryDefault(stringFields, query, databaseType) {
     const distinctQueries = stringFields.map((field) => {
         return `SELECT '${field}' AS ${processColumnReference('field', databaseType)}, ARRAY_AGG(DISTINCT ${field}) AS ${processColumnReference('string_values', databaseType)} FROM querytable`;
     });
     const distinctQuery = distinctQueries.join(' UNION ALL ');
     return `WITH querytable AS (${query.replace(';', '')}) ` + distinctQuery;
 }
-exports.generateDistinctQuery = generateDistinctQuery;
+function generateDistinctQueryMySQL(stringFields, query) {
+    //   WITH querytable AS (
+    //     SELECT DISTINCT merchant, user_name, category
+    //     FROM transactions
+    // )
+    // SELECT 'merchant' AS field, JSON_ARRAYAGG(merchant) AS string_values
+    // FROM (SELECT DISTINCT merchant FROM querytable) AS distinct_merchants
+    // UNION ALL
+    // SELECT 'user_name' AS field, JSON_ARRAYAGG(user_name) AS string_values
+    // FROM (SELECT DISTINCT user_name FROM querytable) AS distinct_user_names
+    // UNION ALL
+    // SELECT 'category' AS field, JSON_ARRAYAGG(category) AS string_values
+    // FROM (SELECT DISTINCT category FROM querytable) AS distinct_categories;
+    // const distinctQueries = stringFields.map((field) => {
+    //   return `SELECT '${field}' AS ${processColumnReference('field', 'mysql')}, JSON_ARRAYAGG(${field}) AS ${processColumnReference('string_values', 'mysql')} FROM querytable`;
+    // });
+    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}`;
+    });
+    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`;
+    });
+    const distinctQuery = distinctQueries.join(' UNION ALL ');
+    return `WITH querytable AS (${query.replace(';', '')}) ` + distinctQuery;
+}
 function generateMinMaxRangeQueries(columnFields, query, databaseType) {
     const distinctQueries = columnFields.map((field) => {
         const wrappedField = ['postgresql', 'snowflake'].includes(databaseType.toLowerCase())
@@ -124,10 +181,10 @@ function create2DStringPivotQuery(pivot, itemQueries, columnFieldValues, databas
     const valueField = pivot.valueField;
     const columnField = pivot.columnField;
     const caseWhens = columnFieldValues.map((column) => {
-        return `${processAggType(pivot.aggregationType, true)}(CASE WHEN ${processColumnReference(columnField, databaseType)} = '${processSingleQuotes(column, databaseType)}' THEN ${processValueField(pivot.aggregationType, databaseType, valueField)} END) AS ${processColumnReference(column, databaseType, '_')}`;
+        return `${processAggType(pivot.aggregationType, true)}(CASE WHEN ${processColumnReference(columnField, databaseType)} = '${processSingleQuotes(column, databaseType)}' THEN ${processValueField(pivot.aggregationType, databaseType, valueField)} END) AS ${processColumnReference(column, databaseType, '_', true)}`;
     });
     const caseWhensCompare = columnFieldValues.map((column) => {
-        return `${processAggType(pivot.aggregationType, true)}(CASE WHEN ${processColumnReference(columnField, databaseType)} = '${processSingleQuotes(column, databaseType)}' THEN ${processValueField(pivot.aggregationType, databaseType, valueField)} END) AS ${processColumnReference(`comparison_${column}`, databaseType, '_')}`;
+        return `${processAggType(pivot.aggregationType, true)}(CASE WHEN ${processColumnReference(columnField, databaseType)} = '${processSingleQuotes(column, databaseType)}' THEN ${processValueField(pivot.aggregationType, databaseType, valueField)} END) AS ${processColumnReference(`comparison_${column}`, databaseType, '_', true)}`;
     });
     const compareCTE = itemQueries[1]
         ? `, quill_ct as (${itemQueries[1]?.replaceAll(';', '')})`
@@ -151,10 +208,10 @@ function create2DDatePivotQuery(pivot, itemQueries, columnFieldValues, databaseT
     const rowField = pivot.rowField;
     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, '_')}`;
+        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, '_', true)}`;
     });
     const caseWhensCompare = columnFieldValues.map((column) => {
-        return `${processAggType(pivot.aggregationType, true)}(CASE WHEN ${processColumnReference(columnField, databaseType)} = '${processSingleQuotes(column, databaseType)}' THEN ${processValueField(pivot.aggregationType, databaseType, pivot.valueField)} END) AS ${processColumnReference(`comparison_${column}`, databaseType, '_')}`;
+        return `${processAggType(pivot.aggregationType, true)}(CASE WHEN ${processColumnReference(columnField, databaseType)} = '${processSingleQuotes(column, databaseType)}' THEN ${processValueField(pivot.aggregationType, databaseType, pivot.valueField)} END) AS ${processColumnReference(`comparison_${column}`, databaseType, '_', true)}`;
     });
     const compareCTE = itemQueries[1] && comparisonInterval
         ? `, quill_ct as (${itemQueries[1]?.replaceAll(';', '')})`

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

@@ -1,8 +1,8 @@
-import { TableInfo } from '../components/ReportBuilder/schema';
+import { Client } from '../models/Client';
 import { ColumnInternal } from '../models/Columns';
 import { Pivot } from '../models/Pivot';
 import { QuillReport, QuillReportInternal } from '../models/Report';
-import { DateRangesByColumn, UniqueValuesByTable } from '../models/Tables';
+import { DateRangesByColumn, Table, UniqueValuesByTable } from '../models/Tables';
 import { AdditionalProcessing } from './tableProcessing';
 export type ReportBuilderInfo = {
     rows: any[];
@@ -22,13 +22,14 @@ export type ReportBuilderInfo = {
     error?: string;
 };
 export declare const EMPTY_REPORT: QuillReport;
-export declare function fetchReport(reportId: string, client: any, useReportTask?: boolean, filters?: any[], additionalProcessing?: AdditionalProcessing, dateBucket?: string, customFields?: any): Promise<{
+export declare const EMPTY_INTERNAL_REPORT: QuillReportInternal;
+export declare function fetchReport(reportId: string, client: Client, useReportTask?: boolean, filters?: any[], additionalProcessing?: AdditionalProcessing, dateBucket?: string, customFields?: any): Promise<{
     report: QuillReportInternal;
     error?: string;
 }>;
 export declare const formatRowsFromReport: (report: any) => any;
 export declare function convertInternalReportToReport(report: QuillReportInternal): QuillReport;
-export declare const fetchReportBuilderDataFromAST: (baseAst: any, formData: any, schema: TableInfo[], client: any, pivot?: Pivot, previousFormData?: any, currentTable?: string, previousRelevant?: {
+export declare const fetchReportBuilderDataFromAST: (baseAst: any, formData: any, schema: Table[], client: Client, pivot?: Pivot, previousFormData?: any, currentTable?: string, previousRelevant?: {
     uniqueStrings: UniqueValuesByTable;
     dateRanges: DateRangesByColumn;
 }, report?: QuillReportInternal, customFields?: any) => Promise<ReportBuilderInfo>;

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

@@ -1 +1 @@
-{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/utils/report.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAE/D,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAa3E,OAAO,EACL,oBAAoB,EAGrB,MAAM,mBAAmB,CAAC;AAG3B,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,SAAS,EAAE;QAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QAAC,OAAO,EAAE,cAAc,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7D,aAAa,EAAE,GAAG,EAAE,CAAC;IACrB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,mBAAmB,CAAC;IAClC,UAAU,EAAE,kBAAkB,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,WAkB1B,CAAC;AAEF,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,mBAAmB,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA0G1D;AAED,eAAO,MAAM,oBAAoB,WAAY,GAAG,QAkB/C,CAAC;AAEF,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,mBAAmB,GAC1B,WAAW,CAsDb;AAED,eAAO,MAAM,6BAA6B,YAC/B,GAAG,YACF,GAAG,UACL,SAAS,EAAE,UACX,GAAG,UACH,KAAK,qBACM,GAAG,iBACP,MAAM,qBACF;IACjB,aAAa,EAAE,mBAAmB,CAAC;IACnC,UAAU,EAAE,kBAAkB,CAAC;CAChC,WACQ,mBAAmB,iBACb,GAAG,KACjB,QAAQ,iBAAiB,CAmI3B,CAAC"}
+{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/utils/report.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EACL,kBAAkB,EAClB,KAAK,EACL,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAa1B,OAAO,EACL,oBAAoB,EAGrB,MAAM,mBAAmB,CAAC;AAG3B,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,SAAS,EAAE;QAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QAAC,OAAO,EAAE,cAAc,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7D,aAAa,EAAE,GAAG,EAAE,CAAC;IACrB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,mBAAmB,CAAC;IAClC,UAAU,EAAE,kBAAkB,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,WAkB1B,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,mBAGnC,CAAC;AA0BF,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,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,mBAAmB,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA0G1D;AAED,eAAO,MAAM,oBAAoB,WAAY,GAAG,QAkB/C,CAAC;AAEF,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,mBAAmB,GAC1B,WAAW,CAsDb;AAED,eAAO,MAAM,6BAA6B,YAC/B,GAAG,YACF,GAAG,UACL,KAAK,EAAE,UACP,MAAM,UACN,KAAK,qBACM,GAAG,iBACP,MAAM,qBACF;IACjB,aAAa,EAAE,mBAAmB,CAAC;IACnC,UAAU,EAAE,kBAAkB,CAAC;CAChC,WACQ,mBAAmB,iBACb,GAAG,KACjB,QAAQ,iBAAiB,CAqI3B,CAAC"}

package/dist/cjs/utils/report.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchReportBuilderDataFromAST = exports.convertInternalReportToReport = exports.formatRowsFromReport = exports.fetchReport = exports.EMPTY_REPORT = void 0;
+exports.fetchReportBuilderDataFromAST = exports.convertInternalReportToReport = exports.formatRowsFromReport = exports.fetchReport = exports.EMPTY_INTERNAL_REPORT = exports.EMPTY_REPORT = void 0;
 const ChartBuilder_1 = require("../ChartBuilder");
 const ast_1 = require("../components/ReportBuilder/ast");
 const PivotModal_1 = require("../internals/ReportBuilder/PivotModal");
@@ -37,6 +37,31 @@ exports.EMPTY_REPORT = {
     queryString: '',
     rowCount: 0,
 };
+exports.EMPTY_INTERNAL_REPORT = {
+    ...exports.EMPTY_REPORT,
+    columnInternal: [],
+};
+function extractAllReportValuesFromQuillInternalReport(reportInternal) {
+    return {
+        id: reportInternal.id,
+        name: reportInternal.name,
+        dashboardName: reportInternal.dashboardName,
+        rows: reportInternal.rows,
+        columns: reportInternal.columns,
+        chartType: reportInternal.chartType,
+        dateField: reportInternal.dateField,
+        pivot: reportInternal.pivot,
+        xAxisLabel: reportInternal.xAxisLabel,
+        xAxisField: reportInternal.xAxisField,
+        xAxisFormat: reportInternal.xAxisFormat,
+        yAxisFields: reportInternal.yAxisFields,
+        order: reportInternal.order,
+        compareRows: reportInternal.compareRows,
+        filtersApplied: reportInternal.filtersApplied,
+        queryString: reportInternal.queryString,
+        rowCount: reportInternal.rowCount,
+    };
+}
 async function fetchReport(reportId, client, useReportTask = true, filters = [], additionalProcessing, dateBucket, customFields) {
     let reportInfo = undefined;
     let errorMessage = undefined;
@@ -175,7 +200,7 @@ function convertInternalReportToReport(report) {
                 rows = (0, exports.formatRowsFromReport)({ rows, columns });
             }
             return {
-                ...formattedReport,
+                ...extractAllReportValuesFromQuillInternalReport(formattedReport),
                 rows: rows,
                 yAxisFields: (0, columnProcessing_1.getYAxisFields)(report),
                 columns: columns,
@@ -187,7 +212,7 @@ function convertInternalReportToReport(report) {
             rows = (0, exports.formatRowsFromReport)(report);
         }
         return {
-            ...formattedReport,
+            ...extractAllReportValuesFromQuillInternalReport(formattedReport),
             rows: rows,
             yAxisFields: (0, columnProcessing_1.getYAxisFields)(report),
         };
@@ -208,7 +233,7 @@ const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, client,
     let table = '';
     let error;
     const relevantInfo = previousRelevant ?? { uniqueStrings: {}, dateRanges: {} };
-    let query = '';
+    const query = '';
     try {
         const tables = (0, ast_1.getTableNames)(baseAst);
         table = tables[0] ? tables[0] : '';
@@ -231,7 +256,10 @@ const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, client,
             rowCount: tableData.rowCount,
             filtersApplied: [],
             rows: tableData.rows,
-            columns: tableData.columns,
+            columns: tableData.columns.map((col) => {
+                return { field: col.field, format: col.format, label: col.label };
+            }),
+            columnInternal: tableData.columns,
         };
         const queryResult = await (0, dataFetcher_1.fetchSqlQuery)({
             ...(0, astProcessing_1.createBasicSelectASTFromColumns)(tableInfo.columns, table),
@@ -240,7 +268,6 @@ const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, client,
         if (queryResult.error) {
             throw new Error(queryResult.error);
         }
-        query = queryResult.query;
         if (table !== currentTable || previousFormData !== formData) {
             const { uniqueStrings, dateRanges } = await (0, tableProcessing_1.getRelevantInfoFromQuery)(tableInfo.columns, client, queryResult.query, customFields);
             relevantInfo.uniqueStrings[table] = uniqueStrings ?? {};
@@ -293,7 +320,7 @@ const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, client,
         pivot: newPivot,
         pivotData: newPivotData,
         formattedRows,
-        report: curReport ?? exports.EMPTY_REPORT,
+        report: curReport ?? exports.EMPTY_INTERNAL_REPORT,
         table,
         uniqueValues: relevantInfo.uniqueStrings,
         dateRanges: relevantInfo.dateRanges,

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

@@ -1,6 +1,8 @@
-export declare const getCustomFieldInfo: (client: any, caller?: string) => Promise<any[]>;
-export declare const getSchemaInfoWithCustomFields: (client: any, caller?: string) => Promise<{
-    schemaData: any;
-    customFieldsByTable: any[];
+import { Client } from '../models/Client';
+import { Table } from '../models/Tables';
+export declare const getCustomFieldInfo: (client: Client, caller?: string) => Promise<any[]>;
+export declare const getSchemaInfoWithCustomFields: (client: Client, caller?: string) => Promise<{
+    schemaData: Table[];
+    customFieldsByTable: any;
 }>;
 //# sourceMappingURL=schema.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AAmDA,eAAO,MAAM,kBAAkB,WAAkB,GAAG,oCA8EnD,CAAC;AAEF,eAAO,MAAM,6BAA6B,WAChC,GAAG;;;EAoDZ,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAsDzC,eAAO,MAAM,kBAAkB,WAAkB,MAAM,oCA8EtD,CAAC;AAEF,eAAO,MAAM,6BAA6B,WAChC,MAAM,sBAEb,QAAQ;IAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IAAC,mBAAmB,EAAE,GAAG,CAAA;CAAE,CAmD3D,CAAC"}

package/dist/cjs/utils/schema.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSchemaInfoWithCustomFields = exports.getCustomFieldInfo = void 0;
+const columnProcessing_1 = require("./columnProcessing");
 const triggerSoftUpdate = async (client, tables) => {
     const { queryEndpoint, queryHeaders, publicKey, withCredentials } = client;
     tables.forEach(async (table) => {
@@ -52,7 +53,7 @@ const getCustomFieldInfo = async (client, caller = 'se') => {
     let customFieldsByTableUnique = [];
     try {
         const { queryEndpoint, queryHeaders, publicKey, databaseType, customerId } = client;
-        if (databaseType.toLowerCase() !== 'postgresql' ||
+        if ((databaseType && databaseType.toLowerCase() !== 'postgresql') ||
             !['665610862cf7a3000be66453'].includes(publicKey)) {
             throw new Error('CUSTOM FIELDS IS ONLY ALLOWED FOR POSTGRESQL DATABASES');
         }
@@ -152,10 +153,32 @@ const getSchemaInfoWithCustomFields = async (client, caller = 'se') => {
     });
     const result = await response.json();
     const parsedData = parseResponse(result);
-    triggerSoftUpdate(client, parsedData);
+    const converted = convertSchemaInfoToTable(parsedData);
+    triggerSoftUpdate(client, converted);
     return {
-        schemaData: parsedData,
+        schemaData: converted,
         customFieldsByTable: customFieldsByTableUnique,
     };
 };
 exports.getSchemaInfoWithCustomFields = getSchemaInfoWithCustomFields;
+// Used to convert backend data to front end data
+function convertSchemaInfoToTable(schemaData) {
+    const tables = [];
+    schemaData.forEach((table) => {
+        const columnInternal = table.columns.map((column) => {
+            return (0, columnProcessing_1.convertColumnInfoToColumnInternal)(column);
+        });
+        const newTable = {
+            name: table.name,
+            columns: columnInternal,
+            rowCount: table.rowCount,
+            isSelectStar: table.isSelectStar,
+            viewQuery: table.viewQuery,
+            _id: table._id,
+            customFieldInfo: table.customFieldInfo,
+            displayName: table.displayName,
+        };
+        tables.push(newTable);
+    });
+    return tables;
+}

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

@@ -1,5 +1,5 @@
 import { NodeSQLParser } from '../components/ReportBuilder/ast';
-import { ColumnInfo } from '../components/ReportBuilder/schema';
+import { Client } from '../models/Client';
 import { Column, ColumnInternal } from '../models/Columns';
 import { Pagination } from '../models/Pagination';
 import { DateRangesByColumn, UniqueValuesByColumn } from '../models/Tables';
@@ -12,18 +12,18 @@ export interface AdditionalProcessing {
     last?: any;
 }
 export declare const hasColumnAlias: (columns: Column[], referencedColumns: string[]) => boolean;
-export declare const getUniqueValuesByColumns: (columns: Column[], query: string, rows: any, client: any, customFields: any[]) => Promise<{
+export declare const getUniqueValuesByColumns: (columns: Column[], query: string, rows: any, client: Client, customFields: any[]) => Promise<{
     [column: string]: {
         [value: string]: boolean;
     };
 } | null>;
-export declare const getRelevantInfoFromQuery: (columns: ColumnInfo[], client: any, query: string, customFields?: any) => Promise<{
+export declare const getRelevantInfoFromQuery: (columns: ColumnInternal[], client: Client, query: string, customFields?: any) => Promise<{
     uniqueStrings?: UniqueValuesByColumn | undefined;
     dateRanges?: DateRangesByColumn | undefined;
     error?: string | undefined;
 }>;
-export declare const getCountsByColumns: (columns: Column[], query: string, client: any, customFields: any[]) => Promise<Column[]>;
-export declare const getDateRangeByColumns: (columns: Column[], query: string, client: any, customFields: any[]) => Promise<{
+export declare const getCountsByColumns: (columns: Column[], query: string, client: Client, customFields: any[]) => Promise<Column[]>;
+export declare const getDateRangeByColumns: (columns: Column[], query: string, client: Client, customFields: any[]) => Promise<{
     [column: string]: {
         dateRange: {
             start: Date;
@@ -31,26 +31,26 @@ export declare const getDateRangeByColumns: (columns: Column[], query: string, c
         };
     };
 } | null>;
-export declare const getPaginatedRows: (client: any, query?: string, reportId?: string, processing?: AdditionalProcessing, filters?: any, customFields?: any) => Promise<{
+export declare const getPaginatedRows: (client: Client, query?: string, reportId?: string, processing?: AdditionalProcessing, filters?: any, customFields?: any) => Promise<{
     columns: Column[];
     rows: any[];
     rowCount?: number;
     error?: string;
 }>;
-export declare const fetchTableByQuery: (query: string, client: any, processing?: AdditionalProcessing, customFields?: any) => Promise<{
+export declare const fetchTableByQuery: (query: string, client: Client, processing?: AdditionalProcessing, customFields?: any) => Promise<{
     columns: ColumnInternal[];
     rows: any[];
     rowCount?: number | undefined;
     error?: string | undefined;
     itemQuery?: string[] | undefined;
 }>;
-export declare const fetchTableByReport: (reportId: string, client: any, processing?: AdditionalProcessing, filters?: any, customFields?: any) => Promise<{
+export declare const fetchTableByReport: (reportId: string, client: Client, processing?: AdditionalProcessing, filters?: any, customFields?: any) => Promise<{
     columns: Column[];
     rows: any[];
     rowCount?: number | undefined;
     error?: string | undefined;
 }>;
-export declare const fetchTableByAST: (ast: NodeSQLParser.Select, client: any, processing?: AdditionalProcessing, customFields?: any) => Promise<{
+export declare const fetchTableByAST: (ast: NodeSQLParser.Select, client: Client, processing?: AdditionalProcessing, customFields?: any) => Promise<{
     columns: ColumnInternal[];
     rows: any[];
     rowCount?: number | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAkB5E,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,eAAO,MAAM,cAAc,YAChB,MAAM,EAAE,qBACE,MAAM,EAAE,KAC1B,OAUF,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,MAAM,EAAE,SACV,MAAM,QACP,GAAG,UACD,GAAG,gBACG,GAAG,EAAE;;;;SAkEpB,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,UAAU,EAAE,UACb,GAAG,SACJ,MAAM,iBACE,GAAG;;;;EAiEnB,CAAC;AAEF,eAAO,MAAM,kBAAkB,YACpB,MAAM,EAAE,SACV,MAAM,UACL,GAAG,gBACG,GAAG,EAAE,KAClB,QAAQ,MAAM,EAAE,CA2ClB,CAAC;AAkDF,eAAO,MAAM,qBAAqB,YACvB,MAAM,EAAE,SACV,MAAM,UACL,GAAG,gBACG,GAAG,EAAE;;mBAEY;YAAE,KAAK,EAAE,IAAI,CAAC;YAAC,GAAG,EAAE,IAAI,CAAA;SAAE;;SAiB1D,CAAC;AA2DF,eAAO,MAAM,gBAAgB,WACnB,GAAG,UACH,MAAM,aACH,MAAM,eACJ,oBAAoB,YACvB,GAAG,iBACE,GAAG,KACjB,QAAQ;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAaA,CAAC;AAEF,eAAO,MAAM,iBAAiB,UACrB,MAAM,UACL,GAAG,eACE,oBAAoB,iBAClB,GAAG;aAET,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EAqDZ,CAAC;AAEF,eAAO,MAAM,kBAAkB,aACnB,MAAM,UACR,GAAG,eACE,oBAAoB,YACvB,GAAG,iBACE,GAAG;aAET,MAAM,EAAE;UACX,GAAG,EAAE;;;EAgFZ,CAAC;AAEF,eAAO,MAAM,eAAe,QACrB,cAAc,MAAM,UACjB,GAAG,eACE,oBAAoB,iBAClB,GAAG;aAET,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EAuDZ,CAAC;AAEF,eAAO,MAAM,+CAA+C,0BACnC,oBAAoB;;CAU5C,CAAC"}
+{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAe5E,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,eAAO,MAAM,cAAc,YAChB,MAAM,EAAE,qBACE,MAAM,EAAE,KAC1B,OAUF,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,MAAM,EAAE,SACV,MAAM,QACP,GAAG,UACD,MAAM,gBACA,GAAG,EAAE;;;;SAmEpB,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,cAAc,EAAE,UACjB,MAAM,SACP,MAAM,iBACE,GAAG;;;;EA6DnB,CAAC;AAEF,eAAO,MAAM,kBAAkB,YACpB,MAAM,EAAE,SACV,MAAM,UACL,MAAM,gBACA,GAAG,EAAE,KAClB,QAAQ,MAAM,EAAE,CA2ClB,CAAC;AAkDF,eAAO,MAAM,qBAAqB,YACvB,MAAM,EAAE,SACV,MAAM,UACL,MAAM,gBACA,GAAG,EAAE;;mBAEY;YAAE,KAAK,EAAE,IAAI,CAAC;YAAC,GAAG,EAAE,IAAI,CAAA;SAAE;;SAiB1D,CAAC;AA2DF,eAAO,MAAM,gBAAgB,WACnB,MAAM,UACN,MAAM,aACH,MAAM,eACJ,oBAAoB,YACvB,GAAG,iBACE,GAAG,KACjB,QAAQ;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAaA,CAAC;AAEF,eAAO,MAAM,iBAAiB,UACrB,MAAM,UACL,MAAM,eACD,oBAAoB,iBAClB,GAAG;aAET,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EAqDZ,CAAC;AAEF,eAAO,MAAM,kBAAkB,aACnB,MAAM,UACR,MAAM,eACD,oBAAoB,YACvB,GAAG,iBACE,GAAG;aAET,MAAM,EAAE;UACX,GAAG,EAAE;;;EAgFZ,CAAC;AAEF,eAAO,MAAM,eAAe,QACrB,cAAc,MAAM,UACjB,MAAM,eACD,oBAAoB,iBAClB,GAAG;aAET,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EAuDZ,CAAC;AAEF,eAAO,MAAM,+CAA+C,0BACnC,oBAAoB;;CAU5C,CAAC"}

package/dist/cjs/utils/tableProcessing.js

@@ -76,21 +76,17 @@ const getRelevantInfoFromQuery = async (columns, client, query, customFields) =>
     let uniqueStrings = {};
     let error = undefined;
     try {
-        const convertedStringColumns = columns
-            .filter((column) => {
+        const convertedStringColumns = columns.filter((column) => {
             return (0, ast_1.isTextColumnType)(column.fieldType);
-        })
-            .map((column) => (0, columnProcessing_1.convertColumnInfoToColumnInternal)(column));
+        });
         const stringNames = convertedStringColumns.map((column) => column.field);
         if (stringNames.length > 0) {
             const smallStringColumns = await (0, exports.getCountsByColumns)(convertedStringColumns, query, client, customFields);
             uniqueStrings = await (0, exports.getUniqueValuesByColumns)(smallStringColumns, query, [], client, customFields);
         }
-        const dateColumns = columns
-            .filter((column) => {
+        const dateColumns = columns.filter((column) => {
             return column.fieldType === 'date';
-        })
-            .map((column) => (0, columnProcessing_1.convertColumnInfoToColumnInternal)(column));
+        });
         if (dateColumns.length > 0) {
             dateRanges = await (0, exports.getDateRangeByColumns)(dateColumns, query, client, customFields);
             if (dateRanges === null) {
@@ -110,7 +106,7 @@ const getRelevantInfoFromQuery = async (columns, client, query, customFields) =>
 exports.getRelevantInfoFromQuery = getRelevantInfoFromQuery;
 const getCountsByColumns = async (columns, query, client, customFields) => {
     const stringNames = columns.map((column) => column.field);
-    const countQuery = (0, queryConstructor_1.generateCountQuery)(stringNames, query, client.databaseType);
+    const countQuery = (0, queryConstructor_1.generateCountQuery)(stringNames, query, client.databaseType || 'postgresql');
     try {
         const hostedBody = {
             metadata: {
@@ -181,7 +177,7 @@ const getDateRangeByColumns = async (columns, query, client, customFields) => {
     const columnNames = columns.map(
     // @ts-ignore
     (column) => column.field || column.name);
-    const distinctValueQuery = (0, queryConstructor_1.generateMinMaxRangeQueries)(columnNames, query, client.databaseType);
+    const distinctValueQuery = (0, queryConstructor_1.generateMinMaxRangeQueries)(columnNames, query, client.databaseType || 'postgresql');
     const dateRanges = await fetchDateRanges(distinctValueQuery, client, customFields);
     return dateRanges;
 };
@@ -207,8 +203,8 @@ const fetchDateRanges = async (query, client, customFields) => {
         const results = data.rows.reduce((acc, currentValue) => {
             acc[currentValue.field] = {
                 dateRange: {
-                    start: (0, dates_1.parseDateByDatabaseType)(currentValue.min_range, client.databaseType),
-                    end: (0, dates_1.parseDateByDatabaseType)(currentValue.max_range, client.databaseType),
+                    start: (0, dates_1.parseDateByDatabaseType)(currentValue.min_range, client.databaseType || 'postgresql'),
+                    end: (0, dates_1.parseDateByDatabaseType)(currentValue.max_range, client.databaseType || 'postgresql'),
                 },
             };
             return acc;

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

@@ -1,7 +1,5 @@
 import { type AxisFormat } from '../Dashboard';
 export type Field = {
-    _id: string;
-    label: string;
     field: string;
     format: AxisFormat;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"valueFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/valueFormatter.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,MAAM,KAAK,GAAG;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAQ7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,UAM/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,6BAA8B,KAAK,KAAG,MA0ChE,CAAC;AAEF,eAAO,MAAM,WAAW;WAIf,GAAG;YACF,MAAM;MACZ,MA2CH,CAAC;AAoNF,eAAO,MAAM,aAAa;;;;WAGhB,MAAM,KACb,MAkDF,CAAC"}
+{"version":3,"file":"valueFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/valueFormatter.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,MAAM,KAAK,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAQ7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,UAM/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,6BAA8B,KAAK,KAAG,MA8ChE,CAAC;AAEF,eAAO,MAAM,WAAW;WAIf,GAAG;YACF,MAAM;MACZ,MAgDH,CAAC;AAoNF,eAAO,MAAM,aAAa;;;;WAGhB,MAAM,KACb,MAkDF,CAAC"}