@quillsql/react 2.12.29 → 2.12.30

package/dist/esm/utils/report.js

@@ -0,0 +1,88 @@
+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 { quillFormat } from './valueFormatter';
+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 {
+                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) => {
+    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;
+        }, {});
+    });
+};

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"}

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

@@ -1,14 +1,12 @@
-import { QuillReport } from '../Dashboard';
-import { Column } from '../models/Columns';
+import { Column, ColumnInternal } from '../models/Columns';
+import { Pagination } from '../models/Pagination';
 export interface AdditionalProcessing {
     sort?: {
         field: string;
         direction: string;
     };
-    page?: {
-        currentPage: number;
-        rowsPerPage: number;
-    };
+    page?: Pagination;
+    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<{
@@ -25,7 +23,23 @@ export declare const getDateRangeByColumns: (columns: Column[], query: string, c
         };
     };
 } | null>;
-export declare const getPaginatedRows: (report: QuillReport, client: any, processing?: any, filters?: any, customFields?: any) => Promise<{
-    [field: string]: any;
+export declare const getPaginatedRows: (client: any, 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<{
+    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<{
+    columns: Column[];
+    rows: any[];
+    rowCount?: number | undefined;
+    error?: string | undefined;
 }>;
 //# sourceMappingURL=tableProcessing.d.ts.map

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,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAW3C,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,CAAC,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;CACrD;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;;;;SAiEpB,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,WAAW,UACX,GAAG,eACE,GAAG,YACN,GAAG,iBACE,GAAG;;EA4CnB,CAAC"}
+{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAalD,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,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;;;;EAkDZ,CAAC;AAEF,eAAO,MAAM,kBAAkB,aACnB,MAAM,UACR,GAAG,eACE,oBAAoB,YACvB,GAAG,iBACE,GAAG;aAET,MAAM,EAAE;UACX,GAAG,EAAE;;;EA6EZ,CAAC"}

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

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

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

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

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

@@ -0,0 +1,61 @@
+import { DEFAULT_PAGINATION } from './paginationProcessing';
+import { getClient } from './report.ispec';
+import { fetchTableByQuery, fetchTableByReport } from './tableProcessing';
+describe('tableProcessing', () => {
+    let client = undefined;
+    beforeAll(async () => {
+        const publicKey = '65d65b57cdd8ae70a5648d9c';
+        client = await getClient(publicKey);
+    });
+    describe('fetchTableByQuery', () => {
+        it('should table data with processing', async () => {
+            const query = 'select * from transactions';
+            const tableData = await fetchTableByQuery(query, client, {
+                page: DEFAULT_PAGINATION,
+            });
+            expect(tableData.rows).toBeDefined();
+            expect(tableData.rows.length).toEqual(DEFAULT_PAGINATION.rowsPerRequest);
+            expect(tableData.columns).toBeDefined();
+            expect(tableData.rowCount).toBeDefined();
+        });
+        it('should table data without prcessing info', async () => {
+            const query = 'select * from transactions';
+            const tableData = await fetchTableByQuery(query, client);
+            expect(tableData.rows).toBeDefined();
+            expect(tableData.columns).toBeDefined();
+            expect(tableData.rowCount).toBeUndefined();
+        });
+        it('should return an error message on query failu', async () => {
+            const query = 'select * from transactionss';
+            const tableData = await fetchTableByQuery(query, client, {
+                page: DEFAULT_PAGINATION,
+            });
+            expect(tableData.rows.length).toEqual(0);
+            expect(tableData.error).toBeDefined();
+        });
+    });
+    describe('fetchTableByReport', () => {
+        it('should get table data with reportId', async () => {
+            const reportId = '669167e392533d0c68bfe002';
+            const tableData = await fetchTableByReport(reportId, client, {
+                page: DEFAULT_PAGINATION,
+            });
+            expect(tableData.rows).toBeDefined();
+            expect(tableData.rows.length).toEqual(DEFAULT_PAGINATION.rowsPerRequest);
+            expect(tableData.columns).toBeDefined();
+        });
+        it('should get table data without processing', async () => {
+            const reportId = '669167e392533d0c68bfe002';
+            const tableData = await fetchTableByReport(reportId, client);
+            expect(tableData.rows).toBeDefined();
+            expect(tableData.columns).toBeDefined();
+        });
+        it('should return an error on failure', async () => {
+            const reportId = 'DUMMY669167e392533d0c68bfe002';
+            const tableData = await fetchTableByReport(reportId, client);
+            expect(tableData.rows).toBeDefined();
+            expect(tableData.columns).toBeDefined();
+            expect(tableData.error).toBeDefined();
+        });
+    });
+});

package/dist/esm/utils/tableProcessing.js

@@ -1,7 +1,9 @@
+import { convertPostgresColumn } from './columnProcessing';
 import { getData } from './dataFetcher';
 import { parseDateByDatabaseType } from './dates';
 import { processFilterErrorList } from './errorProcessing';
 import { mergeComparisonRange } from './merge';
+import { DEFAULT_PAGINATION } from './paginationProcessing';
 import { generateCountQuery, generateDistinctQuery, generateMinMaxRangeQueries, } from './queryConstructor';
 export const hasColumnAlias = (columns, referencedColumns) => {
     if (!referencedColumns) {
@@ -28,11 +30,12 @@ export const getUniqueValuesByColumns = async (columns, query, rows, client, cus
                     clientId: client.publicKey,
                     databaseType: client?.databaseType,
                     customFieldsByTable: customFields,
+                    useNewNodeSql: true,
                 },
             };
             const cloudBody = { query };
             const data = await getData(client, 'dashquery', 'same-origin', hostedBody, cloudBody);
-            if (data.errorMessage) {
+            if (!data || data.errorMessage) {
                 return null;
             }
             rows = data.rows;
@@ -72,6 +75,7 @@ export const getCountsByColumns = async (columns, query, client, customFields) =
                 clientId: client.publicKey,
                 databaseType: client?.databaseType,
                 customFieldsByTable: customFields,
+                useNewNodeSql: true,
             },
         };
         const cloudBody = { countQuery };
@@ -89,7 +93,6 @@ export const getCountsByColumns = async (columns, query, client, customFields) =
         return filteredColumns;
     }
     catch (e) {
-        console.error(e);
         return columns;
     }
 };
@@ -103,6 +106,7 @@ const fetchDistinctStrings = async (query, client, customFields) => {
                 clientId: client.publicKey,
                 databaseType: client?.databaseType,
                 customFieldsByTable: customFields,
+                useNewNodeSql: true,
             },
         };
         const cloudBody = { query };
@@ -124,7 +128,6 @@ const fetchDistinctStrings = async (query, client, customFields) => {
         return results;
     }
     catch (e) {
-        console.error(e);
         return null;
     }
 };
