@quillsql/react 2.13.18 → 2.13.19

package/dist/esm/utils/report.js

@@ -8,7 +8,6 @@ import { fetchSqlQuery, getData } from './dataFetcher';
 import { parseValueFromBigQueryDates } from './dataProcessing';
 import { getDateBucketFromRange } from './dates';
 import { DataLoadError } from './error';
-import { processFilterErrorList } from './errorProcessing';
 import { internalLog } from './logging';
 import { DEFAULT_PAGINATION } from './paginationProcessing';
 import { isPivotPossible, isValidPivot } from './pivotProcessing';
@@ -89,59 +88,20 @@ export async function fetchReport(reportId, client, useReportTask = true, filter
             useNewNodeSql: true,
         };
         const resp = await getData(client, 'itempost', 'omit', hostedBody, cloudBody, 'POST', 'fetch-data', abortSignal);
-        processFilterErrorList(resp);
-        const dashboardItem = {
-            ...resp,
-            filtersApplied: getDefaultDashboardFilters ? resp.filters : filters,
-        };
-        if (resp.errorMessage) {
-            throw new DataLoadError(resp?.errorMessage, {
-                ...resp,
-                useReportTask,
-            });
-        }
-        if (client.databaseType &&
-            client.databaseType.toLowerCase() === 'bigquery') {
-            parseValueFromBigQueryDates(dashboardItem.rows, resp.fields);
-        }
-        if (dashboardItem.compareRows) {
-            if (client.databaseType &&
-                client.databaseType.toLowerCase() === 'bigquery') {
-                parseValueFromBigQueryDates(dashboardItem.compareRows, resp.fields);
-            }
-        }
-        reportInfo = await cleanDashboardItem(dashboardItem, filters, client, dateBucket);
-        if (additionalProcessing) {
-            reportInfo.pagination = additionalProcessing.page;
-            reportInfo.sort = additionalProcessing.sort;
-        }
-        // Ensure the report columns don't reference any columns that aren't present in the rows
-        const observedColumns = reportInfo?.rows[0]
-            ? Object.keys(reportInfo.rows[0])
-            : null;
-        if (observedColumns &&
-            reportInfo &&
-            !reportInfo.pivot &&
-            !reportInfo.pivotColumns &&
-            !reportInfo.error &&
-            useReportTask &&
-            reportInfo.columns?.filter((col) => !observedColumns.includes(col.field))
-                ?.length > 0) {
-            reportInfo.columns = reportInfo.columns.filter((col) => observedColumns.includes(col.field));
-            reportInfo.columnInternal = reportInfo.columnInternal.filter((col) => observedColumns.includes(col.field));
-            await saveReport({
-                report: { ...dashboardItem, query: reportInfo.queryString },
-                dashboardItemId: reportId,
-                client,
-            });
-        }
+        reportInfo = await processReportResponse({
+            resp,
+            client,
+            filters,
+            dateBucket,
+            additionalProcessing,
+        });
     }
     catch (error) {
         if (error instanceof Error && error.name === 'AbortError') {
             throw error;
         }
         if (error instanceof DataLoadError) {
-            if (error.data.useReportTask) {
+            if (useReportTask) {
                 internalLog('USING ITEM AS BACKUP');
                 const { report, error } = await fetchReport(reportId, client, false, filters, additionalProcessing, dateBucket, customFields, rowsOnly, rowCountOnly);
                 reportInfo = report;
@@ -170,6 +130,74 @@ export async function fetchReport(reportId, client, useReportTask = true, filter
     }
     return { report: reportInfo || EMPTY_INTERNAL_REPORT, error: errorMessage };
 }
+export async function processReportResponse({ resp, client, filters, dateBucket, additionalProcessing, }) {
+    const dashboardItem = {
+        ...resp,
+        filtersApplied: filters,
+    };
+    if (resp.errorMessage) {
+        throw new DataLoadError(resp?.errorMessage, {
+            ...resp,
+            useReportTask: true,
+        });
+    }
+    if (client.databaseType && client.databaseType.toLowerCase() === 'bigquery') {
+        parseValueFromBigQueryDates(dashboardItem.rows, resp.fields);
+    }
+    if (dashboardItem.compareRows) {
+        if (client.databaseType &&
+            client.databaseType.toLowerCase() === 'bigquery') {
+            parseValueFromBigQueryDates(dashboardItem.compareRows, resp.fields);
+        }
+    }
+    console.log('dashboardItem', dashboardItem);
+    console.log('filters', filters);
+    const reportInfo = await cleanDashboardItem(dashboardItem, filters, client, dateBucket);
+    console.log('reportInfo', reportInfo);
+    if (additionalProcessing) {
+        reportInfo.pagination = additionalProcessing.page;
+        reportInfo.sort = additionalProcessing.sort;
+    }
+    //TODO: Revisit this code
+    // It's purpose is to filter out columns that are not present in the rows
+    // But it appears to be confusing dashboardItem and reportInfo
+    // Ensure the report columns don't reference any columns that aren't present in the rows
+    const observedColumns = reportInfo?.rows[0]
+        ? Object.keys(reportInfo.rows[0])
+        : null;
+    if (observedColumns &&
+        reportInfo &&
+        !reportInfo.pivot &&
+        !reportInfo.pivotColumns &&
+        !reportInfo.error &&
+        reportInfo.columns?.filter((col) => !observedColumns.includes(col.field))
+            ?.length > 0) {
+        reportInfo.columns = reportInfo.columns.filter((col) => observedColumns.includes(col.field));
+        reportInfo.columnInternal = reportInfo.columnInternal.filter((col) => observedColumns.includes(col.field));
+        await saveReport({
+            report: { ...reportInfo, query: reportInfo.queryString },
+            dashboardItemId: reportInfo.id,
+            client,
+        });
+    }
+    return reportInfo;
+}
+export async function fetchReportInfo(reportId, client) {
+    const hostedBody = {
+        metadata: {
+            reportId,
+            clientId: client.publicKey,
+            task: 'report-info',
+            orgId: client.organizationId || '*',
+        },
+    };
+    const cloudBody = {
+        id: reportId,
+        useNewNodeSql: true,
+    };
+    const resp = await getData(client, 'itempost', 'omit', hostedBody, cloudBody, 'POST', 'fetch-data');
+    return { report: resp.report, filters: resp.filters };
+}
 export async function fetchReportRowCount(reportId, client, useReportTask = true, filters = [], additionalProcessing, customFields, abortSignal) {
     // Remove extra fields on each filter so we don't confuse the backend.
     const hostedBody = {
@@ -246,7 +274,7 @@ export const formatRowsFromReport = (report) => {
         }, {});
     });
 };
-export function convertInternalReportToReport(report) {
+export function convertInternalReportToReport(report, dashboardFilters) {
     try {
         if (!report) {
             return EMPTY_REPORT;
@@ -283,7 +311,7 @@ export function convertInternalReportToReport(report) {
             return {
                 ...extractAllReportValuesFromQuillInternalReport(formattedReport),
                 rows: rows,
-                yAxisFields: getYAxisFields(report),
+                yAxisFields: getYAxisFields(report, dashboardFilters),
                 columns: columns,
                 rowCount: rows ? rows.length : 0,
             };
@@ -295,7 +323,7 @@ export function convertInternalReportToReport(report) {
         return {
             ...extractAllReportValuesFromQuillInternalReport(formattedReport),
             rows: rows,
-            yAxisFields: getYAxisFields(report),
+            yAxisFields: getYAxisFields(report, dashboardFilters),
         };
     }
     catch (error) {

package/package.json

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