@quillsql/react 2.13.48 → 2.13.49

package/dist/cjs/utils/pivotConstructor.js

@@ -11,7 +11,7 @@ const dates_1 = require("./dates");
 const merge_1 = require("./merge");
 const queryConstructor_1 = require("./queryConstructor");
 const textProcessing_1 = require("./textProcessing");
-async function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFilter, distinctStrings, dashboardName, tenants, additionalProcessing, pivotQuery, comparisonPivotQuery, getPivotRowCount = true, caller, }) {
+async function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFilter, distinctStrings, dashboardName, tenants, additionalProcessing, pivotQuery, comparisonPivotQuery, getPivotRowCount = true, caller, getToken, }) {
     let sqlQuery = pivotQuery;
     let comparisonPivotSql = comparisonPivotQuery;
     const databaseType = client.databaseType || 'postgresql';
@@ -86,10 +86,11 @@ async function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFil
     if (paginatedComparisonQuery) {
         preQueries.push(paginatedComparisonQuery);
     }
-    const hostedBody = {
+    const { data: resp } = await (0, dataFetcher_1.quillFetch)({
+        client,
+        task: 'query',
         metadata: {
             preQueries,
-            task: 'query',
             clientId: client.publicKey,
             databaseType: databaseType,
             runQueryConfig: {
@@ -100,9 +101,10 @@ async function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFil
             dashboardName: dashboardName && tenants ? dashboardName : undefined,
             tenants: dashboardName && tenants ? tenants : undefined,
         },
-    };
-    const cloudBody = { ...hostedBody };
-    const resp = await (0, dataFetcher_1.getData)(client, 'query', 'same-origin', hostedBody, cloudBody, 'POST', 'fetch-pivot');
+        urlParameters: `caller=generatePivot&task=query`,
+        credentials: 'same-origin',
+        getToken,
+    });
     if (resp.success === false) {
         throw resp.errorMessage;
     }
@@ -150,11 +152,13 @@ async function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFil
         label: (0, textProcessing_1.snakeCaseToTitleCase)((0, columnProcessing_1.processColumnName)(field.name.replace('comparison_', 'comparison '))),
         format: field.name === pivot.rowField
             ? 'string'
-            // This scary equation is calculating which aggregation a column is associated with. 
-            // Eg you have 7 columns and 2 aggregations, you can assume column 0 is the row field, 1-3 is aggregation 0, and 4-6 is aggregation 1.
-            : pivot.aggregations?.[Math.floor((index - 1) / Math.floor((responseFields.length - 1) / (pivot.aggregations?.length ?? 1)))]?.aggregationType === 'percentage'
-                ? 'percent'
-                : 'whole_number',
+            : // This scary equation is calculating which aggregation a column is associated with.
+                // Eg you have 7 columns and 2 aggregations, you can assume column 0 is the row field, 1-3 is aggregation 0, and 4-6 is aggregation 1.
+                pivot.aggregations?.[Math.floor((index - 1) /
+                    Math.floor((responseFields.length - 1) /
+                        (pivot.aggregations?.length ?? 1)))]?.aggregationType === 'percentage'
+                    ? 'percent'
+                    : 'whole_number',
         fieldType: field.fieldType,
         jsType: field.jsType,
         dataTypeID: field.dataTypeID,

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

@@ -1 +1 @@
-{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAMxD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAuB7E;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,EAAE,oBAAoB;;;;EAyDnC;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,CAsCP;AAED,eAAO,MAAM,eAAe,WAAY,GAAG,SAAS,KAAK,YA8BxD,CAAC;AAEF,eAAO,MAAM,aAAa,UACjB,KAAK,WACH,cAAc,EAAE,WAChB,mBAAmB,kBACZ,MAAM,cACV,SAAS;;;;;;;;;;;CAuDtB,CAAC"}
+{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAWxD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAuB7E;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,EAAE,oBAAoB;;;;EAqDnC;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,CAsCP;AAED,eAAO,MAAM,eAAe,WAAY,GAAG,SAAS,KAAK,YA8BxD,CAAC;AAEF,eAAO,MAAM,aAAa,UACjB,KAAK,WACH,cAAc,EAAE,WAChB,mBAAmB,kBACZ,MAAM,cACV,SAAS;;;;;;;;;;;CAuDtB,CAAC"}

package/dist/cjs/utils/pivotProcessing.js

@@ -37,7 +37,7 @@ function getPossiblePivotFieldOptions(columns, uniqueValues) {
     const valueFields = [];
     for (const column of columns) {
         // row fields can be dates or strings
-        if (valueFormatter_1.DATE_FORMAT_TYPES.includes(column.format)) {
+        if ((0, columnProcessing_1.isDateType)(column.fieldType)) {
             rowFields.push(column.field);
         }
         // include ID fields as rowField pivot option
@@ -45,7 +45,7 @@ function getPossiblePivotFieldOptions(columns, uniqueValues) {
         //   rowFields.push(column.field);
         // }
         // column fields can be strings
-        if (column.jsType === 'string') {
+        if ((0, columnProcessing_1.isStringType)(column.fieldType)) {
             const possibleValues = uniqueValues?.[column.field] ?? [];
             const isNullValuesOnly = !possibleValues ||
                 (Object.keys(possibleValues).length === 1 &&
@@ -62,9 +62,7 @@ function getPossiblePivotFieldOptions(columns, uniqueValues) {
             }
         }
         // value fields can be numbers or bools
-        // TODO: should "format" be used as the indicator, or fieldType?
-        if (valueFormatter_1.NUMBER_FORMAT_TYPES.includes(column.format) ||
-            column.jsType === 'bool') {
+        if ((0, columnProcessing_1.isNumberType)(column.fieldType) || (0, columnProcessing_1.isBoolType)(column.fieldType)) {
             if (!(0, util_1.isIdColumn)(column.field)) {
                 valueFields.push(column.field);
             }

package/dist/cjs/utils/queryConstructor.js

@@ -877,7 +877,7 @@ function additionalProcessingOnPivotQuery(pivot, query, additionalProcessing, da
     }
     const additionalProcessingQuery = `
     SELECT * 
-    FROM quill_base_pivot ${sortQuery}${databaseType === 'mssql' ? ` OFFSET ${offset} ROWS FETCH NEXT ${limit} ROWS ONLY` : ` LIMIT ${limit} OFFSET ${offset}`}
+    FROM quill_base_pivot ${sortQuery}${databaseType.toLowerCase() === 'mssql' ? ` OFFSET ${offset} ROWS FETCH NEXT ${limit} ROWS ONLY` : ` LIMIT ${limit} OFFSET ${offset}`}
     `
         .replace(/\s+/g, ' ')
         .trim();

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

@@ -27,7 +27,7 @@ export type ReportBuilderInfo = {
 };
 export declare const EMPTY_REPORT: QuillReport;
 export declare const EMPTY_INTERNAL_REPORT: QuillReportInternal;
-export declare function fetchReport({ reportId, client, tenants, flags, useReportTask, filters, additionalProcessing, dateBucket, customFields, rowsOnly, rowCountOnly, abortSignal, getDefaultDashboardFilters, }: {
+export declare function fetchReport({ reportId, client, tenants, flags, useReportTask, filters, additionalProcessing, dateBucket, customFields, rowsOnly, rowCountOnly, abortSignal, getToken, }: {
     reportId: string;
     client: QuillProviderClient;
     tenants?: {
@@ -43,12 +43,12 @@ export declare function fetchReport({ reportId, client, tenants, flags, useRepor
     rowsOnly?: boolean;
     rowCountOnly?: boolean;
     abortSignal?: AbortSignal;
-    getDefaultDashboardFilters?: boolean;
+    getToken: () => Promise<string>;
 }): Promise<{
     report: QuillReportInternal;
     error?: string;
 }>;
-export declare function processReportResponse({ resp, client, filters, dateBucket, additionalProcessing, customFields, }: {
+export declare function processReportResponse({ resp, client, filters, dateBucket, additionalProcessing, customFields, getToken, }: {
     resp: any;
     client: QuillProviderClient;
     filters?: (DashboardFilter | InternalFilter)[];
@@ -57,26 +57,28 @@ export declare function processReportResponse({ resp, client, filters, dateBucke
     customFields?: {
         [tableName: string]: CustomField[];
     } | null;
+    getToken: () => Promise<string>;
 }): Promise<QuillReportInternal>;
-export declare function fetchReportInfo(reportId: string, client: QuillProviderClient, tenants?: {
+export declare function fetchReportInfo(reportId: string, client: QuillProviderClient, getToken: () => Promise<string>, tenants?: {
     tenantField: string;
     tenantIds: (string | number)[];
 }[] | (string | number)[]): Promise<{
     report: any;
     filters: any;
 }>;
-export declare function fetchReportRowCount(reportId: string, client: QuillProviderClient, tenants?: {
+export declare function fetchReportRowCount(reportId: string, client: QuillProviderClient, getToken: () => Promise<string>, tenants?: {
     tenantField: string;
     tenantIds: (string | number)[];
 }[] | (string | number)[], flags?: string[], useReportTask?: boolean, filters?: any[], additionalProcessing?: AdditionalProcessing, customFields?: any, abortSignal?: AbortSignal): Promise<number | undefined>;
-export declare function saveReport({ report, dashboardItemId, client, }: {
+export declare function saveReport({ report, dashboardItemId, client, getToken, }: {
     report: any;
     dashboardItemId?: string;
     client: QuillProviderClient;
+    getToken: () => Promise<string>;
 }): Promise<any>;
 export declare const formatRowsFromReport: (report: any, xAxisField?: string, xAxisFormat?: string) => any;
 export declare function convertInternalReportToReport(report: QuillReportInternal, dashboardFilters: DashboardFilter[], initiator?: string): QuillReport;
-export declare const fetchReportBuilderDataFromAST: ({ baseAst, schema, client, tenants, pivot, previousRelevant, requiresNewFilteredUniqueValues, report, customFields, skipUniqueValues, skipRowCount, processing, dashboardName, }: {
+export declare const fetchReportBuilderDataFromAST: ({ baseAst, schema, client, tenants, pivot, previousRelevant, requiresNewFilteredUniqueValues, report, customFields, skipUniqueValues, skipRowCount, processing, dashboardName, getToken, }: {
     baseAst: any;
     schema: Table[];
     client: QuillProviderClient;
@@ -97,5 +99,6 @@ export declare const fetchReportBuilderDataFromAST: ({ baseAst, schema, client,
     skipRowCount?: boolean;
     processing?: AdditionalProcessing;
     dashboardName: string;
+    getToken: () => Promise<string>;
 }) => Promise<ReportBuilderInfo>;
 //# sourceMappingURL=report.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/utils/report.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/utils/report.ts"],"names":[],"mappings":"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"}

package/dist/cjs/utils/report.js

@@ -74,17 +74,18 @@ function extractAllReportValuesFromQuillInternalReport(reportInternal) {
         columnsWithCustomFields: reportInternal.columnsWithCustomFields,
     };
 }
-async function fetchReport({ reportId, client, tenants, flags, useReportTask = true, filters = [], additionalProcessing, dateBucket, customFields, rowsOnly, rowCountOnly, abortSignal, getDefaultDashboardFilters, }) {
+async function fetchReport({ reportId, client, tenants, flags, useReportTask = true, filters = [], additionalProcessing, dateBucket, customFields, rowsOnly, rowCountOnly, abortSignal, getToken, }) {
     let reportInfo = undefined;
     let errorMessage = undefined;
     try {
         // Remove extra fields on each filter so we don't confuse the backend.
-        const hostedBody = {
+        const fetchResp = await (0, dataFetcher_1.quillFetch)({
+            client,
+            task: useReportTask ? 'report' : 'item',
             metadata: {
                 reportId,
                 dashboardItemId: reportId,
                 clientId: client.publicKey,
-                task: useReportTask ? 'report' : 'item',
                 databaseType: client.databaseType,
                 filters: filters.map((filter) => ({ ...filter, options: undefined })),
                 customFields,
@@ -92,17 +93,13 @@ async function fetchReport({ reportId, client, tenants, flags, useReportTask = t
                 useNewNodeSql: true,
                 rowsOnly,
                 rowCountOnly,
-                getDefaultDashboardFilters,
                 tenants,
                 flags,
             },
-        };
-        const cloudBody = {
-            id: reportId,
-            filters: filters,
-            useNewNodeSql: true,
-        };
-        const resp = await (0, dataFetcher_1.getData)(client, 'itempost', 'omit', hostedBody, cloudBody, 'POST', 'fetch-data', abortSignal);
+            abortSignal,
+            getToken,
+        });
+        const resp = await (0, dataFetcher_1.parseFetchResponse)(client, useReportTask ? 'report' : 'item', fetchResp, getToken);
         reportInfo = await processReportResponse({
             resp,
             client,
@@ -110,6 +107,7 @@ async function fetchReport({ reportId, client, tenants, flags, useReportTask = t
             dateBucket,
             additionalProcessing,
             customFields,
+            getToken,
         });
     }
     catch (error) {
@@ -123,10 +121,12 @@ async function fetchReport({ reportId, client, tenants, flags, useReportTask = t
             }
             else {
                 reportInfo = {
-                    ...error.data.data,
-                    id: error.data.data._id,
+                    ...(error.data?.data?.data || error.data?.data),
+                    id: error.data?.data?.data?._id || error.data?.data?._id,
+                    rows: [], // indicate loading finished
                     error: error.message,
-                    adminError: error.data.adminErrorMessage,
+                    adminError: error.data?.data?.data?.adminErrorMessage ||
+                        error.data?.data?.adminErrorMessage,
                 };
                 errorMessage = error.message;
             }
@@ -138,7 +138,7 @@ async function fetchReport({ reportId, client, tenants, flags, useReportTask = t
     }
     return { report: reportInfo || exports.EMPTY_INTERNAL_REPORT, error: errorMessage };
 }
-async function processReportResponse({ resp, client, filters, dateBucket, additionalProcessing, customFields, }) {
+async function processReportResponse({ resp, client, filters, dateBucket, additionalProcessing, customFields, getToken, }) {
     const dashboardItem = {
         ...resp,
         filtersApplied: filters?.filter((filter) => filter.filterType in Filter_1.InternalFilterType),
@@ -165,6 +165,7 @@ async function processReportResponse({ resp, client, filters, dateBucket, additi
         dateBucket,
         additionalProcessing,
         customFields,
+        getToken,
     });
     if (additionalProcessing) {
         reportInfo.pagination = additionalProcessing.page;
@@ -190,34 +191,34 @@ async function processReportResponse({ resp, client, filters, dateBucket, additi
             report: { ...reportInfo, query: reportInfo.queryString },
             dashboardItemId: reportInfo.id,
             client,
+            getToken,
         });
     }
     return reportInfo;
 }
-async function fetchReportInfo(reportId, client, tenants) {
-    const hostedBody = {
+// Unused?
+async function fetchReportInfo(reportId, client, getToken, tenants) {
+    const { data: resp } = await (0, dataFetcher_1.quillFetch)({
+        client,
+        task: 'report-info',
         metadata: {
             reportId,
             clientId: client.publicKey,
-            task: 'report-info',
             tenants,
         },
-    };
-    const cloudBody = {
-        id: reportId,
-        useNewNodeSql: true,
-    };
-    const resp = await (0, dataFetcher_1.getData)(client, 'itempost', 'omit', hostedBody, cloudBody, 'POST', 'fetch-data');
+        getToken,
+    });
     return { report: resp.report, filters: resp.filters };
 }
-async function fetchReportRowCount(reportId, client, tenants, flags, useReportTask = true, filters = [], additionalProcessing, customFields, abortSignal) {
+async function fetchReportRowCount(reportId, client, getToken, tenants, flags, useReportTask = true, filters = [], additionalProcessing, customFields, abortSignal) {
     // Remove extra fields on each filter so we don't confuse the backend.
-    const hostedBody = {
+    const fetchResp = await (0, dataFetcher_1.quillFetch)({
+        client,
+        task: useReportTask ? 'report' : 'item',
         metadata: {
             reportId,
             dashboardItemId: reportId,
             clientId: client.publicKey,
-            task: useReportTask ? 'report' : 'item',
             databaseType: client.databaseType,
             filters: filters.map((filter) => ({ ...filter, options: undefined })),
             customFields,
@@ -227,41 +228,30 @@ async function fetchReportRowCount(reportId, client, tenants, flags, useReportTa
             tenants,
             flags,
         },
-    };
-    const cloudBody = {
-        id: reportId,
-        filters: filters,
-        useNewNodeSql: true,
-    };
-    const resp = await (0, dataFetcher_1.getData)(client, 'itempost', 'omit', hostedBody, cloudBody, 'POST', 'fetch-data', abortSignal);
+        abortSignal,
+        getToken,
+    });
+    const resp = await (0, dataFetcher_1.parseFetchResponse)(client, useReportTask ? 'report' : 'item', fetchResp, getToken);
     return resp.rowCount;
 }
-async function saveReport({ report, dashboardItemId, client, }) {
+async function saveReport({ report, dashboardItemId, client, getToken, }) {
     const { publicKey, databaseType } = client;
-    const cloudBody = {
-        ...report,
-        dashboardItemId,
-        useNewNodeSql: true,
-    };
-    // @ts-ignore
-    if (cloudBody['rows']) {
-        // @ts-ignore
-        delete cloudBody['rows'];
-        // @ts-ignore
-        delete cloudBody['compareRows'];
-    }
-    // set defaultDateField if date field not present
-    const hostedBody = {
+    const { data } = await (0, dataFetcher_1.quillFetch)({
+        client,
+        task: 'create',
         metadata: {
-            task: 'create',
+            ...report,
+            rows: undefined,
+            compareRows: undefined,
+            dashboardItemId,
+            useNewNodeSql: true,
             clientId: publicKey,
             databaseType: databaseType,
-            ...cloudBody,
-            useNewNodeSql: true,
         },
-    };
-    const searchParams = new URLSearchParams({ clientId: publicKey }).toString();
-    return await (0, dataFetcher_1.getData)(client, `dashedit2?${searchParams}`, 'same-origin', hostedBody, cloudBody);
+        credentials: 'same-origin',
+        getToken,
+    });
+    return data;
 }
 const formatRowsFromReport = (report, xAxisField, xAxisFormat) => {
     if (!report.rows || !report.columns) {
@@ -355,7 +345,7 @@ function convertInternalReportToReport(report, dashboardFilters, initiator) {
         return exports.EMPTY_REPORT;
     }
 }
-const fetchReportBuilderDataFromAST = async ({ baseAst, schema, client, tenants, pivot, previousRelevant, requiresNewFilteredUniqueValues, report, customFields, skipUniqueValues, skipRowCount, processing, dashboardName, }) => {
+const fetchReportBuilderDataFromAST = async ({ baseAst, schema, client, tenants, pivot, previousRelevant, requiresNewFilteredUniqueValues, report, customFields, skipUniqueValues, skipRowCount, processing, dashboardName, getToken, }) => {
     let newRows = [];
     let newColumns = [];
     let newRowCount = 0;
@@ -420,7 +410,7 @@ const fetchReportBuilderDataFromAST = async ({ baseAst, schema, client, tenants,
                 };
             });
         });
-        const tableData = await (0, tableProcessing_1.fetchTableByAST)(baseAst, client, tenants, processing ?? { page: paginationProcessing_1.DEFAULT_PAGINATION }, customFields, skipRowCount, undefined, dashboardName);
+        const tableData = await (0, tableProcessing_1.fetchTableByAST)(baseAst, client, getToken, tenants, processing ?? { page: paginationProcessing_1.DEFAULT_PAGINATION }, customFields, skipRowCount, undefined, dashboardName);
         if (tableData.error) {
             throw new Error(tableData.error);
         }
@@ -451,19 +441,20 @@ const fetchReportBuilderDataFromAST = async ({ baseAst, schema, client, tenants,
             referenceLines: report?.referenceLines,
             referenceLineYValues: report?.referenceLineYValues,
         };
-        const queryResult = await (0, dataFetcher_1.fetchSqlQuery)(baseAst, client);
+        const queryResult = await (0, dataFetcher_1.fetchSqlQuery)(baseAst, client, getToken);
         if (queryResult.error) {
             throw new Error(queryResult.error);
         }
         query = queryResult.query;
         if (!skipUniqueValues || (pivot && requiresNewFilteredUniqueValues)) {
-            const starQuery = await (0, dataFetcher_1.fetchSqlQuery)((0, astProcessing_1.createSelectStarFromAst)(baseAst), client);
+            const starQuery = await (0, dataFetcher_1.fetchSqlQuery)((0, astProcessing_1.createSelectStarFromAst)(baseAst), client, getToken);
             const { uniqueStrings, dateRanges, columnUniqueValues } = await (0, tableProcessing_1.getRelevantInfoFromQuery)({
                 tables,
                 columns: columnInfo,
                 aliasedColumns: aliasedColumnInfo,
                 reportBuilderColumns,
                 client,
+                getToken,
                 tenants,
                 query: queryResult.query,
                 queryTemplate: starQuery.query,
@@ -479,7 +470,7 @@ const fetchReportBuilderDataFromAST = async ({ baseAst, schema, client, tenants,
                 return column.fieldType === 'date';
             });
             if (dateColumns.length > 0) {
-                const dateRanges = await (0, tableProcessing_1.getQueryDateRangeByColumns)(dateColumns, queryResult.query, client, tenants, customFields ?? [], dashboardName);
+                const dateRanges = await (0, tableProcessing_1.getQueryDateRangeByColumns)(dateColumns, queryResult.query, client, getToken, tenants, customFields ?? [], dashboardName);
                 if (dateRanges === null) {
                     throw new Error("Couldn't fetch date ranges");
                 }
@@ -518,6 +509,7 @@ const fetchReportBuilderDataFromAST = async ({ baseAst, schema, client, tenants,
                     tenants,
                     additionalProcessing: processing,
                     caller: 'ReportBuilder',
+                    getToken,
                 });
                 newPivot = pivot;
             }

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

@@ -3,18 +3,18 @@ import { QuillProviderClient } from '../models/Client';
 import { ColumnInternal } from '../models/Columns';
 import { CustomField } from '../models/Schema';
 import { Table } from '../models/Tables';
-export declare const getCustomFieldInfo: ({ client, tenants, caller, abortSignal, }: {
+export declare const getCustomFieldInfo: ({ client, tenants, abortSignal, getToken, }: {
     client: QuillProviderClient;
     tenants: {
         tenantField: string;
         tenantIds: (string | number)[];
     }[] | (string | number)[];
-    caller?: string;
     abortSignal?: AbortSignal;
+    getToken: () => Promise<string>;
 }) => Promise<{
     [tableName: string]: CustomField[];
 } | null>;
-export declare const getSchemaInfo: ({ client, caller, tenants, tableIds, abortSignal, }: {
+export declare const getSchemaInfo: ({ client, caller, tenants, tableIds, abortSignal, getToken, }: {
     client: QuillProviderClient;
     tenants?: {
         tenantField: string;
@@ -23,6 +23,7 @@ export declare const getSchemaInfo: ({ client, caller, tenants, tableIds, abortS
     caller?: string;
     tableIds?: string[];
     abortSignal?: AbortSignal;
+    getToken: () => Promise<string>;
 }) => Promise<{
     schemaData: Table[];
     customFieldsByTable: {

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EAEd,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AA8BzC,eAAO,MAAM,kBAAkB,8CAK5B;IACD,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,EACH;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,KAAG,OAAO,CAAC;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;CAAE,GAAG,IAAI,CAwFxD,CAAC;AAEF,eAAO,MAAM,aAAa,wDAMvB;IACD,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,CAAC,EACJ;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,KAAG,OAAO,CAAC;IACV,UAAU,EAAE,KAAK,EAAE,CAAC;IACpB,mBAAmB,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IACnE,sBAAsB,EAAE,KAAK,EAAE,CAAC;CACjC,CAgEA,CAAC;AA2BF,eAAO,MAAM,2BAA2B,gBACzB,WAAW,KACvB,cAaF,CAAC;AAIF,eAAO,MAAM,0BAA0B,WAAY,KAAK,EAAE,KAAG,aA8B5D,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EAEd,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AA+BzC,eAAO,MAAM,kBAAkB,gDAK5B;IACD,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,EACH;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CACjC,KAAG,OAAO,CAAC;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;CAAE,GAAG,IAAI,CAgFxD,CAAC;AAEF,eAAO,MAAM,aAAa,kEAOvB;IACD,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,CAAC,EACJ;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CACjC,KAAG,OAAO,CAAC;IACV,UAAU,EAAE,KAAK,EAAE,CAAC;IACpB,mBAAmB,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IACnE,sBAAsB,EAAE,KAAK,EAAE,CAAC;CACjC,CAyDA,CAAC;AA2BF,eAAO,MAAM,2BAA2B,gBACzB,WAAW,KACvB,cAaF,CAAC;AAIF,eAAO,MAAM,0BAA0B,WAAY,KAAK,EAAE,KAAG,aA8B5D,CAAC"}

package/dist/cjs/utils/schema.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSchemaForeignKeyMapping = exports.customFieldToColumnInternal = exports.getSchemaInfo = exports.getCustomFieldInfo = void 0;
 const columnProcessing_1 = require("./columnProcessing");
+const dataFetcher_1 = require("./dataFetcher");
 const parseResponse = (results) => {
     if (results.data?.data) {
         if (results.data.data.queries &&
@@ -23,35 +24,27 @@ const parseResponse = (results) => {
         }
     }
 };
-const getCustomFieldInfo = async ({ client, tenants, caller = 'se', abortSignal, }) => {
+const getCustomFieldInfo = async ({ client, tenants, abortSignal, getToken, }) => {
     let customFieldsByTableUniqueRows = [];
     try {
-        const { queryEndpoint, queryHeaders, publicKey, databaseType } = client;
+        const { publicKey, databaseType } = client;
         // if (
         //   (databaseType && databaseType.toLowerCase() !== 'postgresql') ||
         //   !['665610862cf7a3000be66453'].includes(publicKey)
         // ) {
         //   throw new Error('CUSTOM FIELDS IS ONLY ALLOWED FOR POSTGRESQL DATABASES');
         // }
-        const response = await fetch(`${queryEndpoint}?cfr-${caller}`, {
-            method: 'POST',
-            headers: {
-                ...queryHeaders,
-                'Content-Type': 'application/json',
+        const result = await (0, dataFetcher_1.quillFetch)({
+            client,
+            task: 'custom-fields',
+            metadata: {
+                clientId: publicKey,
+                tenants,
+                databaseType,
             },
-            credentials: client.withCredentials ? 'include' : 'omit',
-            body: JSON.stringify({
-                metadata: {
-                    clientId: publicKey,
-                    publicKey,
-                    tenants,
-                    task: 'custom-fields',
-                    databaseType: databaseType,
-                },
-            }),
-            signal: abortSignal,
+            abortSignal,
+            getToken,
         });
-        const result = await response.json();
         const extractedData = parseResponse(result);
         const customFieldsByTable = [];
         extractedData.forEach((table) => {
@@ -104,8 +97,8 @@ const getCustomFieldInfo = async ({ client, tenants, caller = 'se', abortSignal,
     return customFieldsByTableUnique;
 };
 exports.getCustomFieldInfo = getCustomFieldInfo;
-const getSchemaInfo = async ({ client, caller = 'se', tenants, tableIds, abortSignal, }) => {
-    const { queryEndpoint, queryHeaders, publicKey, withCredentials } = client;
+const getSchemaInfo = async ({ client, caller = 'se', tenants, tableIds, abortSignal, getToken, }) => {
+    const { publicKey } = client;
     let customFieldsByTableUnique = null;
     if (client.featureFlags?.customFieldsEnabled &&
         tenants &&
@@ -118,38 +111,31 @@ const getSchemaInfo = async ({ client, caller = 'se', tenants, tableIds, abortSi
             customFieldsByTableUnique = await (0, exports.getCustomFieldInfo)({
                 client,
                 tenants,
-                caller,
                 abortSignal,
+                getToken,
             });
         }
         catch (e) {
             console.error('Error fetching custom fields', e);
         }
     }
-    const response = await fetch(`${queryEndpoint}?schema-${caller}`, {
-        method: 'POST',
-        headers: {
-            ...queryHeaders,
-            'Content-Type': 'application/json',
+    const result = await (0, dataFetcher_1.quillFetch)({
+        client,
+        task: 'schema',
+        metadata: {
+            clientId: publicKey,
+            removeCustomerField: true,
+            removeCustomFieldRef: true,
+            tableIds,
+            customFieldsByTable: customFieldsByTableUnique,
+            useNewCustomFields: true,
+            gatherSchemaData: '665610862cf7a3000be66453' === publicKey ? true : false, // TODO: this should be a feature flag on the client
+            tenants,
         },
-        credentials: withCredentials ? 'include' : 'omit',
-        body: JSON.stringify({
-            metadata: {
-                clientId: publicKey,
-                publicKey: publicKey,
-                task: 'schema',
-                removeCustomerField: true,
-                removeCustomFieldRef: true,
-                tableIds,
-                customFieldsByTable: customFieldsByTableUnique,
-                useNewCustomFields: true,
-                gatherSchemaData: '665610862cf7a3000be66453' === publicKey ? true : false,
-                tenants,
-            },
-            signal: abortSignal,
-        }),
+        abortSignal,
+        urlParameters: `caller=${caller}&task=schema`,
+        getToken,
     });
-    const result = await response.json();
     const parsedData = parseResponse(result);
     const converted = convertSchemaInfoToTable(parsedData);
     // triggerSoftUpdate(client, converted);