@quillsql/react 2.12.29 → 2.12.31

package/dist/esm/utils/pivotConstructor.js

@@ -24,13 +24,16 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
     }
     if (pivot.rowField && !pivot.rowFieldType) {
         const rowColumn = report.columns.find((column) => column.field === pivot.rowField);
-        pivot.rowFieldType = rowColumn.format;
+        pivot.rowFieldType = rowColumn?.format || 'string';
     }
     let distinctStringValues = undefined;
     if (!distinctStrings && report.rows && pivot.columnField) {
         const distinctValues = Array.from(new Set(report.rows.map((row) => row[pivot.columnField])));
         distinctStringValues = distinctValues.map((value) => value.toString());
     }
+    if (!report.itemQuery) {
+        return undefined;
+    }
     const sqlQuery = generatePivotQuery(pivot, report.itemQuery, client.databaseType, comparisonInterval, distinctStrings ? distinctStrings : distinctStringValues, dateBucket);
     if (sqlQuery && report.rows.length > 0) {
         const hostedBody = {
@@ -45,6 +48,7 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
                     overridePost: true,
                     convertDatatypes: true,
                 },
+                useNewNodeSql: true,
             },
         };
         const cloudBody = { ...hostedBody };
@@ -66,6 +70,9 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
             .map((field) => ({
             field: processColumnName(field.name),
             label: snakeCaseToTitleCase(processColumnName(field.name.replace('comparison_', 'comparison '))),
+            format: field.name === pivot.rowField
+                ? 'string'
+                : pivot.valueFieldType ?? 'whole_number',
         }))
             .filter((field, index) => field.field !== 'comparison_' + pivot.rowField || index === 0)
             .sort((a, b) => {
@@ -128,6 +135,14 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
                 }
             });
         }
