@quillsql/react 2.12.30 → 2.12.32

package/dist/cjs/utils/columnProcessing.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processColumnName = exports.convertFormatToJsType = exports.convertFieldTypeToJSType = exports.convertColumnInfoToColumnInternal = exports.convertPostgresColumn = void 0;
+exports.getYAxisFields = exports.processColumnName = exports.convertFormatToJsType = exports.convertFieldTypeToJSType = exports.convertColumnInfoToColumnInternal = exports.convertPostgresColumn = void 0;
+const filterProcessing_1 = require("./filterProcessing");
 function removeBigQuerySpecialChars(columnName) {
     return columnName.replaceAll('quill_forward_slash', '/');
 }
@@ -214,3 +215,55 @@ function processColumnName(columnName) {
     return removeBigQuerySpecialChars(columnName);
 }
 exports.processColumnName = processColumnName;
+const getYAxisFields = (report) => {
+    try {
+        const curDateFilter = (0, filterProcessing_1.findAndProcessDateFilter)(Object.values(report.filtersApplied));
+        if (report.pivot && report.pivotColumns && report.pivot.columnField) {
+            return (report.pivotColumns
+                .slice(1)
+                .map((column) => {
+                // @ts-ignore
+                return { ...column, format: report.yAxisFields[0].format };
+            }) ?? []);
+        }
+        else if (report.pivot && report.pivotColumns) {
+            return (report.pivotColumns
+                .slice(1)
+                .map((column) => {
+                return {
+                    ...column,
+                    // @ts-ignore
+                    label: report?.yAxisFields[0].label,
+                    // @ts-ignore
+                    format: report?.yAxisFields[0].format,
+                };
+            }) ?? []);
+        }
+        else {
+            if (curDateFilter?.comparison &&
+                curDateFilter.comparisonRange.value !== 'NO_COMPARISON') {
+                const comparisonYAxisFields = report.yAxisFields?.map((field) => {
+                    return {
+                        ...field,
+                        field: `comparison_${field.field}`,
+                        label: `comparison ${field.label ?? field.field}`,
+                    };
+                });
+                if (report.pivotColumns) {
+                    return report.pivotColumns;
+                }
+                else if (comparisonYAxisFields || report.yAxisFields) {
+                    const yAxisFields = report.yAxisFields ?? [];
+                    const compYAxisFields = comparisonYAxisFields ?? [];
+                    return [...yAxisFields, ...compYAxisFields];
+                }
+                return [];
+            }
+            return report.pivotColumns ?? report.yAxisFields ?? [];
+        }
+    }
+    catch (e) {
+        return report.yAxisFields;
+    }
+};
+exports.getYAxisFields = getYAxisFields;

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

