@quillsql/react 2.12.41 → 2.12.43

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

@@ -1,7 +1,8 @@
-import { ColumnInfo, TableInfo } from '../components/ReportBuilder/schema';
-import { Column } from '../models/Columns';
+import { Client } from '../models/Client';
+import { Column, ColumnInternal } from '../models/Columns';
 import { Pivot } from '../models/Pivot';
 import { QuillReportInternal } from '../models/Report';
+import { Table } from '../models/Tables';
 export declare function getSelectFromAST(ast: any): any;
 export declare function processStarColumn(ast: any, columns: Column[]): any;
 export declare function recursiveSearchByKey(node: any, searchKey: string): any;
@@ -19,18 +20,18 @@ export declare function processApostrophe(node: any, searchKeys: string[]): any;
 export declare function recursiveSearchByKeysFindAllOccurances(node: any, searchKeys: string[], results: any[]): any;
 export declare function getColumnAndTableInfo(tableAliasMap: {
     [alias: string]: string;
-}, column: any, schemaInfo: any): {
+}, column: any, schemaInfo: Table[]): {
     tableName: string;
     columnName: string;
 } | undefined;
-export declare function getColumnsByTableFromASTAndSchema(ast: any, tables: any, tableAliasMap: any): {
+export declare function getColumnsByTableFromASTAndSchema(ast: any, tables: Table[], tableAliasMap: any): {
     [table: string]: string[];
 };
 export declare const isSubquery: (node: any) => boolean;
-export declare const getAllPossibleColumns: (baseAst: any, schema: TableInfo[]) => (ColumnInfo & {
+export declare const getAllPossibleColumns: (baseAst: any, schema: Table[]) => (ColumnInternal & {
     table: string;
 })[];
-export declare const createBasicSelectASTFromColumns: (columns: ColumnInfo[], tableName: string) => {
+export declare const createBasicSelectASTFromColumns: (columns: ColumnInternal[], tableName: string) => {
     type: string;
     options: null;
     distinct: null;
@@ -38,7 +39,7 @@ export declare const createBasicSelectASTFromColumns: (columns: ColumnInfo[], ta
         expr: {
             type: string;
             table: string;
-            column: any;
+            column: string;
         };
         as: null;
     }[];
@@ -53,16 +54,16 @@ export declare const createBasicSelectASTFromColumns: (columns: ColumnInfo[], ta
     orderby: null;
     limit: null;
 };
-export declare const fetchAndProcessASTFromPrompt: (aiPrompt: string, schema: TableInfo[], client: any, prevPivot?: Pivot, currentQuery?: string) => Promise<{
+export declare const fetchAndProcessASTFromPrompt: (aiPrompt: string, schema: Table[], client: Client, prevPivot?: Pivot, currentQuery?: string) => Promise<{
     ast: any;
     pivot: Pivot | null | undefined;
     whereAST: any;
     error?: string | undefined;
 }>;
-export declare const fetchASTFromQuillReport: (report: QuillReportInternal, client: any, schema: any) => Promise<{
+export declare const fetchASTFromQuillReport: (report: QuillReportInternal, client: Client, schema: Table[]) => Promise<{
     ast: any;
     pivot: Pivot | undefined | null;
-    schema?: TableInfo[] | undefined;
+    schema?: Table[] | undefined;
     error?: string | undefined;
 }>;
 //# sourceMappingURL=astProcessing.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"astProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAK3E,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAIvD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,OAQxC;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAe5D;AAGD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,GAAG,GAAG,CAgBtE;AAGD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,CAgB1E;AAED,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG;;EA4BtD;AAED,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,MAAM,GAChB;IAAE,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAahD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,CActE;AAED,wBAAgB,sCAAsC,CACpD,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,MAAM,EAAE,EACpB,OAAO,EAAE,GAAG,EAAE,GACb,GAAG,CAYL;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAC1C,MAAM,EAAE,GAAG,EACX,UAAU,EAAE,GAAG,GACd;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAqCvD;AAED,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,GAAG,EACX,aAAa,EAAE,GAAG,GACjB;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAqG/B;AAED,eAAO,MAAM,UAAU,SAAU,GAAG,YAWnC,CAAC;AAEF,eAAO,MAAM,qBAAqB,YACvB,GAAG,UACJ,SAAS,EAAE,KAClB,CAAC,UAAU,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,EAmClC,CAAC;AAEF,eAAO,MAAM,+BAA+B,YACjC,UAAU,EAAE,aACV,MAAM;;;;;;;;;;;;;;;;;;;;;;CAsBlB,CAAC;AAEF,eAAO,MAAM,4BAA4B,aAC7B,MAAM,UACR,SAAS,EAAE,UACX,GAAG,cACC,KAAK,iBACF,MAAM;SAEhB,GAAG;WACD,KAAK,GAAG,IAAI,GAAG,SAAS;cACrB,GAAG;;EA6Fd,CAAC;AAEF,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,UACnB,GAAG,UACH,GAAG;SAEN,GAAG;WACD,KAAK,GAAG,SAAS,GAAG,IAAI;;;EAmDhC,CAAC"}
+{"version":3,"file":"astProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAIzC,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,OAQxC;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAe5D;AAGD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,GAAG,GAAG,CAgBtE;AAGD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,CAgB1E;AAED,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG;;EA4BtD;AAED,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,MAAM,GAChB;IAAE,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAahD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,CActE;AAED,wBAAgB,sCAAsC,CACpD,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,MAAM,EAAE,EACpB,OAAO,EAAE,GAAG,EAAE,GACb,GAAG,CAYL;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAC1C,MAAM,EAAE,GAAG,EACX,UAAU,EAAE,KAAK,EAAE,GAClB;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAmCvD;AAED,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,KAAK,EAAE,EACf,aAAa,EAAE,GAAG,GACjB;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAqG/B;AAED,eAAO,MAAM,UAAU,SAAU,GAAG,YAWnC,CAAC;AAEF,eAAO,MAAM,qBAAqB,YACvB,GAAG,UACJ,KAAK,EAAE,KACd,CAAC,cAAc,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,EAmCtC,CAAC;AAEF,eAAO,MAAM,+BAA+B,YACjC,cAAc,EAAE,aACd,MAAM;;;;;;;;;;;;;;;;;;;;;;CAqBlB,CAAC;AAEF,eAAO,MAAM,4BAA4B,aAC7B,MAAM,UACR,KAAK,EAAE,UACP,MAAM,cACF,KAAK,iBACF,MAAM;SAEhB,GAAG;WACD,KAAK,GAAG,IAAI,GAAG,SAAS;cACrB,GAAG;;EA+Fd,CAAC;AAEF,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,UACnB,MAAM,UACN,KAAK,EAAE;SAEV,GAAG;WACD,KAAK,GAAG,SAAS,GAAG,IAAI;;;EA4DhC,CAAC"}

package/dist/cjs/utils/astProcessing.js

@@ -171,17 +171,13 @@ function getColumnAndTableInfo(tableAliasMap, column, schemaInfo) {
             const tableInfo = schemaInfo.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(columnName)) {
                 tableName = table;
                 break;
             }
         }
     }
-    // const tableName = columnsInfo.table
-    //   ? tableAliasMap[columnsInfo.table]
-    //   : //@ts-ignore
-    //     tableAliasMap[Object.keys(tableAliasMap)[0]];
     return { tableName, columnName };
 }
 exports.getColumnAndTableInfo = getColumnAndTableInfo;
@@ -196,7 +192,7 @@ function getColumnsByTableFromASTAndSchema(ast, tables, tableAliasMap) {
                 if (!referencedColumns[table]) {
                     referencedColumns[table] = [];
                 }
-                referencedColumns[table] = tableInfo.columns.map((column) => column.name || '');
+                referencedColumns[table] = tableInfo.columns.map((column) => column.field);
             }
         });
     }
@@ -307,12 +303,12 @@ const getAllPossibleColumns = (baseAst, schema) => {
         table: table.displayName,
     }))
         .sort((a, b) => {
-        const aIsId = a.name.toLowerCase() === 'id' ||
-            a.name.toLowerCase().endsWith('_id') ||
-            a.name.endsWith('Id');
-        const bIsId = b.name.toLowerCase() === 'id' ||
-            b.name.toLowerCase().endsWith('_id') ||
-            b.name.endsWith('Id');
+        const aIsId = a.field.toLowerCase() === 'id' ||
+            a.field.toLowerCase().endsWith('_id') ||
+            a.field.endsWith('Id');
+        const bIsId = b.field.toLowerCase() === 'id' ||
+            b.field.toLowerCase().endsWith('_id') ||
+            b.field.endsWith('Id');
         if (aIsId && !bIsId)
             return 1;
         if (bIsId && !aIsId)
@@ -330,8 +326,7 @@ const createBasicSelectASTFromColumns = (columns, tableName) => {
             expr: {
                 type: 'column_ref',
                 table: tableName,
-                // @ts-ignore
-                column: column.field || column.name,
+                column: column.field,
             },
             as: null,
         })),
