@quillsql/react 2.12.52 → 2.13.0

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

@@ -1,7 +1,7 @@
-import { Client } from '../models/Client';
-export declare function getData(client: Client, cloudQueryEndpoint: string, noCred: RequestCredentials, hostedRequestBody: any, cloudRequestBody: any, method?: string, queryParam?: string): Promise<any>;
-export declare function getDataFromCloud(client: Client, cloudQueryEndpoint: string, cloudRequestBody: any, method?: string): Promise<any>;
-export declare function fetchSqlQuery(ast: any, client: Client, formData?: any): Promise<{
+import { QuillProviderClient } from '../models/Client';
+export declare function getData(client: QuillProviderClient, cloudQueryEndpoint: string, noCred: RequestCredentials, hostedRequestBody: any, cloudRequestBody: any, method?: string, queryParam?: string): Promise<any>;
+export declare function getDataFromCloud(client: QuillProviderClient, cloudQueryEndpoint: string, cloudRequestBody: any, method?: string): Promise<any>;
+export declare function fetchSqlQuery(ast: any, client: QuillProviderClient, 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":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AA8E1C,wBAAsB,OAAO,CAC3B,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,EACf,UAAU,CAAC,EAAE,MAAM,gBAgJpB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBA6BhB;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,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;AA8EvD,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,gBAgJpB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,mBAAmB,EAC3B,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBA6BhB;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"}

package/dist/esm/utils/dataFetcher.js

@@ -192,7 +192,7 @@ export async function getDataFromCloud(client, cloudQueryEndpoint, cloudRequestB
                 ...cloudRequestBody,
                 ...{
                     publicKey: client?.publicKey,
-                    orgId: client?.customerId,
+                    orgId: client?.organizationId,
                 },
             })
             : null,

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

