@quillsql/react 2.13.39 → 2.13.41

package/dist/esm/utils/dashboard.js

@@ -30,7 +30,7 @@ const defaultDashboardItem = {
  * interface to build amazing dashboards on top of.
  * @param item
  */
-export async function cleanDashboardItem(item, dashboardFilters, client, dateBucket, additionalProcessing) {
+export async function cleanDashboardItem({ item, dashboardFilters, client, dateBucket, additionalProcessing, customFields, }) {
     if (!item)
         return defaultDashboardItem;
     if (!item.rows) {
@@ -40,24 +40,51 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
             name: item.name,
         };
     }
+    const columnsWithCustomFields = [...(item.columns ?? [])];
+    if (item.includeCustomFields && item.rows?.length > 0) {
+        const tables = item.referencedTables ?? [];
+        tables.forEach((table) => {
+            const _customFields = customFields?.[table] ?? [];
+            _customFields.forEach((field) => {
+                if (item.rows[0][field.field] !== undefined &&
+                    !item.columns.some((col) => col.field === field.field)) {
+                    columnsWithCustomFields.push({
+                        field: field.field,
+                        format: 'string',
+                        label: snakeAndCamelCaseToTitleCase(field.field),
+                        fieldType: 'varchar',
+                        dataTypeID: 1043,
+                        jsType: 'string',
+                    });
+                }
+            });
+        });
+    }
     const processedColumns = item.columns.map((col) => {
         return { ...col, label: snakeAndCamelCaseToTitleCase(col.label) };
     });
+    const columnInternal = (item.includeCustomFields ? columnsWithCustomFields : item.columns).map((col) => {
+        return { ...col, label: snakeAndCamelCaseToTitleCase(col.label) };
+    });
     let pivotTable;
     let pivotError;
     try {
         pivotTable = await getPivotTable({
             ...item,
-            pivot: item.pivot ? {
-                ...item.pivot,
-                aggregations: item.pivot.aggregations ?? [{
-                        valueField: item.pivot.valueField,
-                        valueFieldType: item.pivot.valueFieldType,
-                        valueField2: item.pivot.valueField2,
-                        valueField2Type: item.pivot.valueField2Type,
-                        aggregationType: item.pivot.aggregationType,
-                    }]
-            } : undefined,
+            pivot: item.pivot
+                ? {
+                    ...item.pivot,
+                    aggregations: item.pivot.aggregations ?? [
+                        {
+                            valueField: item.pivot.valueField,
+                            valueFieldType: item.pivot.valueFieldType,
+                            valueField2: item.pivot.valueField2,
+                            valueField2Type: item.pivot.valueField2Type,
+                            aggregationType: item.pivot.aggregationType,
+                        },
+                    ],
+                }
+                : undefined,
         }, dashboardFilters, client, dateBucket, additionalProcessing, item.dashboardName);
     }
     catch (e) {
@@ -65,6 +92,29 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
         console.error('Error fetching pivot table', e);
         pivotError = 'Error fetching pivot table';
     }
+    // For each key on item that starts with "referenceLine_{field}", we want to
+    // add it to referenceLineYValues as [field]: [value, value] (we only support horizontal lines)
+    // Then for each number value in the referenceLines map, we also want to add [key]: [value, value]
+    const referenceLineYValues = [];
+    for (const key in item) {
+        if (key.startsWith('referenceLine_')) {
+            const field = key.slice(14);
+            if (!item[key] || !item[key][0])
+                continue;
+            const value = Object.values(item[key][0])[0];
+            referenceLineYValues.push({ label: field, query: [value, value] });
+        }
+    }
+    if (item.referenceLines) {
+        for (const referenceLine of item.referenceLines) {
+            if (Array.isArray(referenceLine.query)) {
+                referenceLineYValues.push({ label: referenceLine.label, query: referenceLine.query });
+            }
+            else if (referenceLine.query === '') {
+                referenceLineYValues.push({ label: referenceLine.label, query: (pivotTable?.rows ? pivotTable.rows : item.rows).map((row) => Number(row[referenceLine.label]) || 0) });
+            }
+        }
+    }
     return {
         id: item._id ?? item.id,
         name: item.name,
@@ -80,7 +130,9 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
                 label: column.label,
             };
         }),