@@ -350,7 +345,6 @@ const fetchAndProcessASTFromPrompt = async (aiPrompt, schema, client, prevPivot,
     let whereAST;
     const MAX_RETRIES = 3;
     try {
-        console.log(`[Prompt]: ${aiPrompt}`);
         let isTableJoin = !ast || !ast.from || ast.from.length !== 1;
         while (isTableJoin || (0, exports.isSubquery)(ast?.where)) {
             if (numRetries === MAX_RETRIES)
@@ -395,7 +389,7 @@ const fetchAndProcessASTFromPrompt = async (aiPrompt, schema, client, prevPivot,
         newAst = (0, convert_1.convertBigQuery)(ast);
         newAst = (0, convert_1.convertWildcardColumns)(newAst, schema); // must go before groupby
         ({ ast: newAst, pivot } = (0, convert_1.convertGroupBy)(newAst, schema, prevPivot));
-        newAst = (0, convert_1.convertStringComparison)(newAst, client.databaseType);
+        newAst = (0, convert_1.convertStringComparison)(newAst, client.databaseType || 'postgresql');
         newAst = (0, convert_1.convertRemoveSimpleParentheses)(newAst);
         const table = (0, ast_1.getTableNames)(newAst)[0];
         if (!table) {
@@ -407,7 +401,7 @@ const fetchAndProcessASTFromPrompt = async (aiPrompt, schema, client, prevPivot,
             throw new Error('Table info not found');
         }
         newAst = (0, convert_1.convertUnaryToBinary)(newAst);
-        newAst = (0, util_1.removeNonSelectedTableReferences)(newAst, processedName, tableInfo.columns.map((col) => col.name));
+        newAst = (0, util_1.removeNonSelectedTableReferences)(newAst, processedName, tableInfo.columns.map((col) => col.field));
         if (pivot) {
             newAst = (0, util_1.deepCopy)({ ...newAst, orderby: null, limit: null });
         }
@@ -441,7 +435,16 @@ const fetchASTFromQuillReport = async (report, client, schema) => {
             headers: {
                 'Content-Type': 'application/json',
             },
-            body: JSON.stringify({ query: report.queryString, useNewNodeSql: true }),
+            body: client?.publicKey
+                ? JSON.stringify({
+                    query: report.queryString,
+                    useNewNodeSql: true,
+                    publicKey: client.publicKey,
+                })
+                : JSON.stringify({
+                    query: report.queryString,
+                    useNewNodeSql: true,
+                }),
         });
         const resp = await result.json();
         if (resp.success === false) {

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

@@ -1,8 +1,7 @@
+import { AxisFormat } from '../Dashboard';
 type Field = {
-    _id: string;
-    label: string;
     field: string;
-    format: 'percent';
+    format: AxisFormat;
 };
 type Props = {
     value: string | number | boolean | undefined | null;
@@ -15,6 +14,6 @@ type Props = {
  * The axis formatter will print a shorter version of the valueFormatter, which
  * fits nicely along the X or Y axes.
  */
-export declare const axisFormatter: ({ value, field, fields, }: Props) => string | number | boolean;
+export declare const axisFormatter: ({ value, field, fields }: Props) => string;
 export {};
 //# sourceMappingURL=axisFormatter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"axisFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/axisFormatter.ts"],"names":[],"mappings":"AAGA,KAAK,KAAK,GAAG;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,IAAI,CAAC;IACpD,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,aAAa,8BAIvB,KAAK,KAAG,MAAM,GAAG,MAAM,GAAG,OAgC5B,CAAC"}
+{"version":3,"file":"axisFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/axisFormatter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,IAAI,CAAC;IACpD,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,aAAa,6BAA8B,KAAK,KAAG,MAwC/D,CAAC"}

package/dist/cjs/utils/axisFormatter.js

@@ -9,7 +9,7 @@ const date_fns_tz_1 = require("date-fns-tz");
  * The axis formatter will print a shorter version of the valueFormatter, which
  * fits nicely along the X or Y axes.
  */
-const axisFormatter = ({ value, field, fields, }) => {
+const axisFormatter = ({ value, field, fields }) => {
     if (field === undefined || field === null)
         return '';
     if (value === undefined || value === null)
@@ -17,30 +17,39 @@ const axisFormatter = ({ value, field, fields, }) => {
     const fieldInfo = fields.find((f) => f.field === field);
     if (!fieldInfo)
         return '';
-    const HANDLERS = {
-        percent: formatPercent,
-        dollar_amount: formatDollarAmount,
-        dollar_cents: formatDollarAmount, // no cents for axis format
-        whole_number: formatWholeNumber,
-        one_decimal_place: formatWholeNumber, // no decimals for axis format
-        two_decimal_places: formatWholeNumber, // no decimals for axis format
-        string: formatString,
-        yyyy: format_YYYY,
-        MMM_yyyy: format_MMM_yyyy,
-        MMM_dd: format_MMM_dd,
-        MMM_dd_yyyy: format_MMM_dd_yyyy,
-        MMM_ww_yyyy: format_MMM_ww_yyyy,
-        hh_ap_pm: format_hh_ap_pm,
-        'MMM_dd-MMM_dd': format_MMM_dd_MMM_dd,
-        'MMM_dd_hh:mm_ap_pm': format_MMM_dd_hh_mm_ap_pm,
-        'wo, yyyy': format_wo_yyyy,
-    };
     // try to handle this value using the associated formatType handler
     const formatType = fieldInfo.format;
-    if (Object.keys(HANDLERS).includes(formatType)) {
-        return HANDLERS[formatType](value);
+    switch (formatType) {
+        case 'percent':
+            return formatPercent(value);
+        case 'dollar_amount':
+            return formatDollarAmount(value);
+        case 'whole_number':
+            return formatWholeNumber(value);
+        case 'string':
+            return formatString(value);
+        case 'yyyy':
+            return format_YYYY(value);
+        case 'MMM_dd':
+            return format_MMM_dd(value);
+        case 'MMM_yyyy':
+            return format_MMM_yyyy(value);
+        case 'MMM_dd_yyyy':
+            return format_MMM_dd_yyyy(value);
+        // not sure what this is
+        // case 'MMM_ww_yyyy':
+        //   return format_MMM_ww_yyyy(value);
+        case 'hh_ap_pm':
+            return format_hh_ap_pm(value);
+        case 'MMM_dd-MMM_dd':
+            return format_MMM_dd_MMM_dd(value);
+        case 'MMM_dd_hh:mm_ap_pm':
+            return format_MMM_dd_hh_mm_ap_pm(value);
+        case 'wo, yyyy':
+            return format_wo_yyyy(value);
+        default:
+            return formatString(value);
     }
-    return formatString(value); // by default make this value a string
 };
 exports.axisFormatter = axisFormatter;
 /**
@@ -155,18 +164,17 @@ const format_MMM_dd_MMM_dd = (value) => {
         return `${(0, date_fns_1.format)(monday, 'MMM dd')} - ${(0, date_fns_1.format)(sunday, 'MMM dd')}`;
     }
 };
-const format_MMM_ww_yyyy = (value) => {
-    const utcDate = (0, date_fns_tz_1.utcToZonedTime)(new Date(value), 'UTC');
-    if (!(0, date_fns_1.isValid)(utcDate))
-        return 'Invalid date';
-    const startOfWeekDate = (0, date_fns_1.startOfWeek)(utcDate, { weekStartsOn: 1 });
-    const endOfWeekDate = (0, date_fns_1.endOfWeek)(utcDate, { weekStartsOn: 1 });
-    const month = (0, date_fns_1.format)(utcDate, 'MMM');
-    const startDay = (0, date_fns_1.format)(startOfWeekDate, 'd');
-    const endDay = (0, date_fns_1.format)(endOfWeekDate, 'd');
-    const year = (0, date_fns_1.format)(utcDate, 'yyyy');
-    return `${month}, ${startDay}-${endDay}, ${year}`;
-};
+// const format_MMM_ww_yyyy = (value: any) => {
+//   const utcDate: Date = utcToZonedTime(new Date(value), 'UTC');
+//   if (!isValid(utcDate)) return 'Invalid date';
+//   const startOfWeekDate = startOfWeek(utcDate, { weekStartsOn: 1 });
+//   const endOfWeekDate = endOfWeek(utcDate, { weekStartsOn: 1 });
+//   const month = format(utcDate, 'MMM');
+//   const startDay = format(startOfWeekDate, 'd');
+//   const endDay = format(endOfWeekDate, 'd');
+//   const year = format(utcDate, 'yyyy');
+//   return `${month}, ${startDay}-${endDay}, ${year}`;
+// };
 const format_MMM_dd_hh_mm_ap_pm = (value) => {
     const utcDate = (0, date_fns_tz_1.utcToZonedTime)(new Date(value), 'UTC');
     if (!(0, date_fns_1.isValid)(utcDate))

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

@@ -0,0 +1,4 @@
+import { Client } from '../models/Client';
+export declare const EMPTY_CLIENT: Client;
+export declare function fetchClient(publicKey: string, queryEndpoint: string, withCredentials?: boolean, queryHeaders?: HeadersInit): Promise<Client>;
+//# sourceMappingURL=client.d.ts.map

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

@@ -0,0 +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"}

package/dist/cjs/utils/client.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchClient = exports.EMPTY_CLIENT = void 0;
+exports.EMPTY_CLIENT = {
+    customerId: '',
+    clientId: '',
+    userId: '',
+    publicKey: '',
+    queryEndpoint: '',
+    queryHeaders: {},
+    withCredentials: false,
+    databaseType: '',
+};
+async function fetchClient(publicKey, queryEndpoint, withCredentials = false, queryHeaders) {
+    let result = exports.EMPTY_CLIENT;
+    try {
+        const response = await fetch(`${queryEndpoint}`, {
+            method: 'POST',
+            headers: {
+                ...queryHeaders,
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                metadata: {
+                    clientId: publicKey,
+                    publicKey,
+                    task: 'client',
+                },
+            }),
+            credentials: withCredentials ? 'include' : 'omit',
+        });
+        const json = await response.json();
+        result = json.data?.data?.client || json.data?.client;
+    }
+    catch (error) {
+        console.error('ERROR:', error);
+    }
+    return result;
+}
+exports.fetchClient = fetchClient;

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

@@ -1,13 +1,20 @@
 import { ColumnInfo } from '../components/ReportBuilder/schema';
 import { Column, ColumnInternal } from '../models/Columns';
 import { QuillReportInternal } from '../models/Report';
-export declare function convertPostgresColumn(field: {
+interface ConvertPostgresColumnParamsWithColumnInternal {
+    field: string;
+    dataTypeID: number;
+}
+interface ConvertPostgresColumnParamsWithField {
     name: string;
     dataTypeID: number;
-}): ColumnInternal;
+}
+type ConvertPostgresColumnParams = ConvertPostgresColumnParamsWithColumnInternal | ConvertPostgresColumnParamsWithField;
+export declare function convertPostgresColumn(field: ConvertPostgresColumnParams): ColumnInternal;
 export declare function convertColumnInfoToColumnInternal(columnInfo: ColumnInfo): ColumnInternal;
 export declare function convertFieldTypeToJSType(fieldType: string): string;
 export declare function convertFormatToJsType(column: Column): string;
 export declare function processColumnName(columnName: string): string;
 export declare const getYAxisFields: (report: QuillReportInternal) => any[];
+export {};
 //# sourceMappingURL=columnProcessing.d.ts.map

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,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,cAAc,CAyGjB;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;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"}

package/dist/cjs/utils/columnProcessing.js

@@ -99,8 +99,8 @@ function convertPostgresColumn(field) {
             jsType = 'string';
     }
     return {
-        label: field.name,
-        field: field.name,
+        label: 'field' in field ? field.field : field.name,
+        field: 'field' in field ? field.field : field.name,
         format,
         fieldType,
         dataTypeID: field.dataTypeID,

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

@@ -1,6 +1,7 @@
+import { Column } from '../models/Columns';
 export declare const downloadCSV: (data: {
     rows: any[];
-    fields?: any[];
+    fields?: Column[];
     name?: string;
 }) => void;
 //# sourceMappingURL=csv.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"csv.d.ts","sourceRoot":"","sources":["../../../src/utils/csv.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,WAAW,SAAU;IAChC,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,SA2FA,CAAC"}
+{"version":3,"file":"csv.d.ts","sourceRoot":"","sources":["../../../src/utils/csv.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG3C,eAAO,MAAM,WAAW,SAAU;IAChC,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,SA2FA,CAAC"}

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

@@ -1,4 +1,5 @@
 import { QuillReportInternal } from '../models/Report';
+import { Client } from '../models/Client';
 /**
  * Returns a cleaned version of the dashboard item we store in state. We clean
  * the dashboard item so that we aren't exposing unnecessary details to the
@@ -8,6 +9,6 @@ import { QuillReportInternal } from '../models/Report';
  */
 export declare function cleanDashboardItem(item: {
     [key: string]: any;
-} | undefined, dashboardFilters: any, client?: any, dateBucket?: string): Promise<QuillReportInternal>;
-export declare function getDashboard(dashboardName: string, client: any): Promise<any>;
+} | undefined, dashboardFilters: any, client?: Client, dateBucket?: string): Promise<QuillReportInternal>;
+export declare function getDashboard(dashboardName: string, client: Client): Promise<any>;
 //# sourceMappingURL=dashboard.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AA+BpE;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,CAAC,EAAE,GAAG,EACZ,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CA2C9B;AAgHD,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC,GAAG,CAAC,CA2Bd"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAWvD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAuB1C;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,CAAC,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CAmD9B;AAgHD,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,GAAG,CAAC,CA2Bd"}

package/dist/cjs/utils/dashboard.js

@@ -24,6 +24,7 @@ const defaultDashboardItem = {
     filtersApplied: {},
     queryString: '',
     rowCount: 0,
+    columnInternal: [],
 };
 /**
  * Returns a cleaned version of the dashboard item we store in state. We clean
@@ -42,6 +43,9 @@ async function cleanDashboardItem(item, dashboardFilters, client, dateBucket) {
             name: item.name,
         };
     const pivotTable = await getPivotTable(item, dashboardFilters, client, dateBucket);
+    const processedColumns = item.columns.map((col) => {
+        return { ...col, label: (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(col.label) };
+    });
     return {
         id: item._id,
         name: item.name,
@@ -50,9 +54,14 @@ async function cleanDashboardItem(item, dashboardFilters, client, dateBucket) {
         pivotRows: pivotTable ? pivotTable.rows : undefined,
         pivotColumns: pivotTable ? pivotTable.columns : undefined,
         compareRows: item.compareRows,
-        columns: item.columns.map((col) => {
-            return { ...col, label: (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(col.label) };
+        columns: processedColumns.map((column) => {
+            return {
+                field: column.field,
+                format: column.format,
+                label: column.label,
+            };
         }),
+        columnInternal: processedColumns,
         chartType: item.chartType,
         dateField: item.dateField,
         pivot: item.pivot,

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

@@ -1,6 +1,7 @@
-export declare function getData(client: any, cloudQueryEndpoint: string, noCred: RequestCredentials, hostedRequestBody: any, cloudRequestBody: any, method?: string, queryParam?: string): Promise<any>;
-export declare function getDataFromCloud(client: any, cloudQueryEndpoint: string, cloudRequestBody: any, method?: string): Promise<any>;
-export declare function fetchSqlQuery(ast: any, client: any, formData?: any): Promise<{
+import { Client } from '../models/Client';
+export declare function getData(client: Client, cloudQueryEndpoint: string, noCred: RequestCredentials, hostedRequestBody: any, cloudRequestBody: any, method?: string, queryParam?: string): Promise<any>;
+export declare function getDataFromCloud(client: Client, cloudQueryEndpoint: string, cloudRequestBody: any, method?: string): Promise<any>;
+export declare function fetchSqlQuery(ast: any, client: Client, formData?: any): Promise<{
     query: string;
     error?: string;
 }>;

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

@@ -1 +1 @@
-{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AA6EA,wBAAsB,OAAO,CAC3B,MAAM,EAAE,GAAG,EACX,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,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBAgChB;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,GAAG,EACX,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,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"}

package/dist/cjs/utils/dataFetcher.js

@@ -178,7 +178,6 @@ async function getData(client, cloudQueryEndpoint, noCred, hostedRequestBody, cl
 }
 exports.getData = getData;
 async function getDataFromCloud(client, cloudQueryEndpoint, cloudRequestBody, method = 'POST') {
-    const environment = client?.environment;
     const host = (typeof process !== 'undefined' && process?.env?.QUILL_SERVER_HOST) ||
         'https://quill-344421.uc.r.appspot.com';
     const url = `${host}/${cloudQueryEndpoint}`;
@@ -186,9 +185,7 @@ async function getDataFromCloud(client, cloudQueryEndpoint, cloudRequestBody, me
         method,
         headers: {
             Authorization: 'Bearer ',
-            ...(environment ? { environment } : {}), // Remember to provide the actual token
             'Content-Type': 'application/json',
-            environment: environment || undefined,
         },
         body: method === 'POST'
             ? JSON.stringify({

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

@@ -1,11 +1,15 @@
-import { QuillReportInternal } from '../models/Report';
+import { QuillReport } from '../models/Report';
+import { ColumnInternal } from '../models/Columns';
 export declare enum Calculation {
     PointToPointPercentageChange = "POINT_TO_POINT_PERCENTAGE_CHANGE",
     SimplePercentageChange = "SIMPLE_PERCENTAGE_CHANGE",
     Sum = "SUM"
 }
-export declare const getSimplePercentageChange: (data: QuillReportInternal) => number | undefined;
-export declare const getPointToPointPercentageChange: (data: QuillReportInternal) => number | undefined;
-export declare const getSumOfFields: (data: QuillReportInternal, comparison: boolean) => number;
-export declare function parseValueFromBigQueryDates(rows: any[], columns: any[]): void;
+export declare const getSimplePercentageChange: (data: QuillReport) => number | undefined;
+export declare const getPointToPointPercentageChange: (data: QuillReport) => number | undefined;
+export declare const getSumOfFields: (data: QuillReport, comparison: boolean) => number;
+export declare function parseValueFromBigQueryDates(rows: any[], columns: ColumnInternal[] | {
+    name: string;
+    dataTypeID: number;
+}[]): void;
 //# sourceMappingURL=dataProcessing.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dataProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/dataProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,oBAAY,WAAW;IACrB,4BAA4B,qCAAqC;IACjE,sBAAsB,6BAA6B;IACnD,GAAG,QAAQ;CACZ;AAyBD,eAAO,MAAM,yBAAyB,SAAU,mBAAmB,uBAsClE,CAAC;AAEF,eAAO,MAAM,+BAA+B,SAAU,mBAAmB,uBAkFxE,CAAC;AAEF,eAAO,MAAM,cAAc,SACnB,mBAAmB,cACb,OAAO,WAoBpB,CAAC;AAGF,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,QAkBtE"}
+{"version":3,"file":"dataProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/dataProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAM/C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,oBAAY,WAAW;IACrB,4BAA4B,qCAAqC;IACjE,sBAAsB,6BAA6B;IACnD,GAAG,QAAQ;CACZ;AAyBD,eAAO,MAAM,yBAAyB,SAAU,WAAW,uBAsC1D,CAAC;AAEF,eAAO,MAAM,+BAA+B,SAAU,WAAW,uBA4EhE,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,WAAW,cAAc,OAAO,WAmBpE,CAAC;AAGF,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EACH,cAAc,EAAE,GAChB;IACE,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,EAAE,QAaR"}

package/dist/cjs/utils/dataProcessing.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseValueFromBigQueryDates = exports.getSumOfFields = exports.getPointToPointPercentageChange = exports.getSimplePercentageChange = exports.Calculation = void 0;
 const PivotModal_1 = require("../internals/ReportBuilder/PivotModal");
 const dates_1 = require("./dates");
-const util_1 = require("../components/ReportBuilder/util");
+const columnProcessing_1 = require("./columnProcessing");
 var Calculation;
 (function (Calculation) {
     Calculation["PointToPointPercentageChange"] = "POINT_TO_POINT_PERCENTAGE_CHANGE";
@@ -30,16 +30,16 @@ const getSumOfFieldsAndRows = (rows, fields) => {
 };
 const getSimplePercentageChange = (data) => {
     if (data.compareRows && data.compareRows.length > 0) {
-        if (data.pivot && data.pivotRows && data.pivotColumns) {
-            const pivotRows = data.pivotRows;
-            const comparisonFields = data.pivotColumns
+        if (data.pivot) {
+            const pivotRows = data.rows;
+            const comparisonFields = data.columns
                 .filter((field) => {
                 return field.field.includes(`comparison_`);
             })
                 .map((field) => {
                 return field.field;
             });
-            const nonComparisonFields = data.pivotColumns
+            const nonComparisonFields = data.columns
                 .filter((field) => {
                 return !field.field.includes(`comparison_`);
             })
@@ -65,19 +65,15 @@ const getSimplePercentageChange = (data) => {
 };
 exports.getSimplePercentageChange = getSimplePercentageChange;
 const getPointToPointPercentageChange = (data) => {
-    if (data.pivot &&
-        data.pivotRows &&
-        data.pivotRows.length > 0 &&
-        data.pivotColumns &&
-        data.pivot.rowFieldType === 'date') {
-        const lastRow = data.pivotRows[data.pivotRows.length - 1];
+    if (data.pivot && data.pivot.rowFieldType === 'date') {
+        const lastRow = data.rows[data.rows.length - 1];
         const sumLastRow = getSumOfFieldsAndRows(
         // @ts-ignore
-        [lastRow], data.pivotColumns.map((field) => field.field));
-        const firstRow = data.pivotRows[0];
+        [lastRow], data.columns.map((field) => field.field));
+        const firstRow = data.rows[0];
         const sumFirstRow = getSumOfFieldsAndRows(
         // @ts-ignore
-        [firstRow], data.pivotColumns.map((field) => field.field));
+        [firstRow], data.columns.map((field) => field.field));
         return (sumLastRow - sumFirstRow) / sumFirstRow;
     }
     else {
@@ -134,9 +130,9 @@ const getSumOfFields = (data, comparison) => {
         });
         return getSumOfFieldsAndRows(data.compareRows, yAxisFields);
     }
-    if (data.pivot && data.pivotRows && data.pivotColumns) {
-        const pivotRows = data.pivotRows;
-        const fields = data.pivotColumns.map((field) => {
+    if (data.pivot) {
+        const pivotRows = data.rows;
+        const fields = data.columns.map((field) => {
             return field.field;
         });
         return getSumOfFieldsAndRows(pivotRows, fields);
@@ -153,14 +149,12 @@ exports.getSumOfFields = getSumOfFields;
 function parseValueFromBigQueryDates(rows, columns) {
     if (!rows || !columns)
         return;
+    columns = columns.map((column) => (0, columnProcessing_1.convertPostgresColumn)(column));
     columns.forEach((column) => {
-        if ((0, PivotModal_1.isDateField)(column.fieldType) ||
-            (0, util_1.getPostgresBasicType)(column) === 'date') {
+        if ((0, PivotModal_1.isDateField)(column.fieldType)) {
             rows.forEach((row) => {
-                if (row[column.field ?? column.name] &&
-                    typeof row[column.field ?? column.name] === 'object') {
-                    row[column.field ?? column.name] =
-                        row[column.field ?? column.name].value;
+                if (row[column.field] && typeof row[column.field] === 'object') {
+                    row[column.field] = row[column.field].value;
                 }
             });
         }

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

@@ -14,7 +14,7 @@ export declare function getComparisonInterval(comparisonRange: {
 export declare function getDateBucketFromRange(dateRange: {
     start: Date;
     end: Date;
-}): "month" | "week" | "day" | "year";
+}): "year" | "month" | "week" | "day";
 export declare function parseDateByDatabaseType(date: any, databaseType: string): Date;
 export declare function getDateFormatFromBucket(dateBucket: string): string;
 //# sourceMappingURL=dates.d.ts.map