@@ -1 +1 @@
-{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,UAAU,EACV,MAAM,EAEP,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAmB,MAAM,uBAAuB,CAAC;AAGxE,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAoB5D;AAMD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,GAAG,OAkBnD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,GAAG,EACX,KAAK,GAAE,GAAU,EACjB,UAAU,GAAE,GAAU,OAuGvB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,iFAwDhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAwBrD;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,GAAG,GAAG,cAAc,EAAE,CAoCrE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,GAAG,EAAE,yBAgCnD;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,cAAc,EAAE,EACzB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA2B/D;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,oBAAoB,GAAG;IAC3E,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB,CASA"}
+{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,UAAU,EACV,MAAM,EAEP,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAmB,MAAM,uBAAuB,CAAC;AAGxE,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAoB5D;AAMD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,GAAG,OAkBnD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,GAAG,EACX,KAAK,GAAE,GAAU,EACjB,UAAU,GAAE,GAAU,OAgGvB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,iFAwDhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAwBrD;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,GAAG,GAAG,cAAc,EAAE,CAoCrE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,GAAG,EAAE,yBAgCnD;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,cAAc,EAAE,EACzB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA2B/D;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,oBAAoB,GAAG;IAC3E,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB,CASA"}

package/dist/esm/utils/filterProcessing.js

@@ -88,17 +88,12 @@ export function updateFilter(filter, value = null, comparison = null) {
         }
         if (comparison ||
             (filter.comparison && filter.comparisonRange.value !== 'NO_COMPARISON')) {
-            let preset = '';
-            if (comparison) {
-                preset = filter.preset.label;
-            }
             const key = comparison?.value || filter.comparisonRange.value;
             let primaryRange = {
                 start: value ? value.startDate : filter.startDate,
                 end: value ? value.endDate : filter.endDate,
             };
             if (value && value.preset) {
-                preset = value.preset;
                 primaryRange = getRangeFromPresetOptions(value.preset, presetsOptions);
             }
             return {
@@ -107,7 +102,7 @@ export function updateFilter(filter, value = null, comparison = null) {
                 filterType: 'date_range',
                 label: 'Date',
                 field: 'date_range',
-                preset: { label: preset },
+                preset: filter.preset,
                 options: filter.options,
                 comparison: true,
                 comparisonRange: {
@@ -125,10 +120,9 @@ export function updateFilter(filter, value = null, comparison = null) {
                     start: value?.startDate || filter.startDate,
                     end: value?.endDate || filter.endDate,
                 };
-            const preset = value?.preset ? value.preset : '';
             return {
                 ...filter,
-                preset: { label: preset },
+                preset: filter.preset,
                 startDate: primaryRange.start,
                 endDate: primaryRange.end,
                 filterType: 'date_range',

package/dist/esm/utils/paginationProcessing.js

@@ -1,7 +1,7 @@
 export const DEFAULT_PAGINATION = {
     page: 0,
     rowsPerPage: 10,
-    rowsPerRequest: 1000,
+    rowsPerRequest: 600,
 };
 export function shouldFetchMore(pagination, page, maxPage) {
     if (!pagination) {

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

@@ -1,7 +1,7 @@
-import { Client } from '../models/Client';
+import { QuillProviderClient } from '../models/Client';
 import { Pivot } from '../models/Pivot';
 import { QuillReportInternal } from '../models/Report';
-export declare function generatePivotWithSQL(pivot: Pivot, report: QuillReportInternal, client: Client, dateBucket?: string, dateFilter?: any, distinctStrings?: any): Promise<{
+export declare function generatePivotWithSQL(pivot: Pivot, report: QuillReportInternal, client: QuillProviderClient, dateBucket?: string, dateFilter?: any, distinctStrings?: any): Promise<{
     rows: any;
     columns: any;
 } | undefined>;

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

@@ -1 +1 @@
-{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAOvD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,GAAG,EAChB,eAAe,CAAC,EAAE,GAAG;;;eAuMtB"}
+{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAOvD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,mBAAmB,EAC3B,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,GAAG,EAChB,eAAe,CAAC,EAAE,GAAG;;;eAuMtB"}

package/dist/esm/utils/pivotConstructor.js

@@ -40,7 +40,7 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
             metadata: {
                 preQueries: [sqlQuery],
                 task: 'query',
-                orgId: client.customerId || '*',
+                orgId: client.organizationId || '*',
                 clientId: client.publicKey,
                 databaseType: client?.databaseType,
                 getCustomFields: false,

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

@@ -1 +1 @@
-{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAIxD,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,EAAE,GACxB,MAAM,CAuCR;AAkBD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,WA0BxC;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,EAAE,oBAAoB;;;;EA6CnC;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,eAAe,EAAE;IACf,SAAS,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,GAAG,CAAC;IAClB,WAAW,EAAE,GAAG,CAAC;CAClB,GACA,KAAK,CAqCP;AAED,eAAO,MAAM,eAAe,WAAY,GAAG,SAAS,KAAK,YA8BxD,CAAC"}
+{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAIxD,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,EAAE,GACxB,MAAM,CAuCR;AAkBD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,WA0BxC;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,EAAE,oBAAoB;;;;EAqDnC;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,eAAe,EAAE;IACf,SAAS,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,GAAG,CAAC;IAClB,WAAW,EAAE,GAAG,CAAC;CAClB,GACA,KAAK,CAqCP;AAED,eAAO,MAAM,eAAe,WAAY,GAAG,SAAS,KAAK,YA8BxD,CAAC"}

package/dist/esm/utils/pivotProcessing.js

@@ -84,11 +84,15 @@ export function getPossiblePivotFieldOptions(columns, uniqueValues) {
                 (Object.keys(possibleValues).length === 1 &&
                     Object.keys(possibleValues)[0] === 'null');
             if (!isNullValuesOnly &&
-                Object.keys(possibleValues).length <= MAX_PIVOT_UNIQUE_VALUES) {
+                Object.keys(possibleValues).length <= MAX_PIVOT_UNIQUE_VALUES &&
+                !(Object.keys(possibleValues).length === 1 &&
+                    possibleValues['EXCEEDS_LIMIT'] !== undefined)) {
                 columnFields.push(column.field);
             }
             if (!isNullValuesOnly &&
-                Object.keys(possibleValues).length <= MAX_PIVOT_UNIQUE_VALUES) {
+                Object.keys(possibleValues).length <= MAX_PIVOT_UNIQUE_VALUES &&
+                !(Object.keys(possibleValues).length === 1 &&
+                    possibleValues['EXCEEDS_LIMIT'] !== undefined)) {
                 rowFields.push(column.field);
             }
         }

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

@@ -1 +1 @@
-{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAmBxC,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,iBAAiB,CAAC,EAAE,OAAO,UAmC5B;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAwDD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAmBrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAUrB;AAsDD,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAcrB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAyBpB"}
+{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAoBxC,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,iBAAiB,CAAC,EAAE,OAAO,UAgC5B;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAwDD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAsBrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAUrB;AAsDD,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAcrB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAyBpB"}

package/dist/esm/utils/queryConstructor.js

@@ -1,3 +1,4 @@
+import { MAX_PIVOT_UNIQUE_VALUES } from './constants';
 import { isValidPivot } from './pivotProcessing';
 function processSingleQuotes(value, databaseType) {
     if (['postgresql', 'snowflake'].includes(databaseType.toLowerCase())) {
@@ -37,11 +38,8 @@ isPivotFieldAlias) {
         if (column === '' && fallbackOnNull) {
             return `${fallbackOnNull}`;
         }
-        // Wrap in single quotes if contains whitespace or special characters and no single quotes
-        if (column.match(/[^a-zA-Z0-9_]/) && !column.includes("'")) {
-            return `'${column}'`;
-        }
-        return `${column}`;
+        // Wrap MySQL columns in backticks to handle whitespace
+        return `\`${column}\``;
     }
     const columnParts = column.split('.');
     if (columnParts.length > 1) {
@@ -92,19 +90,24 @@ function processValueField(aggType, databaseType, valueField) {
 }
 export function generateCountQuery(fields, query, databaseType) {
     let countQuery = [];
+    let cteQuery = `WITH querytable AS (${query.replace(';', '')}) `;
+    let cte = [];
     switch (databaseType.toLowerCase()) {
         case 'mysql':
-            countQuery = fields.map((field) => {
-                return `SELECT '${field}' AS ${processColumnReference('field', databaseType)}, COUNT(DISTINCT ${processColumnReference(field, databaseType)}) AS ${processColumnReference('count', databaseType)} FROM querytable`;
+            cte = fields.map((field, index) => {
+                return `, distinct_cte_${index} AS (SELECT DISTINCT ${processColumnReference(field, databaseType)} FROM querytable LIMIT ${MAX_PIVOT_UNIQUE_VALUES + 1})`;
+            });
+            countQuery = fields.map((field, index) => {
+                return `SELECT '${field}' AS ${processColumnReference('field', databaseType)}, COUNT(*) AS ${processColumnReference('count', databaseType)} FROM distinct_cte_${index}`;
             });
+            cteQuery += cte.join(' ');
             break;
         default:
             countQuery = fields.map((field) => {
                 return `SELECT '${field}' AS ${processColumnReference('field', databaseType)}, COUNT(DISTINCT ${processColumnReference(field, databaseType)}) AS ${processColumnReference('count', databaseType)} FROM querytable`;
             });
     }
-    return (`WITH querytable AS (${query.replace(';', '')}) ` +
-        countQuery.join(' UNION ALL '));
+    return cteQuery + countQuery.join(' UNION ALL ');
 }
 export function generateDistinctQuery(stringFields, query, databaseType) {
     switch (databaseType.toLowerCase()) {

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

@@ -1,4 +1,4 @@
-import { Client } from '../models/Client';
+import { QuillProviderClient } from '../models/Client';
 import { ColumnInternal } from '../models/Columns';
 import { Pivot } from '../models/Pivot';
 import { QuillReport, QuillReportInternal } from '../models/Report';
@@ -23,19 +23,20 @@ export type ReportBuilderInfo = {
 };
 export declare const EMPTY_REPORT: QuillReport;
 export declare const EMPTY_INTERNAL_REPORT: QuillReportInternal;
-export declare function fetchReport(reportId: string, client: Client, useReportTask?: boolean, filters?: any[], additionalProcessing?: AdditionalProcessing, dateBucket?: string, customFields?: any): Promise<{
+export declare function fetchReport(reportId: string, client: QuillProviderClient, useReportTask?: boolean, filters?: any[], additionalProcessing?: AdditionalProcessing, dateBucket?: string, customFields?: any, rowsOnly?: boolean, rowCountOnly?: boolean): Promise<{
     report: QuillReportInternal;
     error?: string;
 }>;
+export declare function fetchReportRowCount(reportId: string, client: QuillProviderClient, useReportTask?: boolean, filters?: any[], additionalProcessing?: AdditionalProcessing, customFields?: any): Promise<number | undefined>;
 export declare function saveReport({ report, dashboardItemId, client, }: {
     report: any;
     dashboardItemId?: string;
-    client: Client;
+    client: QuillProviderClient;
 }): Promise<any>;
 export declare const formatRowsFromReport: (report: any) => any;
 export declare function convertInternalReportToReport(report: QuillReportInternal): QuillReport;
-export declare const fetchReportBuilderDataFromAST: (baseAst: any, formData: any, schema: Table[], client: Client, pivot?: Pivot, previousFormData?: any, currentTable?: string, previousRelevant?: {
+export declare const fetchReportBuilderDataFromAST: (baseAst: any, formData: any, schema: Table[], client: QuillProviderClient, pivot?: Pivot, previousFormData?: any, currentTable?: string, previousRelevant?: {
     uniqueStrings: UniqueValuesByTable;
     dateRanges: DateRangesByColumn;
-}, report?: QuillReportInternal, customFields?: any) => Promise<ReportBuilderInfo>;
+}, report?: QuillReportInternal, customFields?: any, skipUniqueValues?: boolean, skipRowCount?: boolean, processing?: AdditionalProcessing) => Promise<ReportBuilderInfo>;
 //# sourceMappingURL=report.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/utils/report.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EACL,kBAAkB,EAClB,KAAK,EACL,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAa1B,OAAO,EACL,oBAAoB,EAGrB,MAAM,mBAAmB,CAAC;AAI3B,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,SAAS,EAAE;QAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QAAC,OAAO,EAAE,cAAc,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7D,aAAa,EAAE,GAAG,EAAE,CAAC;IACrB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,mBAAmB,CAAC;IAClC,UAAU,EAAE,kBAAkB,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,WAkB1B,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,mBAGnC,CAAC;AA2BF,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,aAAa,UAAO,EACpB,OAAO,GAAE,GAAG,EAAO,EACnB,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,GAAG,GACjB,OAAO,CAAC;IAAE,MAAM,EAAE,mBAAmB,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA4H1D;AAED,wBAAsB,UAAU,CAAC,EAC/B,MAAM,EACN,eAAe,EACf,MAAM,GACP,EAAE;IACD,MAAM,EAAE,GAAG,CAAC;IACZ,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,GAAG,CAAC,CA4Cf;AAED,eAAO,MAAM,oBAAoB,WAAY,GAAG,QAkB/C,CAAC;AAEF,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,mBAAmB,GAC1B,WAAW,CAsDb;AAED,eAAO,MAAM,6BAA6B,YAC/B,GAAG,YACF,GAAG,UACL,KAAK,EAAE,UACP,MAAM,UACN,KAAK,qBACM,GAAG,iBACP,MAAM,qBACF;IACjB,aAAa,EAAE,mBAAmB,CAAC;IACnC,UAAU,EAAE,kBAAkB,CAAC;CAChC,WACQ,mBAAmB,iBACb,GAAG,KACjB,QAAQ,iBAAiB,CAyI3B,CAAC"}
+{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/utils/report.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EACL,kBAAkB,EAClB,KAAK,EACL,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAa1B,OAAO,EACL,oBAAoB,EAIrB,MAAM,mBAAmB,CAAC;AAI3B,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,SAAS,EAAE;QAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QAAC,OAAO,EAAE,cAAc,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7D,aAAa,EAAE,GAAG,EAAE,CAAC;IACrB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,mBAAmB,CAAC;IAClC,UAAU,EAAE,kBAAkB,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,WAkB1B,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,mBAGnC,CAAC;AA2BF,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,mBAAmB,EAC3B,aAAa,UAAO,EACpB,OAAO,GAAE,GAAG,EAAO,EACnB,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,GAAG,EAClB,QAAQ,CAAC,EAAE,OAAO,EAClB,YAAY,CAAC,EAAE,OAAO,GACrB,OAAO,CAAC;IAAE,MAAM,EAAE,mBAAmB,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAmI1D;AAED,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,mBAAmB,EAC3B,aAAa,UAAO,EACpB,OAAO,GAAE,GAAG,EAAO,EACnB,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,YAAY,CAAC,EAAE,GAAG,GACjB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkC7B;AAED,wBAAsB,UAAU,CAAC,EAC/B,MAAM,EACN,eAAe,EACf,MAAM,GACP,EAAE;IACD,MAAM,EAAE,GAAG,CAAC;IACZ,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,mBAAmB,CAAC;CAC7B,GAAG,OAAO,CAAC,GAAG,CAAC,CA4Cf;AAED,eAAO,MAAM,oBAAoB,WAAY,GAAG,QAkB/C,CAAC;AAEF,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,mBAAmB,GAC1B,WAAW,CAsDb;AAED,eAAO,MAAM,6BAA6B,YAC/B,GAAG,YACF,GAAG,UACL,KAAK,EAAE,UACP,mBAAmB,UACnB,KAAK,qBACM,GAAG,iBACP,MAAM,qBACF;IACjB,aAAa,EAAE,mBAAmB,CAAC;IACnC,UAAU,EAAE,kBAAkB,CAAC;CAChC,WACQ,mBAAmB,iBACb,GAAG,qBACC,OAAO,iBACX,OAAO,eACT,oBAAoB,KAChC,QAAQ,iBAAiB,CAgK3B,CAAC"}

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, rowsOnly, rowCountOnly) {
     let reportInfo = undefined;
     let errorMessage = undefined;
     try {
@@ -70,14 +70,16 @@ 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,
-                filters: filters,
+                filters: filters.map((filter) => ({ ...filter, options: undefined })),
                 customFields,
                 additionalProcessing,
                 useNewNodeSql: true,
+                rowsOnly,
+                rowCountOnly,
             },
         };
         const cloudBody = {
@@ -113,8 +115,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 +136,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, rowsOnly, rowCountOnly);
                 reportInfo = report;
                 errorMessage = error;
             }
@@ -158,12 +163,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.map((filter) => ({ ...filter, options: undefined })),
+            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 +211,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 +295,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 +306,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 +314,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 +338,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,