-        columnInternal: processedColumns,
+        includeCustomFields: item.includeCustomFields,
+        columnInternal,
+        columnsWithCustomFields,
         chartType: item.chartType,
         dateField: item.dateField,
         pivot: pivotError
@@ -88,14 +140,16 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
             : item.pivot
                 ? {
                     ...item.pivot,
-                    aggregations: item.pivot.aggregations ?? [{
+                    aggregations: item.pivot.aggregations ?? [
+                        {
                             valueField: item.pivot.valueField,
                             valueFieldType: item.pivot.valueFieldType,
                             valueField2: item.pivot.valueField2,
                             valueField2Type: item.pivot.valueField2Type,
                             aggregationType: item.pivot.aggregationType,
-                        }],
-                    columnValues: item.distinctStrings
+                        },
+                    ],
+                    columnValues: item.distinctStrings,
                 }
                 : undefined,
         yAxisFields: pivotTable
@@ -119,6 +173,8 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
         referencedTables: item?.referencedTables || [],
         referencedColumns: item?.referencedColumns || {},
         error: item.error ?? pivotError,
+        referenceLineYValues: referenceLineYValues,
+        referenceLines: item.referenceLines,
     };
 }
 /**
@@ -153,7 +209,8 @@ async function getPivotTable(report, dashboardFilters, client, dateBucketInitial
                         field: agg.valueField,
                         label: snakeCaseToTitleCase(processColumnName(agg.valueField)),
                         //FIXME: valueFieldType is not always the same as the format
-                        format: agg.valueFieldType ?? 'whole_number',
+                        format: agg.valueFieldType ??
+                            'whole_number',
                         jsType: agg.valueFieldType ?? 'number',
                         fieldType: agg.valueFieldType ?? 'number',
                         dataTypeID: fieldTypeToDataTypeID(agg.valueFieldType ?? 'number'),

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

@@ -1 +1 @@
-{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAgFvD,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,EACnB,WAAW,CAAC,EAAE,WAAW,gBA0K1B;AAED,wBAAgB,aAAa;+BAGjB,mBAAmB,sBACP,MAAM,oBACR,GAAG,iCAEP,WAAW;EAoC5B;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"}
+{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAgFvD,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,EACnB,WAAW,CAAC,EAAE,WAAW,gBA4K1B;AAED,wBAAgB,aAAa;+BAGjB,mBAAmB,sBACP,MAAM,oBACR,GAAG,iCAEP,WAAW;EAoC5B;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

@@ -90,7 +90,9 @@ export async function getData(client, cloudQueryEndpoint, noCred, hostedRequestB
                 let errorMessage = 'Failed to fetch report: ' + responseJson.error;
                 if (hostedRequestBody.metadata.task === 'query' ||
                     hostedRequestBody.metadata.task === 'patterns') {
-                    errorPrefix = 'SQL Error: ';
+                    errorPrefix = responseJson.error?.includes('Query Parsing Error')
+                        ? ''
+                        : 'SQL Error: ';
                     errorMessage = errorPrefix + responseJson.error;
                 }
                 else if (responseJson.error?.includes('Virtual Table Error')) {

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

@@ -1 +1 @@
-{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,SAAS,EACT,cAAc,EAGd,mBAAmB,EACnB,MAAM,EAEN,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,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,EAAE,GAAG,YAAO,EACjB,UAAU,EAAE,GAAG,YAAO,EACtB,aAAa,EAAE,MAAM,OAmGtB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,cA0DhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAwB7D;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,CA4B/D;AAED,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,mBAAmB,GACvC,mBAAmB,CAkKrB;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,eAAe,EAAE,EAC1B,aAAa,EAAE,cAAc,EAAE,GAC9B,GAAG,EAAE,CA+CP;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,cAAc,EAAE,EAC3B,QAAQ,CAAC,EAAE,cAAc,EAAE,GAC1B,OAAO,CA+BT;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE;IACpD,CAAC,MAAM,EAAE,MAAM,GAAG;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;CAChD,GAAG;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB,CASA;AAED,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,WAClB,WAAW,EAAE,iBACP,MAAM,KACpB,CAAC,mBAAmB,GAAG;IAAE,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GAAG,SAqDpD,CAAC"}
+{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,SAAS,EACT,cAAc,EAGd,mBAAmB,EACnB,MAAM,EAEN,eAAe,EAEhB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,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,EAAE,GAAG,YAAO,EACjB,UAAU,EAAE,GAAG,YAAO,EACtB,aAAa,EAAE,MAAM,OAmGtB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,cA0DhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAwB7D;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,CA4B/D;AAED,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,mBAAmB,GACvC,mBAAmB,CAkKrB;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,eAAe,EAAE,EAC1B,aAAa,EAAE,cAAc,EAAE,GAC9B,GAAG,EAAE,CA+CP;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,cAAc,EAAE,EAC3B,QAAQ,CAAC,EAAE,cAAc,EAAE,GAC1B,OAAO,CA+BT;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE;IACpD,CAAC,MAAM,EAAE,MAAM,GAAG;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;CAChD,GAAG;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB,CASA;AAED,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,WAClB,WAAW,EAAE,iBACP,MAAM,KACpB,CAAC,mBAAmB,GAAG;IAAE,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GAAG,SAqDpD,CAAC"}

package/dist/esm/utils/filterProcessing.js

@@ -1,6 +1,6 @@
 import { endOfDay, parse, startOfDay, sub } from 'date-fns';
 import { COMPARISON_RANGE, PRIMARY_RANGE, defaultOptionsV2, getRangeFromPresetOptions, } from '../DateRangePicker/dateRangePickerUtils';
-import { DateOperator, FieldType, FilterType, DashboardFilterType, TimeUnit, } from '../models/Filter';
+import { DateOperator, FieldType, InternalFilterType, DashboardFilterType, TimeUnit, FilterType, } from '../models/Filter';
 import { filterTreeToAst } from './astFilterProcessing';
 import { snakeAndCamelCaseToTitleCase } from './textProcessing';
 export function findAndProcessDateFilter(filters) {
@@ -203,7 +203,7 @@ export const getType = (t) => {
  */
 export function filterSentence(filter) {
     let value = '';
-    if (filter.filterType == FilterType.NullFilter) {
+    if (filter.filterType == InternalFilterType.NullFilter) {
         return `${snakeAndCamelCaseToTitleCase(filter.field)} ${filter.operator}`;
     }
     else if (filter.value === null || filter.value === undefined) {
@@ -335,7 +335,7 @@ export async function buildQueryFromFilters(baseAst, filters, endpoint, client)
     }
 }
 export function applyCustomFilterToDashDateFilter(customDateFilter, dashboardDateFilter) {
-    if (customDateFilter.filterType === FilterType.DateCustomFilter &&
+    if (customDateFilter.filterType === FilterType.Date &&
         customDateFilter.value &&
         typeof customDateFilter.value === 'object' &&
         'startDate' in customDateFilter.value &&
@@ -348,14 +348,14 @@ export function applyCustomFilterToDashDateFilter(customDateFilter, dashboardDat
             endDate: new Date(endDate),
         };
     }
-    else if (customDateFilter.filterType === FilterType.DateFilter &&
+    else if (customDateFilter.filterType === FilterType.Date &&
         customDateFilter.value &&
         typeof customDateFilter.value === 'object' &&
         'value' in customDateFilter.value &&
         'unit' in customDateFilter.value) {
         const { value, unit } = customDateFilter.value;
         let processedUnit;
-        let processedValue = value;
+        let processedValue = value || 1;
         switch (unit) {
             case TimeUnit.Day:
                 processedUnit = 'days';
@@ -438,7 +438,7 @@ export function applyCustomFilterToDashDateFilter(customDateFilter, dashboardDat
                 return dashboardDateFilter;
         }
     }
-    else if (customDateFilter.filterType === FilterType.DateComparisonFilter &&
+    else if (customDateFilter.filterType === FilterType.Date &&
         customDateFilter.value &&
         typeof customDateFilter.value === 'string') {
         const parsedDate = parse(customDateFilter.value, 'yyyy-mm-dd', new Date());
@@ -480,14 +480,14 @@ export function applyCustomFilterToDashDateFilter(customDateFilter, dashboardDat
     return dashboardDateFilter;
 }
 export function mergeCustomFilters(filters, customFilters) {
-    const customDateFilters = customFilters.filter((filter) => filter.filterType === FilterType.DateCustomFilter ||
-        filter.filterType === FilterType.DateFilter ||
-        filter.filterType === FilterType.DateComparisonFilter);
+    const customDateFilters = customFilters.filter((filter) => filter.filterType === InternalFilterType.DateCustomFilter ||
+        filter.filterType === InternalFilterType.DateFilter ||
+        filter.filterType === InternalFilterType.DateComparisonFilter);
     if (customDateFilters.length === 0) {
         return filters.concat(customFilters);
     }
     const withoutDate = filters.filter((filter) => filter.filterType !== DashboardFilterType.Date);
-    const customWithoutDate = customFilters.filter((filter) => filter.filterType !== FilterType.DateCustomFilter);
+    const customWithoutDate = customFilters.filter((filter) => filter.filterType !== InternalFilterType.DateCustomFilter);
     const withDate = filters.find((filter) => filter.filterType === DashboardFilterType.Date);
     return withoutDate
         .concat([

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

@@ -4,5 +4,8 @@
  * @param  fields - The fields to consider for domain calculation.
  * @returns - An array representing the adjusted domain [min, max].
  */
-export default function getDomain(data: any[], fields: any[]): number[];
+export default function getDomain(data: any[], fields: any[], referenceLines: {
+    label: string;
+    query: number[];
+}[] | undefined): number[];
 //# sourceMappingURL=getDomain.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getDomain.d.ts","sourceRoot":"","sources":["../../../src/utils/getDomain.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,CAkCtE"}
+{"version":3,"file":"getDomain.d.ts","sourceRoot":"","sources":["../../../src/utils/getDomain.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,cAAc,EAAE;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAC,EAAE,GAAG,SAAS,GAAG,MAAM,EAAE,CA6CtI"}

package/dist/esm/utils/getDomain.js

@@ -4,7 +4,7 @@
  * @param  fields - The fields to consider for domain calculation.
  * @returns - An array representing the adjusted domain [min, max].
  */
-export default function getDomain(data, fields) {
+export default function getDomain(data, fields, referenceLines) {
     const fieldsArray = fields.map((elem) => elem.field);
     const numericValues = [];
     data.forEach((item) => {
@@ -20,6 +20,16 @@ export default function getDomain(data, fields) {
             }
         });
     });
+    if (referenceLines) {
+        referenceLines.forEach((line) => {
+            if (typeof line.query[0] === 'number') {
+                numericValues.push(line.query[0]);
+            }
+            if (typeof line.query[line.query.length - 1] === 'number') {
+                numericValues.push(line.query[line.query.length - 1]);
+            }
+        });
+    }
     const [minValue, maxValue] = numericValues.reduce(([min, max], value) => [Math.min(min, value), Math.max(max, value)], [Infinity, -Infinity]);
     if (minValue === 0 && maxValue === 0) {
         return [0, 1];

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

@@ -1 +1 @@
-{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAYvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAsB,oBAAoB,CAAC,EACzC,KAAK,EACL,MAAM,EACN,MAAM,EACN,UAAU,EACV,UAAU,EACV,eAAe,EACf,aAAa,EACb,OAAO,EACP,oBAAoB,EACpB,UAAU,EACV,oBAAoB,EACpB,gBAAuB,GACxB,EAAE;IACD,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EACJ;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GAAG,OAAO,CAAC,SAAS,CAAC,CAkWrB;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,KAAK,sBAUnD"}
+{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAYvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAsB,oBAAoB,CAAC,EACzC,KAAK,EACL,MAAM,EACN,MAAM,EACN,UAAU,EACV,UAAU,EACV,eAAe,EACf,aAAa,EACb,OAAO,EACP,oBAAoB,EACpB,UAAU,EACV,oBAAoB,EACpB,gBAAuB,GACxB,EAAE;IACD,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EACJ;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GAAG,OAAO,CAAC,SAAS,CAAC,CAuWrB;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,KAAK,sBASnD"}

package/dist/esm/utils/pivotConstructor.js

@@ -25,13 +25,15 @@ export async function generatePivotWithSQL({ pivot, report, client, dateBucket,
         }
     }
     if (!pivot.aggregations?.length && pivot.aggregationType) {
-        pivot.aggregations = [{
+        pivot.aggregations = [
+            {
                 aggregationType: pivot.aggregationType,
                 valueField: pivot.valueField,
                 valueFieldType: pivot.valueFieldType,
                 valueField2: pivot.valueField2,
                 valueField2Type: pivot.valueField2Type,
-            }];
+            },
+        ];
     }
     let comparisonInterval = undefined;
     if (dateFilter && dateFilter.comparisonRange) {
@@ -70,7 +72,8 @@ export async function generatePivotWithSQL({ pivot, report, client, dateBucket,
         ? additionalProcessingOnPivotQuery(pivot, comparisonPivotSql, additionalProcessing, client.databaseType)
         : '';
     const preQueries = [paginatedSqlQuery];
-    if (getPivotRowCount && report?.chartType === 'table') {
+    getPivotRowCount = getPivotRowCount && report?.chartType === 'table';
+    if (getPivotRowCount) {
         const pivotRowCountQuery = generateRowCountQuery(sqlQuery, client.databaseType);
         preQueries.push(pivotRowCountQuery);
     }
@@ -83,7 +86,6 @@ export async function generatePivotWithSQL({ pivot, report, client, dateBucket,
             task: 'query',
             clientId: client.publicKey,
             databaseType: databaseType,
-            getCustomFields: false,
             runQueryConfig: {
                 overridePost: true,
                 convertDatatypes: true,
@@ -142,7 +144,7 @@ export async function generatePivotWithSQL({ pivot, report, client, dateBucket,
         label: snakeCaseToTitleCase(processColumnName(field.name.replace('comparison_', 'comparison '))),
         format: field.name === pivot.rowField
             ? 'string'
-            : (pivot.aggregations?.[index]?.aggregationType === 'percentage')
+            : pivot.aggregations?.[index]?.aggregationType === 'percentage'
                 ? 'percent'
                 : 'whole_number',
         fieldType: field.fieldType,
@@ -258,7 +260,6 @@ export async function generatePivotWithSQL({ pivot, report, client, dateBucket,
     };
 }
 export function disambiguatedValueField(pivot) {
-    // console.log(pivot);
     if (pivot.aggregations && pivot.aggregations.length > 0) {
         if (pivot.aggregations.length === 1) {
             return pivot.aggregations[0]?.valueField ?? pivot.valueField;

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

@@ -2,7 +2,7 @@ import { Pivot } from '../models/Pivot';
 import { AdditionalProcessing } from './tableProcessing';
 export declare function processSingleQuotes(value: string, databaseType: string): string;
 export declare function processAggType(aggType: string, hasColumnField?: boolean): string;
-export declare function processColumnReference(column: string, databaseType: string, fallbackOnNull?: string, isPivotColumnFieldAlias?: boolean, isPivotValueFieldAlias?: boolean): string;
+export declare function processColumnReference(column: string, databaseType: string, fallbackOnNull?: string, isColumnFieldAlias?: boolean, isValueFieldAlias?: boolean): string;
 export declare function replaceSpacesWithUnderscores(column: string): string;
 export declare function processDateTrunc(dateBucket: string, rowField: string, databaseType: string, comparisonInterval?: string): string;
 export declare function processValueField(aggType: string, databaseType: string, valueField: string): string;

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;AAIxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAStE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,UAAQ,UAGrE;AAMD,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,uBAAuB,CAAC,EAAE,OAAO,EACjC,sBAAsB,CAAC,EAAE,OAAO,UAkGjC;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAmBD,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,UA8B5B;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,UAYnB;AAED,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,UAcrB;AAmFD,wBAAgB,8BAA8B,CAC5C,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAkBrB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAkBpB;AA8uBD,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,KAAK,EACZ,KAAK,CAAC,EAAE,MAAM,EACd,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,YAAY,SAAe,sBAgE5B;AAED,wBAAgB,qBAAqB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,sBAqB1E"}
+{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAIxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAStE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,UAAQ,UAGrE;AAMD,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,kBAAkB,CAAC,EAAE,OAAO,EAC5B,iBAAiB,CAAC,EAAE,OAAO,UAkG5B;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAmBD,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,UA8B5B;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,UAYnB;AAED,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,UAcrB;AAmFD,wBAAgB,8BAA8B,CAC5C,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAkBrB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAkBpB;AAw2BD,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,KAAK,EACZ,KAAK,CAAC,EAAE,MAAM,EACd,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,YAAY,SAAe,sBAuE5B;AAED,wBAAgB,qBAAqB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,sBAqB1E"}