@quillsql/react 2.13.40 → 2.13.42

package/dist/esm/utils/astProcessing.js

@@ -1,6 +1,7 @@
 import { getTableNames } from '../components/ReportBuilder/ast';
 import { convertBigQuery, convertGroupBy, convertOrderBy, convertRemoveSimpleParentheses, convertStringComparison, convertUnaryToBinary, convertWildcardColumns, } from '../components/ReportBuilder/convert';
 import { deepCopy, removeNonSelectedTableReferences, removeTableNameAlias, } from '../components/ReportBuilder/util';
+import { getFieldFromExpression } from './astFilterProcessing';
 import { QUILL_SERVER } from './constants';
 import { getUniqueStringValues } from './tableProcessing';
 export function getSelectFromAST(ast) {
@@ -169,9 +170,10 @@ export function getColumnAndTableInfo(tableAliasMap, column, schemaInfo) {
     }
     return { tableName, columnName };
 }
-export function getColumnsByTableFromASTAndSchema(ast, tables, tableAliasMap) {
+export function getColumnsByTableFromASTAndSchema(ast, tables, tableAliasMap, skipStar = false) {
     const referencedColumns = {};
-    if (ast?.columns === '*' || ast?.columns?.[0]?.expr?.column === '*') {
+    if (!skipStar &&
+        (ast?.columns === '*' || ast?.columns?.[0]?.expr?.column === '*')) {
         // Be sure to select everything from stars
         const tableList = ast.from.map((table) => recursiveSearchByKey(table, 'table'));
         tableList.forEach((table) => {
@@ -251,6 +253,23 @@ export function getColumnsByTableFromASTAndSchema(ast, tables, tableAliasMap) {
             }
         });
     }
+    // Look through the orderby's
+    if (ast.orderby) {
+        const allColumnReferencesInOrderBy = ast.orderby.map((orderby) => ({
+            field: getFieldFromExpression(orderby.expr ?? orderby),
+            table: orderby.expr?.table,
+        }));
+        allColumnReferencesInOrderBy.forEach((column) => {
+            const table = column.table || ast.from?.length === 1 ? ast.from[0].table : '';
+            if (!table) {
+                return;
+            }
+            if (!referencedColumns[table]) {
+                referencedColumns[table] = [];
+            }
+            referencedColumns[table].push(column.field);
+        });
+    }
     for (const table in referencedColumns) {
         referencedColumns[table] = Array.from(new Set(referencedColumns[table]));
     }
@@ -377,7 +396,7 @@ export const fetchAndProcessASTFromPrompt = async (aiPrompt, schema, client, pre
         }
         ast = ast.length ? ast[0] : ast;
         newAst = convertBigQuery(ast);
-        newAst = removeTableNameAlias(newAst);
+        newAst = removeTableNameAlias(newAst, schema);
         newAst = convertWildcardColumns(newAst, schema); // must go before groupby
         ({ ast: newAst, pivot } = convertGroupBy(newAst, schema, prevPivot, prevTable));
         newAst = convertOrderBy(newAst, schema);
@@ -471,7 +490,7 @@ const POSTGRES_DATE_TYPES = [
     'time',
     'timetz',
 ];
-export function getTablesHelper(ast, allTables) {
+export function getTablesHelper(ast, allTables, skipStar) {
     const tableAliasMap = createTableNameToTableAliasMap(ast);
     const tablesInQuery = Object.values(tableAliasMap);
     // Remove all aliased tables (with statements and subqueries)
@@ -479,7 +498,7 @@ export function getTablesHelper(ast, allTables) {
         .filter((table) => tablesInQuery.includes(table.displayName))
         .map((table) => table.displayName);
     // Get non with statement column references
-    let referencedColumns = getColumnsByTableFromASTAndSchema(ast, allTables, tableAliasMap);
+    let referencedColumns = getColumnsByTableFromASTAndSchema(ast, allTables, tableAliasMap, skipStar);
     referencedColumns = Object.keys(referencedColumns)
         .filter((table) => onlyReferenceTables.includes(table))
         .reduce((obj, key) => {
@@ -491,7 +510,7 @@ export function getTablesHelper(ast, allTables) {
         for (const withStmt of ast.with) {
             const astFrom = withStmt.stmt.from ?? withStmt.stmt.ast.from;
             if (astFrom) {
-                const withReferencedColumns = getColumnsByTableFromASTAndSchema(withStmt.stmt.ast ?? withStmt.stmt, allTables, tableAliasMap);
+                const withReferencedColumns = getColumnsByTableFromASTAndSchema(withStmt.stmt.ast ?? withStmt.stmt, allTables, tableAliasMap, skipStar);
                 // @ts-ignore
                 Object.keys(withReferencedColumns).forEach((tableName) => {
                     if (referencedColumns[tableName]) {

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

@@ -1 +1 @@
-{"version":3,"file":"axisFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/axisFormatter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,IAAI,CAAC;IACpD,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,aAAa,6BAA8B,KAAK,KAAG,MAwC/D,CAAC"}
+{"version":3,"file":"axisFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/axisFormatter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,IAAI,CAAC;IACpD,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,aAAa,6BAA8B,KAAK,KAAG,MA4C/D,CAAC"}

package/dist/esm/utils/axisFormatter.js

@@ -23,6 +23,10 @@ export const axisFormatter = ({ value, field, fields }) => {
             return formatDollarAmount(value);
         case 'whole_number':
             return formatWholeNumber(value);
+        case 'two_decimal_places':
+            return formatDecimal2(value);
+        case 'one_decimal_place':
+            return formatDecimal1(value);
         case 'string':
             return formatString(value);
         case 'yyyy':
@@ -60,6 +64,26 @@ const formatString = (value) => {
     }
     return value.toString();
 };
+const formatterDecimal2 = new Intl.NumberFormat('en-US', {
+    style: 'decimal',
+    maximumFractionDigits: 2,
+});
+/**
+ * Formats the value as a number with two decimal places.
+ */
+const formatDecimal2 = (value) => {
+    return formatterDecimal2.format(Number(value));
+};
+const formatterDecimal1 = new Intl.NumberFormat('en-US', {
+    style: 'decimal',
+    maximumFractionDigits: 1,
+});
+/**
+ * Formats the value as a number with one decimal place.
+ */
+const formatDecimal1 = (value) => {
+    return formatterDecimal1.format(Number(value));
+};
 // Formats large numbers like 12345.67 ->  $12K
 const formatterBigDollars = new Intl.NumberFormat('en-US', {
     style: 'currency',
@@ -99,6 +123,7 @@ const formatDollarAmount = (value) => {
 const formatterBigWholeNumber = new Intl.NumberFormat('en-US', {
     minimumSignificantDigits: 1,
     maximumSignificantDigits: 2,
+    maximumFractionDigits: 0,
     notation: 'compact',
     compactDisplay: 'short',
 });

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

@@ -15,7 +15,166 @@ export type Color = (typeof colorValues)[number];
  * @param index the index of this element in colors
  */
 export declare function selectColor(element: any, colors: string[], index: number): string;
+/**
+ * Transform a hex string to an RGB array.
+ *
+ * Examples:
+ * - #8661f2   -> [134, 97, 242]
+ * - #1661ea2e -> [22, 97, 234, 46]
+ *
+ * TODO: Add support for triplet-style hex codes like this:
+ * - #123 -> #112233 -> [17, 34, 51]
+ */
+export declare function hexToRGB(hex: string): number[];
+export declare function RGBToHex(rgb: number[]): string;
 export declare function namedColorToHex(color: string): string;
+/**
+ * A comprehensive map of all the CSS named-colors that modern browsers will
+ * recognize, and converts them into their hex values.
+ */
+export declare const COLOR_TO_HEX: {
+    aliceblue: string;
+    antiquewhite: string;
+    aqua: string;
+    aquamarine: string;
+    azure: string;
+    beige: string;
+    bisque: string;
+    black: string;
+    blanchedalmond: string;
+    blue: string;
+    blueviolet: string;
+    brown: string;
+    burlywood: string;
+    cadetblue: string;
+    chartreuse: string;
+    chocolate: string;
+    coral: string;
+    cornflowerblue: string;
+    cornsilk: string;
+    crimson: string;
+    cyan: string;
+    darkblue: string;
+    darkcyan: string;
+    darkgoldenrod: string;
+    darkgray: string;
+    darkgreen: string;
+    darkkhaki: string;
+    darkmagenta: string;
+    darkolivegreen: string;
+    darkorange: string;
+    darkorchid: string;
+    darkred: string;
+    darksalmon: string;
+    darkseagreen: string;
+    darkslateblue: string;
+    darkslategray: string;
+    darkturquoise: string;
+    darkviolet: string;
+    deeppink: string;
+    deepskyblue: string;
+    dimgray: string;
+    dodgerblue: string;
+    firebrick: string;
+    floralwhite: string;
+    forestgreen: string;
+    fuchsia: string;
+    gainsboro: string;
+    ghostwhite: string;
+    gold: string;
+    goldenrod: string;
+    gray: string;
+    green: string;
+    greenyellow: string;
+    honeydew: string;
+    hotpink: string;
+    indianred: string;
+    indigo: string;
+    ivory: string;
+    khaki: string;
+    lavender: string;
+    lavenderblush: string;
+    lawngreen: string;
+    lemonchiffon: string;
+    lightblue: string;
+    lightcoral: string;
+    lightcyan: string;
+    lightgoldenrodyellow: string;
+    lightgrey: string;
+    lightgreen: string;
+    lightpink: string;
+    lightsalmon: string;
+    lightseagreen: string;
+    lightskyblue: string;
+    lightslategray: string;
+    lightsteelblue: string;
+    lightyellow: string;
+    lime: string;
+    limegreen: string;
+    linen: string;
+    magenta: string;
+    maroon: string;
+    mediumaquamarine: string;
+    mediumblue: string;
+    mediumorchid: string;
+    mediumpurple: string;
+    mediumseagreen: string;
+    mediumslateblue: string;
+    mediumspringgreen: string;
+    mediumturquoise: string;
+    mediumvioletred: string;
+    midnightblue: string;
+    mintcream: string;
+    mistyrose: string;
+    moccasin: string;
+    navajowhite: string;
+    navy: string;
+    oldlace: string;
+    olive: string;
+    olivedrab: string;
+    orange: string;
+    orangered: string;
+    orchid: string;
+    palegoldenrod: string;
+    palegreen: string;
+    paleturquoise: string;
+    palevioletred: string;
+    papayawhip: string;
+    peachpuff: string;
+    peru: string;
+    pink: string;
+    plum: string;
+    powderblue: string;
+    purple: string;
+    rebeccapurple: string;
+    red: string;
+    rosybrown: string;
+    royalblue: string;
+    saddlebrown: string;
+    salmon: string;
+    sandybrown: string;
+    seagreen: string;
+    seashell: string;
+    sienna: string;
+    silver: string;
+    skyblue: string;
+    slateblue: string;
+    slategray: string;
+    snow: string;
+    springgreen: string;
+    steelblue: string;
+    tan: string;
+    teal: string;
+    thistle: string;
+    tomato: string;
+    turquoise: string;
+    violet: string;
+    wheat: string;
+    white: string;
+    whitesmoke: string;
+    yellow: string;
+    yellowgreen: string;
+};
 /**
  * Converts an RGB color value to HSL. Conversion formula
  * adapted from http://en.wikipedia.org/wiki/HSL_color_space.

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

@@ -1 +1 @@
-{"version":3,"file":"color.d.ts","sourceRoot":"","sources":["../../../src/utils/color.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,EACzB,MAAM,EAAE,MAAM,GACb,MAAM,EAAE,CAwBV;AA6ED,QAAA,MAAM,WAAW,mKAkBP,CAAC;AAEX,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjD;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,UAuBxE;AAyDD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,UAK5C;AAwJD;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,YA4B9C;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,YAuB9C"}
+{"version":3,"file":"color.d.ts","sourceRoot":"","sources":["../../../src/utils/color.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,EACzB,MAAM,EAAE,MAAM,GACb,MAAM,EAAE,CAwBV;AA6ED,QAAA,MAAM,WAAW,mKAkBP,CAAC;AAEX,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjD;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,UAuBxE;AAED;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAyB9C;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,CAK9C;AAoBD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,UAK5C;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8IxB,CAAC;AAIF;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,YA4B9C;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,YAuB9C"}

package/dist/esm/utils/color.js

@@ -152,7 +152,7 @@ export function selectColor(element, colors, index) {
  * TODO: Add support for triplet-style hex codes like this:
  * - #123 -> #112233 -> [17, 34, 51]
  */
-function hexToRGB(hex) {
+export function hexToRGB(hex) {
     // Matches 3-4 pairs of hex digits with an optional leading `#` character
     const regex = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})?$/i;
     const result = regex.exec(hex);
@@ -176,6 +176,12 @@ function hexToRGB(hex) {
     }
     return [128, 128, 128]; // unknown color, return 'gray'
 }
+export function RGBToHex(rgb) {
+    return `#${rgb
+        .map((c) => Math.round(c).toString(16).padStart(2, '0'))
+        .join('')
+        .toUpperCase()}`;
+}
 /**
  * Converts an RGB object to grayscale.
  *
@@ -204,7 +210,7 @@ export function namedColorToHex(color) {
  * A comprehensive map of all the CSS named-colors that modern browsers will
  * recognize, and converts them into their hex values.
  */
-const COLOR_TO_HEX = {
+export const COLOR_TO_HEX = {
     aliceblue: '#f0f8ff',
     antiquewhite: '#faebd7',
     aqua: '#00ffff',

package/dist/esm/utils/columnProcessing.js

@@ -294,7 +294,7 @@ export function processColumnName(columnName) {
     return removeBigQuerySpecialChars(columnName);
 }
 export function isStringType(fieldType) {
-    return ['string', 'varchar', 'text', 'char', 'bpchar', 'citext'].includes(fieldType);
+    return ['string', 'varchar', 'text', 'char', 'bpchar', 'citext'].includes(fieldType?.toLowerCase());
 }
 export function isDateType(fieldType) {
     return [
@@ -304,7 +304,7 @@ export function isDateType(fieldType) {
         'timestamptz',
         'timestamp',
         'interval',
-    ].includes(fieldType);
+    ].includes(fieldType?.toLowerCase());
 }
 export function isNumberType(fieldType) {
     return [
@@ -318,7 +318,7 @@ export function isNumberType(fieldType) {
         'smallint',
         'float2',
         'float16',
-    ].includes(fieldType);
+    ].includes(fieldType?.toLowerCase());
 }
 export function isBoolType(fieldType) {
     return ['bool', 'boolean'].includes(fieldType);

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

@@ -4,4 +4,5 @@ export declare const QUILL_SERVER: string;
 export declare const QUILL_QUERY_ENDPOINT: string;
 export declare const ALL_TENANTS = "QUILL_ALL_TENANTS";
 export declare const SINGLE_TENANT = "QUILL_SINGLE_TENANT";
+export declare const REFERENCE_LINE = "QUILL_REFERENCE_LINE";
 //# sourceMappingURL=constants.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAC3C,eAAO,MAAM,YAAY,QAGoB,CAAC;AAC9C,eAAO,MAAM,oBAAoB,QAGnB,CAAC;AACf,eAAO,MAAM,WAAW,sBAAsB,CAAC;AAC/C,eAAO,MAAM,aAAa,wBAAwB,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAC3C,eAAO,MAAM,YAAY,QAGoB,CAAC;AAC9C,eAAO,MAAM,oBAAoB,QAGnB,CAAC;AACf,eAAO,MAAM,WAAW,sBAAsB,CAAC;AAC/C,eAAO,MAAM,aAAa,wBAAwB,CAAC;AACnD,eAAO,MAAM,cAAc,yBAAyB,CAAC"}

package/dist/esm/utils/constants.js

@@ -8,3 +8,4 @@ export const QUILL_QUERY_ENDPOINT = typeof process !== 'undefined' && process.en
     : '/cloud';
 export const ALL_TENANTS = 'QUILL_ALL_TENANTS';
 export const SINGLE_TENANT = 'QUILL_SINGLE_TENANT';
+export const REFERENCE_LINE = 'QUILL_REFERENCE_LINE';

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

@@ -1,6 +1,7 @@
 import { QuillReportInternal } from '../models/Report';
 import { QuillProviderClient } from '../models/Client';
 import { AdditionalProcessing } from './tableProcessing';
+import { CustomField } from '../models/Schema';
 /**
  * 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
@@ -8,9 +9,19 @@ import { AdditionalProcessing } from './tableProcessing';
  * interface to build amazing dashboards on top of.
  * @param item
  */
-export declare function cleanDashboardItem(item: {
-    [key: string]: any;
-} | undefined, dashboardFilters: any, client: QuillProviderClient, dateBucket?: string, additionalProcessing?: AdditionalProcessing): Promise<QuillReportInternal>;
+export declare function cleanDashboardItem({ item, dashboardFilters, client, dateBucket, additionalProcessing, customFields, skipPivotFetch, }: {
+    item: {
+        [key: string]: any;
+    } | undefined;
+    dashboardFilters: any;
+    client: QuillProviderClient;
+    dateBucket?: string;
+    additionalProcessing?: AdditionalProcessing;
+    customFields?: {
+        [tableName: string]: CustomField[];
+    } | null;
+    skipPivotFetch?: boolean;
+}): Promise<QuillReportInternal>;
 export declare function getDashboard(dashboardName: string, client: QuillProviderClient, tenants?: {
     tenantField: string;
     tenantIds: (string | number)[];

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;AAcvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AA2BzD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,EAAE,mBAAmB,EAC3B,UAAU,CAAC,EAAE,MAAM,EACnB,oBAAoB,CAAC,EAAE,oBAAoB,GAC1C,OAAO,CAAC,mBAAmB,CAAC,CA+F9B;AA0ID,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,CAAC,EACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EACvB,KAAK,CAAC,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,GAAG,CAAC,CA6Bd"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAcvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAOzD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAsB/C;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,EACvC,IAAI,EACJ,gBAAgB,EAChB,MAAM,EACN,UAAU,EACV,oBAAoB,EACpB,YAAY,EACZ,cAAc,GACf,EAAE;IACD,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GAAG,SAAS,CAAC;IACzC,gBAAgB,EAAE,GAAG,CAAC;IACtB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,YAAY,CAAC,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7D,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAqK/B;AA2ID,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,CAAC,EACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EACvB,KAAK,CAAC,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,GAAG,CAAC,CA6Bd"}

package/dist/esm/utils/dashboard.js

@@ -3,7 +3,7 @@ import { snakeAndCamelCaseToTitleCase, snakeCaseToTitleCase, } from './textProce
 import { getData } from './dataFetcher';
 import { getDateBucketFromRange } from './dates';
 import { generatePivotWithSQL } from './pivotConstructor';
-import { convertFieldTypeToJSType, fieldTypeToDataTypeID, processColumnName, } from './columnProcessing';
+import { convertFieldTypeToJSType, convertPostgresColumn, fieldTypeToDataTypeID, processColumnName, } from './columnProcessing';
 const defaultDashboardItem = {
     id: '',
     name: '',
@@ -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, skipPivotFetch, }) {
     if (!item)
         return defaultDashboardItem;
     if (!item.rows) {
@@ -40,24 +40,56 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
             name: item.name,
         };
     }
+    const fields = item.fields || [];
+    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) => {
+                const isJsonCustomField = !!field.refColumn;
+                if (item.rows[0][field.field] !== undefined &&
+                    !item.columns.some((col) => col.field === field.field)) {
+                    const result_field = fields.find((f) => f.name === field.field);
+                    const converted_field = convertPostgresColumn(result_field ?? {});
+                    columnsWithCustomFields.push({
+                        field: field.field,
+                        format: converted_field.format,
+                        label: snakeAndCamelCaseToTitleCase(field.field),
+                        fieldType: converted_field.fieldType,
+                        dataTypeID: converted_field.dataTypeID,
+                        jsType: converted_field.jsType,
+                        inferFormat: isJsonCustomField,
+                    });
+                }
+            });
+        });
+    }
     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 && !skipPivotFetch
+                ? {
+                    ...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 +97,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,
@@ -78,9 +133,12 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
                 field: column.field,
                 format: column.format,
                 label: column.label,
+                inferFormat: column.inferFormat,
             };
         }),
-        columnInternal: processedColumns,
+        includeCustomFields: item.includeCustomFields,
+        columnInternal,
+        columnsWithCustomFields,
         chartType: item.chartType,
         dateField: item.dateField,
         pivot: pivotError
@@ -88,14 +146,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 +179,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 +215,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"}