@quillsql/react 2.14.13 → 2.14.14

package/dist/esm/utils/tableProcessing.js

@@ -18,14 +18,14 @@ export const hasColumnAlias = (columns, referencedColumns) => {
     }
     return false;
 };
-export const getUniqueValuesByQuery = async ({ columns, query, client, getToken, tenants, customFields, filters, dashboardName, }) => {
+export const getUniqueValuesByQuery = async ({ columns, query, client, getToken, tenants, customFields, filters, dashboardName, eventTracking, }) => {
     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, getToken, tenants, customFields, filters, dashboardName);
+    const distinctStrings = await fetchDistinctStrings(distinctValueQuery, client, getToken, tenants, eventTracking, customFields, filters, dashboardName);
     if (!distinctStrings) {
         return {};
     }
@@ -34,13 +34,13 @@ export const getUniqueValuesByQuery = async ({ columns, query, client, getToken,
     }
     return uniqueValues;
 };
-export const getUniqueStringValuesByColumn = async ({ columns, tableName, client, getToken, tenants, customFields, withExceededColumns, query, dashboardName, }) => {
+export const getUniqueStringValuesByColumn = async ({ columns, tableName, client, getToken, tenants, customFields, withExceededColumns, query, dashboardName, eventTracking, }) => {
     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, getToken, tenants, customFields ?? [], dashboardName)
+        ? await getCountsByColumns(convertedStringColumns, query || `Select ${stringNames.join(', ')} from ${tableName}`, client, getToken, tenants, customFields ?? [], eventTracking, dashboardName)
         : { filteredColumns: [], exceededColumns: undefined };
     const smallStringNames = smallStringColumns.map((column) => processColumnReference(column.field, client.databaseType, undefined, true));
     const newUniqueValues = query || smallStringColumns.length > 0
@@ -53,6 +53,7 @@ export const getUniqueStringValuesByColumn = async ({ columns, tableName, client
             tenants,
             customFields: customFields ?? [],
             dashboardName,
+            eventTracking,
         })
         : null;
     if (!newUniqueValues) {
@@ -67,7 +68,7 @@ export const getUniqueStringValuesByColumn = async ({ columns, tableName, client
     }
     return newUniqueValues;
 };
-export const getUniqueStringValuesByTable = async ({ tables, columns, client, getToken, tenants, dashboardName, customFields, withExceededColumns, queryTemplate, }) => {
+export const getUniqueStringValuesByTable = async ({ tables, columns, client, getToken, tenants, dashboardName, customFields, withExceededColumns, queryTemplate, eventTracking, }) => {
     const uniqueValues = {};
     await Promise.all(tables.map(async (tableName) => {
         const tableColumns = columns.filter((column) => {
@@ -89,12 +90,13 @@ export const getUniqueStringValuesByTable = async ({ tables, columns, client, ge
             customFields,
             withExceededColumns,
             query,
+            eventTracking,
         });
         uniqueValues[tableName] = newUniqueValues;
     }));
     return uniqueValues;
 };
-export const getRelevantInfoFromQuery = async ({ tables, columns, aliasedColumns, reportBuilderColumns, client, getToken, tenants, query, queryTemplate, customFields, dashboardName, }) => {
+export const getRelevantInfoFromQuery = async ({ tables, columns, aliasedColumns, reportBuilderColumns, client, getToken, tenants, query, queryTemplate, customFields, dashboardName, eventTracking, }) => {
     let dateRanges = {};
     let uniqueStrings = null;
     const columnUniqueValues = {};
@@ -110,6 +112,7 @@ export const getRelevantInfoFromQuery = async ({ tables, columns, aliasedColumns
             customFields,
             withExceededColumns: true,
             queryTemplate,
+            eventTracking,
         });
         reportBuilderColumns.forEach((column) => {
             columnUniqueValues[column.alias || column.field] =
@@ -119,13 +122,24 @@ export const getRelevantInfoFromQuery = async ({ tables, columns, aliasedColumns
             return column.fieldType === 'date';
         });
         if (dateColumns.length > 0) {
-            dateRanges = await getQueryDateRangeByColumns(dateColumns, query, client, getToken, tenants, customFields, dashboardName);
+            dateRanges = await getQueryDateRangeByColumns(dateColumns, query, client, getToken, tenants, eventTracking, customFields, dashboardName);
             if (dateRanges === null) {
                 throw new Error("Couldn't fetch date ranges");
             }
         }
     }
     catch (e) {
+        eventTracking?.logError?.({
+            type: 'bug', // TODO: determine type
+            severity: 'high',
+            message: 'Error fetching pivot info',
+            errorMessage: e.message,
+            errorStack: e.stack,
+            errorData: {
+                caller: 'getRelevantInfoFromQuery',
+                function: 'getRelevantInfoFromQuery',
+            },
+        });
         error = "Couldn't fetch pivot info";
     }
     return {
@@ -135,7 +149,7 @@ export const getRelevantInfoFromQuery = async ({ tables, columns, aliasedColumns
         error,
     };
 };
-export const getCountsByColumns = async (columns, query, client, getToken, tenants, customFields, dashboardName) => {
+export const getCountsByColumns = async (columns, query, client, getToken, tenants, customFields, eventTracking, dashboardName) => {
     const stringNames = columns.map((column) => column.field);
     const countQuery = generateCountQuery(stringNames, query, client.databaseType || 'postgresql');
     try {
@@ -174,11 +188,21 @@ export const getCountsByColumns = async (columns, query, client, getToken, tenan
         return { filteredColumns, exceededColumns };
     }
     catch (e) {
-        console.error(e);
+        eventTracking?.logError?.({
+            type: 'bug', // TODO: determine type
+            severity: 'high',
+            message: 'Error fetching counts by columns',
+            errorMessage: e.message,
+            errorStack: e.stack,
+            errorData: {
+                caller: 'getCountsByColumns',
+                function: 'getCountsByColumns',
+            },
+        });
         return { filteredColumns: columns, exceededColumns: undefined };
     }
 };
-const fetchDistinctStrings = async (query, client, getToken, tenants, customFields, filters, dashboardName) => {
+const fetchDistinctStrings = async (query, client, getToken, tenants, eventTracking, customFields, filters, dashboardName) => {
     try {
         const { data } = await quillFetch({
             client,
@@ -231,18 +255,29 @@ const fetchDistinctStrings = async (query, client, getToken, tenants, customFiel
         return results;
     }
     catch (e) {
+        eventTracking?.logError?.({
+            type: 'bug', // TODO: determine type
+            severity: 'high',
+            message: 'Error fetching distinct strings',
+            errorMessage: e.message,
+            errorStack: e.stack,
+            errorData: {
+                caller: 'fetchDistinctStrings',
+                function: 'fetchDistinctStrings',
+            },
+        });
         return null;
     }
 };
-export const getQueryDateRangeByColumns = async (columns, query, client, getToken, tenants, customFields, dashboardName) => {
+export const getQueryDateRangeByColumns = async (columns, query, client, getToken, tenants, eventTracking, 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, getToken, tenants, customFields, dashboardName);
+    const dateRanges = await fetchQueryDateRanges(distinctValueQuery, client, getToken, tenants, eventTracking, customFields, dashboardName);
     return dateRanges;
 };
-const fetchQueryDateRanges = async (query, client, getToken, tenants, customFields, dashboardName) => {
+const fetchQueryDateRanges = async (query, client, getToken, tenants, eventTracking, customFields, dashboardName) => {
     try {
         const { data } = await quillFetch({
             client,
@@ -270,11 +305,22 @@ const fetchQueryDateRanges = async (query, client, getToken, tenants, customFiel
         return results;
     }
     catch (e) {
+        eventTracking?.logError?.({
+            type: 'bug', // TODO: determine type
+            severity: 'high',
+            message: 'Error fetching query date ranges',
+            errorMessage: e.message,
+            errorStack: e.stack,
+            errorData: {
+                caller: 'fetchQueryDateRanges',
+                function: 'fetchQueryDateRanges',
+            },
+        });
         return null;
     }
 };
 // Unused?
-export const getPaginatedRows = async (client, getToken, tenants, dashboardName, query, reportId, processing, filters, customFields) => {
+export const getPaginatedRows = async (client, getToken, eventTracking, tenants, dashboardName, query, reportId, processing, filters, customFields) => {
     if (query) {
         return await fetchResultsByQuery({
             query,
@@ -285,6 +331,7 @@ export const getPaginatedRows = async (client, getToken, tenants, dashboardName,
             filters,
             dashboardName,
             getToken,
+            eventTracking,
         });
     }
     else if (reportId) {
@@ -296,11 +343,12 @@ export const getPaginatedRows = async (client, getToken, tenants, dashboardName,
             filters,
             customFields,
             getToken,
+            eventTracking,
         });
     }
     return { rows: [], columns: [] };
 };
-export const fetchResultsByQuery = async ({ query, client, tenants, processing, customFields, filters, dateField, rowsOnly, rowCountOnly, filterMap, dashboardName, pivot, getPivotRowCount = true, comparisonQuery, getToken, }) => {
+export const fetchResultsByQuery = async ({ query, client, tenants, processing, customFields, filters, dateField, rowsOnly, rowCountOnly, filterMap, dashboardName, pivot, getPivotRowCount = true, comparisonQuery, getToken, eventTracking, }) => {
     let rows = [];
     let columns = [];
     let error = undefined;
@@ -409,6 +457,17 @@ export const fetchResultsByQuery = async ({ query, client, tenants, processing,
         }
     }
     catch (e) {
+        eventTracking?.logError?.({
+            type: 'bug', // TODO: determine type
+            severity: 'high',
+            message: 'Error fetching results by query',
+            errorMessage: e.message,
+            errorStack: e.stack,
+            errorData: {
+                caller: 'fetchResultsByQuery',
+                function: 'fetchResultsByQuery',
+            },
+        });
         rows = [];
         columns = [];
         error = e.message || e;
@@ -418,7 +477,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, getToken, }) => {
+export const fetchResultsByReport = async ({ reportId, client, tenants, processing, filters, customFields, rowsOnly, rowCountOnly, abortSignal, pivot, pivotQuery, comparisonPivotQuery, getPivotRowCount = true, getToken, eventTracking, }) => {
     if (pivot && pivotQuery) {
         return fetchResultsByQuery({
             query: pivotQuery,
@@ -431,6 +490,7 @@ export const fetchResultsByReport = async ({ reportId, client, tenants, processi
             pivot,
             getPivotRowCount,
             getToken,
+            eventTracking,
         });
     }
     const updatedProcessing = { ...processing };
@@ -494,6 +554,17 @@ export const fetchResultsByReport = async ({ reportId, client, tenants, processi
         if (e instanceof Error && e.name === 'AbortError') {
             throw e;
         }
+        eventTracking?.logError?.({
+            type: 'bug', // TODO: determine type
+            severity: 'high',
+            message: 'Error fetching results by report',
+            errorMessage: e.message,
+            errorStack: e.stack,
+            errorData: {
+                caller: 'fetchResultsByReport',
+                function: 'fetchResultsByReport',
+            },
+        });
         rows = [];
         columns = [];
         rowCount = 0;
@@ -504,7 +575,7 @@ export const fetchResultsByReport = async ({ reportId, client, tenants, processi
     }
     return { rows, columns, rowCount, error };
 };
-export const fetchTableByAST = async (ast, client, getToken, tenants, dashboardName, processing, customFields, rowsOnly, rowCountOnly) => {
+export const fetchTableByAST = async (ast, client, getToken, tenants, eventTracking, dashboardName, processing, customFields, rowsOnly, rowCountOnly) => {
     let rows = [];
     let columns = [];
     let rowCount;
@@ -557,6 +628,17 @@ export const fetchTableByAST = async (ast, client, getToken, tenants, dashboardN
         }
     }
     catch (e) {
+        eventTracking?.logError?.({
+            type: 'bug', // TODO: determine type
+            severity: 'high',
+            message: 'Error fetching table by AST',
+            errorMessage: e.message,
+            errorStack: e.stack,
+            errorData: {
+                caller: 'fetchTableByAST',
+                function: 'fetchTableByAST',
+            },
+        });
         rows = [];
         columns = [];
         rowCount = 0;

package/package.json

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