@quillsql/react 2.12.52 → 2.12.53

package/dist/esm/internals/ReportBuilder/PivotModal.js

@@ -16,7 +16,7 @@ import { getCountsByColumns, getDateRangeByColumns, getUniqueValuesByColumns, }
 import { generatePivotWithSQL } from '../../utils/pivotConstructor';
 import { getDateBucketFromRange } from '../../utils/dates';
 import Big from 'big.js';
-export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotAggregation, setPivotAggregation, popUpTitle, setPopUpTitle, selectedTable, SelectComponent, ButtonComponent, SecondaryButtonComponent, PopoverComponent, ErrorMessageComponent = QuillErrorMessageComponent, PivotRowContainer = QuillPivotRowContainer, PivotColumnContainer = QuillPivotColumnContainer, LoadingComponent = QuillLoadingComponent, CardComponent = QuillCard, HeaderComponent, LabelComponent, TextComponent, selectedPivotIndex, setSelectedPivotIndex, removePivot, selectPivot, showUpdatePivot, setShowUpdatePivot, data, columns, theme, isOpen, setIsOpen, dateRange, createdPivots, setCreatedPivots, recommendedPivots, setRecommendedPivots, triggerButtonText = 'Pivot', showPivotEditButton = false, showEditOnPivotClick = true, showTrigger = true, pivotCountRequest = 6, query, initialUniqueValues, initialSelectedPivotTable, disabled = false, pivotRecommendationsEnabled = true, report, }) => {
+export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotAggregation, setPivotAggregation, popUpTitle, setPopUpTitle, selectedTable, SelectComponent, ButtonComponent, SecondaryButtonComponent, PopoverComponent, ErrorMessageComponent = QuillErrorMessageComponent, PivotRowContainer = QuillPivotRowContainer, PivotColumnContainer = QuillPivotColumnContainer, LoadingComponent = QuillLoadingComponent, CardComponent = QuillCard, HeaderComponent, LabelComponent, TextComponent, selectedPivotIndex, setSelectedPivotIndex, removePivot, selectPivot, showUpdatePivot, setShowUpdatePivot, data, columns, theme, isOpen, setIsOpen, dateRange, createdPivots, setCreatedPivots, recommendedPivots, setRecommendedPivots, triggerButtonText = 'Pivot', showPivotEditButton = false, showEditOnPivotClick = true, showTrigger = true, pivotCountRequest = 6, query, initialUniqueValues, uniqueValuesIsLoading, initialSelectedPivotTable, disabled = false, pivotRecommendationsEnabled = true, report, }) => {
     const [isLoading, setIsLoading] = useState(false);
     const [selectedPivotType, setSelectedPivotType] = useState('recommended');
     const [errors, setErrors] = useState([]);
@@ -49,7 +49,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                 setAllowedValueFields(possibleColumns.valueFields);
                 return { possibleColumns, uniqueValues: {} };
             }
-            const smallStringColumns = await getCountsByColumns(stringColumns, query || '', client, schemaData.customFields ?? []);
+            const { filteredColumns: smallStringColumns } = await getCountsByColumns(stringColumns, query || '', client, schemaData.customFields ?? []);
             const newUniqueValues = await getUniqueValuesByColumns(smallStringColumns, query || '', data.rows || [], client, schemaData.customFields ?? []);
             if (!uniqueValues ||
                 hashCode(uniqueValues) !== hashCode(newUniqueValues)) {
@@ -462,7 +462,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                                                                     label: snakeAndCamelCaseToTitleCase(field),
                                                                     value: field,
                                                                 };