@@ -146,6 +149,7 @@ const fetchDateRanges = async (query, client, customFields) => {
                 clientId: client.publicKey,
                 databaseType: client?.databaseType,
                 customFieldsByTable: customFields,
+                useNewNodeSql: true,
             },
         };
         const cloudBody = { query };
@@ -165,18 +169,71 @@ const fetchDateRanges = async (query, client, customFields) => {
         return results;
     }
     catch (e) {
-        console.error(e);
         return null;
     }
 };
-export const getPaginatedRows = async (report, client, processing, filters, customFields) => {
-    let updatedProcessing = { ...processing };
+export const getPaginatedRows = async (client, query, reportId, processing, filters, customFields) => {
+    if (query) {
+        return await fetchTableByQuery(query, client, processing, customFields);
+    }
+    else if (reportId) {
+        return await fetchTableByReport(reportId, client, processing, filters, customFields);
+    }
+    return { rows: [], columns: [] };
+};
+export const fetchTableByQuery = async (query, client, processing, customFields) => {
+    let rows = [];
+    let columns = [];
+    let error = undefined;
+    let rowCount = undefined;
+    let itemQuery = undefined;
+    try {
+        const hostedBody = {
+            metadata: {
+                query,
+                task: 'query',
+                orgId: client.customerId || '*',
+                clientId: client.publicKey,
+                databaseType: client?.databaseType,
+                getCustomFields: !client.customerId || client.customerId === '*' ? false : true,
+                customFieldsByTable: customFields,
+                additionalProcessing: processing,
+                useUpdatedDataGathering: processing ? true : false,
+                useNewNodeSql: true,
+            },
+        };
+        const cloudBody = { query };
+        const resp = await getData(client, 'dashquery', 'same-origin', hostedBody, cloudBody);
+        if (resp && resp.errorMessage) {
+            throw new Error(resp.errorMessage);
+        }
+        if (resp.rowCount) {
+            rowCount = resp.rowCount;
+        }
+        columns = resp.fields.map((elem) => convertPostgresColumn(elem));
+        rows = resp.rows;
+        itemQuery = resp.itemQuery;
+    }
+    catch (e) {
+        rows = [];
+        columns = [];
+        error = e.message;
+    }
+    return { rows, columns, rowCount, error, itemQuery };
+};
+export const fetchTableByReport = async (reportId, client, processing, filters, customFields) => {
+    const updatedProcessing = { ...processing };
+    let rows = [];
+    let columns = [];
+    let rowCount;
+    let error;
     if (processing && processing.sort && !updatedProcessing.page) {
-        updatedProcessing.page = {};
-        updatedProcessing.page.currentPage = 0;
+        updatedProcessing.page = DEFAULT_PAGINATION;
+        updatedProcessing.page.page = 0;
     }
-    const minimalFilters = Object.values(filters).length
-        ? Object.values(filters).map((filter) => {
+    const processedFilters = filters ? filters : [];
+    const minimalFilters = Object.values(processedFilters).length
+        ? Object.values(processedFilters).map((filter) => {
             const newFilter = { ...filter };
             if (newFilter.filterType === 'date_range') {
                 delete newFilter['field'];
@@ -186,29 +243,51 @@ export const getPaginatedRows = async (report, client, processing, filters, cust
             return newFilter;
         })
         : [];
-    const hostedBody = {
-        metadata: {
-            dashboardItemId: report.id,
-            orgId: client?.customerId || '*',
-            task: 'item',
-            filters: minimalFilters,
-            clientId: client?.publicKey,
-            databaseType: client?.databaseType,
-            additionalProcessing: updatedProcessing,
-            forcePagination: true,
-            customFields,
-        },
-    };
-    const cloudBody = {
-        id: report.id,
-        filters: [],
-    };
-    const resp = await getData(client, 'itempost', 'omit', hostedBody, cloudBody);
-    processFilterErrorList(resp);
-    if (resp && resp.name !== 'error') {
-        if (resp.compareRows) {
-            mergeComparisonRange(resp);
+    try {
+        const hostedBody = {
+            metadata: {
+                dashboardItemId: reportId,
+                orgId: client?.customerId || '*',
+                task: 'item',
+                filters: minimalFilters,
+                clientId: client?.publicKey,
+                databaseType: client?.databaseType,
+                additionalProcessing: updatedProcessing,
+                forcePagination: true,
+                customFields,
+                useNewNodeSql: true,
+            },
+        };
+        const cloudBody = {
+            id: reportId,
+            filters: [],
+            useNewNodeSql: true,
+        };
+        const resp = await getData(client, 'itempost', 'omit', hostedBody, cloudBody);
+        if (resp.errorMessage) {
+            throw new Error(resp.errorMessage);
+        }
+        processFilterErrorList(resp);
+        if (resp.rowCount) {
+            rowCount = resp.rowCount;
+        }
+        const gatheredRows = resp.rows && resp.rows.length ? resp.rows : [];
+        columns = resp.fields.map((elem) => convertPostgresColumn(elem));
+        rows = gatheredRows;
+        if (resp && resp.name !== 'error') {
+            if (resp.compareRows) {
+                mergeComparisonRange(resp);
+            }
+        }
+        else {
+            throw new Error(resp.errorMessage);
         }
     }
-    return resp.rows;
+    catch (e) {
+        rows = [];
+        columns = [];
+        rowCount = 0;
+        error = e.message;
+    }
+    return { rows, columns, rowCount, error };
 };

package/dist/esm/utils/textProcessing.js

@@ -2,10 +2,10 @@ export function capitalize(text) {
     return text.charAt(0).toUpperCase() + text.slice(1);
 }
 export function depluralize(text) {
-    if (text.endsWith("ies")) {
-        return text.slice(0, -3) + "y";
+    if (text.endsWith('ies')) {
+        return text.slice(0, -3) + 'y';
     }
-    if (text.endsWith("s")) {
+    if (text.endsWith('s')) {
         return text.slice(0, -1);
     }
     return text;

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

@@ -0,0 +1,9 @@
+import { ChartBuilderData } from '../ChartBuilder';
+export declare const validateReport: (formData: ChartBuilderData, dashboardData: {
+    filters?: any[];
+    dateFilter?: any;
+}, defaultDateFilter: {
+    table?: string;
+    field?: string;
+}, allTables: any[]) => any[];
+//# sourceMappingURL=validation.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../src/utils/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,eAAO,MAAM,cAAc,aACf,gBAAgB,iBACX;IAAE,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,CAAA;CAAE,qBACjC;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,aAC1C,GAAG,EAAE,UA4BjB,CAAC"}

package/dist/esm/utils/validation.js

@@ -0,0 +1,20 @@
+export const validateReport = (formData, dashboardData, defaultDateFilter, allTables) => {
+    const issues = [];
+    const filters = dashboardData.filters || [];
+    const dateFilter = dashboardData.dateFilter;
+    if (dateFilter && dateFilter.comparison && formData.chartType === 'pie') {
+        issues.push(`"${formData.dashboardName}" is a date comparison dashboard that only supports line and column charts.`);
+    }
+    if (dateFilter &&
+        ((!defaultDateFilter.table && !defaultDateFilter.field) ||
+            (!formData.dateField.field && !formData.dateField.table))) {
+        issues.push(`Delete the date filter "${formData.dashboardName}" or add to another dashboard.`);
+    }
+    filters.forEach((filter) => {
+        const table = allTables.find((elem) => elem === filter.table);
+        if (!table) {
+            issues.push(`Delete the "${filter.label}" filter on "${formData.dashboardName}" or add to another dashboard.`);
+        }
+    });
+    return issues;
+};

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,MAwCH,CAAC;AAiNF,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,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"}

package/dist/esm/utils/valueFormatter.js

@@ -60,7 +60,8 @@ export const valueFormatter = ({ value, field, fields }) => {
 };
 export const quillFormat = ({ value, format, }) => {
     // Handle special case, if value is null and format is numeric display '-'
-    if (value === null && NUMBER_FORMAT_TYPES.includes(format)) {
+    if (value === null &&
+        (NUMBER_FORMAT_TYPES.includes(format) || DATE_FORMAT_TYPES.includes(format))) {
         return '-';
     }
     const HANDLERS = {
@@ -195,9 +196,13 @@ const formatPercent = (value) => {
 // Converts the value to a UTC date with the given format string. If the
 // resulting date is invalid, it returns "Invalid date".
 const _getUTCDateHelper = (value, fmt) => {
-    const utcDate = utcToZonedTime(new Date(value), 'UTC');
+    const parsedDate = parse(value, fmt, new Date());
+    const utcDate = isValid(parsedDate)
+        ? utcToZonedTime(parsedDate, 'UTC')
+        : utcToZonedTime(new Date(value), 'UTC');
+    // const utcDate: Date = utcToZonedTime(new Date(value), 'UTC');
     if (!isValid(utcDate))
-        return 'Invalid date';
+        return value; //'Invalid date';
     return format(utcDate, fmt);
 };
 const format_YYYY = (value) => _getUTCDateHelper(value, 'yyyy');
@@ -239,7 +244,6 @@ const format_MMM_ww_yyyy = (value) => {
     const utcDate = utcToZonedTime(new Date(value), 'UTC');
     if (!isValid(utcDate))
         return 'Invalid date';
-    const currentDate = new Date();
     const startOfWeekDate = startOfWeek(utcDate, { weekStartsOn: 1 });
     const endOfWeekDate = endOfWeek(utcDate, { weekStartsOn: 1 });
     const month = format(utcDate, 'MMM');

package/package.json

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

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

@@ -1 +0,0 @@
-{"version":3,"file":"monacoAutocomplete.d.ts","sourceRoot":"","sources":["../../../src/utils/monacoAutocomplete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAY,KAAK,EAAE,MAAM,eAAe,CAAC;AAGhD,UAAU,cAAc;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AA4HD,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,GAAG,EAAE,EACb,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,MAAM,GACnB,cAAc,EAAE,CA4BlB;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,MAAM;;;;;;IAMrB"}