@@ -1,4 +1,4 @@
-import { QuillReportInternal } from '../Dashboard';
+import { QuillReportInternal } from '../models/Report';
 /**
  * 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

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

@@ -1 +1 @@
-{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAgC5E;;;;;;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,GAAG,EACZ,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CAgD9B;AA0KD,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC,GAAG,CAAC,CA2Bd"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AA+BpE;;;;;;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,GAAG,EACZ,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CAyC9B;AAgHD,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC,GAAG,CAAC,CA2Bd"}

package/dist/cjs/utils/dashboard.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDashboard = exports.cleanDashboardItem = void 0;
-const valueFormatter_1 = require("./valueFormatter");
 const PivotModal_1 = require("../internals/ReportBuilder/PivotModal");
 const textProcessing_1 = require("./textProcessing");
 const dataFetcher_1 = require("./dataFetcher");
@@ -17,15 +16,14 @@ const defaultDashboardItem = {
     chartType: '',
     dateField: null,
     pivot: null,
-    primaryAggregation: '',
-    comparisonAggregation: '',
-    aggregationPercentChange: undefined,
     yAxisFields: [],
     xAxisLabel: '',
     xAxisField: '',
     xAxisFormat: 'string',
     order: -1,
     filtersApplied: {},
+    queryString: '',
+    rowCount: 0,
 };
 /**
  * Returns a cleaned version of the dashboard item we store in state. We clean
@@ -44,7 +42,6 @@ async function cleanDashboardItem(item, dashboardFilters, client, dateBucket) {
             name: item.name,
         };
     const pivotTable = await getPivotTable(item, dashboardFilters, client, dateBucket);
-    const { primaryAggregation, comparisonAggregation, aggregationPercentChange, } = getAggragations(pivotTable, item);
     return {
         id: item._id,
         name: item.name,
@@ -59,9 +56,6 @@ async function cleanDashboardItem(item, dashboardFilters, client, dateBucket) {
         chartType: item.chartType,
         dateField: item.dateField,
         pivot: item.pivot,
-        primaryAggregation,
-        comparisonAggregation,
-        aggregationPercentChange,
         yAxisFields: pivotTable
             ? extractPivotedYAxis(pivotTable, item)
             : item.yAxisFields,
@@ -73,43 +67,10 @@ async function cleanDashboardItem(item, dashboardFilters, client, dateBucket) {
         rowCount: parseInt(item.rowCount),
         sort: item.sort,
         itemQuery: item.itemQuery,
+        queryString: item.queryString,
     };
 }
 exports.cleanDashboardItem = cleanDashboardItem;
-/**
- * Extracts the aggregations from the item, if any.
- */
-function getAggragations(pivotTable, item) {
-    const yAxisFields = extractPivotedYAxis(pivotTable, item);
-    const rows = extractPivotedData(pivotTable, item);
-    // extract the aggragation for the primary range.
-    const mainKey = yAxisFields[0]?.field ?? item.pivot?.valueField;
-    const primary = mainKey
-        ? rows.reduce((sum, row) => sum + parseFloat(row[mainKey]), 0)
-        : 0;
-    // extract the aggragation for the comparison range, if applicable.
-    const compKey = yAxisFields[1]?.field ?? item.pivot?.valueField;
-    const comparison = compKey
-        ? rows.reduce((sum, row) => sum + parseFloat(row[compKey]), 0)
-        : 0;
-    return {
-        primaryAggregation: formatAggragation(item, primary),
-        comparisonAggregation: formatAggragation(item, comparison),
-        aggregationPercentChange: Number(primary - comparison),
-    };
-}
-/**
- * Applies a valueFormatter to the given value based on the format in the item.
- */
-function formatAggragation(item, value) {
-    if (!value)
-        return undefined;
-    return (0, valueFormatter_1.valueFormatter)({
-        value,
-        field: item.pivot?.valueField,
-        fields: item.yAxisFields,
-    });
-}
 /**
  * Extract and transform the data from itemInfo.
  */
@@ -165,20 +126,6 @@ async function getPivotTable(report, dashboardFilters, client, dateBucketInitial
             : undefined)
         : undefined;
 }
-/**
- * Returns the data list based on whether the table is pivoted and if there is
- * a config value passed into this component.
- */
-function extractPivotedData(pivotTable, item, config = undefined) {
-    if (pivotTable)
-        return pivotTable.rows;
-    if (config) {
-        if (config.bucketedRows.length > 0)
-            return config.bucketedRows;
-        return config.rows;
-    }
-    return item.rows;
-}
 /**
  * Extracts the yAxis from the pivot table, if one exists.
  */

package/dist/cjs/utils/dataProcessing.d.ts

@@ -1,8 +1,10 @@
-import { QuillReportInternal } from '../Dashboard';
+import { QuillReportInternal } from '../models/Report';
 export declare enum Calculation {
     PointToPointPercentageChange = "POINT_TO_POINT_PERCENTAGE_CHANGE",
-    SimplePercentageChange = "SIMPLE_PERCENTAGE_CHANGE"
+    SimplePercentageChange = "SIMPLE_PERCENTAGE_CHANGE",
+    Sum = "SUM"
 }
 export declare const getSimplePercentageChange: (data: QuillReportInternal) => number | undefined;
 export declare const getPointToPointPercentageChange: (data: QuillReportInternal) => number | undefined;
