@quillsql/react 2.13.47 → 2.13.49

package/dist/esm/utils/dataFetcher.js

@@ -1,6 +1,4 @@
-import { useContext } from 'react';
-import { QUILL_SERVER } from './constants';
-import { TenantContext } from '../Context';
+import { QUILL_QUERY_ENDPOINT, QUILL_SERVER } from './constants';
 function fetchQuillData(responseData) {
     if (!responseData) {
         return null;
@@ -32,39 +30,159 @@ function parseData(rows, queryType) {
             return rows;
     }
 }
-async function testSqlViewState(hostedRequestBody, client, referencedTables) {
+async function testSqlViewState(client, referencedTables, getToken) {
     let errorMessage = null;
     await Promise.all(referencedTables.map(async (table) => {
         if (!table) {
             return;
         }
-        const hostedBody = {
+        const { data: resp } = await quillFetch({
+            client,
+            task: 'test-view',
             metadata: {
                 tables: [table],
-                task: 'test-view',
-                clientId: hostedRequestBody.metadata.clientId,
+                clientId: client.clientId,
             },
-        };
-        const cloudBody = { ...hostedBody };
-        const resp = await getData(client, 'test-view', 'same-origin', hostedBody, cloudBody);
+            getToken,
+        });
         if (resp.success === false) {
             const brokenBody = {
                 metadata: {
                     table: table,
                     task: 'set-broken-view',
-                    clientId: hostedRequestBody.metadata.clientId,
+                    clientId: client.clientId,
                 },
             };
-            getData(client, 'test-view', 'same-origin', brokenBody, cloudBody);
+            quillFetch({
+                client,
+                task: 'set-broken-view',
+                metadata: brokenBody,
+                credentials: 'same-origin',
+                getToken,
+            });
             errorMessage = `Virtual Table Error: '${table}' is out of sync with datasource.`;
         }
     }));
     return errorMessage;
 }
-// this function gets the data either from the self hosted endpoint or
-// our cloud server
-// Tenants and Flags must be passed in as part of the body explicity
-export async function getData(client, cloudQueryEndpoint, noCred, hostedRequestBody, cloudRequestBody, method = 'POST', queryParam, abortSignal) {
+export const quillFetch = async ({ client, task, method = 'POST', metadata, abortSignal, credentials = 'omit', urlParameters, getToken, }) => {
+    const token = await getToken();
+    const queryString = urlParameters ?? `task=${task}`;
+    const endpoint = client.queryEndpoint
+        ? `${client.queryEndpoint}?${queryString}`
+        : `${QUILL_SERVER}${QUILL_QUERY_ENDPOINT}?${queryString}`;
+    try {
+        const response = await fetch(endpoint, {
+            method,
+            headers: {
+                ...(token ? { Authorization: `Bearer ${token}` } : {}),
+                ...client.queryHeaders,
+                'Content-Type': 'application/json',
+                'Vercel-Env': process.env.NEXT_PUBLIC_VERCEL_ENV ?? 'production',
+            },
+            body: JSON.stringify({
+                metadata: {
+                    task,
+                    clientId: client.clientId,
+                    ...metadata,
+                },
+            }),
+            credentials: client.withCredentials ? 'include' : credentials,
+            signal: abortSignal,
+        });
+        if (!response.ok) {
+            throw new Error('API request failed');
+        }
+        let result = await response.json();
+        // Not sure if this is required, but putting it here just in case
+        // based on other lines of code I've seen
+        // Probably happens if self-hosted endpoint was not set up correctly and
+        // the response was wrapped in an additional data object
+        if (result.data?.data &&
+            (result.data.queries || result.data.status || result.data.error)) {
+            result = result.data;
+        }
+        return {
+            data: result.data,
+            queries: result.queries,
+            status: result.status,
+            error: result.error,
+        };
+    }
+    catch (e) {
+        if (e instanceof Error && e.name === 'AbortError') {
+            throw e;
+        }
+        console.error('Failed to fetch:', e);
+        return { error: 'Failed to fetch data' };
+    }
+};
+// This function parses the response from the fetch call,
+// which is what getData used to do after fetching data
+export const parseFetchResponse = async (client, task, response, getToken) => {
+    try {
+        if (response.status === 'error' || response.data?.error) {
+            let errorPrefix = 'Error: ';
+            let errorMessage = 'Failed to fetch report: ' + (response.error || response.data?.error);
+            if (task === 'query' || task === 'patterns') {
+                errorPrefix = response.error?.includes('Query Parsing Error')
+                    ? ''
+                    : 'SQL Error: ';
+                errorMessage = errorPrefix + response.error;
+            }
+            else if (response.error?.includes('Virtual Table Error')) {
+                errorMessage = response.error;
+            }
+            let adminErrorMessage = undefined;
+            if (response?.data?.referencedTables) {
+                adminErrorMessage =
+                    (await testSqlViewState(client, response.data.referencedTables, getToken)) ?? undefined;
+            }
+            return {
+                success: false,
+                errorMessage,
+                adminErrorMessage,
+                data: response,
+            };
+        }
+        if (response.error) {
+            return {
+                success: false,
+                errorMessage: response.error,
+                ...response,
+            };
+        }
+        const result = {
+            ...response.data,
+        };
+        const fields = response.queries?.queryResults[0]?.fields;
+        const rows = response.queries?.queryResults[0]?.rows;
+        const compareRows = response.queries?.queryResults[1]?.rows;
+        if (fields) {
+            result.fields = fields;
+        }
+        if (rows) {
+            result.rows = rows;
+        }
+        if (compareRows && task !== 'report') {
+            result.compareRows = compareRows;
+        }
+        if (response.data?.queryOrder) {
+            response.data.queryOrder.forEach((queryKey, index) => {
+                result[queryKey] = parseData(response.queries?.queryResults?.[index]?.rows, queryKey);
+            });
+        }
+        return result;
+    }
+    catch (e) {
+        console.error('Failed to parse response:', e);
+        return null;
+    }
+};
+/**
+ * @deprecated Use quillFetch instead. If post fetch parsing is required, use parseFetchResponse.
+ */
+export async function getData(client, cloudQueryEndpoint, noCred, hostedRequestBody, cloudRequestBody, method = 'POST', getToken, queryParam, abortSignal) {
     if (!client) {
         return null;
     }
@@ -105,7 +223,7 @@ export async function getData(client, cloudQueryEndpoint, noCred, hostedRequestB
                     processedData.data &&
                     processedData.data.referencedTables) {
                     adminErrorMessage =
-                        (await testSqlViewState(hostedRequestBody, client, processedData.data.referencedTables)) ?? undefined;
+                        (await testSqlViewState(client, processedData.data.referencedTables, getToken)) ?? undefined;
                 }
                 return {
                     success: false,
@@ -214,58 +332,62 @@ export async function getData(client, cloudQueryEndpoint, noCred, hostedRequestB
         return null;
     }
 }
-export function useQuillCloud() {
-    const { tenants, flags } = useContext(TenantContext);
-    const getDataFromCloud = async (client, cloudQueryEndpoint, cloudRequestBody, method = 'POST', abortSignal) => {
-        try {
-            const url = `${QUILL_SERVER}/${cloudQueryEndpoint}`;
-            const resp = await fetch(url, {
-                method,
-                headers: {
-                    Authorization: 'Bearer ',
-                    'Content-Type': 'application/json',
-                },
-                body: method === 'POST'
-                    ? JSON.stringify({
-                        ...cloudRequestBody,
-                        ...{
-                            publicKey: client?.publicKey,
-                            tenants: tenants,
-                            flags: flags,
-                        },
-                    })
-                    : null,
-                signal: abortSignal,
-            });
-            return await resp.json();
-        }
-        catch (e) {
-            if (e instanceof Error && e.name === 'AbortError') {
-                throw e;
-            }
-            console.error('Failed to parse JSON:', e);
-            return null;
-        }
-    };
-    return {
-        getDataFromCloud,
-    };
-}
-export async function fetchSqlQuery(ast, client, formData) {
+// export function useQuillCloud() {
+//   const { tenants, flags } = useContext(TenantContext);
+//   const getDataFromCloud = async (
+//     client: QuillProviderClient,
+//     cloudQueryEndpoint: string,
+//     cloudRequestBody: any,
+//     method = 'POST',
+//     abortSignal?: AbortSignal,
+//   ) => {
+//     try {
+//       const url = `${QUILL_SERVER}/${cloudQueryEndpoint}`;
+//       const resp = await fetch(url, {
+//         method,
+//         headers: {
+//           Authorization: 'Bearer ',
+//           'Content-Type': 'application/json',
+//         },
+//         body:
+//           method === 'POST'
+//             ? JSON.stringify({
+//                 ...cloudRequestBody,
+//                 ...{
+//                   publicKey: client?.publicKey,
+//                   tenants: tenants,
+//                   flags: flags,
+//                 },
+//               })
+//             : null,
+//         signal: abortSignal,
+//       });
+//       return await resp.json();
+//     } catch (e) {
+//       if (e instanceof Error && e.name === 'AbortError') {
+//         throw e;
+//       }
+//       console.error('Failed to parse JSON:', e);
+//       return null;
+//     }
+//   };
+//   return {
+//     getDataFromCloud,
+//   };
+// }
+export async function fetchSqlQuery(ast, client, getToken, formData) {
     try {
         const where = formData ? formData : ast?.where || null;
-        const response = await fetch(`${QUILL_SERVER}/sqlify`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
+        const { data } = await quillFetch({
+            client,
+            task: 'sqlify',
+            metadata: {
+                clientId: client.clientId,
+                useNewNodeSql: true,
                 ast: { ...ast, where },
-                publicKey: client.publicKey,
-                useNewNodeSql: true, // new flag
-            }),
+            },
+            getToken,
         });
-        const data = await response.json();
         return { query: data.query };
     }
     catch (error) {

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

@@ -2,6 +2,7 @@ import { FieldType, InternalFilter, DashboardDateFilter, Filter, DashboardFilter
 import { QuillReport } from '../models/Report';
 import { FilterTreeNode } from './astFilterProcessing';
 import { ReportBuilderState } from '../models/ReportBuilder';
+import { QuillProviderClient } from '../models/Client';
 export declare function findAndProcessDateFilter(filters: any[]): any;
 export declare function processFilterFromBackend(filter: any): any;
 export declare function updateFilter(filter: any, value: any | undefined, comparison: any | undefined, dashboardName: string): any;
@@ -22,7 +23,7 @@ export declare function filterStackToFilterTree(stack: any[]): FilterTreeNode |
 /**
  * This function uses the baseAst and forms a SQL query using the a filters array
  */
-export declare function buildQueryFromFilters(reportBuilderState: ReportBuilderState, filters: FilterTreeNode[], endpoint: string, client: any): Promise<{
+export declare function buildQueryFromFilters(reportBuilderState: ReportBuilderState, filters: FilterTreeNode[], client: QuillProviderClient, getToken: () => Promise<string>): Promise<{
     success: boolean;
     query?: string;
     error?: string;

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

@@ -1 +1 @@
-{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,SAAS,EACT,cAAc,EAGd,mBAAmB,EACnB,MAAM,EAEN,eAAe,EAEhB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAmB,MAAM,uBAAuB,CAAC;AAExE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAG7D,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAoB5D;AAMD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,GAAG,OAkBnD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,GAAG,EACX,KAAK,EAAE,GAAG,YAAO,EACjB,UAAU,EAAE,GAAG,YAAO,EACtB,aAAa,EAAE,MAAM,OAmGtB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,cA0DhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAwB7D;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,GAAG,GAAG,cAAc,EAAE,CAoCrE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,GAAG,EAAE,yBAgCnD;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,kBAAkB,EAAE,kBAAkB,EACtC,OAAO,EAAE,cAAc,EAAE,EACzB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiC/D;AAED,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,mBAAmB,GACvC,mBAAmB,CAkKrB;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,eAAe,EAAE,EAC1B,aAAa,EAAE,cAAc,EAAE,GAC9B,GAAG,EAAE,CA+CP;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,cAAc,EAAE,EAC3B,QAAQ,CAAC,EAAE,cAAc,EAAE,GAC1B,OAAO,CA+BT;AAED,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,WAClB,WAAW,EAAE,iBACP,MAAM,KACpB,CAAC,mBAAmB,GAAG;IAAE,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GAAG,SAqDpD,CAAC"}
+{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AASA,OAAO,EAEL,SAAS,EACT,cAAc,EAGd,mBAAmB,EACnB,MAAM,EAEN,eAAe,EAEhB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAmB,MAAM,uBAAuB,CAAC;AAExE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGvD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAoB5D;AAMD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,GAAG,OAkBnD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,GAAG,EACX,KAAK,EAAE,GAAG,YAAO,EACjB,UAAU,EAAE,GAAG,YAAO,EACtB,aAAa,EAAE,MAAM,OAqFtB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,cA0DhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAwB7D;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,GAAG,GAAG,cAAc,EAAE,CAoCrE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,GAAG,EAAE,yBAgCnD;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,kBAAkB,EAAE,kBAAkB,EACtC,OAAO,EAAE,cAAc,EAAE,EACzB,MAAM,EAAE,mBAAmB,EAC3B,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,GAC9B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiC/D;AAED,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,mBAAmB,GACvC,mBAAmB,CAkKrB;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,eAAe,EAAE,EAC1B,aAAa,EAAE,cAAc,EAAE,GAC9B,GAAG,EAAE,CAgDP;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,cAAc,EAAE,EAC3B,QAAQ,CAAC,EAAE,cAAc,EAAE,GAC1B,OAAO,CA+BT;AAED,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,WAClB,WAAW,EAAE,iBACP,MAAM,KACpB,CAAC,mBAAmB,GAAG;IAAE,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GAAG,SAkDpD,CAAC"}

package/dist/esm/utils/filterProcessing.js

@@ -1,9 +1,10 @@
 import { endOfDay, parse, startOfDay, sub } from 'date-fns';
-import { COMPARISON_RANGE, PRIMARY_RANGE, defaultOptionsV2, getRangeFromPresetOptions, } from '../DateRangePicker/dateRangePickerUtils';
+import { COMPARISON_RANGE, PRIMARY_RANGE, convertPresetOptionsToSelectableList, defaultOptionsV2, getRangeFromPresetOptions, } from '../DateRangePicker/dateRangePickerUtils';
 import { DateOperator, FieldType, InternalFilterType, DashboardFilterType, TimeUnit, FilterType, } from '../models/Filter';
 import { filterTreeToAst } from './astFilterProcessing';
 import { snakeAndCamelCaseToTitleCase } from './textProcessing';
 import { reportBuilderStateToAst } from './reportBuilder';
+import { quillFetch } from './dataFetcher';
 export function findAndProcessDateFilter(filters) {
     let dateFilter = filters.find((filter) => filter.filterType === 'date_range');
     if (dateFilter) {
@@ -70,25 +71,8 @@ export function updateFilter(filter, value = null, comparison = null, dashboardN
     }
     if (filter.filterType === 'date' || filter.filterType === 'date_range') {
         let presetsOptions = defaultOptionsV2;
-        if (filter.presetRanges) {
-            presetsOptions = filter.presetRanges.map((elem) => {
-                if (!elem.isStatic) {
-                    return {
-                        label: elem.label,
-                        value: elem.value,
-                        startDate: (PRIMARY_RANGE[elem.value] ??
-                            PRIMARY_RANGE['LAST_30_DAYS']).startDate,
-                        endDate: (PRIMARY_RANGE[elem.value] ??
-                            PRIMARY_RANGE['LAST_30_DAYS']).endDate,
-                    };
-                }
-                return {
-                    label: elem.label,
-                    value: elem.value,
-                    startDate: new Date(elem.startDate),
-                    endDate: new Date(elem.endDate),
-                };
-            });
+        if (filter.presetOptions || filter.defaultPresetRanges) {
+            presetsOptions = convertPresetOptionsToSelectableList(filter.presetOptions ?? [], filter.defaultPresetRanges ?? []);
         }
         if (comparison ||
             (filter.comparison && filter.comparisonRange.value !== 'NO_COMPARISON')) {
@@ -307,29 +291,26 @@ export function filterStackToFilterTree(stack) {
 /**
  * This function uses the baseAst and forms a SQL query using the a filters array
  */
-export async function buildQueryFromFilters(reportBuilderState, filters, endpoint, client) {
+export async function buildQueryFromFilters(reportBuilderState, filters, client, getToken) {
     const subTree = filterStackToFilterTree(filters);
     let whereNode = null;
     if (subTree) {
-        whereNode = filterTreeToAst(subTree, client.databaseType.toLowerCase());
+        whereNode = filterTreeToAst(subTree, client.databaseType?.toLowerCase() || 'postgresql');
     }
-    const ast = reportBuilderStateToAst({ ...reportBuilderState, filterStack: filters }, client.databaseType.toLowerCase());
+    const ast = reportBuilderStateToAst({ ...reportBuilderState, filterStack: filters }, client.databaseType?.toLowerCase() || 'postgresql');
     const queryAst = { ...ast, where: whereNode };
     try {
-        const response = await fetch(`${endpoint}/sqlify`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-                ast: queryAst,
-                publicKey: client.publicKey,
+        const { data } = await quillFetch({
+            client,
+            task: 'sqlify',
+            metadata: {
+                clientId: client.clientId,
                 useNewNodeSql: true,
-            }),
-            credentials: client.withCredentials ? 'include' : 'omit',
+                ast: queryAst,
+            },
+            getToken,
         });
-        const data = await response.json();
-        const query = data.query;
+        const query = data?.query;
         return { success: true, query };
     }
     catch (error) {
@@ -506,7 +487,8 @@ export function mergeCustomFilters(filters, customFilters) {
                     value: 'LAST_30_DAYS',
                 },
                 dashboardName: 'none',
-                presetRanges: defaultOptionsV2,
+                presetOptions: [],
+                defaultPresetRanges: [],
                 preset: {
                     label: 'Last 30 Days',
                     value: 'LAST_30_DAYS',
@@ -544,8 +526,7 @@ export function filtersAreEquivalent(filters1, filters2) {
 export const createDefaultDateFilter = (filter, reports, dashboardName) => {
     const comparisonRangeStart = getComparisonRange(filter, 'startDate');
     const comparisonRangeEnd = getComparisonRange(filter, 'endDate');
-    const range = filter?.presetRanges?.find((range) => range.value === filter.primaryRange?.value) ??
-        PRIMARY_RANGE[filter.primaryRange?.value ?? 'LAST_30_DAYS'] ??
+    const range = PRIMARY_RANGE[filter.primaryRange?.value ?? 'LAST_30_DAYS'] ??
         PRIMARY_RANGE['LAST_30_DAYS'];
     return filter
         ? {
@@ -579,7 +560,12 @@ export const createDefaultDateFilter = (filter, reports, dashboardName) => {
         : undefined;
 };
 const getComparisonRange = (dateFilter, rangeType) => {
-    const range = dateFilter?.presetRanges?.find((range) => range.value === dateFilter?.primaryRange?.value) ?? PRIMARY_RANGE[dateFilter?.primaryRange?.value ?? 'LAST_30_DAYS'];
+    const range = convertPresetOptionsToSelectableList(dateFilter?.presetOptions ?? [], dateFilter?.defaultPresetRanges ?? []).find((option) => option.value === dateFilter?.primaryRange?.value) ??
+        PRIMARY_RANGE[dateFilter?.primaryRange?.value ?? 'LAST_30_DAYS'] ??
+        PRIMARY_RANGE['LAST_30_DAYS'];
+    if (!range.startDate || !range.endDate) {
+        return undefined;
+    }
     return (dateFilter?.comparisonRange?.[rangeType] ??
         COMPARISON_RANGE[dateFilter?.defaultComparisonRange ??
             'NO_COMPARISON']({

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

@@ -1 +1 @@
-{"version":3,"file":"getDomain.d.ts","sourceRoot":"","sources":["../../../src/utils/getDomain.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,cAAc,EAAE;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAC,EAAE,GAAG,SAAS,GAAG,MAAM,EAAE,CA6CtI"}
+{"version":3,"file":"getDomain.d.ts","sourceRoot":"","sources":["../../../src/utils/getDomain.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,IAAI,EAAE,GAAG,EAAE,EACX,MAAM,EAAE,GAAG,EAAE,EACb,cAAc,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,EAAE,GAAG,SAAS,GAC/D,MAAM,EAAE,CA6CV"}

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

@@ -1,5 +1,6 @@
 import { Pagination } from '../models/Pagination';
 export declare const DEFAULT_PAGINATION: Pagination;
+export declare const DEFAULT_TABLE_PAGINATION: Pagination;
 export declare function shouldFetchMore(pagination: Pagination, page: number, maxPage: number, currentRowCount?: number): boolean;
 export declare function shouldSortInMemory(pagination: Pagination, rowCount?: number): boolean;
 //# sourceMappingURL=paginationProcessing.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"paginationProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/paginationProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,eAAO,MAAM,kBAAkB,EAAE,UAIhC,CAAC;AAEF,wBAAgB,eAAe,CAC7B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,eAAe,CAAC,EAAE,MAAM,WAkBzB;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,MAAM,WAK3E"}
+{"version":3,"file":"paginationProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/paginationProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,eAAO,MAAM,kBAAkB,EAAE,UAIhC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,UAItC,CAAC;AAEF,wBAAgB,eAAe,CAC7B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,eAAe,CAAC,EAAE,MAAM,WAkBzB;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,MAAM,WAK3E"}

package/dist/esm/utils/paginationProcessing.js

@@ -3,6 +3,11 @@ export const DEFAULT_PAGINATION = {
     rowsPerPage: 10,
     rowsPerRequest: 600,
 };
+export const DEFAULT_TABLE_PAGINATION = {
+    page: 0,
+    rowsPerPage: 10,
+    rowsPerRequest: 50,
+};
 export function shouldFetchMore(pagination, page, maxPage, currentRowCount) {
     if (!pagination ||
         (currentRowCount && currentRowCount >= pagination.rowsPerPage * (page + 1))) {

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

@@ -2,7 +2,7 @@ import { QuillProviderClient } from '../models/Client';
 import { Pivot, PivotData } from '../models/Pivot';
 import { QuillReportInternal } from '../models/Report';
 import { AdditionalProcessing } from './tableProcessing';
-export declare function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFilter, distinctStrings, dashboardName, tenants, additionalProcessing, pivotQuery, comparisonPivotQuery, getPivotRowCount, caller, }: {
+export declare function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFilter, distinctStrings, dashboardName, tenants, additionalProcessing, pivotQuery, comparisonPivotQuery, getPivotRowCount, caller, getToken, }: {
     pivot: Pivot;
     report?: QuillReportInternal;
     client: QuillProviderClient;
@@ -19,6 +19,7 @@ export declare function generatePivotWithSQL({ pivot, report, client, dateBucket
     comparisonPivotQuery?: string;
     getPivotRowCount?: boolean;
     caller?: string;
+    getToken: () => Promise<string>;
 }): Promise<PivotData>;
 export declare function disambiguatedValueField(pivot: Pivot): string | undefined;
 //# sourceMappingURL=pivotConstructor.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAYvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAsB,oBAAoB,CAAC,EACzC,KAAK,EACL,MAAM,EACN,MAAM,EACN,UAAU,EACV,UAAU,EACV,eAAe,EACf,aAAa,EACb,OAAO,EACP,oBAAoB,EACpB,UAAU,EACV,oBAAoB,EACpB,gBAAuB,EACvB,MAAM,GACP,EAAE;IACD,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,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,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,SAAS,CAAC,CAyWrB;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,KAAK,sBAYnD"}
+{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAYvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAsB,oBAAoB,CAAC,EACzC,KAAK,EACL,MAAM,EACN,MAAM,EACN,UAAU,EACV,UAAU,EACV,eAAe,EACf,aAAa,EACb,OAAO,EACP,oBAAoB,EACpB,UAAU,EACV,oBAAoB,EACpB,gBAAuB,EACvB,MAAM,EACN,QAAQ,GACT,EAAE;IACD,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,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,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CACjC,GAAG,OAAO,CAAC,SAAS,CAAC,CA6WrB;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,KAAK,sBAYnD"}

package/dist/esm/utils/pivotConstructor.js

@@ -1,13 +1,13 @@
 import { getDateString } from '../internals/ReportBuilder/PivotModal';
 import { isStringType, processColumnName } from './columnProcessing';
 import { MAX_PIVOT_UNIQUE_VALUES } from './constants';
-import { getData } from './dataFetcher';
+import { quillFetch } from './dataFetcher';
 import { parseValueFromBigQueryDates } from './dataProcessing';
 import { getComparisonInterval } from './dates';
 import { mergeComparisonPivotColumns, mergeComparisonPivotRows } from './merge';
 import { additionalProcessingOnPivotQuery, generatePivotQuery, generateRowCountQuery, } from './queryConstructor';
 import { matchCasing, snakeCaseToTitleCase } from './textProcessing';
-export async function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFilter, distinctStrings, dashboardName, tenants, additionalProcessing, pivotQuery, comparisonPivotQuery, getPivotRowCount = true, caller, }) {
+export 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';
@@ -82,10 +82,11 @@ export async function generatePivotWithSQL({ pivot, report, client, dateBucket,
     if (paginatedComparisonQuery) {
         preQueries.push(paginatedComparisonQuery);
     }
-    const hostedBody = {
+    const { data: resp } = await quillFetch({
+        client,
+        task: 'query',
         metadata: {
             preQueries,
-            task: 'query',
             clientId: client.publicKey,
             databaseType: databaseType,
             runQueryConfig: {
@@ -96,9 +97,10 @@ export async function generatePivotWithSQL({ pivot, report, client, dateBucket,
             dashboardName: dashboardName && tenants ? dashboardName : undefined,
             tenants: dashboardName && tenants ? tenants : undefined,
         },
-    };
-    const cloudBody = { ...hostedBody };
-    const resp = await 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;
     }
@@ -146,9 +148,13 @@ export async function generatePivotWithSQL({ pivot, report, client, dateBucket,
         label: snakeCaseToTitleCase(processColumnName(field.name.replace('comparison_', 'comparison '))),
         format: field.name === pivot.rowField
             ? 'string'
-            : pivot.aggregations?.[index]?.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/esm/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/esm/utils/pivotProcessing.js

@@ -1,9 +1,9 @@
 import { isIdColumn } from '../components/ReportBuilder/util';
 import { isDateField } from '../internals/ReportBuilder/PivotModal';
-import { isDateType, isNumberType } from './columnProcessing';
+import { isBoolType, isDateType, isNumberType, isStringType, } from './columnProcessing';
 import { MAX_PIVOT_UNIQUE_VALUES } from './constants';
 import { disambiguatedValueField } from './pivotConstructor';
-import { DATE_FORMAT_TYPES, NUMBER_FORMAT_TYPES } from './valueFormatter';
+import { NUMBER_FORMAT_TYPES } from './valueFormatter';
 export function isValidPivot(pivot) {
     if (!pivot.rowField && !pivot.aggregations?.[0]?.valueField) {
         return {
@@ -31,7 +31,7 @@ export function getPossiblePivotFieldOptions(columns, uniqueValues) {
     const valueFields = [];
     for (const column of columns) {
         // row fields can be dates or strings
-        if (DATE_FORMAT_TYPES.includes(column.format)) {
+        if (isDateType(column.fieldType)) {
             rowFields.push(column.field);
         }
         // include ID fields as rowField pivot option
@@ -39,7 +39,7 @@ export function getPossiblePivotFieldOptions(columns, uniqueValues) {
         //   rowFields.push(column.field);
         // }
         // column fields can be strings
-        if (column.jsType === 'string') {
+        if (isStringType(column.fieldType)) {
             const possibleValues = uniqueValues?.[column.field] ?? [];
             const isNullValuesOnly = !possibleValues ||
                 (Object.keys(possibleValues).length === 1 &&
@@ -56,9 +56,7 @@ export function getPossiblePivotFieldOptions(columns, uniqueValues) {
             }
         }
         // value fields can be numbers or bools
-        // TODO: should "format" be used as the indicator, or fieldType?
-        if (NUMBER_FORMAT_TYPES.includes(column.format) ||
-            column.jsType === 'bool') {
+        if (isNumberType(column.fieldType) || isBoolType(column.fieldType)) {
             if (!isIdColumn(column.field)) {
                 valueFields.push(column.field);
             }

package/dist/esm/utils/queryConstructor.js

@@ -863,7 +863,7 @@ export function additionalProcessingOnPivotQuery(pivot, query, additionalProcess
     }
     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();