@quillsql/react 2.13.47 → 2.13.49

package/dist/esm/utils/astProcessing.js

@@ -2,7 +2,7 @@ import { getTableNames } from '../components/ReportBuilder/ast';
 import { convertBigQuery, convertGroupBy, convertOrderBy, convertRemoveSimpleParentheses, convertStringComparison, convertUnaryToBinary, convertWildcardColumns, } from '../components/ReportBuilder/convert';
 import { deepCopy, removeNonSelectedTableReferences, removeTableNameAlias, } from '../components/ReportBuilder/util';
 import { astToFilterTree, filterTreeToAst, getFieldFromExpression, } from './astFilterProcessing';
-import { QUILL_SERVER } from './constants';
+import { quillFetch } from './dataFetcher';
 import { getUniqueStringValuesByColumn } from './tableProcessing';
 export function getSelectFromAST(ast) {
     if (Array.isArray(ast)) {
@@ -363,43 +363,41 @@ export const createSelectStarFromAst = (ast) => {
         ],
     };
 };
-//TODO: Move all fetches to a /sdk route
-export const fetchAndProcessASTFromPrompt = async ({ aiPrompt, schema, client, prevPivot, currentQuery, prevTable, dashboardName, tenants, }) => {
+export const fetchAndProcessASTFromPrompt = async ({ aiPrompt, schema, client, prevPivot, currentQuery, prevTable, dashboardName, tenants, getToken, }) => {
     let res, data, ast, newAst, pivot;
     let numRetries = 0;
     let whereAST;
     const MAX_RETRIES = 3;
+    if (aiPrompt.trim().length > 500) {
+        throw new Error('Error: Prompt must be less than 500 characters');
+    }
     try {
         let isTableJoin = !ast || !ast.from || ast.from.length !== 1;
         while (isTableJoin || isSubquery(ast?.where)) {
             if (numRetries === MAX_RETRIES)
                 break;
             if (!currentQuery || (ast && (isTableJoin || isSubquery(ast?.where)))) {
-                res = await fetch(`${QUILL_SERVER}/magic`, {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({
+                res = await quillFetch({
+                    client,
+                    task: 'magic',
+                    metadata: {
                         initialQuestion: aiPrompt,
-                        publicKey: client.publicKey,
-                        useNewNodeSql: true, // new flag
-                        useNewAstGroupBy: true, // new flag
-                    }),
+                    },
+                    getToken,
                 });
             }
             else {
-                res = await fetch(`${QUILL_SERVER}/magic/edit`, {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({
+                res = await quillFetch({
+                    client,
+                    task: 'magic-edit',
+                    metadata: {
                         sqlQuery: currentQuery,
                         initialQuestion: aiPrompt,
-                        publicKey: client.publicKey,
-                        useNewNodeSql: true, // new flag
-                        useNewAstGroupBy: true, // new flag
-                    }),
+                    },
+                    getToken,
                 });
             }
-            data = await res.json();
+            data = res.data;
             ast = data?.ast?.length ? data?.ast[0] : data?.ast;
             // TODO: Debug invalid table joins in handleAsk
             isTableJoin =
@@ -433,6 +431,7 @@ export const fetchAndProcessASTFromPrompt = async ({ aiPrompt, schema, client, p
             columns: tableInfo.columns,
             tableName: processedName,
             client,
+            getToken,
             tenants,
             dashboardName,
         });
@@ -465,7 +464,7 @@ export const fetchAndProcessASTFromPrompt = async ({ aiPrompt, schema, client, p
     }
     return { ast: newAst, pivot, whereAST };
 };
-export const fetchASTFromQuillReport = async (report, client, schema) => {
+export const fetchASTFromQuillReport = async (report, client, schema, getToken) => {
     let newAst;
     let groupByPivot = null;
     let schemaInfo = [];
@@ -473,24 +472,16 @@ export const fetchASTFromQuillReport = async (report, client, schema) => {
         if (!report) {
             throw new Error('Report not found');
         }
-        const url = `${QUILL_SERVER}/astify`;
-        const result = await fetch(url, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
+        const { data: resp } = await quillFetch({
+            client,
+            task: 'astify',
+            metadata: {
+                clientId: client.clientId,
+                useNewNodeSql: true,
+                query: report.queryString,
             },
-            body: client?.publicKey
-                ? JSON.stringify({
-                    query: report.queryString,
-                    useNewNodeSql: true,
-                    publicKey: client.publicKey,
-                })
-                : JSON.stringify({
-                    query: report.queryString,
-                    useNewNodeSql: true,
-                }),
+            getToken,
         });
-        const resp = await result.json();
         if (resp.success === false) {
             throw new Error("Couldn't process report query.");
         }

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

@@ -1,9 +1,9 @@
 import { Client, QuillTenant } from '../models/Client';
 export declare const EMPTY_CLIENT: Client;
-export declare function fetchClient(publicKey: string, queryEndpoint: string, withCredentials?: boolean, queryHeaders?: HeadersInit): Promise<Client & {
+export declare function fetchClient(publicKey: string, queryEndpoint: string, withCredentials: boolean | undefined, getToken: () => Promise<string>, queryHeaders?: HeadersInit, includeTenants?: boolean): Promise<Client & {
     allTenantTypes?: QuillTenant[];
 }>;
-export declare function getClientTenantIds({ queryEndpoint, queryHeaders, withCredentials, tenant, clientId, }: {
+export declare function getClientTenantIds({ queryEndpoint, queryHeaders, withCredentials, tenant, clientId, getToken, }: {
     queryEndpoint: string;
     queryHeaders?: HeadersInit;
     withCredentials?: boolean;
@@ -11,6 +11,7 @@ export declare function getClientTenantIds({ queryEndpoint, queryHeaders, withCr
         id: string;
     };
     clientId: string;
+    getToken: () => Promise<string>;
 }): Promise<{
     id: string;
     tenantIds: any;

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

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/utils/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEvD,eAAO,MAAM,YAAY,EAAE,MAK1B,CAAC;AAEF,wBAAsB,WAAW,CAC/B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,eAAe,UAAQ,EACvB,YAAY,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC,MAAM,GAAG;IAAE,cAAc,CAAC,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC,CAoDtD;AAED,wBAAsB,kBAAkB,CAAC,EACvC,aAAa,EACb,YAAY,EACZ,eAAe,EACf,MAAM,EACN,QAAQ,GACT,EAAE;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,MAAM,EAAE,WAAW,GAAG;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;CAClB;;;GAyCA"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/utils/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGvD,eAAO,MAAM,YAAY,EAAE,MAK1B,CAAC;AAEF,wBAAsB,WAAW,CAC/B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,eAAe,qBAAQ,EACvB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAC/B,YAAY,CAAC,EAAE,WAAW,EAC1B,cAAc,UAAQ,GACrB,OAAO,CAAC,MAAM,GAAG;IAAE,cAAc,CAAC,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC,CAoDtD;AAED,wBAAsB,kBAAkB,CAAC,EACvC,aAAa,EACb,YAAY,EACZ,eAAe,EACf,MAAM,EACN,QAAQ,EACR,QAAQ,GACT,EAAE;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,MAAM,EAAE,WAAW,GAAG;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CACjC;;;GAuCA"}

package/dist/esm/utils/client.js

@@ -1,42 +1,43 @@
+import { quillFetch } from './dataFetcher';
 export const EMPTY_CLIENT = {
     name: '',
     _id: '',
     databaseType: '',
     domainName: '',
 };
-export async function fetchClient(publicKey, queryEndpoint, withCredentials = false, queryHeaders) {
+export async function fetchClient(publicKey, queryEndpoint, withCredentials = false, getToken, queryHeaders, includeTenants = false) {
     let result = EMPTY_CLIENT;
     let clientTenantIds = [];
     try {
-        const response = await fetch(`${queryEndpoint}`, {
-            method: 'POST',
-            headers: {
-                ...queryHeaders,
-                'Content-Type': 'application/json',
+        const json = await quillFetch({
+            client: {
+                clientId: publicKey,
+                queryEndpoint,
+                queryHeaders,
+                withCredentials: !!withCredentials,
             },
-            body: JSON.stringify({
-                metadata: {
-                    clientId: publicKey,
-                    publicKey,
-                    task: 'client',
-                },
-            }),
-            credentials: withCredentials ? 'include' : 'omit',
+            task: 'client',
+            metadata: {
+                clientId: publicKey,
+            },
+            getToken,
         });
-        const json = await response.json();
         result = json.data?.data?.client || json.data?.client;
         if (!result) {
             throw new Error('No client found');
         }
-        clientTenantIds = await Promise.all(result?.allTenantTypes?.map(async (tenant) => {
-            return await getClientTenantIds({
-                queryEndpoint,
-                queryHeaders,
-                withCredentials,
-                tenant,
-                clientId: publicKey,
-            });
-        }));
+        clientTenantIds = includeTenants
+            ? await Promise.all(result?.allTenantTypes?.map(async (tenant) => {
+                return await getClientTenantIds({
+                    queryEndpoint,
+                    queryHeaders,
+                    withCredentials,
+                    tenant,
+                    clientId: publicKey,
+                    getToken,
+                });
+            }))
+            : [];
     }
     catch (error) {
         console.error('ERROR:', error);
@@ -51,29 +52,27 @@ export async function fetchClient(publicKey, queryEndpoint, withCredentials = fa
         })),
     };
 }
-export async function getClientTenantIds({ queryEndpoint, queryHeaders, withCredentials, tenant, clientId, }) {
+export async function getClientTenantIds({ queryEndpoint, queryHeaders, withCredentials, tenant, clientId, getToken, }) {
     if (tenant.scope === 'database') {
         return {
             id: tenant.id,
             tenantIds: [],
         };
     }
-    const tenantResponse = await fetch(queryEndpoint, {
-        method: 'POST',
-        headers: {
-            ...queryHeaders,
-            'Content-Type': 'application/json',
+    const data = await quillFetch({
+        client: {
+            clientId: clientId,
+            queryEndpoint,
+            queryHeaders,
+            withCredentials: !!withCredentials,
         },
-        body: JSON.stringify({
-            metadata: {
-                tenantId: tenant.id,
-                task: 'tenant-query',
-                clientId: clientId,
-            },
-        }),
-        credentials: withCredentials ? 'include' : 'omit',
+        task: 'tenant-query',
+        metadata: {
+            tenantId: tenant.id,
+            clientId: clientId,
+        },
+        getToken,
     });
-    const data = await tenantResponse.json();
     if (!data.data?.rows || !data.data?.fields) {
         return {
             id: tenant.id,

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

@@ -1 +1 @@
-{"version":3,"file":"columnProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/columnProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,UAAU,6CAA6C;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,oCAAoC;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,KAAK,2BAA2B,GAC5B,6CAA6C,GAC7C,oCAAoC,CAAC;AAEzC,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,2BAA2B,GACjC,cAAc,CAmJhB;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AA0BD,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CA0C/D;AAED,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAwDlE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAY5D;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAIvD;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CASrD;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAavD;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAErD;AAED,eAAO,MAAM,cAAc,WACjB,mBAAmB,oBACT,eAAe,EAAE,UAqDpC,CAAC"}
+{"version":3,"file":"columnProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/columnProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,UAAU,6CAA6C;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,oCAAoC;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,KAAK,2BAA2B,GAC5B,6CAA6C,GAC7C,oCAAoC,CAAC;AAEzC,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,2BAA2B,GACjC,cAAc,CAmJhB;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AA0BD,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CA0C/D;AAED,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAwDlE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAY5D;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAIvD;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CASrD;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAwBvD;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAErD;AAED,eAAO,MAAM,cAAc,WACjB,mBAAmB,oBACT,eAAe,EAAE,UAqDpC,CAAC"}

package/dist/esm/utils/columnProcessing.js

@@ -308,16 +308,27 @@ export function isDateType(fieldType) {
 }
 export function isNumberType(fieldType) {
     return [
+        'int64',
+        'int32',
+        'int16',
         'int8',
-        'int2',
         'int4',
+        'int2',
+        'float2',
         'float4',
         'float8',
+        'float16',
         'numeric',
         'number',
         'smallint',
-        'float2',
-        'float16',
+        'bigint',
+        'tinyint',
+        'mediumint',
+        'integer',
+        'int',
+        'uint32',
+        'uint16',
+        'uint8',
     ].includes(fieldType?.toLowerCase());
 }
 export function isBoolType(fieldType) {

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

@@ -4,5 +4,6 @@ export declare const QUILL_SERVER: string;
 export declare const QUILL_QUERY_ENDPOINT: string;
 export declare const ALL_TENANTS = "QUILL_ALL_TENANTS";
 export declare const SINGLE_TENANT = "QUILL_SINGLE_TENANT";
+export declare const SAVED_QUERIES_DASHBOARD = "quill-saved-queries";
 export declare const REFERENCE_LINE = "QUILL_REFERENCE_LINE";
 //# sourceMappingURL=constants.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAC3C,eAAO,MAAM,YAAY,QAGoB,CAAC;AAC9C,eAAO,MAAM,oBAAoB,QAGnB,CAAC;AACf,eAAO,MAAM,WAAW,sBAAsB,CAAC;AAC/C,eAAO,MAAM,aAAa,wBAAwB,CAAC;AACnD,eAAO,MAAM,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAC3C,eAAO,MAAM,YAAY,QAGoB,CAAC;AAC9C,eAAO,MAAM,oBAAoB,QAGnB,CAAC;AACf,eAAO,MAAM,WAAW,sBAAsB,CAAC;AAC/C,eAAO,MAAM,aAAa,wBAAwB,CAAC;AACnD,eAAO,MAAM,uBAAuB,wBAAwB,CAAC;AAC7D,eAAO,MAAM,cAAc,yBAAyB,CAAC"}

package/dist/esm/utils/constants.js

@@ -8,4 +8,5 @@ export const QUILL_QUERY_ENDPOINT = typeof process !== 'undefined' && process.en
     : '/cloud';
 export const ALL_TENANTS = 'QUILL_ALL_TENANTS';
 export const SINGLE_TENANT = 'QUILL_SINGLE_TENANT';
+export const SAVED_QUERIES_DASHBOARD = 'quill-saved-queries';
 export const REFERENCE_LINE = 'QUILL_REFERENCE_LINE';

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

@@ -9,11 +9,12 @@ import { CustomField } from '../models/Schema';
  * interface to build amazing dashboards on top of.
  * @param item
  */
-export declare function cleanDashboardItem({ item, dashboardFilters, client, dateBucket, additionalProcessing, customFields, skipPivotFetch, }: {
+export declare function cleanDashboardItem({ item, dashboardFilters, getToken, client, dateBucket, additionalProcessing, customFields, skipPivotFetch, }: {
     item: {
         [key: string]: any;
     } | undefined;
     dashboardFilters: any;
+    getToken: () => Promise<string>;
     client: QuillProviderClient;
     dateBucket?: string;
     additionalProcessing?: AdditionalProcessing;
@@ -22,7 +23,7 @@ export declare function cleanDashboardItem({ item, dashboardFilters, client, dat
     } | null;
     skipPivotFetch?: boolean;
 }): Promise<QuillReportInternal>;
-export declare function getDashboard(dashboardName: string, client: QuillProviderClient, tenants?: {
+export declare function getDashboard(dashboardName: string, client: QuillProviderClient, getToken: () => Promise<string>, tenants?: {
     tenantField: string;
     tenantIds: (string | number)[];
 }[] | (string | number)[], flags?: string[]): Promise<any>;

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

@@ -1 +1 @@
-{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAcvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAOzD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAsB/C;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,EACvC,IAAI,EACJ,gBAAgB,EAChB,MAAM,EACN,UAAU,EACV,oBAAoB,EACpB,YAAY,EACZ,cAAc,GACf,EAAE;IACD,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GAAG,SAAS,CAAC;IACzC,gBAAgB,EAAE,GAAG,CAAC;IACtB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,YAAY,CAAC,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7D,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAsL/B;AA2ID,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,CAAC,EACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EACvB,KAAK,CAAC,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,GAAG,CAAC,CA6Bd"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAcvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAOzD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAuB/C;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,EACvC,IAAI,EACJ,gBAAgB,EAChB,QAAQ,EACR,MAAM,EACN,UAAU,EACV,oBAAoB,EACpB,YAAY,EACZ,cAAc,GACf,EAAE;IACD,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GAAG,SAAS,CAAC;IACzC,gBAAgB,EAAE,GAAG,CAAC;IACtB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,YAAY,CAAC,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7D,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAuL/B;AA8ID,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,EAC3B,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAC/B,OAAO,CAAC,EACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EACvB,KAAK,CAAC,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,GAAG,CAAC,CA6Cd"}

package/dist/esm/utils/dashboard.js

@@ -1,6 +1,6 @@
 import { generatePivotTable, generatePivotTableYAxis, } from '../internals/ReportBuilder/PivotModal';
 import { snakeAndCamelCaseToTitleCase, snakeCaseToTitleCase, } from './textProcessing';
-import { getData } from './dataFetcher';
+import { quillFetch } from './dataFetcher';
 import { getDateBucketFromRange } from './dates';
 import { generatePivotWithSQL } from './pivotConstructor';
 import { convertFieldTypeToJSType, convertPostgresColumn, fieldTypeToDataTypeID, processColumnName, } from './columnProcessing';
@@ -30,7 +30,7 @@ const defaultDashboardItem = {
  * interface to build amazing dashboards on top of.
  * @param item
  */
-export async function cleanDashboardItem({ item, dashboardFilters, client, dateBucket, additionalProcessing, customFields, skipPivotFetch, }) {
+export async function cleanDashboardItem({ item, dashboardFilters, getToken, client, dateBucket, additionalProcessing, customFields, skipPivotFetch, }) {
     if (!item)
         return defaultDashboardItem;
     if (!item.rows) {
@@ -98,7 +98,7 @@ export async function cleanDashboardItem({ item, dashboardFilters, client, dateB
                     ],
                 }
                 : undefined,
-        }, dashboardFilters, client, dateBucket, additionalProcessing, item.dashboardName);
+        }, dashboardFilters, getToken, client, dateBucket, additionalProcessing, item.dashboardName);
     }
     catch (e) {
         pivotTable = undefined;
@@ -201,7 +201,7 @@ export async function cleanDashboardItem({ item, dashboardFilters, client, dateB
 /**
  * Extract and transform the data from itemInfo.
  */
-async function getPivotTable(report, dashboardFilters, client, dateBucketInitial, additionalProcessing, dashboardName, tenants) {
+async function getPivotTable(report, dashboardFilters, getToken, client, dateBucketInitial, additionalProcessing, dashboardName, tenants) {
     if (!report)
         return undefined;
     const dateFilter = Object.values(dashboardFilters ?? {}).find((filter) => filter.filterType === 'date_range' || filter.operator === 'BETWEEN');
@@ -270,6 +270,7 @@ async function getPivotTable(report, dashboardFilters, client, dateBucketInitial
                 dashboardName,
                 tenants,
                 additionalProcessing,
+                getToken,
             });
             return pivotTable;
         }
@@ -288,6 +289,7 @@ async function getPivotTable(report, dashboardFilters, client, dateBucketInitial
             tenants,
             dateFilter,
             additionalProcessing,
+            getToken,
         })
         : undefined;
 }
@@ -314,25 +316,41 @@ function extractPivotedYAxis(pivotTable, itemInfo, config = undefined) {
     // }
     // return fields;
 }
-export async function getDashboard(dashboardName, client, tenants, flags) {
-    const hostedBody = {
+export async function getDashboard(dashboardName, client, getToken, tenants, flags) {
+    const { data: resp } = await quillFetch({
+        client,
+        task: 'dashboard',
         metadata: {
             name: dashboardName,
-            task: 'dashboard',
             clientId: client.publicKey,
             databaseType: client.databaseType,
             useNewNodeSql: true,
             tenants,
             flags,
         },
-    };
-    const searchParams = new URLSearchParams({
-        publicKey: client.publicKey,
-        name: dashboardName,
-    }).toString();
-    const resp = await getData(client, `dashconfig?${searchParams}`, 'omit', hostedBody, null, 'GET');
+        getToken,
+    });
     return {
         ...resp,
         createdAt: resp.createdAt && new Date(resp.createdAt),
+        dateFilter: resp.dateFilter
+            ? {
+                ...resp.dateFilter,
+                presetOptions: resp.dateFilter.presetOptions?.map((preset) => ({
+                    ...preset,
+                    loopStart: preset.loopStart
+                        ? new Date(preset.loopStart)
+                        : undefined,
+                    loopEnd: preset.loopEnd ? new Date(preset.loopEnd) : undefined,
+                })),
+                defaultPresetRanges: resp.dateFilter.defaultPresetRanges?.map((preset) => ({
+                    ...preset,
+                    loopStart: preset.loopStart
+                        ? new Date(preset.loopStart)
+                        : undefined,
+                    loopEnd: preset.loopEnd ? new Date(preset.loopEnd) : undefined,
+                })),
+            }
+            : undefined,
     };
 }

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

@@ -1,9 +1,12 @@
 import { QuillProviderClient } from '../models/Client';
-export declare function getData(client: QuillProviderClient, cloudQueryEndpoint: string, noCred: RequestCredentials, hostedRequestBody: any, cloudRequestBody: any, method?: string, queryParam?: string, abortSignal?: AbortSignal): Promise<any>;
-export declare function useQuillCloud(): {
-    getDataFromCloud: (client: QuillProviderClient, cloudQueryEndpoint: string, cloudRequestBody: any, method?: string, abortSignal?: AbortSignal) => Promise<any>;
-};
-export declare function fetchSqlQuery(ast: any, client: QuillProviderClient, formData?: any): Promise<{
+import { QuillFetchOptions, QuillResults } from '../models/Data';
+export declare const quillFetch: ({ client, task, method, metadata, abortSignal, credentials, urlParameters, getToken, }: QuillFetchOptions) => Promise<QuillResults>;
+export declare const parseFetchResponse: (client: QuillProviderClient, task: string, response: QuillResults, getToken: () => Promise<string>) => Promise<any>;
+/**
+ * @deprecated Use quillFetch instead. If post fetch parsing is required, use parseFetchResponse.
+ */
+export declare function getData(client: QuillProviderClient, cloudQueryEndpoint: string, noCred: RequestCredentials, hostedRequestBody: any, cloudRequestBody: any, method: string | undefined, getToken: () => Promise<string>, queryParam?: string, abortSignal?: AbortSignal): Promise<any>;
+export declare function fetchSqlQuery(ast: any, client: QuillProviderClient, getToken: () => Promise<string>, formData?: any): Promise<{
     query: string;
     error?: string;
 }>;

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

@@ -1 +1 @@
-{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAgFvD,wBAAsB,OAAO,CAC3B,MAAM,EAAE,mBAAmB,EAC3B,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,WAAW,gBAgL1B;AAED,wBAAgB,aAAa;+BAGjB,mBAAmB,sBACP,MAAM,oBACR,GAAG,iCAEP,WAAW;EAoC5B;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,mBAAmB,EAC3B,QAAQ,CAAC,EAAE,GAAG,GACb,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAmB5C"}
+{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AA6EjE,eAAO,MAAM,UAAU,2FASpB,iBAAiB,KAAG,OAAO,CAAC,YAAY,CAuD1C,CAAC;AAIF,eAAO,MAAM,kBAAkB,WACrB,mBAAmB,QACrB,MAAM,YACF,YAAY,YACZ,MAAM,OAAO,CAAC,MAAM,CAAC,iBA0EhC,CAAC;AAEF;;GAEG;AACH,wBAAsB,OAAO,CAC3B,MAAM,EAAE,mBAAmB,EAC3B,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,oBAAS,EACf,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAC/B,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,WAAW,gBAgL1B;AA+CD,wBAAsB,aAAa,CACjC,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,mBAAmB,EAC3B,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAC/B,QAAQ,CAAC,EAAE,GAAG,GACb,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiB5C"}