+export declare const getSumOfFields: (data: QuillReportInternal) => number;
 //# sourceMappingURL=dataProcessing.d.ts.map

package/dist/cjs/utils/dataProcessing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/dataProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAInD,oBAAY,WAAW;IACrB,4BAA4B,qCAAqC;IACjE,sBAAsB,6BAA6B;CACpD;AAyBD,eAAO,MAAM,yBAAyB,SAAU,mBAAmB,uBAsClE,CAAC;AAEF,eAAO,MAAM,+BAA+B,SAAU,mBAAmB,uBAkFxE,CAAC"}
+{"version":3,"file":"dataProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/dataProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAIvD,oBAAY,WAAW;IACrB,4BAA4B,qCAAqC;IACjE,sBAAsB,6BAA6B;IACnD,GAAG,QAAQ;CACZ;AAyBD,eAAO,MAAM,yBAAyB,SAAU,mBAAmB,uBAsClE,CAAC;AAEF,eAAO,MAAM,+BAA+B,SAAU,mBAAmB,uBAkFxE,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,mBAAmB,WAavD,CAAC"}

package/dist/cjs/utils/dataProcessing.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPointToPointPercentageChange = exports.getSimplePercentageChange = exports.Calculation = void 0;
+exports.getSumOfFields = exports.getPointToPointPercentageChange = exports.getSimplePercentageChange = exports.Calculation = void 0;
 const PivotModal_1 = require("../internals/ReportBuilder/PivotModal");
 const dates_1 = require("./dates");
 var Calculation;
 (function (Calculation) {
     Calculation["PointToPointPercentageChange"] = "POINT_TO_POINT_PERCENTAGE_CHANGE";
     Calculation["SimplePercentageChange"] = "SIMPLE_PERCENTAGE_CHANGE";
+    Calculation["Sum"] = "SUM";
 })(Calculation || (exports.Calculation = Calculation = {}));
 const getSumOfField = (rows, field) => {
     if (rows[0] && rows[0][field]) {
@@ -125,3 +126,19 @@ const getPointToPointPercentageChange = (data) => {
     }
 };
 exports.getPointToPointPercentageChange = getPointToPointPercentageChange;
+const getSumOfFields = (data) => {
+    if (data.pivot && data.pivotRows && data.pivotColumns) {
+        const pivotRows = data.pivotRows;
+        const fields = data.pivotColumns.map((field) => {
+            return field.field;
+        });
+        return getSumOfFieldsAndRows(pivotRows, fields);
+    }
+    else {
+        const yAxisFields = data.yAxisFields.map((field) => {
+            return field.field;
+        });
+        return getSumOfFieldsAndRows(data.rows, yAxisFields);
+    }
+};
+exports.getSumOfFields = getSumOfFields;

package/dist/cjs/utils/dates.d.ts

@@ -14,6 +14,7 @@ export declare function getComparisonInterval(comparisonRange: {
 export declare function getDateBucketFromRange(dateRange: {
     start: Date;
     end: Date;
-}): "month" | "week" | "year" | "day";
+}): "year" | "month" | "week" | "day";
 export declare function parseDateByDatabaseType(date: any, databaseType: string): Date;
+export declare function getDateFormatFromBucket(dateBucket: string): string;
 //# sourceMappingURL=dates.d.ts.map

package/dist/cjs/utils/dates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../src/utils/dates.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,UAYxB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,WAa/C;AAED,wBAAgB,qBAAqB,CACnC,eAAe,EAAE;IACf,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,IAAI,CAAC;CACf,EACD,UAAU,CAAC,EAAE,MAAM,sBAepB;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,qCAW3E;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,QAMtE"}
+{"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../src/utils/dates.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,UAYxB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,WAa/C;AAED,wBAAgB,qBAAqB,CACnC,eAAe,EAAE;IACf,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,IAAI,CAAC;CACf,EACD,UAAU,CAAC,EAAE,MAAM,sBAepB;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,qCAW3E;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,QAMtE;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,UAoBzD"}

package/dist/cjs/utils/dates.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseDateByDatabaseType = exports.getDateBucketFromRange = exports.getComparisonInterval = exports.isDateFormat = exports.convertComparisonRange = void 0;
+exports.getDateFormatFromBucket = exports.parseDateByDatabaseType = exports.getDateBucketFromRange = exports.getComparisonInterval = exports.isDateFormat = exports.convertComparisonRange = void 0;
 const date_fns_1 = require("date-fns");
 const dateRangePickerUtils_1 = require("../DateRangePicker/dateRangePickerUtils");
 /**
@@ -80,3 +80,25 @@ function parseDateByDatabaseType(date, databaseType) {
     }
 }
 exports.parseDateByDatabaseType = parseDateByDatabaseType;
+function getDateFormatFromBucket(dateBucket) {
+    let format = 'MMM_yyyy';
+    switch (dateBucket) {
+        case 'day':
+            format = 'MMM_dd';
+            break;
+        case 'week':
+            format = 'MMM_dd-MMM_dd';
+            break;
+        case 'month':
+            format = 'MMM_yyyy';
+            break;
+        case 'year':
+            format = 'yyyy';
+            break;
+        default:
+            format = 'MMM_yyyy';
+            break;
+    }
+    return format;
+}
+exports.getDateFormatFromBucket = getDateFormatFromBucket;

package/dist/cjs/utils/filterProcessing.d.ts

@@ -1,4 +1,10 @@
+import { Filter } from '../models/Filter';
 export declare function findAndProcessDateFilter(filters: any[]): any;
-export declare function processFilterFromBackend(filter: any, rows: any[]): any;
+export declare function processFilterFromBackend(filter: any): any;
 export declare function updateFilter(filter: any, value?: any, comparison?: any): any;
+export declare const getType: (t: string) => "string" | "boolean" | "numeric" | "date";
+/**
+ * Returns a sentence to describe a Filter
+ */
+export declare function filterSentence(filter: Filter): string;
 //# sourceMappingURL=filterProcessing.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAQA,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAoB5D;AAMD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,OA4BhE;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,GAAG,EACX,KAAK,GAAE,GAAU,EACjB,UAAU,GAAE,GAAU,OAuGvB"}
+{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAOA,OAAO,EAAgB,MAAM,EAAe,MAAM,kBAAkB,CAAC;AAGrE,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,8CAwDhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAwBrD"}

package/dist/cjs/utils/filterProcessing.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateFilter = exports.processFilterFromBackend = exports.findAndProcessDateFilter = void 0;
+exports.filterSentence = exports.getType = exports.updateFilter = exports.processFilterFromBackend = exports.findAndProcessDateFilter = void 0;
 const dateRangePickerUtils_1 = require("../DateRangePicker/dateRangePickerUtils");
+const Filter_1 = require("../models/Filter");
+const textProcessing_1 = require("./textProcessing");
 function findAndProcessDateFilter(filters) {
     let dateFilter = filters.find((filter) => filter.filterType === 'date_range');
     if (dateFilter) {
@@ -24,7 +26,7 @@ exports.findAndProcessDateFilter = findAndProcessDateFilter;
 function isValidDate(date) {
     return !isNaN(Date.parse(date));
 }
-function processFilterFromBackend(filter, rows) {
+function processFilterFromBackend(filter) {
     if (filter.filterType === 'date_range') {
         return {
             ...filter,
@@ -33,20 +35,12 @@ function processFilterFromBackend(filter, rows) {
             options: dateRangePickerUtils_1.defaultOptionsV2,
             comparisonRange: {
                 ...filter.comparisonRange,
-                value: filter.defaultComparisonRange,
+                value: 'PREV_PERIOD',
             },
         };
     }
     if (filter.filterType === 'string') {
-        const options = rows.map((row) => row[filter.field]);
-        const distinctOptions = Array.from(new Set(options)).filter((value) => value !== undefined && value !== null);
-        return {
-            ...filter,
-            options: distinctOptions.map((option) => ({
-                label: option,
-                value: option,
-            })),
-        };
+        return filter;
     }
     return filter;
 }
@@ -56,7 +50,7 @@ function updateFilter(filter, value = null, comparison = null) {
     const { ...filterWithoutSelectedValue } = filter;
     if (filter.filterType === 'string') {
         let selectedValue = {};
-        if (value) {
+        if (value || value === '') {
             if (filter.stringFilterType === 'multiselect') {
                 const parsedValue = value;
                 if (parsedValue.length === 0) {
@@ -151,3 +145,96 @@ function updateFilter(filter, value = null, comparison = null) {
     }
 }
 exports.updateFilter = updateFilter;
+// Function to translate field type to "string", "numeric", or "date"
+const getType = (t) => {
+    // strip any size numbers at the end
+    // TODO: 'max' data types, e.g. varchar(max)
+    t = t.replace(/\d+$/, '');
+    switch (t) {
+        case 'string':
+        case 'char':
+        case 'varchar':
+        case 'nchar':
+        case 'nvarchar':
+        case 'ntext':
+        case 'binary':
+        case 'varbinary':
+        case 'tinyblob':
+        case 'tinytext':
+        case 'blob':
+        case 'mediumtext':
+        case 'mediumblob':
+        case 'longtext':
+        case 'longblob':
+        case 'text':
+            return 'string';
+        case 'numeric':
+        case 'bit':
+        case 'tinybit':
+        case 'smallint':
+        case 'mediumint':
+        case 'int':
+        case 'tinyint':
+        case 'integer':
+        case 'bigint':
+        case 'float':
+        case 'double':
+        case 'double precision':
+        case 'decimal':
+        case 'dec':
+        case 'smallmoney':
+        case 'money':
+        case 'real':
+            return 'numeric';
+        case 'date':
+        case 'datetime':
+        case 'datetime2':
+        case 'smalldatetime':
+        case 'datetimeoffset':
+        case 'timestamp':
+        case 'timestamptz':
+        case 'time':
+        case 'year':
+            return 'date';
+        case 'bool':
+        case 'boolean':
+            return 'boolean';
+        default:
+            return 'string';
+    }
+};
+exports.getType = getType;
+/**
+ * Returns a sentence to describe a Filter
+ */
+function filterSentence(filter) {
+    let value = '';
+    if (filter.name == Filter_1.FilterNames.NullFilter) {
+        return `${(0, textProcessing_1.snakeAndCamelCaseToTitleCase)(filter.field)} ${filter.operator}`;
+    }
+    else if (filter.value === null || filter.value === undefined) {
+        return 'Error: filter missing value';
+    }
+    if (typeof filter.value === 'string' || typeof filter.value === 'number') {
+        value = filter.value.toString();
+    }
+    else if (filter.value === false || filter.value === true) {
+        value = filter.value.toString();
+    }
+    else if ('unit' in filter.value) {
+        if (filter.operator === Filter_1.DateOperator.InTheCurrent) {
+            value = `${filter.value.unit}`;
+        }
+        else {
+            value = `${filter.value.value} ${filter.value.unit}${filter.value.value === 1 ? '' : 's'}`;
+        }
+    }
+    else if ('startDate' in filter.value) {
+        value = `from ${filter.value.startDate}`;
+    }
+    else if (filter.value.length > 0) {
+        value = filter.value.join(', ');
+    }
+    return `${(0, textProcessing_1.snakeAndCamelCaseToTitleCase)(filter.field)} ${filter.operator}${filter.operator === 'is' || filter.operator === 'is not' ? ' one of' : ''} ${value}`;
+}
+exports.filterSentence = filterSentence;

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAiB,MAAM,uCAAuC,CAAC;AAO7E,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,GAAG,EACX,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,GAAG,EAChB,eAAe,CAAC,EAAE,GAAG;;;eAkLtB"}
+{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAiB,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAOvD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,GAAG,EACX,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,GAAG,EAChB,eAAe,CAAC,EAAE,GAAG;;;eAyLtB"}

package/dist/cjs/utils/pivotConstructor.js

@@ -27,13 +27,16 @@ async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilte
     }
     if (pivot.rowField && !pivot.rowFieldType) {
         const rowColumn = report.columns.find((column) => column.field === pivot.rowField);
-        pivot.rowFieldType = rowColumn.format;
+        pivot.rowFieldType = rowColumn?.format || 'string';
     }
     let distinctStringValues = undefined;
     if (!distinctStrings && report.rows && pivot.columnField) {
         const distinctValues = Array.from(new Set(report.rows.map((row) => row[pivot.columnField])));
         distinctStringValues = distinctValues.map((value) => value.toString());
     }
+    if (!report.itemQuery) {
+        return undefined;
+    }
     const sqlQuery = (0, queryConstructor_1.generatePivotQuery)(pivot, report.itemQuery, client.databaseType, comparisonInterval, distinctStrings ? distinctStrings : distinctStringValues, dateBucket);
     if (sqlQuery && report.rows.length > 0) {
         const hostedBody = {
@@ -70,6 +73,9 @@ async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilte
             .map((field) => ({
             field: (0, columnProcessing_1.processColumnName)(field.name),
             label: (0, textProcessing_1.snakeCaseToTitleCase)((0, columnProcessing_1.processColumnName)(field.name.replace('comparison_', 'comparison '))),
+            format: field.name === pivot.rowField
+                ? 'string'
+                : pivot.valueFieldType ?? 'whole_number',
         }))
             .filter((field, index) => field.field !== 'comparison_' + pivot.rowField || index === 0)
             .sort((a, b) => {

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

@@ -1,7 +1,10 @@
+import { QuillReport, QuillReportInternal } from '../models/Report';
 import { AdditionalProcessing } from './tableProcessing';
+export declare const EMPTY_REPORT: QuillReport;
 export declare function fetchReport(reportId: string, client: any, useReportTask?: boolean, filters?: any[], additionalProcessing?: AdditionalProcessing, dateBucket?: string, customFields?: any): Promise<{
-    report: any;
+    report: QuillReportInternal;
     error?: string;
 }>;
 export declare const formatRowsFromReport: (report: any) => any;
+export declare function convertInternalReportToReport(report: QuillReportInternal): QuillReport;
 //# sourceMappingURL=report.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/utils/report.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,EACX,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,GAAG,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAsF1C;AAED,eAAO,MAAM,oBAAoB,WAAY,GAAG,QAe/C,CAAC"}
+{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/utils/report.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AASpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,eAAO,MAAM,YAAY,EAAE,WAkB1B,CAAC;AAEF,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,EACX,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,CA2F1D;AAED,eAAO,MAAM,oBAAoB,WAAY,GAAG,QAkB/C,CAAC;AAEF,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,mBAAmB,GAC1B,WAAW,CAsDb"}

package/dist/cjs/utils/report.js

@@ -1,13 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatRowsFromReport = exports.fetchReport = void 0;
+exports.convertInternalReportToReport = exports.formatRowsFromReport = exports.fetchReport = exports.EMPTY_REPORT = void 0;
+const columnProcessing_1 = require("./columnProcessing");
 const dashboard_1 = require("./dashboard");
 const dataFetcher_1 = require("./dataFetcher");
 const error_1 = require("./error");
 const errorProcessing_1 = require("./errorProcessing");
 const logging_1 = require("./logging");
 const merge_1 = require("./merge");
+const pivotProcessing_1 = require("./pivotProcessing");
 const valueFormatter_1 = require("./valueFormatter");
+exports.EMPTY_REPORT = {
+    id: '',
+    name: '',
+    dashboardName: '',
+    rows: [],
+    columns: [],
+    chartType: '',
+    dateField: null,
+    pivot: null,
+    xAxisLabel: '',
+    xAxisField: '',
+    xAxisFormat: 'string',
+    yAxisFields: [],
+    order: -1,
+    compareRows: [],
+    filtersApplied: [],
+    queryString: '',
+    rowCount: 0,
+};
 async function fetchReport(reportId, client, useReportTask = true, filters = [], additionalProcessing, dateBucket, customFields) {
     let reportInfo = undefined;
     let errorMessage = undefined;
@@ -56,12 +77,18 @@ async function fetchReport(reportId, client, useReportTask = true, filters = [],
                 errorMessage = error;
             }
             else {
-                reportInfo = {
-                    ...error.data.data,
-                    id: error.data.data._id,
-                    error: error.message,
-                    adminError: error.data.adminErrorMessage,
-                };
+                if (!error.data.data) {
+                    errorMessage = "Couln't find report";
+                    reportInfo = exports.EMPTY_REPORT;
+                }
+                else {
+                    reportInfo = {
+                        ...error.data.data,
+                        id: error.data.data._id,
+                        error: error.message,
+                        adminError: error.data.adminErrorMessage,
+                    };
+                }
                 errorMessage = error.message;
             }
         }
@@ -78,6 +105,9 @@ async function fetchReport(reportId, client, useReportTask = true, filters = [],
 }
 exports.fetchReport = fetchReport;
 const formatRowsFromReport = (report) => {
+    if (!report.rows || !report.columns) {
+        return [];
+    }
     return report.rows.map((row) => {
         return report.columns.reduce((formattedRow, column) => {
             // Apply the format function to each field in the row
@@ -91,3 +121,60 @@ const formatRowsFromReport = (report) => {
     });
 };
 exports.formatRowsFromReport = formatRowsFromReport;
+function convertInternalReportToReport(report) {
+    try {
+        if (!report) {
+            return exports.EMPTY_REPORT;
+        }
+        const formattedReport = {
+            ...report,
+        };
+        if (formattedReport.pivot && (0, pivotProcessing_1.isValidPivot)(formattedReport.pivot)) {
+            let columns = report.pivotColumns ?? report.columns;
+            let rows = report.pivotRows ?? report.rows;
+            if (report.chartType === 'table') {
+                columns =
+                    report.pivotColumns?.map((col, index) => {
+                        if (index === 0) {
+                            return {
+                                ...col,
+                                format: col.format || 'string',
+                            };
+                        }
+                        return {
+                            ...col,
+                            format: report.pivot?.valueFieldType || 'whole_number',
+                        };
+                    }) ?? report.columns;
+                rows = (0, exports.formatRowsFromReport)({ rows, columns });
+            }
+            else if (report.chartType === 'metric') {
+                columns =
+                    report.pivotColumns?.map((col) => {
+                        return { ...col, format: report.xAxisFormat };
+                    }) ?? report.columns;
+                rows = (0, exports.formatRowsFromReport)({ rows, columns });
+            }
+            return {
+                ...formattedReport,
+                rows: rows,
+                yAxisFields: (0, columnProcessing_1.getYAxisFields)(report),
+                columns: columns,
+                rowCount: rows ? rows.length : 0,
+            };
+        }
+        let rows = report.rows;
+        if (report.chartType === 'metric' || report.chartType === 'table') {
+            rows = (0, exports.formatRowsFromReport)(report);
+        }
+        return {
+            ...formattedReport,
+            rows: rows,
+            yAxisFields: (0, columnProcessing_1.getYAxisFields)(report),
+        };
+    }
+    catch (error) {
+        return exports.EMPTY_REPORT;
+    }
+}
+exports.convertInternalReportToReport = convertInternalReportToReport;

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

@@ -34,7 +34,7 @@ export declare const fetchTableByQuery: (query: string, client: any, processing?
     rows: any[];
     rowCount?: number | undefined;
     error?: string | undefined;
-    itemQuery?: string | undefined;
+    itemQuery?: string[] | undefined;
 }>;
 export declare const fetchTableByReport: (reportId: string, client: any, processing?: AdditionalProcessing, filters?: any, customFields?: any) => Promise<{
     columns: Column[];