@quillsql/react 2.13.47 → 2.13.49

package/dist/esm/utils/tableProcessing.js

@@ -1,6 +1,6 @@
 import { convertPostgresColumn, isStringType } from './columnProcessing';
-import { MAX_PIVOT_UNIQUE_VALUES, QUILL_QUERY_ENDPOINT, QUILL_SERVER, } from './constants';
-import { getData } from './dataFetcher';
+import { MAX_PIVOT_UNIQUE_VALUES } from './constants';
+import { parseFetchResponse, quillFetch } from './dataFetcher';
 import { parseValueFromBigQueryDates } from './dataProcessing';
 import { parseQueryDateRangeByDatabaseType } from './dates';
 import { processFilterErrorList } from './errorProcessing';
@@ -18,14 +18,14 @@ export const hasColumnAlias = (columns, referencedColumns) => {
     }
     return false;
 };
-export const getUniqueValuesByQuery = async ({ columns, query, client, tenants, customFields, filters, dashboardName, }) => {
+export const getUniqueValuesByQuery = async ({ columns, query, client, getToken, tenants, customFields, filters, dashboardName, }) => {
     const stringNames = columns.map((column) => column.field);
     const uniqueValues = {};
     if (stringNames.length === 0) {
         return {};
     }
     const distinctValueQuery = generateDistinctQuery(stringNames, query, client.databaseType || 'postgresql');
-    const distinctStrings = await fetchDistinctStrings(distinctValueQuery, client, tenants, customFields, filters, dashboardName);
+    const distinctStrings = await fetchDistinctStrings(distinctValueQuery, client, getToken, tenants, customFields, filters, dashboardName);
     if (!distinctStrings) {
         return {};
     }
@@ -34,13 +34,13 @@ export const getUniqueValuesByQuery = async ({ columns, query, client, tenants,
     }
     return uniqueValues;
 };
-export const getUniqueStringValuesByColumn = async ({ columns, tableName, client, tenants, customFields, withExceededColumns, query, dashboardName, }) => {
+export const getUniqueStringValuesByColumn = async ({ columns, tableName, client, getToken, tenants, customFields, withExceededColumns, query, dashboardName, }) => {
     const convertedStringColumns = columns.filter((column) => {
         return isStringType(column.fieldType);
     });
     const stringNames = convertedStringColumns.map((column) => processColumnReference(column.field, client.databaseType, undefined, true));
     const { filteredColumns: smallStringColumns, exceededColumns } = stringNames.length > 0
-        ? await getCountsByColumns(convertedStringColumns, query || `Select ${stringNames.join(', ')} from ${tableName}`, client, tenants, customFields ?? [], dashboardName)
+        ? await getCountsByColumns(convertedStringColumns, query || `Select ${stringNames.join(', ')} from ${tableName}`, client, getToken, tenants, customFields ?? [], dashboardName)
         : { filteredColumns: [], exceededColumns: undefined };
     const smallStringNames = smallStringColumns.map((column) => processColumnReference(column.field, client.databaseType, undefined, true));
     const newUniqueValues = query || smallStringColumns.length > 0
@@ -49,6 +49,7 @@ export const getUniqueStringValuesByColumn = async ({ columns, tableName, client
             columns: smallStringColumns,
             query: query || `Select ${smallStringNames.join(', ')} from ${tableName}`,
             client,
+            getToken,
             tenants,
             customFields: customFields ?? [],
             dashboardName,
@@ -66,7 +67,7 @@ export const getUniqueStringValuesByColumn = async ({ columns, tableName, client
     }
     return newUniqueValues;
 };
-export const getUniqueStringValuesByTable = async ({ tables, columns, client, tenants, dashboardName, customFields, withExceededColumns, queryTemplate, }) => {
+export const getUniqueStringValuesByTable = async ({ tables, columns, client, getToken, tenants, dashboardName, customFields, withExceededColumns, queryTemplate, }) => {
     const uniqueValues = {};
     await Promise.all(tables.map(async (tableName) => {
         const tableColumns = columns.filter((column) => {
@@ -82,6 +83,7 @@ export const getUniqueStringValuesByTable = async ({ tables, columns, client, te
             columns: tableColumns,
             tableName,
             client,
+            getToken,
             tenants,
             dashboardName,
             customFields,
@@ -92,7 +94,7 @@ export const getUniqueStringValuesByTable = async ({ tables, columns, client, te
     }));
     return uniqueValues;
 };
-export const getRelevantInfoFromQuery = async ({ tables, columns, aliasedColumns, reportBuilderColumns, client, tenants, query, queryTemplate, customFields, dashboardName, }) => {
+export const getRelevantInfoFromQuery = async ({ tables, columns, aliasedColumns, reportBuilderColumns, client, getToken, tenants, query, queryTemplate, customFields, dashboardName, }) => {
     let dateRanges = {};
     let uniqueStrings = null;
     const columnUniqueValues = {};
@@ -102,6 +104,7 @@ export const getRelevantInfoFromQuery = async ({ tables, columns, aliasedColumns
             tables,
             columns,
             client,
+            getToken,
             tenants,
             dashboardName,
             customFields,
@@ -116,7 +119,7 @@ export const getRelevantInfoFromQuery = async ({ tables, columns, aliasedColumns
             return column.fieldType === 'date';
         });
         if (dateColumns.length > 0) {
-            dateRanges = await getQueryDateRangeByColumns(dateColumns, query, client, tenants, customFields, dashboardName);
+            dateRanges = await getQueryDateRangeByColumns(dateColumns, query, client, getToken, tenants, customFields, dashboardName);
             if (dateRanges === null) {
                 throw new Error("Couldn't fetch date ranges");
             }
@@ -132,24 +135,26 @@ export const getRelevantInfoFromQuery = async ({ tables, columns, aliasedColumns
         error,
     };
 };
-export const getCountsByColumns = async (columns, query, client, tenants, customFields, dashboardName) => {
+// TODO: Tenants should be required (not undefined in any circumstance)
+export const getCountsByColumns = async (columns, query, client, getToken, tenants, customFields, dashboardName) => {
     const stringNames = columns.map((column) => column.field);
     const countQuery = generateCountQuery(stringNames, query, client.databaseType || 'postgresql');
     try {
-        const hostedBody = {
+        const { data } = await quillFetch({
+            client,
+            task: 'query',
             metadata: {
                 query: countQuery,
-                task: 'query',
                 clientId: client.publicKey,
-                databaseType: client?.databaseType,
+                databaseType: client.databaseType,
                 customFieldsByTable: customFields,
                 useNewNodeSql: true,
                 dashboardName: dashboardName && tenants ? dashboardName : undefined,
                 tenants: dashboardName && tenants ? tenants : undefined,
             },
-        };
-        const cloudBody = { countQuery };
-        const data = await getData(client, 'dashquery', 'same-origin', hostedBody, cloudBody);
+            urlParameters: `caller=getCounts&task=query`,
+            getToken,
+        });
         if (data.errorMessage) {
             return { filteredColumns: columns, exceededColumns: undefined };
         }
@@ -174,25 +179,25 @@ export const getCountsByColumns = async (columns, query, client, tenants, custom
         return { filteredColumns: columns, exceededColumns: undefined };
     }
 };
-const fetchDistinctStrings = async (query, client, tenants, customFields, filters, dashboardName) => {
+const fetchDistinctStrings = async (query, client, getToken, tenants, customFields, filters, dashboardName) => {
     try {
-        const hostedBody = {
+        const { data } = await quillFetch({
+            client,
+            task: 'query',
             metadata: {
                 query,
-                task: 'query',
                 clientId: client.publicKey,
-                databaseType: client?.databaseType,
+                databaseType: client.databaseType,
                 customFieldsByTable: customFields,
                 useNewNodeSql: true,
                 filters,
-                // @ts-ignore
                 dateField: filters?.find((filter) => filter.filterType === 'date_range')?.dateField,
                 dashboardName,
                 tenants,
             },
-        };
-        const cloudBody = { query };
-        const data = await getData(client, 'dashquery', 'same-origin', hostedBody, cloudBody);
+            urlParameters: `caller=fetchDistinct&task=query`,
+            getToken,
+        });
         if (data.errorMessage) {
             return null;
         }
@@ -230,30 +235,30 @@ const fetchDistinctStrings = async (query, client, tenants, customFields, filter
         return null;
     }
 };
-export const getQueryDateRangeByColumns = async (columns, query, client, tenants, customFields, dashboardName) => {
+export const getQueryDateRangeByColumns = async (columns, query, client, getToken, tenants, customFields, dashboardName) => {
     const columnNames = columns.map(
     // @ts-ignore
     (column) => column.field || column.name);
     const distinctValueQuery = generateMinMaxDateRangeQueries(columnNames, query, client.databaseType || 'postgresql');
-    const dateRanges = await fetchQueryDateRanges(distinctValueQuery, client, tenants, customFields, dashboardName);
+    const dateRanges = await fetchQueryDateRanges(distinctValueQuery, client, getToken, tenants, customFields, dashboardName);
     return dateRanges;
 };
-const fetchQueryDateRanges = async (query, client, tenants, customFields, dashboardName) => {
+const fetchQueryDateRanges = async (query, client, getToken, tenants, customFields, dashboardName) => {
     try {
-        const hostedBody = {
+        const { data } = await quillFetch({
+            client,
+            task: 'query',
             metadata: {
                 query,
-                task: 'query',
                 clientId: client.publicKey,
-                databaseType: client?.databaseType,
+                databaseType: client.databaseType,
                 customFieldsByTable: customFields,
                 useNewNodeSql: true,
                 dashboardName: dashboardName && tenants ? dashboardName : undefined,
                 tenants: dashboardName && tenants ? tenants : undefined,
             },
-        };
-        const cloudBody = { query };
-        const data = await getData(client, 'dashquery', 'same-origin', hostedBody, cloudBody);
+            getToken,
+        });
         if (data.errorMessage) {
             return null;
         }
@@ -269,7 +274,8 @@ const fetchQueryDateRanges = async (query, client, tenants, customFields, dashbo
         return null;
     }
 };
-export const getPaginatedRows = async (client, tenants, query, reportId, processing, filters, customFields, dashboardName) => {
+// Unused?
+export const getPaginatedRows = async (client, getToken, tenants, query, reportId, processing, filters, customFields, dashboardName) => {
     if (query) {
         return await fetchResultsByQuery({
             query,
@@ -279,6 +285,7 @@ export const getPaginatedRows = async (client, tenants, query, reportId, process
             customFields,
             filters,
             dashboardName,
+            getToken,
         });
     }
     else if (reportId) {
@@ -289,12 +296,12 @@ export const getPaginatedRows = async (client, tenants, query, reportId, process
             processing,
             filters,
             customFields,
+            getToken,
         });
     }
     return { rows: [], columns: [] };
 };
-// TODO: Move these to call through the sdk
-export const fetchResultsByQuery = async ({ query, client, tenants, processing, customFields, filters, dateField, rowsOnly, rowCountOnly, filterMap, dashboardName, pivot, getPivotRowCount = true, comparisonQuery, }) => {
+export const fetchResultsByQuery = async ({ query, client, tenants, processing, customFields, filters, dateField, rowsOnly, rowCountOnly, filterMap, dashboardName, pivot, getPivotRowCount = true, comparisonQuery, getToken, }) => {
     let rows = [];
     let columns = [];
     let error = undefined;
@@ -310,6 +317,7 @@ export const fetchResultsByQuery = async ({ query, client, tenants, processing,
                 comparisonPivotQuery: comparisonQuery,
                 additionalProcessing: processing,
                 getPivotRowCount,
+                getToken,
             });
             rows = pivotData.rows;
             columns = pivotData.columns;
@@ -319,16 +327,34 @@ export const fetchResultsByQuery = async ({ query, client, tenants, processing,
                 : [pivotData.pivotQuery];
         }
         else {
-            const hostedBody = {
+            let parsedSuccessfully = true;
+            let parsingError = '';
+            if (!rowCountOnly) {
+                const { data: results } = await quillFetch({
+                    client,
+                    task: 'astify',
+                    metadata: {
+                        clientId: client.clientId,
+                        useNewNodeSql: true,
+                        query,
+                    },
+                    getToken,
+                });
+                if (!results || results.success == false) {
+                    parsedSuccessfully = false;
+                    parsingError = results.message;
+                }
+            }
+            const fetchResp = await quillFetch({
+                client,
+                task: 'query',
                 metadata: {
                     query,
-                    task: 'query',
                     filterMap,
                     clientId: client.publicKey,
                     databaseType: client?.databaseType,
                     customFieldsByTable: customFields,
                     additionalProcessing: processing,
-                    useUpdatedDataGathering: processing ? true : false,
                     useNewNodeSql: true,
                     filters: filters?.map((filter) => ({
                         ...filter,
@@ -340,30 +366,10 @@ export const fetchResultsByQuery = async ({ query, client, tenants, processing,
                     dashboardName: dashboardName && tenants ? dashboardName : undefined,
                     tenants: dashboardName && tenants ? tenants : undefined,
                 },
-            };
-            const cloudBody = { query };
-            let parsedSuccessfully = true;
-            let parsingError = '';
-            if (!rowCountOnly) {
-                const localURL = `${QUILL_SERVER}/astify`;
-                const response = await fetch(localURL, {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/json',
-                    },
-                    body: JSON.stringify({
-                        query,
-                        publicKey: client.publicKey,
-                        useNewNodeSql: true,
-                    }),
-                });
-                const results = await response.json();
-                if (results.success == false) {
-                    parsedSuccessfully = false;
-                    parsingError = results.message;
-                }
-            }
-            const resp = await getData(client, 'dashquery', 'same-origin', hostedBody, cloudBody);
+                getToken,
+            });
+            const resp = await parseFetchResponse(client, 'query', fetchResp, getToken);
+            // console.log('newdata', newdata);
             if (resp && resp.errorMessage) {
                 throw new Error(resp.errorMessage);
             }
@@ -371,19 +377,15 @@ export const fetchResultsByQuery = async ({ query, client, tenants, processing,
                 rowCount = resp.rowCount;
             }
             if (!resp.error && !parsedSuccessfully) {
-                fetch(`${QUILL_SERVER}${QUILL_QUERY_ENDPOINT}`, {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/json',
+                await quillFetch({
+                    client,
+                    task: 'log-broken-query',
+                    metadata: {
+                        query,
+                        clientId: client.clientId,
+                        error: parsingError,
                     },
-                    body: JSON.stringify({
-                        metadata: {
-                            task: 'log-broken-query',
-                            query,
-                            clientId: client.clientId,
-                            error: parsingError,
-                        },
-                    }),
+                    getToken,
                 });
                 throw new Error('Quill parsing error' +
                     parsingError.replace(`Error parsing query`, ''));
@@ -417,7 +419,7 @@ export const fetchResultsByQuery = async ({ query, client, tenants, processing,
     }
     return { rows, columns, rowCount, error, itemQuery, referencedTables };
 };
-export const fetchResultsByReport = async ({ reportId, client, tenants, processing, filters, customFields, rowsOnly, rowCountOnly, abortSignal, pivot, pivotQuery, comparisonPivotQuery, getPivotRowCount = true, }) => {
+export const fetchResultsByReport = async ({ reportId, client, tenants, processing, filters, customFields, rowsOnly, rowCountOnly, abortSignal, pivot, pivotQuery, comparisonPivotQuery, getPivotRowCount = true, getToken, }) => {
     if (pivot && pivotQuery) {
         return fetchResultsByQuery({
             query: pivotQuery,
@@ -429,6 +431,7 @@ export const fetchResultsByReport = async ({ reportId, client, tenants, processi
             filters,
             pivot,
             getPivotRowCount,
+            getToken,
         });
     }
     const updatedProcessing = { ...processing };
@@ -447,16 +450,18 @@ export const fetchResultsByReport = async ({ reportId, client, tenants, processi
             if (newFilter.filterType === 'date_range') {
                 delete newFilter['field'];
                 delete newFilter['selectedValue'];
+                delete newFilter['presetOptions'];
             }
             delete newFilter['options'];
             return newFilter;
         })
         : [];
     try {
-        const hostedBody = {
+        const fetchResp = await quillFetch({
+            client,
+            task: 'item',
             metadata: {
                 dashboardItemId: reportId,
-                task: 'item',
                 filters: minimalFilters,
                 clientId: client?.publicKey,
                 databaseType: client?.databaseType,
@@ -468,13 +473,10 @@ export const fetchResultsByReport = async ({ reportId, client, tenants, processi
                 rowCountOnly,
                 tenants,
             },
-        };
-        const cloudBody = {
-            id: reportId,
-            filters: [],
-            useNewNodeSql: true,
-        };
-        const resp = await getData(client, 'itempost', 'omit', hostedBody, cloudBody, undefined, undefined, abortSignal);
+            abortSignal,
+            getToken,
+        });
+        const resp = await parseFetchResponse(client, 'item', fetchResp, getToken);
         if (resp.errorMessage) {
             throw new Error(resp.errorMessage);
         }
@@ -503,7 +505,7 @@ export const fetchResultsByReport = async ({ reportId, client, tenants, processi
     }
     return { rows, columns, rowCount, error };
 };
-export const fetchTableByAST = async (ast, client, tenants, processing, customFields, rowsOnly, rowCountOnly, dashboardName) => {
+export const fetchTableByAST = async (ast, client, getToken, tenants, processing, customFields, rowsOnly, rowCountOnly, dashboardName) => {
     let rows = [];
     let columns = [];
     let rowCount;
@@ -511,12 +513,12 @@ export const fetchTableByAST = async (ast, client, tenants, processing, customFi
     let itemQuery;
     let referencedTables;
     try {
-        const hostedBody = {
+        const fetchResp = await quillFetch({
+            client,
+            task: 'patterns',
             metadata: {
                 clientId: client.publicKey,
                 ast,
-                publicKey: client.publicKey,
-                task: 'patterns',
                 customFields,
                 additionalProcessing: processing,
                 useUpdatedDataGathering: true,
@@ -526,9 +528,9 @@ export const fetchTableByAST = async (ast, client, tenants, processing, customFi
                 dashboardName: dashboardName && tenants ? dashboardName : undefined,
                 tenants: dashboardName && tenants ? tenants : undefined,
             },
-        };
-        const cloudBody = {};
-        const resp = await getData(client, 'dashquery', 'same-origin', hostedBody, cloudBody);
+            getToken,
+        });
+        const resp = await parseFetchResponse(client, 'patterns', fetchResp, getToken);
         if (resp.errorMessage || resp.name === 'error') {
             throw new Error(resp.errorMessage);
         }

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

@@ -1 +1 @@
-{"version":3,"file":"textProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/textProcessing.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQhD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAsE1F;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,UAa/C;AAED,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,MAAM,UAiBvD;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,UAK7C"}
+{"version":3,"file":"textProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/textProcessing.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQhD;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,QAAQ,EAAE,MAAM,GAAG,SAAS,GAC3B,MAAM,CAwER;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,UAa/C;AAED,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,MAAM,UAiBvD;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,UAK7C"}

package/dist/esm/utils/textProcessing.js

@@ -40,7 +40,8 @@ export function matchCasing(text, template) {
     const toUpperCase = (str) => str.toUpperCase();
     // Function to convert to capitalized (first letter uppercase, rest lowercase)
     const toCapitalized = (str) => str.charAt(0).toUpperCase() + str.slice(1).toLowerCase();
-    const toScreamingSnakeCase = (str) => str.replace(/([A-Z])/g, '_$1') // Add underscore before capitals
+    const toScreamingSnakeCase = (str) => str
+        .replace(/([A-Z])/g, '_$1') // Add underscore before capitals
         .replace(/^_/, '') // Remove leading underscore if present
         .toUpperCase(); // Convert everything to uppercase
     // Match casing of the template and apply to the text

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

@@ -1 +1 @@
-{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../../src/utils/ui.ts"],"names":[],"mappings":"AACC,eAAO,MAAM,mBAAmB,YAAa,WAAW,GAAG,IAAI,+CAU/D,CAAC"}
+{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../../src/utils/ui.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,mBAAmB,YAAa,WAAW,GAAG,IAAI,+CAY9D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.13.47",
+  "version": "2.13.49",
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
@@ -46,6 +46,7 @@
     "@babel/preset-env": "^7.25.8",
     "@babel/preset-react": "^7.25.7",
     "@babel/preset-typescript": "^7.25.7",
+    "@playwright/test": "^1.51.1",
     "@repo/eslint-config": "*",
     "@repo/typescript-config": "*",
     "@types/big.js": "^6.2.2",