+        // for the case of count agg on no value field
+        columns.forEach((column) => {
+            if (['null', 'undefined'].includes(column.label.toLowerCase()) &&
+                !pivot.valueField &&
+                pivot.aggregationType === 'count') {
+                column.label = 'Count';
+            }
+        });
         return {
             rows: rows,
             columns: columns,

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

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

package/dist/esm/utils/pivotProcessing.js

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

package/dist/esm/utils/queryConstructor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAmB9D,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAa1E;AA4CD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAUrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UASrB;AAED,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAcrB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAwBpB"}
+{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAmB9D,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAa1E;AAgDD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAUrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UASrB;AAED,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAcrB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAwBpB"}

package/dist/esm/utils/queryConstructor.js

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

package/dist/esm/utils/queryConstructor.uspec.js

@@ -3,7 +3,7 @@ const removeExtraSpacesAndNewLines = (str) => {
     return str.replace(/\s+/g, ' ').trim();
 };
 describe('queryConstructor', () => {
-    let default2DPivot = {
+    const default2DPivot = {
         rowField: 'merchant',
         rowFieldType: 'string',
         columnField: 'user',
@@ -16,7 +16,7 @@ describe('queryConstructor', () => {
         `select * from transactions where created_at BETWEEN '2024-05-01' AND '2024-06-01'`,
     ];
     describe('bigquery - generatePivotQuery', () => {
-        let databaseType = 'bigquery';
+        const databaseType = 'bigquery';
         it('should return a 2d string pivot query', async () => {
             const query = generatePivotQuery(default2DPivot, nonComparisonQuery, databaseType, undefined, ['value1', 'value2']);
             const expected = `WITH quill_qt AS (select * from transactions), 
@@ -144,13 +144,13 @@ describe('queryConstructor', () => {
         });
     });
     describe('postgresql - generatePivotQuery', () => {
-        let databaseType = 'postgresql';
+        const databaseType = 'postgresql';
         it('should return a 2d string pivot query', async () => {
             const query = generatePivotQuery(default2DPivot, ['select * from transactions'], databaseType, undefined, ['value1', 'value2']);
             const expected = `WITH quill_qt AS (select * from transactions),
       quill_qt_cw AS 
-      (SELECT \"merchant\", sum(CASE WHEN \"user\" = 'value1' THEN \"amount\" ELSE 0 END) AS \"value1\", 
-      sum(CASE WHEN \"user\" = 'value2' THEN \"amount\" ELSE 0 END) AS \"value2\" FROM quill_qt GROUP BY \"merchant\")
+      (SELECT "merchant", sum(CASE WHEN "user" = 'value1' THEN "amount" ELSE 0 END) AS "value1", 
+      sum(CASE WHEN "user" = 'value2' THEN "amount" ELSE 0 END) AS "value2" FROM quill_qt GROUP BY "merchant")
       SELECT * FROM quill_qt_cw qt`;
             expect(removeExtraSpacesAndNewLines(query)).toEqual(removeExtraSpacesAndNewLines(expected));
         });
@@ -161,12 +161,12 @@ describe('queryConstructor', () => {
                 rowField: 'created_at',
             }, ['select * from transactions'], databaseType, undefined, ['value1', 'value2']);
             const expected = `WITH quill_query_table AS (select * from transactions),
-      quill_qt_agg as (SELECT date_trunc('month', \"created_at\") as \"created_at\", 
-      sum(CASE WHEN qt.\"user\" = 'value1' THEN \"amount\" ELSE 0 END) AS \"value1\", 
-      sum(CASE WHEN qt.\"user\" = 'value2' THEN \"amount\" ELSE 0 END) AS \"value2\" 
+      quill_qt_agg as (SELECT date_trunc('month', "created_at") as "created_at", 
+      sum(CASE WHEN qt."user" = 'value1' THEN "amount" ELSE 0 END) AS "value1", 
+      sum(CASE WHEN qt."user" = 'value2' THEN "amount" ELSE 0 END) AS "value2" 
       FROM quill_query_table qt 
-      GROUP BY date_trunc('month', \"created_at\"))
-      SELECT * FROM quill_qt_agg qt ORDER BY qt.\"created_at\"`;
+      GROUP BY date_trunc('month', "created_at"))
+      SELECT * FROM quill_qt_agg qt ORDER BY qt."created_at"`;
             expect(removeExtraSpacesAndNewLines(query)).toEqual(removeExtraSpacesAndNewLines(expected));
         });
         it('should return a 1d date pivot query', async () => {
@@ -177,10 +177,10 @@ describe('queryConstructor', () => {
                 columnField: undefined,
             }, ['select * from transactions'], databaseType, undefined);
             const expected = `WITH quill_qt AS (select * from transactions),
-      quill_qt_agg AS (SELECT date_trunc('month', \"created_at\") as \"created_at\", sum(\"amount\") as \"amount\"
+      quill_qt_agg AS (SELECT date_trunc('month', "created_at") as "created_at", sum("amount") as "amount"
       FROM quill_qt 
-      GROUP BY date_trunc('month', \"created_at\"))
-      SELECT * FROM quill_qt_agg qt ORDER BY qt.\"created_at\"`;
+      GROUP BY date_trunc('month', "created_at"))
+      SELECT * FROM quill_qt_agg qt ORDER BY qt."created_at"`;
             expect(removeExtraSpacesAndNewLines(query)).toEqual(removeExtraSpacesAndNewLines(expected));
         });
         it('should return a 1d string pivot query', async () => {
@@ -208,15 +208,15 @@ describe('queryConstructor', () => {
             }, comparisonQueries, databaseType, '90 DAY', ['value1', 'value2']);
             const expected = `WITH quill_query_table AS 
       (select * from transactions where created_at BETWEEN '2024-06-01' AND '2024-07-01'), 
-      quill_qt_agg as (SELECT date_trunc('month', \"created_at\") as \"created_at\", 
-      sum(CASE WHEN qt.\"user\" = 'value1' THEN \"amount\" ELSE 0 END) AS \"value1\", 
-      sum(CASE WHEN qt.\"user\" = 'value2' THEN \"amount\" ELSE 0 END) AS \"value2\" FROM quill_query_table qt GROUP BY date_trunc('month', \"created_at\")) , 
+      quill_qt_agg as (SELECT date_trunc('month', "created_at") as "created_at", 
+      sum(CASE WHEN qt."user" = 'value1' THEN "amount" ELSE 0 END) AS "value1", 
+      sum(CASE WHEN qt."user" = 'value2' THEN "amount" ELSE 0 END) AS "value2" FROM quill_query_table qt GROUP BY date_trunc('month', "created_at")) , 
       quill_ct as (select * from transactions where created_at BETWEEN '2024-05-01' AND '2024-06-01') , 
-      quill_ct_cw as (SELECT date_trunc('month', \"created_at\") as \"comparison_created_at\", 
-      sum(CASE WHEN \"user\" = 'value1' THEN \"amount\" ELSE 0 END) AS \"comparison_value1\", 
-      sum(CASE WHEN \"user\" = 'value2' THEN \"amount\" ELSE 0 END) AS \"comparison_value2\" FROM quill_ct GROUP BY date_trunc('month', \"created_at\")) 
-      SELECT * FROM quill_qt_agg qt LEFT JOIN quill_ct_cw \"ct\" ON qt.\"created_at\" = date_trunc('month', (\"ct\".\"comparison_created_at\" + INTERVAL '90 DAY')) 
-      ORDER BY qt.\"created_at\"`;
+      quill_ct_cw as (SELECT date_trunc('month', "created_at") as "comparison_created_at", 
+      sum(CASE WHEN "user" = 'value1' THEN "amount" ELSE 0 END) AS "comparison_value1", 
+      sum(CASE WHEN "user" = 'value2' THEN "amount" ELSE 0 END) AS "comparison_value2" FROM quill_ct GROUP BY date_trunc('month', "created_at")) 
+      SELECT * FROM quill_qt_agg qt LEFT JOIN quill_ct_cw "ct" ON qt."created_at" = date_trunc('month', ("ct"."comparison_created_at" + INTERVAL '90 DAY')) 
+      ORDER BY qt."created_at"`;
             expect(removeExtraSpacesAndNewLines(query)).toEqual(removeExtraSpacesAndNewLines(expected));
         });
     });

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

@@ -0,0 +1,10 @@
+import { QuillReport, QuillReportInternal } from '../models/Report';
+import { AdditionalProcessing } from './tableProcessing';
+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<{
+    report: QuillReportInternal;
+    error?: string;
+}>;
+export declare const formatRowsFromReport: (report: any) => any;
+export declare function convertInternalReportToReport(report: QuillReportInternal): QuillReport;
+//# sourceMappingURL=report.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/utils/report.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AASpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,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,CA2F1D;AAED,eAAO,MAAM,oBAAoB,WAAY,GAAG,QAkB/C,CAAC;AAEF,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,mBAAmB,GAC1B,WAAW,CAsDb"}

package/dist/esm/utils/report.ispec.d.ts

@@ -0,0 +1,2 @@
+export declare function getClient(publicKey: string): Promise<any>;
+//# sourceMappingURL=report.ispec.d.ts.map

package/dist/esm/utils/report.ispec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"report.ispec.d.ts","sourceRoot":"","sources":["../../../src/utils/report.ispec.ts"],"names":[],"mappings":"AAIA,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,gBAqBhD"}

package/dist/esm/utils/report.ispec.js

@@ -0,0 +1,46 @@
+import { fetchReport } from './report';
+const QUERY_ENDPOINT = 'https://quill-344421.uc.r.appspot.com/cloud';
+export async function getClient(publicKey) {
+    const response = await fetch(QUERY_ENDPOINT, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+            metadata: {
+                clientId: publicKey,
+                publicKey,
+                task: 'client',
+            },
+        }),
+    });
+    const result = await response.json();
+    return {
+        ...result.data.client,
+        publicKey: result.data.client._id,
+        customerId: result.data.client.adminCustomerId,
+        queryEndpoint: QUERY_ENDPOINT,
+    };
+}
+describe('report', () => {
+    let client = undefined;
+    beforeAll(async () => {
+        const publicKey = '65d65b57cdd8ae70a5648d9c';
+        client = await getClient(publicKey);
+    });
+    describe('fetchReport', () => {
+        it('should fetch report', async () => {
+            const reportId = '669167e392533d0c68bfe002';
+            const report = await fetchReport(reportId, client);
+            expect(report.report).toBeDefined();
+            expect(report.report.pivot).toBeDefined();
+            expect(report.report.rows).toBeDefined();
+        });
+        it('should fetch the broken report and return an error', async () => {
+            const reportId = '66a3d7ef28ca14000c51f498';
+            const report = await fetchReport(reportId, client);
+            expect(report.report).toBeDefined();
+            expect(report.report.error).toBeDefined();
+        });
+    });
+});

package/dist/esm/utils/report.js

@@ -0,0 +1,174 @@
+import { getYAxisFields } from './columnProcessing';
+import { cleanDashboardItem } from './dashboard';
+import { getData } from './dataFetcher';
+import { DataLoadError } from './error';
+import { processFilterErrorList } from './errorProcessing';
+import { internalLog } from './logging';
+import { mergeComparisonRange } from './merge';
+import { isValidPivot } from './pivotProcessing';
+import { quillFormat } from './valueFormatter';
+export const EMPTY_REPORT = {
+    id: '',
+    name: '',
+    dashboardName: '',
+    rows: [],
+    columns: [],
+    chartType: '',
+    dateField: null,
+    pivot: null,
+    xAxisLabel: '',
+    xAxisField: '',
+    xAxisFormat: 'string',
+    yAxisFields: [],
+    order: -1,
+    compareRows: [],
+    filtersApplied: [],
+    queryString: '',
+    rowCount: 0,
+};
+export async function fetchReport(reportId, client, useReportTask = true, filters = [], additionalProcessing, dateBucket, customFields) {
+    let reportInfo = undefined;
+    let errorMessage = undefined;
+    try {
+        // Remove extra fields on each filter so we don't confuse the backend.
+        const hostedBody = {
+            metadata: {
+                reportId,
+                dashboardItemId: reportId,
+                orgId: client.customerId || '*',
+                clientId: client.publicKey,
+                task: useReportTask ? 'report' : 'item',
+                databaseType: client.databaseType,
+                filters: filters,
+                customFields,
+                additionalProcessing,
+                useNewNodeSql: true,
+            },
+        };
+        const cloudBody = {
+            id: reportId,
+            filters: filters,
+            useNewNodeSql: true,
+        };
+        const resp = await getData(client, 'itempost', 'omit', hostedBody, cloudBody, 'POST', 'fetch-data');
+        processFilterErrorList(resp);
+        const dashboardItem = { ...resp, filtersApplied: filters };
+        if (resp.errorMessage) {
+            throw new DataLoadError(resp?.errorMessage, { ...resp, useReportTask });
+        }
+        if (resp.compareRows) {
+            mergeComparisonRange(resp);
+        }
+        reportInfo = await cleanDashboardItem(dashboardItem, filters, client, dateBucket);
+        if (additionalProcessing) {
+            reportInfo.pagination = additionalProcessing.page;
+            reportInfo.sort = additionalProcessing.sort;
+        }
+    }
+    catch (error) {
+        if (error instanceof DataLoadError) {
+            if (error.data.useReportTask) {
+                internalLog('USING ITEM AS BACKUP');
+                const { report, error } = await fetchReport(reportId, client, false, filters, additionalProcessing, dateBucket, customFields);
+                reportInfo = report;
+                errorMessage = error;
+            }
+            else {
+                if (!error.data.data) {
+                    errorMessage = "Couln't find report";
+                    reportInfo = EMPTY_REPORT;
+                }
+                else {
+                    reportInfo = {
+                        ...error.data.data,
+                        id: error.data.data._id,
+                        error: error.message,
+                        adminError: error.data.adminErrorMessage,
+                    };
+                }
+                errorMessage = error.message;
+            }
+        }
+        else {
+            reportInfo = {
+                id: reportId,
+                rows: [],
+                columns: [],
+            };
+            errorMessage = error.message;
+        }
+    }
+    return { report: reportInfo, error: errorMessage };
+}
+export const formatRowsFromReport = (report) => {
+    if (!report.rows || !report.columns) {
+        return [];
+    }
+    return report.rows.map((row) => {
+        return report.columns.reduce((formattedRow, column) => {
+            // Apply the format function to each field in the row
+            const formattedValue = quillFormat({
+                value: row[column.field],
+                format: column.format,
+            });
+            formattedRow[column.field] = formattedValue;
+            return formattedRow;
+        }, {});
+    });
+};
+export function convertInternalReportToReport(report) {
+    try {
+        if (!report) {
+            return EMPTY_REPORT;
+        }
+        const formattedReport = {
+            ...report,
+        };
+        if (formattedReport.pivot && isValidPivot(formattedReport.pivot)) {
+            let columns = report.pivotColumns ?? report.columns;
+            let rows = report.pivotRows ?? report.rows;
+            if (report.chartType === 'table') {
+                columns =
+                    report.pivotColumns?.map((col, index) => {
+                        if (index === 0) {
+                            return {
+                                ...col,
+                                format: col.format || 'string',
+                            };
+                        }
+                        return {
+                            ...col,
+                            format: report.pivot?.valueFieldType || 'whole_number',
+                        };
+                    }) ?? report.columns;
+                rows = formatRowsFromReport({ rows, columns });
+            }
+            else if (report.chartType === 'metric') {
+                columns =
+                    report.pivotColumns?.map((col) => {
+                        return { ...col, format: report.xAxisFormat };
+                    }) ?? report.columns;
+                rows = formatRowsFromReport({ rows, columns });
+            }
+            return {
+                ...formattedReport,
+                rows: rows,
+                yAxisFields: getYAxisFields(report),
+                columns: columns,
+                rowCount: rows ? rows.length : 0,
+            };
+        }
+        let rows = report.rows;
+        if (report.chartType === 'metric' || report.chartType === 'table') {
+            rows = formatRowsFromReport(report);
+        }
+        return {
+            ...formattedReport,
+            rows: rows,
+            yAxisFields: getYAxisFields(report),
+        };
+    }
+    catch (error) {
+        return EMPTY_REPORT;
+    }
+}

package/dist/esm/utils/report.uspec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=report.uspec.d.ts.map

package/dist/esm/utils/report.uspec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"report.uspec.d.ts","sourceRoot":"","sources":["../../../src/utils/report.uspec.ts"],"names":[],"mappings":""}

package/dist/esm/utils/report.uspec.js

@@ -0,0 +1,66 @@
+import { DEFAULT_COMPARISON_DATE_FILTER, TWO_D_PIVOT, GENERIC_REPORT_INTERNAL, } from '../test-utils/constants';
+import { createComparisonColumnsFromColumns, createRows, } from '../test-utils/generators';
+import { convertInternalReportToReport } from './report';
+describe('report', () => {
+    describe('convertInternalReportToReport', () => {
+        it('should convert a generic internal report to a generic report', () => {
+            const internalReport = {
+                ...GENERIC_REPORT_INTERNAL,
+                rows: createRows(GENERIC_REPORT_INTERNAL.columns, 10),
+            };
+            const report = convertInternalReportToReport(internalReport);
+            expect(report).toEqual(internalReport);
+        });
+        it('should convert a comparison internal report to a comparison report', () => {
+            const internalReport = {
+                ...GENERIC_REPORT_INTERNAL,
+                rows: createRows(GENERIC_REPORT_INTERNAL.columns, 10),
+                compareRows: createRows(GENERIC_REPORT_INTERNAL.columns, 10),
+                filtersApplied: [DEFAULT_COMPARISON_DATE_FILTER],
+            };
+            const report = convertInternalReportToReport(internalReport);
+            expect(report).toBeDefined();
+            expect(report.yAxisFields).toBeDefined();
+            expect(report.yAxisFields[1]).toEqual({
+                field: 'comparison_id',
+                format: 'whole_number',
+                label: 'comparison ID',
+            });
+        });
+        it('should convert a pivot internal report to a pivot report', () => {
+            const pivotRows = createRows(TWO_D_PIVOT.pivotColumns, 6);
+            const internalReport = {
+                ...GENERIC_REPORT_INTERNAL,
+                rows: createRows(GENERIC_REPORT_INTERNAL.columns, 10),
+                pivotColumns: TWO_D_PIVOT.pivotColumns,
+                pivotRows: pivotRows,
+                pivot: TWO_D_PIVOT.pivot,
+            };
+            const report = convertInternalReportToReport(internalReport);
+            expect(report).toBeDefined();
+            expect(report.yAxisFields).toBeDefined();
+            expect(report.rows).toEqual(pivotRows);
+            expect(report.yAxisFields[1]).toEqual({
+                field: 'Fuel',
+                format: 'whole_number',
+                label: 'Fuel',
+            });
+        });
+        it('should convert a comparison pivot internal report to a pivot report', () => {
+            const pivotColumns = createComparisonColumnsFromColumns(TWO_D_PIVOT.pivotColumns);
+            const pivotRows = createRows(pivotColumns, 6);
+            const internalReport = {
+                ...GENERIC_REPORT_INTERNAL,
+                rows: createRows(GENERIC_REPORT_INTERNAL.columns, 10),
+                pivotColumns,
+                pivotRows,
+                pivot: TWO_D_PIVOT.pivot,
+            };
+            const report = convertInternalReportToReport(internalReport);
+            expect(report).toBeDefined();
+            expect(report.yAxisFields).toBeDefined();
+            expect(report.rows).toEqual(pivotRows);
+            expect(report.yAxisFields.length).toEqual(pivotColumns.length - 1);
+        });
+    });
+});

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

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

package/dist/esm/utils/schema.js

@@ -1,3 +1,28 @@
+const triggerSoftUpdate = async (client, tables) => {
+    const { queryEndpoint, queryHeaders, publicKey } = client;
+    tables.forEach(async (table) => {
+        if (table.isSelectStar) {
+            fetch(`${queryEndpoint}?update-view`, {
+                method: 'POST',
+                headers: {
+                    ...queryHeaders,
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({
+                    metadata: {
+                        preQueries: [table.viewQuery.replace(/;/, '')],
+                        clientId: publicKey,
+                        publicKey: publicKey,
+                        task: 'update-view',
+                        name: table.name,
+                        id: table._id,
+                        runQueryConfig: { getColumns: true },
+                    },
+                }),
+            });
+        }
+    });
+};
 const parseResponse = (results) => {
     if (results.data?.data) {
         if (results.data.data.queries &&
@@ -27,7 +52,7 @@ export const getCustomFieldInfo = async (client, caller = 'se') => {
             !['65d65b57cdd8ae70a5648d9c', '665610862cf7a3000be66453'].includes(publicKey)) {
             throw new Error('CUSTOM FIELDS IS ONLY ALLOWED FOR POSTGRESQL DATABASES');
         }
-        let response = await fetch(`${queryEndpoint}?cfr-${caller}`, {
+        const response = await fetch(`${queryEndpoint}?cfr-${caller}`, {
             method: 'POST',
             headers: {
                 ...queryHeaders,
@@ -43,7 +68,7 @@ export const getCustomFieldInfo = async (client, caller = 'se') => {
                 },
             }),
         });
-        let result = await response.json();
+        const result = await response.json();
         const extractedData = parseResponse(result);
         const customFieldsByTable = [];
         extractedData.forEach((table) => {
@@ -78,11 +103,13 @@ export const getCustomFieldInfo = async (client, caller = 'se') => {
             return true;
         });
     }
-    catch (e) { }
+    catch (e) {
+        return customFieldsByTableUnique;
+    }
     return customFieldsByTableUnique;
 };
 export const getSchemaInfoWithCustomFields = async (client, caller = 'se') => {
-    const { queryEndpoint, queryHeaders, publicKey, databaseType, customerId } = client;
+    const { queryEndpoint, queryHeaders, publicKey, customerId } = client;
     let customFieldsByTableUnique = [];
     let getCustomFields = true;
     if (!customerId || customerId !== '*') {
@@ -112,13 +139,15 @@ export const getSchemaInfoWithCustomFields = async (client, caller = 'se') => {
                     : true,
                 orgId: client.customerId || '*',
                 customFieldsByTable: customFieldsByTableUnique,
-                gatherSchemaData: true,
+                gatherSchemaData: '665610862cf7a3000be66453' === publicKey ? true : false,
             },
         }),
     });
     const result = await response.json();
+    const parsedData = parseResponse(result);
+    triggerSoftUpdate(client, parsedData);
     return {
-        schemaData: parseResponse(result),
+        schemaData: parsedData,
         customFieldsByTable: customFieldsByTableUnique,
     };
 };

package/dist/esm/utils/styles.d.ts

@@ -4,7 +4,7 @@ export type StyleProps = {
     className: string;
 } | {
     style: CSSProperties;
-} | {};
+} | NonNullable<unknown>;
 /**
  * Converts the given styles to a props object that can be passed directly into
  * a jsx/tsx component. Converts to className if styles is a string, otherwise

package/dist/esm/utils/styles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../src/utils/styles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,aAAa,GAAG,SAAS,CAAC;AAC5D,MAAM,MAAM,UAAU,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,aAAa,CAAA;CAAE,GAAG,EAAE,CAAC;AAE/E;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU,CAO3D"}
+{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../src/utils/styles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,aAAa,GAAG,SAAS,CAAC;AAC5D,MAAM,MAAM,UAAU,GAClB;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,GACrB;IAAE,KAAK,EAAE,aAAa,CAAA;CAAE,GACxB,WAAW,CAAC,OAAO,CAAC,CAAC;AAEzB;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU,CAO3D"}