-                                                            }), width: 200 }) }), _jsx("div", { ref: colFieldRef, children: _jsx(SelectComponent, { id: "pivot-row-field", label: "Column field", value: pivotColumnField, onChange: (e) => {
+                                                            }), isLoading: uniqueValuesIsLoading, width: 200 }) }), _jsx("div", { ref: colFieldRef, children: _jsx(SelectComponent, { id: "pivot-row-field", label: "Column field", value: pivotColumnField, onChange: (e) => {
                                                                 pivotFieldChange('columnField', e.target.value);
                                                                 setPivotColumnField(e.target.value === ''
                                                                     ? undefined
@@ -472,7 +472,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                                                                     label: snakeAndCamelCaseToTitleCase(field),
                                                                     value: field,
                                                                 };
-                                                            }), width: 200 }) })] }), _jsxs(PivotRowContainer, { children: [_jsx(SelectComponent, { id: "pivot-row-field", label: "Value field", value: pivotValueField, onChange: (e) => {
+                                                            }), isLoading: uniqueValuesIsLoading, width: 200 }) })] }), _jsxs(PivotRowContainer, { children: [_jsx(SelectComponent, { id: "pivot-row-field", label: "Value field", value: pivotValueField, onChange: (e) => {
                                                             pivotFieldChange('valueField', e.target.value);
                                                             setPivotValueField(e.target.value === ''
                                                                 ? undefined
@@ -482,7 +482,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                                                                 label: snakeAndCamelCaseToTitleCase(field),
                                                                 value: field,
                                                             };
-                                                        }), width: 200 }), _jsx(SelectComponent, { id: "pivot-row-field", label: "Aggregation type", value: pivotAggregation, onChange: (e) => {
+                                                        }), isLoading: uniqueValuesIsLoading, width: 200 }), _jsx(SelectComponent, { id: "pivot-row-field", label: "Aggregation type", value: pivotAggregation, onChange: (e) => {
                                                             if (e.target.value !== 'count' &&
                                                                 pivotValueField &&
                                                                 !numberFormatOptions.includes(columns.find((col) => col.field === pivotValueField).format)) {
@@ -1081,14 +1081,14 @@ export function generatePivotTableInMemory(pivot, data, dateRange, isComparison,
                 if (isDateField(pivot.columnFieldType || '')) {
                     row[`comparison_${getDateString(colValue, dateRange)}`] =
                         pivot.aggregationType === 'count'
-                            ? comparisonValue.toFixed(0)
-                            : comparisonValue.toFixed(2);
+                            ? comparisonValue?.toFixed(0)
+                            : comparisonValue?.toFixed(2);
                 }
                 else {
                     row[`comparison_${colValue}`] =
                         pivot.aggregationType === 'count'
-                            ? comparisonValue.toFixed(0)
-                            : comparisonValue.toFixed(2);
+                            ? comparisonValue?.toFixed(0)
+                            : comparisonValue?.toFixed(2);
                 }
             }
         });

package/dist/esm/models/Client.d.ts

@@ -1,8 +1,15 @@
 export type Client = {
-    customerId: string;
+    name: string;
+    _id: string;
+    databaseType?: string;
+    multiTenancyDisabled?: boolean;
+    adminCustomerId?: string;
+    recommendedPivotsDisabled?: boolean;
+};
+export type QuillProviderClient = {
+    organizationId?: string;
     name: string;
     clientId: string;
-    userId?: string;
     publicKey: string;
     queryEndpoint: string;
     queryHeaders?: HeadersInit;
@@ -10,5 +17,6 @@ export type Client = {
     databaseType?: string;
     multiTenancyDisabled?: boolean;
     adminCustomerId?: string;
+    recommendedPivotsDisabled?: boolean;
 };
 //# sourceMappingURL=Client.d.ts.map

package/dist/esm/models/Client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Client.d.ts","sourceRoot":"","sources":["../../../src/models/Client.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,MAAM,GAAG;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC"}
+{"version":3,"file":"Client.d.ts","sourceRoot":"","sources":["../../../src/models/Client.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC,CAAC"}

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

@@ -1,4 +1,4 @@
-import { Client } from '../models/Client';
+import { QuillProviderClient } from '../models/Client';
 import { Column, ColumnInternal } from '../models/Columns';
 import { Pivot } from '../models/Pivot';
 import { QuillReportInternal } from '../models/Report';
@@ -54,13 +54,13 @@ export declare const createBasicSelectASTFromColumns: (columns: ColumnInternal[]
     orderby: null;
     limit: null;
 };
-export declare const fetchAndProcessASTFromPrompt: (aiPrompt: string, schema: Table[], client: Client, prevPivot?: Pivot, currentQuery?: string) => Promise<{
+export declare const fetchAndProcessASTFromPrompt: (aiPrompt: string, schema: Table[], client: QuillProviderClient, prevPivot?: Pivot, currentQuery?: string) => Promise<{
     ast: any;
     pivot: Pivot | null | undefined;
     whereAST: any;
     error?: string | undefined;
 }>;
-export declare const fetchASTFromQuillReport: (report: QuillReportInternal, client: Client, schema: Table[]) => Promise<{
+export declare const fetchASTFromQuillReport: (report: QuillReportInternal, client: QuillProviderClient, schema: Table[]) => Promise<{
     ast: any;
     pivot: Pivot | undefined | null;
     schema?: Table[] | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"astProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAIzC,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,OAQxC;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAe5D;AAGD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,GAAG,GAAG,CAgBtE;AAGD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,CAgB1E;AAED,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG;;EA4BtD;AAED,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,MAAM,GAChB;IAAE,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAahD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,CActE;AAED,wBAAgB,sCAAsC,CACpD,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,MAAM,EAAE,EACpB,OAAO,EAAE,GAAG,EAAE,GACb,GAAG,CAYL;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAC1C,MAAM,EAAE,GAAG,EACX,UAAU,EAAE,KAAK,EAAE,GAClB;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAmCvD;AAED,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,KAAK,EAAE,EACf,aAAa,EAAE,GAAG,GACjB;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAyG/B;AAED,eAAO,MAAM,UAAU,SAAU,GAAG,YAWnC,CAAC;AAEF,eAAO,MAAM,qBAAqB,YACvB,GAAG,UACJ,KAAK,EAAE,KACd,CAAC,cAAc,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,EAmCtC,CAAC;AAEF,eAAO,MAAM,+BAA+B,YACjC,cAAc,EAAE,aACd,MAAM;;;;;;;;;;;;;;;;;;;;;;CAqBlB,CAAC;AAEF,eAAO,MAAM,4BAA4B,aAC7B,MAAM,UACR,KAAK,EAAE,UACP,MAAM,cACF,KAAK,iBACF,MAAM;SAEhB,GAAG;WACD,KAAK,GAAG,IAAI,GAAG,SAAS;cACrB,GAAG;;EAsGd,CAAC;AAEF,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,UACnB,MAAM,UACN,KAAK,EAAE;SAEV,GAAG;WACD,KAAK,GAAG,SAAS,GAAG,IAAI;;;EAwDhC,CAAC"}
+{"version":3,"file":"astProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAIzC,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,OAQxC;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAe5D;AAGD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,GAAG,GAAG,CAgBtE;AAGD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,CAgB1E;AAED,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG;;EA4BtD;AAED,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,MAAM,GAChB;IAAE,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAahD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,CActE;AAED,wBAAgB,sCAAsC,CACpD,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,MAAM,EAAE,EACpB,OAAO,EAAE,GAAG,EAAE,GACb,GAAG,CAYL;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAC1C,MAAM,EAAE,GAAG,EACX,UAAU,EAAE,KAAK,EAAE,GAClB;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAmCvD;AAED,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,KAAK,EAAE,EACf,aAAa,EAAE,GAAG,GACjB;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAyG/B;AAED,eAAO,MAAM,UAAU,SAAU,GAAG,YAWnC,CAAC;AAEF,eAAO,MAAM,qBAAqB,YACvB,GAAG,UACJ,KAAK,EAAE,KACd,CAAC,cAAc,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,EAmCtC,CAAC;AAEF,eAAO,MAAM,+BAA+B,YACjC,cAAc,EAAE,aACd,MAAM;;;;;;;;;;;;;;;;;;;;;;CAqBlB,CAAC;AAEF,eAAO,MAAM,4BAA4B,aAC7B,MAAM,UACR,KAAK,EAAE,UACP,mBAAmB,cACf,KAAK,iBACF,MAAM;SAEhB,GAAG;WACD,KAAK,GAAG,IAAI,GAAG,SAAS;cACrB,GAAG;;EAsGd,CAAC;AAEF,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,UACnB,mBAAmB,UACnB,KAAK,EAAE;SAEV,GAAG;WACD,KAAK,GAAG,SAAS,GAAG,IAAI;;;EAwDhC,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/utils/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,eAAO,MAAM,YAAY,EAAE,MAU1B,CAAC;AAEF,wBAAsB,WAAW,CAC/B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,eAAe,UAAQ,EACvB,YAAY,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC,MAAM,CAAC,CAwBjB"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/utils/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,eAAO,MAAM,YAAY,EAAE,MAK1B,CAAC;AAEF,wBAAsB,WAAW,CAC/B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,eAAe,UAAQ,EACvB,YAAY,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC,MAAM,CAAC,CAwBjB"}

package/dist/esm/utils/client.js

@@ -1,13 +1,8 @@
 export const EMPTY_CLIENT = {
     name: '',
-    customerId: '',
-    clientId: '',
-    userId: '',
-    publicKey: '',
-    queryEndpoint: '',
-    queryHeaders: {},
-    withCredentials: false,
+    _id: '',
     databaseType: '',
+    adminCustomerId: '',
 };
 export async function fetchClient(publicKey, queryEndpoint, withCredentials = false, queryHeaders) {
     let result = EMPTY_CLIENT;

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

@@ -1,6 +1,6 @@
 import { QuillReportInternal } from '../models/Report';
-import { Client } from '../models/Client';
-import { DashboardStringFilter } from '../models/Filter';
+import { QuillProviderClient } from '../models/Client';
+import { DashboardFilter } from '../models/Filter';
 /**
  * Returns a cleaned version of the dashboard item we store in state. We clean
  * the dashboard item so that we aren't exposing unnecessary details to the
@@ -10,7 +10,7 @@ import { DashboardStringFilter } from '../models/Filter';
  */
 export declare function cleanDashboardItem(item: {
     [key: string]: any;
-} | undefined, dashboardFilters: any, client?: Client, dateBucket?: string): Promise<QuillReportInternal>;
-export declare function getDashboard(dashboardName: string, client: Client): Promise<any>;
-export declare function getDashboardFilters(dashboardName: string, client: Client): Promise<DashboardStringFilter[]>;
+} | undefined, dashboardFilters: any, client?: QuillProviderClient, dateBucket?: string): Promise<QuillReportInternal>;
+export declare function getDashboard(dashboardName: string, client: QuillProviderClient): Promise<any>;
+export declare function getDashboardFilters(dashboardName: string, client: QuillProviderClient): Promise<DashboardFilter[]>;
 //# sourceMappingURL=dashboard.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAWvD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAuBzD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,CAAC,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CAmD9B;AAgHD,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,GAAG,CAAC,CA2Bd;AAED,wBAAsB,mBAAmB,CACvC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,qBAAqB,EAAE,CAAC,CA2BlC"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAWvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AA6BnD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,CAAC,EAAE,mBAAmB,EAC5B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CAoD9B;AAqID,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,GAAG,CAAC,CA2Bd;AAED,wBAAsB,mBAAmB,CACvC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,eAAe,EAAE,CAAC,CA0F5B"}

package/dist/esm/utils/dashboard.js

@@ -3,6 +3,7 @@ import { snakeAndCamelCaseToTitleCase } from './textProcessing';
 import { getData } from './dataFetcher';
 import { getDateBucketFromRange } from './dates';
 import { generatePivotWithSQL } from './pivotConstructor';
+import { COMPARISON_RANGE, defaultOptionsV2, PRIMARY_RANGE, } from '../DateRangePicker/dateRangePickerUtils';
 const defaultDashboardItem = {
     id: '',
     name: '',
@@ -44,7 +45,7 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
         return { ...col, label: snakeAndCamelCaseToTitleCase(col.label) };
     });
     return {
-        id: item._id,
+        id: item._id ?? item.id,
         name: item.name,
         dashboardName: item.dashboardName,
         rows: item.rows,
@@ -71,6 +72,7 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
         order: item.order,
         filtersApplied: item.filtersApplied,
         rowCount: parseInt(item.rowCount),
+        template: item.template,
         sort: item.sort,
         itemQuery: item.itemQuery,
         queryString: item.queryString,
@@ -93,7 +95,26 @@ async function getPivotTable(report, dashboardFilters, client, dateBucketInitial
     const data = report || {};
     if (pivot && client) {
         if (report.rowCount === 0) {
-            return { rows: [], columns: [] };
+            const columns = [];
+            if (pivot.rowField) {
+                columns.push({
+                    field: pivot.rowField,
+                    label: pivot.rowField.charAt(0).toUpperCase() + pivot.rowField.slice(1),
+                    format: pivot.rowFieldType,
+                });
+            }
+            if (pivot.valueField) {
+                columns.push({
+                    field: pivot.valueField,
+                    label: pivot.valueField.charAt(0).toUpperCase() +
+                        pivot.valueField.slice(1),
+                    format: pivot.valueFieldType,
+                });
+            }
+            return {
+                rows: [],
+                columns: columns,
+            };
         }
         try {
             let dateBucket = dateBucketInitial;
@@ -164,7 +185,7 @@ function extractPivotedYAxis(pivotTable, itemInfo, config = undefined) {
 export async function getDashboard(dashboardName, client) {
     const searchParams = new URLSearchParams({
         publicKey: client.publicKey,
-        orgId: client.customerId,
+        orgId: client?.organizationId || '*',
         name: dashboardName,
     }).toString();
     const hostedBody = {
@@ -172,7 +193,7 @@ export async function getDashboard(dashboardName, client) {
             name: dashboardName,
             task: 'dashboard',
             clientId: client.publicKey,
-            orgId: client.customerId || '*',
+            orgId: client.organizationId || '*',
             databaseType: client.databaseType,
             useNewNodeSql: true,
         },
@@ -183,7 +204,7 @@ export async function getDashboard(dashboardName, client) {
 export async function getDashboardFilters(dashboardName, client) {
     const searchParams = new URLSearchParams({
         publicKey: client.publicKey,
-        orgId: client.customerId,
+        orgId: client.organizationId || '*',
         name: dashboardName,
     }).toString();
     const hostedBody = {
@@ -191,11 +212,70 @@ export async function getDashboardFilters(dashboardName, client) {
             name: dashboardName,
             task: 'dashboard-filters-options',
             clientId: client.publicKey,
-            orgId: client.customerId || '*',
+            orgId: client.organizationId || '*',
             databaseType: client.databaseType,
             useNewNodeSql: true,
         },
     };
     const resp = await getData(client, `dashconfig?${searchParams}`, 'omit', hostedBody, null, 'GET');
-    return resp.filters;
+    const filterArray = [];
+    if (resp.dateFilter && Object.keys(resp.dateFilter).length) {
+        let presetsOptions = defaultOptionsV2;
+        if (resp.dateFilter.presetRanges) {
+            presetsOptions = resp.dateFilter.presetRanges.map((elem) => {
+                if (!elem.isStatic) {
+                    return {
+                        label: elem.label,
+                        value: elem.value,
+                        startDate: PRIMARY_RANGE[elem.value].start,
+                        endDate: PRIMARY_RANGE[elem.value].end,
+                    };
+                }
+                return {
+                    label: elem.label,
+                    value: elem.value,
+                    startDate: new Date(elem.startDate),
+                    endDate: new Date(elem.endDate),
+                };
+            });
+        }
+        const key = resp.dateFilter?.primaryRange?.value || 'LAST_6_MONTHS';
+        const primaryPreset = presetsOptions.find((option) => {
+            return option.value === key;
+        });
+        const filter = {
+            startDate: primaryPreset.startDate,
+            endDate: primaryPreset.endDate,
+            filterType: 'date_range',
+            options: presetsOptions.map((elem) => {
+                return {
+                    label: elem.label,
+                    value: elem.value,
+                };
+            }),
+            field: 'date_range',
+            label: resp.dateFilter.label,
+            preset: {
+                label: primaryPreset.label,
+                value: primaryPreset.value,
+            },
+            dashboardName: dashboardName,
+        };
+        if (resp.dateFilter.comparison) {
+            filter.comparison = true;
+            const compKey = resp.dateFilter.defaultComparisonRange ?? 'PREV_PERIOD';
+            const range = { start: filter.startDate, end: filter.endDate };
+            filter.comparisonRange = {
+                startDate: COMPARISON_RANGE[compKey](range)?.start,
+                endDate: COMPARISON_RANGE[compKey](range)?.end,
+                value: compKey,
+            };
+        }
+        else {
+            filter.comparison = false;
+        }
+        filterArray.push(filter);
+    }
+    filterArray.push(...resp.filters);
+    return filterArray;
 }

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: 20,
 };
 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, queryTask?: string): Promise<{
     report: QuillReportInternal;
     error?: string;
 }>;
+export declare function fetchReportRowCount(reportId: string, client: QuillProviderClient, useReportTask?: boolean, filters?: any[], additionalProcessing?: AdditionalProcessing, customFields?: any): Promise<any>;
 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,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC;IAAE,MAAM,EAAE,mBAAmB,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiI1D;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,gBAmCnB;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"}