@quillsql/react 2.12.41 → 2.12.42

package/dist/esm/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/esm/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/esm/utils/report.js

@@ -34,6 +34,31 @@ export const EMPTY_REPORT = {
     queryString: '',
     rowCount: 0,
 };
+export const EMPTY_INTERNAL_REPORT = {
+    ...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,
+    };
+}
 export async function fetchReport(reportId, client, useReportTask = true, filters = [], additionalProcessing, dateBucket, customFields) {
     let reportInfo = undefined;
     let errorMessage = undefined;
@@ -170,7 +195,7 @@ export function convertInternalReportToReport(report) {
                 rows = formatRowsFromReport({ rows, columns });
             }
             return {
-                ...formattedReport,
+                ...extractAllReportValuesFromQuillInternalReport(formattedReport),
                 rows: rows,
                 yAxisFields: getYAxisFields(report),
                 columns: columns,
@@ -182,7 +207,7 @@ export function convertInternalReportToReport(report) {
             rows = formatRowsFromReport(report);
         }
         return {
-            ...formattedReport,
+            ...extractAllReportValuesFromQuillInternalReport(formattedReport),
             rows: rows,
             yAxisFields: getYAxisFields(report),
         };
@@ -202,7 +227,7 @@ export const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, c
     let table = '';
     let error;
     const relevantInfo = previousRelevant ?? { uniqueStrings: {}, dateRanges: {} };
-    let query = '';
+    const query = '';
     try {
         const tables = getTableNames(baseAst);
         table = tables[0] ? tables[0] : '';
@@ -225,7 +250,10 @@ export const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, c
             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 fetchSqlQuery({
             ...createBasicSelectASTFromColumns(tableInfo.columns, table),
@@ -234,7 +262,6 @@ export const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, c
         if (queryResult.error) {
             throw new Error(queryResult.error);
         }
-        query = queryResult.query;
         if (table !== currentTable || previousFormData !== formData) {
             const { uniqueStrings, dateRanges } = await getRelevantInfoFromQuery(tableInfo.columns, client, queryResult.query, customFields);
             relevantInfo.uniqueStrings[table] = uniqueStrings ?? {};
@@ -287,7 +314,7 @@ export const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, c
         pivot: newPivot,
         pivotData: newPivotData,
         formattedRows,
-        report: curReport ?? EMPTY_REPORT,
+        report: curReport ?? EMPTY_INTERNAL_REPORT,
         table,
         uniqueValues: relevantInfo.uniqueStrings,
         dateRanges: relevantInfo.dateRanges,

package/dist/esm/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/esm/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/esm/utils/schema.js

@@ -1,3 +1,4 @@
+import { convertColumnInfoToColumnInternal } from './columnProcessing';
 const triggerSoftUpdate = async (client, tables) => {
     const { queryEndpoint, queryHeaders, publicKey, withCredentials } = client;
     tables.forEach(async (table) => {
@@ -49,7 +50,7 @@ export 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');
         }
@@ -148,9 +149,31 @@ export 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,
     };
 };
+// Used to convert backend data to front end data
+function convertSchemaInfoToTable(schemaData) {
+    const tables = [];
+    schemaData.forEach((table) => {
+        const columnInternal = table.columns.map((column) => {
+            return 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/esm/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/esm/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;;;;SAkEpB,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/esm/utils/tableProcessing.js

@@ -1,5 +1,5 @@
 import { isTextColumnType, } from '../components/ReportBuilder/ast';
-import { convertColumnInfoToColumnInternal, convertPostgresColumn, } from './columnProcessing';
+import { convertPostgresColumn } from './columnProcessing';
 import { MAX_PIVOT_UNIQUE_VALUES } from './constants';
 import { getData } from './dataFetcher';
 import { parseValueFromBigQueryDates } from './dataProcessing';
@@ -71,21 +71,17 @@ export const getRelevantInfoFromQuery = async (columns, client, query, customFie
     let uniqueStrings = {};
     let error = undefined;
     try {
-        const convertedStringColumns = columns
-            .filter((column) => {
+        const convertedStringColumns = columns.filter((column) => {
             return isTextColumnType(column.fieldType);
-        })
-            .map((column) => convertColumnInfoToColumnInternal(column));
+        });
         const stringNames = convertedStringColumns.map((column) => column.field);
         if (stringNames.length > 0) {
             const smallStringColumns = await getCountsByColumns(convertedStringColumns, query, client, customFields);
             uniqueStrings = await getUniqueValuesByColumns(smallStringColumns, query, [], client, customFields);
         }
-        const dateColumns = columns
-            .filter((column) => {
+        const dateColumns = columns.filter((column) => {
             return column.fieldType === 'date';
-        })
-            .map((column) => convertColumnInfoToColumnInternal(column));
+        });
         if (dateColumns.length > 0) {
             dateRanges = await getDateRangeByColumns(dateColumns, query, client, customFields);
             if (dateRanges === null) {
@@ -104,7 +100,7 @@ export const getRelevantInfoFromQuery = async (columns, client, query, customFie
 };
 export const getCountsByColumns = async (columns, query, client, customFields) => {
     const stringNames = columns.map((column) => column.field);
-    const countQuery = generateCountQuery(stringNames, query, client.databaseType);
+    const countQuery = generateCountQuery(stringNames, query, client.databaseType || 'postgresql');
     try {
         const hostedBody = {
             metadata: {
@@ -174,7 +170,7 @@ export const getDateRangeByColumns = async (columns, query, client, customFields
     const columnNames = columns.map(
     // @ts-ignore
     (column) => column.field || column.name);
-    const distinctValueQuery = generateMinMaxRangeQueries(columnNames, query, client.databaseType);
+    const distinctValueQuery = generateMinMaxRangeQueries(columnNames, query, client.databaseType || 'postgresql');
     const dateRanges = await fetchDateRanges(distinctValueQuery, client, customFields);
     return dateRanges;
 };
@@ -199,8 +195,8 @@ const fetchDateRanges = async (query, client, customFields) => {
         const results = data.rows.reduce((acc, currentValue) => {
             acc[currentValue.field] = {
                 dateRange: {
-                    start: parseDateByDatabaseType(currentValue.min_range, client.databaseType),
-                    end: parseDateByDatabaseType(currentValue.max_range, client.databaseType),
+                    start: parseDateByDatabaseType(currentValue.min_range, client.databaseType || 'postgresql'),
+                    end: parseDateByDatabaseType(currentValue.max_range, client.databaseType || 'postgresql'),
                 },
             };
             return acc;

package/dist/esm/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/esm/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"}

package/dist/esm/utils/valueFormatter.js

@@ -27,36 +27,44 @@ export const valueFormatter = ({ value, field, fields }) => {
     const fieldInfo = fields.find((f) => f.field === field);
     if (!fieldInfo)
         return '';
-    const HANDLERS = {
-        percent: formatPercent,
-        dollar_amount: formatDollarAmount,
-        dollar_cents: formatDollarCents,
-        whole_number: formatWholeNumber,
-        one_decimal_place: formatOneDecimalPlace,
-        two_decimal_places: formatTwoDecimalPlaces,
-        string: formatString,
-        yyyy: format_YYYY,
-        MMM_dd: format_MMM_dd,
-        MMM_yyyy: format_MMM_yyyy,
-        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)) {
-        // if bigquery date type, we have to pull the value out of the json
-        if (DATE_FORMAT_TYPES.includes(formatType) &&
-            typeof value === 'object' &&
-            value.value) {
-            return HANDLERS[formatType](value.value);
-        }
-        return HANDLERS[formatType](value);
+    switch (formatType) {
+        case 'percent':
+            return formatPercent(value);
+        case 'dollar_amount':
+            return formatDollarAmount(value);
+        case 'dollar_cents':
+            return formatDollarCents(value);
+        case 'whole_number':
+            return formatWholeNumber(value);
+        case 'one_decimal_place':
+            return formatOneDecimalPlace(value);
+        case 'two_decimal_places':
+            return formatTwoDecimalPlaces(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);
+        // what is this
+        // 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
 };
 export const quillFormat = ({ value, format, }) => {
     // Handle special case, if value is null and format is numeric display '-'
@@ -64,36 +72,45 @@ export const quillFormat = ({ value, format, }) => {
         (NUMBER_FORMAT_TYPES.includes(format) || DATE_FORMAT_TYPES.includes(format))) {
         return '-';
     }
-    const HANDLERS = {
-        percent: formatPercent,
-        dollar_amount: formatDollarAmount,
-        dollar_cents: formatDollarCents,
-        whole_number: formatWholeNumber,
-        one_decimal_place: formatOneDecimalPlace,
-        two_decimal_places: formatTwoDecimalPlaces,
-        string: formatString,
-        yyyy: format_YYYY,
-        MMM_yyyy: format_MMM_yyyy,
-        MMM_dd_yyyy: format_MMM_dd_yyyy,
-        MMM_dd: format_MMM_dd,
-        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 = format;
-    if (HANDLERS[formatType]) {
-        // if bigquery date type, we have to pull the value out of the json
-        if (DATE_FORMAT_TYPES.includes(formatType) &&
-            typeof value === 'object' &&
-            value &&
-            value.value) {
-            return HANDLERS[formatType](value.value);
-        }
-        return HANDLERS[formatType](value);
+    switch (formatType) {
+        case 'percent':
+            return formatPercent(value);
+        case 'dollar_amount':
+            return formatDollarAmount(value);
+        case 'dollar_cents':
+            return formatDollarCents(value);
+        case 'whole_number':
+            return formatWholeNumber(value);
+        case 'one_decimal_place':
+            return formatOneDecimalPlace(value);
+        case 'two_decimal_places':
+            return formatTwoDecimalPlaces(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);
+        // what is this
+        // 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
 };
 /**
  * HELPER FUNCTION DEFINITIONS
@@ -240,18 +257,17 @@ const format_wo_yyyy = (value) => {
         return 'Invalid date';
     return `${getWeek(utcDate)},${utcDate.getFullYear()}`;
 };
-const format_MMM_ww_yyyy = (value) => {
-    const utcDate = 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_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}`;
+// };
 /**
  * Parses a numeric string back into a number, taking into account that
  * users in different locales will format numbers differently (eg. 1,234 means

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.12.41",
+  "version": "2.12.42",
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",

package/dist/cjs/DateRangePicker/Calendar.d.ts

@@ -1,17 +0,0 @@
-import { Dispatch, SetStateAction } from 'react';
-export declare const colStartClasses: string[];
-export interface CalendarProps {
-    enableYearPagination: boolean;
-    anchorDate: Date;
-    setStartOfCurrMonth: Dispatch<SetStateAction<Date | null>>;
-    startDate: Date | null;
-    endDate: Date | null;
-    minDate: Date | null;
-    maxDate: Date | null;
-    onDateClick: (date: Date) => void;
-    locale: Locale;
-    theme: any;
-}
-export declare function Calendar({ enableYearPagination, anchorDate, setStartOfCurrMonth, startDate, endDate, minDate, maxDate, onDateClick, locale, theme, }: CalendarProps): import("react/jsx-runtime").JSX.Element;
-export default Calendar;
-//# sourceMappingURL=Calendar.d.ts.map

package/dist/cjs/DateRangePicker/Calendar.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Calendar.d.ts","sourceRoot":"","sources":["../../../src/DateRangePicker/Calendar.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,QAAQ,EAAE,cAAc,EAAY,MAAM,OAAO,CAAC;AAiBlE,eAAO,MAAM,eAAe,UAQ3B,CAAC;AAkWF,MAAM,WAAW,aAAa;IAC5B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,UAAU,EAAE,IAAI,CAAC;IACjB,mBAAmB,EAAE,QAAQ,CAAC,cAAc,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC;IAC3D,SAAS,EAAE,IAAI,GAAG,IAAI,CAAC;IACvB,OAAO,EAAE,IAAI,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,IAAI,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,IAAI,GAAG,IAAI,CAAC;IACrB,WAAW,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,GAAG,CAAC;CACZ;AAED,wBAAgB,QAAQ,CAAC,EACvB,oBAAoB,EACpB,UAAU,EACV,mBAAmB,EACnB,SAAS,EACT,OAAO,EACP,OAAO,EACP,OAAO,EACP,WAAW,EACX,MAAM,EACN,KAAK,GACN,EAAE,aAAa,2CA6Bf;AAED,eAAe,QAAQ,CAAC"}