@quillsql/react 2.12.52 → 2.12.53

package/dist/esm/utils/report.js

@@ -13,7 +13,7 @@ import { internalLog } from './logging';
 import { mergeComparisonRange } from './merge';
 import { DEFAULT_PAGINATION } from './paginationProcessing';
 import { isPivotPossible, isValidPivot } from './pivotProcessing';
-import { fetchTableByAST, getRelevantInfoFromQuery, } from './tableProcessing';
+import { fetchTableByAST, getDateRangeByColumns, getRelevantInfoFromQuery, } from './tableProcessing';
 import { snakeAndCamelCaseToTitleCase } from './textProcessing';
 import { quillFormat } from './valueFormatter';
 export const EMPTY_REPORT = {
@@ -61,7 +61,7 @@ function extractAllReportValuesFromQuillInternalReport(reportInternal) {
         template: reportInternal.template,
     };
 }
-export async function fetchReport(reportId, client, useReportTask = true, filters = [], additionalProcessing, dateBucket, customFields) {
+export async function fetchReport(reportId, client, useReportTask = true, filters = [], additionalProcessing, dateBucket, customFields, queryTask) {
     let reportInfo = undefined;
     let errorMessage = undefined;
     try {
@@ -70,7 +70,7 @@ export async function fetchReport(reportId, client, useReportTask = true, filter
             metadata: {
                 reportId,
                 dashboardItemId: reportId,
-                orgId: client.customerId || '*',
+                orgId: client.organizationId || '*',
                 clientId: client.publicKey,
                 task: useReportTask ? 'report' : 'item',
                 databaseType: client.databaseType,
@@ -78,6 +78,7 @@ export async function fetchReport(reportId, client, useReportTask = true, filter
                 customFields,
                 additionalProcessing,
                 useNewNodeSql: true,
+                queryTask,
             },
         };
         const cloudBody = {
@@ -113,8 +114,11 @@ export async function fetchReport(reportId, client, useReportTask = true, filter
         // 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])
-            : [];
-        if (reportInfo &&
+            : null;
+        if (observedColumns &&
+            reportInfo &&
+            !reportInfo.pivot &&
+            !reportInfo.pivotColumns &&
             useReportTask &&
             reportInfo.columns?.filter((col) => !observedColumns.includes(col.field))
                 ?.length > 0) {
@@ -131,7 +135,7 @@ export async function fetchReport(reportId, client, useReportTask = true, filter
         if (error instanceof DataLoadError) {
             if (error.data.useReportTask) {
                 internalLog('USING ITEM AS BACKUP');
-                const { report, error } = await fetchReport(reportId, client, false, filters, additionalProcessing, dateBucket, customFields);
+                const { report, error } = await fetchReport(reportId, client, false, filters, additionalProcessing, dateBucket, customFields, queryTask);
                 reportInfo = report;
                 errorMessage = error;
             }
@@ -158,12 +162,37 @@ export async function fetchReport(reportId, client, useReportTask = true, filter
     }
     return { report: reportInfo || EMPTY_INTERNAL_REPORT, error: errorMessage };
 }
+export async function fetchReportRowCount(reportId, client, useReportTask = true, filters = [], additionalProcessing, customFields) {
+    // Remove extra fields on each filter so we don't confuse the backend.
+    const hostedBody = {
+        metadata: {
+            reportId,
+            dashboardItemId: reportId,
+            orgId: client.organizationId || '*',
+            clientId: client.publicKey,
+            task: useReportTask ? 'report' : 'item',
+            databaseType: client.databaseType,
+            filters: filters,
+            customFields,
+            additionalProcessing,
+            useNewNodeSql: true,
+            rowCountOnly: true,
+        },
+    };
+    const cloudBody = {
+        id: reportId,
+        filters: filters,
+        useNewNodeSql: true,
+    };
+    const resp = await getData(client, 'itempost', 'omit', hostedBody, cloudBody, 'POST', 'fetch-data');
+    return resp.rowCount;
+}
 export async function saveReport({ report, dashboardItemId, client, }) {
-    const { publicKey, customerId, databaseType } = client;
+    const { publicKey, organizationId, databaseType } = client;
     const cloudBody = {
         ...report,
         dashboardItemId,
-        customerId: customerId || '*',
+        customerId: organizationId || '*',
         useNewNodeSql: true,
     };
     // @ts-ignore
@@ -181,14 +210,14 @@ export async function saveReport({ report, dashboardItemId, client, }) {
             clientId: publicKey,
             databaseType: databaseType,
             ...cloudBody,
-            orgId: customerId || '*',
+            orgId: organizationId || '*',
             useNewNodeSql: true,
         },
     };
-    const searchParams = new URLSearchParams(customerId
+    const searchParams = new URLSearchParams(organizationId
         ? {
             clientId: publicKey,
-            customerId: customerId,
+            customerId: organizationId,
         }
         : { clientId: publicKey }).toString();
     return await getData(client, `dashedit2?${searchParams}`, 'same-origin', hostedBody, cloudBody);
@@ -265,7 +294,7 @@ export function convertInternalReportToReport(report) {
         return EMPTY_REPORT;
     }
 }
-export const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, client, pivot, previousFormData, currentTable, previousRelevant, report, customFields) => {
+export const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, client, pivot, previousFormData, currentTable, previousRelevant, report, customFields, skipUniqueValues, skipRowCount, processing) => {
     let newRows = [];
     let newColumns = [];
     let newRowCount = 0;
@@ -276,7 +305,7 @@ export const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, c
     let table = '';
     let error;
     const relevantInfo = previousRelevant ?? { uniqueStrings: {}, dateRanges: {} };
-    const query = '';
+    let query = '';
     try {
         const tables = getTableNames(baseAst);
         table = tables[0] ? tables[0] : '';
@@ -284,7 +313,7 @@ export const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, c
         if (!table || !tableInfo) {
             throw new Error('No table found;');
         }
-        const tableData = await fetchTableByAST({ ...baseAst, where: formData }, client, { page: DEFAULT_PAGINATION });
+        const tableData = await fetchTableByAST({ ...baseAst, where: formData }, client, processing ?? { page: DEFAULT_PAGINATION }, undefined, skipRowCount);
         if (tableData.error) {
             throw new Error(tableData.error);
         }
@@ -308,17 +337,32 @@ export const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, c
             }),
             columnInternal: tableData.columns,
         };
-        const queryResult = await fetchSqlQuery({
-            ...createBasicSelectASTFromColumns(tableInfo.columns, table),
-            where: formData,
-        }, client, formData);
-        if (queryResult.error) {
-            throw new Error(queryResult.error);
-        }
         if (table !== currentTable || previousFormData !== formData) {
-            const { uniqueStrings, dateRanges } = await getRelevantInfoFromQuery(tableInfo.columns, client, queryResult.query, customFields);
-            relevantInfo.uniqueStrings[table] = uniqueStrings ?? {};
-            relevantInfo.dateRanges = dateRanges ?? {};
+            const queryResult = await fetchSqlQuery({
+                ...createBasicSelectASTFromColumns(tableInfo.columns, table),
+                where: formData,
+            }, client, formData);
+            if (queryResult.error) {
+                throw new Error(queryResult.error);
+            }
+            query = queryResult.query;
+            if (!skipUniqueValues) {
+                const { uniqueStrings, dateRanges } = await getRelevantInfoFromQuery(tableInfo.columns, client, queryResult.query, customFields);
+                relevantInfo.uniqueStrings[table] = uniqueStrings ?? {};
+                relevantInfo.dateRanges = dateRanges ?? {};
+            }
+            else {
+                const dateColumns = tableInfo.columns.filter((column) => {
+                    return column.fieldType === 'date';
+                });
+                if (dateColumns.length > 0) {
+                    const dateRanges = await getDateRangeByColumns(dateColumns, queryResult.query, client, customFields ?? []);
+                    if (dateRanges === null) {
+                        throw new Error("Couldn't fetch date ranges");
+                    }
+                    relevantInfo.dateRanges = dateRanges ?? {};
+                }
+            }
         }
         if (!!relevantInfo.error) {
             throw new Error(relevantInfo.error);

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

@@ -1,7 +1,7 @@
-import { Client } from '../models/Client';
+import { QuillProviderClient } from '../models/Client';
 import { Table } from '../models/Tables';
-export declare const getCustomFieldInfo: (client: Client, caller?: string) => Promise<any[]>;
-export declare const getSchemaInfoWithCustomFields: (client: Client, caller?: string) => Promise<{
+export declare const getCustomFieldInfo: (client: QuillProviderClient, caller?: string) => Promise<any[]>;
+export declare const getSchemaInfoWithCustomFields: (client: QuillProviderClient, caller?: string, tableIds?: string[]) => Promise<{
     schemaData: Table[];
     customFieldsByTable: any;
 }>;

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAsDzC,eAAO,MAAM,kBAAkB,WAAkB,MAAM,oCA8EtD,CAAC;AAEF,eAAO,MAAM,6BAA6B,WAChC,MAAM,sBAEb,QAAQ;IAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IAAC,mBAAmB,EAAE,GAAG,CAAA;CAAE,CAmD3D,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAyDzC,eAAO,MAAM,kBAAkB,WACrB,mBAAmB,oCAqF5B,CAAC;AAEF,eAAO,MAAM,6BAA6B,WAChC,mBAAmB,8BAEhB,MAAM,EAAE,KAClB,QAAQ;IAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IAAC,mBAAmB,EAAE,GAAG,CAAA;CAAE,CAoD3D,CAAC"}

package/dist/esm/utils/schema.js

@@ -1,30 +1,33 @@
 import { convertColumnInfoToColumnInternal } from './columnProcessing';
-const triggerSoftUpdate = async (client, tables) => {
-    const { queryEndpoint, queryHeaders, publicKey, withCredentials } = client;
-    tables.forEach(async (table) => {
-        // if (table.isSelectStar) {
-        fetch(`${queryEndpoint}?update-view`, {
-            method: 'POST',
-            headers: {
-                ...queryHeaders,
-                'Content-Type': 'application/json',
-            },
-            credentials: withCredentials ? 'include' : 'omit',
-            body: JSON.stringify({
-                metadata: {
-                    preQueries: [table.viewQuery.replace(/;/, '')],
-                    clientId: publicKey,
-                    publicKey: publicKey,
-                    task: 'update-view',
-                    name: table.name,
-                    id: table._id,
-                    runQueryConfig: { getColumns: true },
-                },
-            }),
-        });
-        // }
-    });
-};
+// const triggerSoftUpdate = async (
+//   client: QuillProviderClient,
+//   tables: Table[],
+// ) => {
+//   const { queryEndpoint, queryHeaders, publicKey, withCredentials } = client;
+//   tables.forEach(async (table: Table) => {
+//     // if (table.isSelectStar) {
+//     fetch(`${queryEndpoint}?update-view`, {
+//       method: 'POST',
+//       headers: {
+//         ...queryHeaders,
+//         'Content-Type': 'application/json',
+//       },
+//       credentials: withCredentials ? 'include' : 'omit',
+//       body: JSON.stringify({
+//         metadata: {
+//           preQueries: [table.viewQuery.replace(/;/, '')],
+//           clientId: publicKey,
+//           publicKey: publicKey,
+//           task: 'update-view',
+//           name: table.name,
+//           id: table._id,
+//           runQueryConfig: { getColumns: true },
+//         },
+//       }),
+//     });
+//     // }
+//   });
+// };
 const parseResponse = (results) => {
     if (results.data?.data) {
         if (results.data.data.queries &&
@@ -49,7 +52,7 @@ const parseResponse = (results) => {
 export const getCustomFieldInfo = async (client, caller = 'se') => {
     let customFieldsByTableUnique = [];
     try {
-        const { queryEndpoint, queryHeaders, publicKey, databaseType, customerId } = client;
+        const { queryEndpoint, queryHeaders, publicKey, databaseType, organizationId, } = client;
         if ((databaseType && databaseType.toLowerCase() !== 'postgresql') ||
             !['665610862cf7a3000be66453'].includes(publicKey)) {
             throw new Error('CUSTOM FIELDS IS ONLY ALLOWED FOR POSTGRESQL DATABASES');
@@ -67,7 +70,7 @@ export const getCustomFieldInfo = async (client, caller = 'se') => {
                     publicKey,
                     task: 'custom-field-records',
                     databaseType: databaseType,
-                    orgId: customerId,
+                    orgId: organizationId,
                 },
             }),
         });
@@ -111,11 +114,11 @@ export const getCustomFieldInfo = async (client, caller = 'se') => {
     }
     return customFieldsByTableUnique;
 };
-export const getSchemaInfoWithCustomFields = async (client, caller = 'se') => {
-    const { queryEndpoint, queryHeaders, publicKey, customerId, withCredentials, } = client;
+export const getSchemaInfoWithCustomFields = async (client, caller = 'se', tableIds) => {
+    const { queryEndpoint, queryHeaders, publicKey, organizationId, withCredentials, } = client;
     let customFieldsByTableUnique = [];
     let getCustomFields = true;
-    if (!customerId || customerId !== '*') {
+    if (!organizationId || organizationId !== '*') {
         try {
             customFieldsByTableUnique = await getCustomFieldInfo(client, caller);
         }
@@ -136,12 +139,13 @@ export const getSchemaInfoWithCustomFields = async (client, caller = 'se') => {
                 publicKey: publicKey,
                 task: 'schema',
                 removeCustomerField: true,
-                getCustomFields: !client.customerId ||
-                    client.customerId === '*' ||
+                getCustomFields: !client.organizationId ||
+                    client.organizationId === '*' ||
                     (customFieldsByTableUnique.length === 0 && !getCustomFields)
                     ? false
                     : true,
-                orgId: client.customerId || '*',
+                orgId: client.organizationId || '*',
+                tableIds,
                 customFieldsByTable: customFieldsByTableUnique,
                 gatherSchemaData: '665610862cf7a3000be66453' === publicKey ? true : false,
             },
@@ -150,7 +154,7 @@ export const getSchemaInfoWithCustomFields = async (client, caller = 'se') => {
     const result = await response.json();
     const parsedData = parseResponse(result);
     const converted = convertSchemaInfoToTable(parsedData);
-    triggerSoftUpdate(client, converted);
+    // triggerSoftUpdate(client, converted);
     return {
         schemaData: converted,
         customFieldsByTable: customFieldsByTableUnique,

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

@@ -1,6 +1,7 @@
 import { NodeSQLParser } from '../components/ReportBuilder/ast';
-import { Client } from '../models/Client';
+import { QuillProviderClient } from '../models/Client';
 import { Column, ColumnInternal } from '../models/Columns';
+import { Filter } from '../models/Filter';
 import { Pagination } from '../models/Pagination';
 import { DateRangesByColumn, UniqueValuesByColumn } from '../models/Tables';
 export interface AdditionalProcessing {
@@ -12,19 +13,22 @@ export interface AdditionalProcessing {
     last?: any;
 }
 export declare const hasColumnAlias: (columns: Column[], referencedColumns: string[]) => boolean;
-export declare const getUniqueValuesByColumns: (columns: Column[], query: string, rows: any, client: Client, customFields: any[]) => Promise<{
+export declare const getUniqueValuesByColumns: (columns: Column[], query: string, rows: any, client: QuillProviderClient, customFields: any[]) => Promise<{
     [column: string]: {
         [value: string]: boolean;
     };
 } | null>;
-export declare const getUniqueStringValues: (columns: ColumnInternal[], tableName: string, client: any, customFields?: any, previousUniqueValues?: any) => Promise<any>;
-export declare const getRelevantInfoFromQuery: (columns: ColumnInternal[], client: Client, query: string, customFields?: any) => Promise<{
+export declare const getUniqueStringValues: (columns: ColumnInternal[], tableName: string, client: any, customFields?: any, previousUniqueValues?: any, withExceededColumns?: boolean, query?: string) => Promise<any>;
+export declare const getRelevantInfoFromQuery: (columns: ColumnInternal[], client: QuillProviderClient, query: string, customFields?: any) => Promise<{
     uniqueStrings?: UniqueValuesByColumn | undefined;
     dateRanges?: DateRangesByColumn | undefined;
     error?: string | undefined;
 }>;
-export declare const getCountsByColumns: (columns: Column[], query: string, client: Client, customFields: any[]) => Promise<Column[]>;
-export declare const getDateRangeByColumns: (columns: Column[], query: string, client: Client, customFields: any[]) => Promise<{
+export declare const getCountsByColumns: (columns: Column[], query: string, client: QuillProviderClient, customFields: any[]) => Promise<{
+    filteredColumns: Column[];
+    exceededColumns: Column[] | undefined;
+}>;
+export declare const getDateRangeByColumns: (columns: Column[], query: string, client: QuillProviderClient, customFields: any[]) => Promise<{
     [column: string]: {
         dateRange: {
             start: Date;
@@ -32,26 +36,29 @@ export declare const getDateRangeByColumns: (columns: Column[], query: string, c
         };
     };
 } | null>;
-export declare const getPaginatedRows: (client: Client, query?: string, reportId?: string, processing?: AdditionalProcessing, filters?: any, customFields?: any) => Promise<{
+export declare const getPaginatedRows: (client: QuillProviderClient, query?: string, reportId?: string, processing?: AdditionalProcessing, filters?: any, customFields?: any) => Promise<{
     columns: Column[];
     rows: any[];
     rowCount?: number;
     error?: string;
 }>;
-export declare const fetchTableByQuery: (query: string, client: Client, processing?: AdditionalProcessing, customFields?: any) => Promise<{
+export declare const fetchResultsByQuery: (query: string, client: QuillProviderClient, processing?: AdditionalProcessing, customFields?: any, filters?: Filter[], dateField?: {
+    field: string;
+    table: string;
+} | null, rowsOnly?: boolean, rowCountOnly?: boolean) => Promise<{
     columns: ColumnInternal[];
     rows: any[];
     rowCount?: number | undefined;
     error?: string | undefined;
     itemQuery?: string[] | undefined;
 }>;
-export declare const fetchTableByReport: (reportId: string, client: Client, processing?: AdditionalProcessing, filters?: any, customFields?: any) => Promise<{
+export declare const fetchResultsByReport: (reportId: string, client: QuillProviderClient, processing?: AdditionalProcessing, filters?: any, customFields?: any) => Promise<{
     columns: Column[];
     rows: any[];
     rowCount?: number | undefined;
     error?: string | undefined;
 }>;
-export declare const fetchTableByAST: (ast: NodeSQLParser.Select, client: Client, processing?: AdditionalProcessing, customFields?: any) => Promise<{
+export declare const fetchTableByAST: (ast: NodeSQLParser.Select, client: QuillProviderClient, processing?: AdditionalProcessing, customFields?: any, rowsOnly?: boolean, rowCountOnly?: boolean) => Promise<{
     columns: ColumnInternal[];
     rows: any[];
     rowCount?: number | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EACd,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAgB5E,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,eAAO,MAAM,cAAc,YAChB,MAAM,EAAE,qBACE,MAAM,EAAE,KAC1B,OAUF,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,MAAM,EAAE,SACV,MAAM,QACP,GAAG,UACD,MAAM,gBACA,GAAG,EAAE;;;;SAmEpB,CAAC;AAEF,eAAO,MAAM,qBAAqB,YACvB,cAAc,EAAE,aACd,MAAM,UACT,GAAG,iBACI,GAAG,yBACK,GAAG,iBAkC3B,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,cAAc,EAAE,UACjB,MAAM,SACP,MAAM,iBACE,GAAG;;;;EA6DnB,CAAC;AAEF,eAAO,MAAM,kBAAkB,YACpB,MAAM,EAAE,SACV,MAAM,UACL,MAAM,gBACA,GAAG,EAAE,KAClB,QAAQ,MAAM,EAAE,CA2ClB,CAAC;AAkDF,eAAO,MAAM,qBAAqB,YACvB,MAAM,EAAE,SACV,MAAM,UACL,MAAM,gBACA,GAAG,EAAE;;mBAEY;YAAE,KAAK,EAAE,IAAI,CAAC;YAAC,GAAG,EAAE,IAAI,CAAA;SAAE;;SAiB1D,CAAC;AA2DF,eAAO,MAAM,gBAAgB,WACnB,MAAM,UACN,MAAM,aACH,MAAM,eACJ,oBAAoB,YACvB,GAAG,iBACE,GAAG,KACjB,QAAQ;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAaA,CAAC;AAEF,eAAO,MAAM,iBAAiB,UACrB,MAAM,UACL,MAAM,eACD,oBAAoB,iBAClB,GAAG;aAET,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EAqDZ,CAAC;AAEF,eAAO,MAAM,kBAAkB,aACnB,MAAM,UACR,MAAM,eACD,oBAAoB,YACvB,GAAG,iBACE,GAAG;aAET,MAAM,EAAE;UACX,GAAG,EAAE;;;EAgFZ,CAAC;AAEF,eAAO,MAAM,eAAe,QACrB,cAAc,MAAM,UACjB,MAAM,eACD,oBAAoB,iBAClB,GAAG;aAET,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EAuDZ,CAAC;AAEF,eAAO,MAAM,+CAA+C,0BACnC,oBAAoB;;CAU5C,CAAC"}
+{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EACd,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAgB5E,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,eAAO,MAAM,cAAc,YAChB,MAAM,EAAE,qBACE,MAAM,EAAE,KAC1B,OAUF,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,MAAM,EAAE,SACV,MAAM,QACP,GAAG,UACD,mBAAmB,gBACb,GAAG,EAAE;;;;SAmEpB,CAAC;AAEF,eAAO,MAAM,qBAAqB,YACvB,cAAc,EAAE,aACd,MAAM,UACT,GAAG,iBACI,GAAG,yBACK,GAAG,wBACJ,OAAO,UACrB,MAAM,iBA2Cf,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,cAAc,EAAE,UACjB,mBAAmB,SACpB,MAAM,iBACE,GAAG;;;;EA6DnB,CAAC;AAEF,eAAO,MAAM,kBAAkB,YACpB,MAAM,EAAE,SACV,MAAM,UACL,mBAAmB,gBACb,GAAG,EAAE,KAClB,QAAQ;IACT,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CACvC,CAiDA,CAAC;AAkDF,eAAO,MAAM,qBAAqB,YACvB,MAAM,EAAE,SACV,MAAM,UACL,mBAAmB,gBACb,GAAG,EAAE;;mBAEY;YAAE,KAAK,EAAE,IAAI,CAAC;YAAC,GAAG,EAAE,IAAI,CAAA;SAAE;;SAiB1D,CAAC;AA2DF,eAAO,MAAM,gBAAgB,WACnB,mBAAmB,UACnB,MAAM,aACH,MAAM,eACJ,oBAAoB,YACvB,GAAG,iBACE,GAAG,KACjB,QAAQ;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAaA,CAAC;AAEF,eAAO,MAAM,mBAAmB,UACvB,MAAM,UACL,mBAAmB,eACd,oBAAoB,iBAClB,GAAG,YACR,MAAM,EAAE,cACN;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,aACxC,OAAO,iBACH,OAAO;aAEb,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EA2DZ,CAAC;AAEF,eAAO,MAAM,oBAAoB,aACrB,MAAM,UACR,mBAAmB,eACd,oBAAoB,YACvB,GAAG,iBACE,GAAG;aAET,MAAM,EAAE;UACX,GAAG,EAAE;;;EAgFZ,CAAC;AAEF,eAAO,MAAM,eAAe,QACrB,cAAc,MAAM,UACjB,mBAAmB,eACd,oBAAoB,iBAClB,GAAG,aACP,OAAO,iBACH,OAAO;aAEb,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EAyDZ,CAAC;AAEF,eAAO,MAAM,+CAA+C,0BACnC,oBAAoB;;CAU5C,CAAC"}

package/dist/esm/utils/tableProcessing.js

@@ -30,7 +30,7 @@ export const getUniqueValuesByColumns = async (columns, query, rows, client, cus
                 metadata: {
                     query: query,
                     task: 'query',
-                    orgId: client.customerId || '*',
+                    orgId: client.organizationId || '*',
                     clientId: client.publicKey,
                     databaseType: client?.databaseType,
                     customFieldsByTable: customFields,
@@ -67,14 +67,21 @@ export const getUniqueValuesByColumns = async (columns, query, rows, client, cus
     }
     return uniqueValues;
 };
-export const getUniqueStringValues = async (columns, tableName, client, customFields, previousUniqueValues) => {
+export const getUniqueStringValues = async (columns, tableName, client, customFields, previousUniqueValues, withExceededColumns, query) => {
     const convertedStringColumns = columns.filter((column) => {
         return isTextColumnType(column.fieldType);
     });
     const stringNames = convertedStringColumns.map((column) => processColumnReference(column.field, client.databaseType));
-    const smallStringColumns = await getCountsByColumns(convertedStringColumns, `Select ${stringNames.join(', ')} from ${tableName}`, client, customFields ?? []);
+    const { filteredColumns: smallStringColumns, exceededColumns } = await getCountsByColumns(convertedStringColumns, query ?? `Select ${stringNames.join(', ')} from ${tableName}`, client, customFields ?? []);
     const smallStringNames = smallStringColumns.map((column) => processColumnReference(column.field, client.databaseType));
-    const newUniqueValues = await getUniqueValuesByColumns(smallStringColumns, `Select ${smallStringNames.join(', ')} from ${tableName}`, [], client, customFields ?? []);
+    const newUniqueValues = await getUniqueValuesByColumns(smallStringColumns, query ?? `Select ${smallStringNames.join(', ')} from ${tableName}`, [], client, customFields ?? []);
+    if (withExceededColumns) {
+        exceededColumns?.forEach((column) => {
+            if (newUniqueValues) {
+                newUniqueValues[column.field] = { EXCEEDS_LIMIT: true };
+            }
+        });
+    }
     if (previousUniqueValues) {
         // This logic was used in ReportBuilder before this function was extracted
         // Not sure if it still accurate, but didn't want to remove in case
@@ -96,7 +103,7 @@ export const getRelevantInfoFromQuery = async (columns, client, query, customFie
         });
         const stringNames = convertedStringColumns.map((column) => column.field);
         if (stringNames.length > 0) {
-            const smallStringColumns = await getCountsByColumns(convertedStringColumns, query, client, customFields);
+            const { filteredColumns: smallStringColumns } = await getCountsByColumns(convertedStringColumns, query, client, customFields);
             uniqueStrings = await getUniqueValuesByColumns(smallStringColumns, query, [], client, customFields);
         }
         const dateColumns = columns.filter((column) => {
@@ -126,7 +133,7 @@ export const getCountsByColumns = async (columns, query, client, customFields) =
             metadata: {
                 query: countQuery,
                 task: 'query',
-                orgId: client.customerId || '*',
+                orgId: client.organizationId || '*',
                 clientId: client.publicKey,
                 databaseType: client?.databaseType,
                 customFieldsByTable: customFields,
@@ -136,7 +143,7 @@ export const getCountsByColumns = async (columns, query, client, customFields) =
         const cloudBody = { countQuery };
         const data = await getData(client, 'dashquery', 'same-origin', hostedBody, cloudBody);
         if (data.errorMessage) {
-            return columns;
+            return { filteredColumns: columns, exceededColumns: undefined };
         }
         const results = data.rows.map((columnInfo) => {
             return { field: columnInfo.field, count: columnInfo.count };
@@ -145,10 +152,14 @@ export const getCountsByColumns = async (columns, query, client, customFields) =
             const columnInfo = results.find((result) => result.field === column.field);
             return columnInfo.count <= MAX_PIVOT_UNIQUE_VALUES;
         });
-        return filteredColumns;
+        const exceededColumns = columns.filter((column) => {
+            const columnInfo = results.find((result) => result.field === column.field);
+            return columnInfo.count > MAX_PIVOT_UNIQUE_VALUES;
+        });
+        return { filteredColumns, exceededColumns };
     }
     catch (e) {
-        return columns;
+        return { filteredColumns: columns, exceededColumns: undefined };
     }
 };
 const fetchDistinctStrings = async (query, client, customFields) => {
@@ -157,7 +168,7 @@ const fetchDistinctStrings = async (query, client, customFields) => {
             metadata: {
                 query,
                 task: 'query',
-                orgId: client.customerId || '*',
+                orgId: client.organizationId || '*',
                 clientId: client.publicKey,
                 databaseType: client?.databaseType,
                 customFieldsByTable: customFields,
@@ -200,7 +211,7 @@ const fetchDateRanges = async (query, client, customFields) => {
             metadata: {
                 query,
                 task: 'query',
-                orgId: client.customerId || '*',
+                orgId: client.organizationId || '*',
                 clientId: client.publicKey,
                 databaseType: client?.databaseType,
                 customFieldsByTable: customFields,
@@ -229,14 +240,14 @@ const fetchDateRanges = async (query, client, customFields) => {
 };
 export const getPaginatedRows = async (client, query, reportId, processing, filters, customFields) => {
     if (query) {
-        return await fetchTableByQuery(query, client, processing, customFields);
+        return await fetchResultsByQuery(query, client, processing, customFields);
     }
     else if (reportId) {
-        return await fetchTableByReport(reportId, client, processing, filters, customFields);
+        return await fetchResultsByReport(reportId, client, processing, filters, customFields);
     }
     return { rows: [], columns: [] };
 };
-export const fetchTableByQuery = async (query, client, processing, customFields) => {
+export const fetchResultsByQuery = async (query, client, processing, customFields, filters, dateField, rowsOnly, rowCountOnly) => {
     let rows = [];
     let columns = [];
     let error = undefined;
@@ -247,14 +258,20 @@ export const fetchTableByQuery = async (query, client, processing, customFields)
             metadata: {
                 query,
                 task: 'query',
-                orgId: client.customerId || '*',
+                orgId: client.organizationId || '*',
                 clientId: client.publicKey,
                 databaseType: client?.databaseType,
-                getCustomFields: !client.customerId || client.customerId === '*' ? false : true,
+                getCustomFields: !client.organizationId || client.organizationId === '*'
+                    ? false
+                    : true,
                 customFieldsByTable: customFields,
                 additionalProcessing: processing,
                 useUpdatedDataGathering: processing ? true : false,
                 useNewNodeSql: true,
+                filters,
+                dateField: dateField ?? undefined,
+                rowsOnly,
+                rowCountOnly,
             },
         };
         const cloudBody = { query };
@@ -279,7 +296,7 @@ export const fetchTableByQuery = async (query, client, processing, customFields)
     }
     return { rows, columns, rowCount, error, itemQuery };
 };
-export const fetchTableByReport = async (reportId, client, processing, filters, customFields) => {
+export const fetchResultsByReport = async (reportId, client, processing, filters, customFields) => {
     const updatedProcessing = { ...processing };
     let rows = [];
     let columns = [];
@@ -305,7 +322,7 @@ export const fetchTableByReport = async (reportId, client, processing, filters,
         const hostedBody = {
             metadata: {
                 dashboardItemId: reportId,
-                orgId: client?.customerId || '*',
+                orgId: client?.organizationId || '*',
                 task: 'item',
                 filters: minimalFilters,
                 clientId: client?.publicKey,
@@ -352,7 +369,7 @@ export const fetchTableByReport = async (reportId, client, processing, filters,
     }
     return { rows, columns, rowCount, error };
 };
-export const fetchTableByAST = async (ast, client, processing, customFields) => {
+export const fetchTableByAST = async (ast, client, processing, customFields, rowsOnly, rowCountOnly) => {
     let rows = [];
     let columns = [];
     let rowCount;
@@ -364,13 +381,15 @@ export const fetchTableByAST = async (ast, client, processing, customFields) =>
                 clientId: client.publicKey,
                 ast,
                 publicKey: client.publicKey,
-                orgId: client.customerId,
+                orgId: client.organizationId || '*',
                 task: 'patterns',
                 getCustomFields: false,
                 customFields,
                 additionalProcessing: processing,
                 useUpdatedDataGathering: true,
                 useNewNodeSql: true,
+                rowsOnly,
+                rowCountOnly,
             },
         };
         const cloudBody = {};

package/package.json

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