@quillsql/react 2.11.9 → 2.11.13

package/dist/cjs/components/ReportBuilder/convert.js

@@ -180,9 +180,10 @@ function convertGroupBy(ast, prevPivot = null, schemaTables) {
                 else if (column.expr?.args?.expr) {
                     columnName = column.expr?.args?.expr?.value;
                 }
-                if (column.expr.type === 'aggr_func') {
+                if (column.expr.type === 'aggr_func' && !isIdColumn(columnName)) {
                     pivot.aggregationType = column.expr.name.toLowerCase();
-                    pivot.valueField = column.expr.args?.expr?.value;
+                    pivot.valueField =
+                        column.expr.args?.expr?.value || column.expr.args?.expr?.column;
                     if (column.expr.args.expr.type === 'column_ref') {
                         columnTable = column.expr.args.expr.table;
                         columnName = column.expr.args.expr.column;
@@ -207,7 +208,7 @@ function convertGroupBy(ast, prevPivot = null, schemaTables) {
                     table: columnTable,
                     column: columnName,
                 },
-                as: columnAs,
+                as: columnName,
             });
         }
         newAst = { ...ast };
@@ -227,8 +228,10 @@ function convertGroupBy(ast, prevPivot = null, schemaTables) {
                 // The result of the CASE is the column to use
                 const columnNode = column.expr?.args?.expr?.args[0]?.result;
                 const columnName = columnNode?.value ?? columnNode?.column;
-                pivot.valueField = columnName;
-                pivot.aggregationType = column?.expr?.name?.toLowerCase();
+                if (!isIdColumn(columnName)) {
+                    pivot.valueField = columnName;
+                    pivot.aggregationType = column?.expr?.name?.toLowerCase();
+                }
                 const findByName = (x) => [x.expr?.value, x.expr?.column].includes(columnName);
                 if (!newColumns.find(findByName)) {
                     newColumns.push({
@@ -245,7 +248,9 @@ function convertGroupBy(ast, prevPivot = null, schemaTables) {
                 // the CASE and we'll use that as the columnField in our pivot.
                 const condNode = column.expr?.args?.expr?.args[0]?.cond;
                 const condColumnName = condNode.left?.column ?? condNode.left?.value;
-                pivot.columnField = condColumnName;
+                if (!isIdColumn(condColumnName)) {
+                    pivot.columnField = condColumnName;
+                }
                 const findByColName = (x) => [x.expr?.value, x.expr?.column].includes(condColumnName);
                 if (!newColumns.find(findByColName)) {
                     // Make sure the column we extracted is in our column list.
@@ -268,7 +273,6 @@ function convertGroupBy(ast, prevPivot = null, schemaTables) {
                 column.expr?.args?.expr?.type === 'column_ref' ||
                 // count(*)
                 column.expr?.args?.expr?.type === 'star') {
-                console.log(column);
                 const columnNode = column.expr?.args?.expr;
                 const columnName = columnNode?.value || columnNode?.column;
                 // if count(*), make the value field an actual column
@@ -291,7 +295,8 @@ function convertGroupBy(ast, prevPivot = null, schemaTables) {
                 }
                 else {
                     // ONLY SET VALUE FIELD IF THE FIELD TYPE IS A NUMBER
-                    if ((0, ast_1.isNumericColumnType)(field?.fieldType)) {
+                    if ((0, ast_1.isNumericColumnType)(field?.fieldType) &&
+                        !isIdColumn(columnName)) {
                         pivot.valueField = columnName;
                         pivot.aggregationType = column?.expr?.name.toLowerCase();
                     }
@@ -422,11 +427,15 @@ function convertGroupBy(ast, prevPivot = null, schemaTables) {
     const extractGroup = ast.groupby.find(isExtract);
     if (dateTruncGroup) {
         const column = dateTruncGroup.args?.value.find(isCol);
-        pivot.rowField = (0, ast_1.extractColumnish)(column);
+        const columnName = (0, ast_1.extractColumnish)(column);
+        pivot.rowField = columnName;
+        pivot.rowFieldType = columns.find((c) => c.field === columnName)?.fieldType;
     }
     else if (extractGroup) {
         const column = extractGroup.args?.source;
-        pivot.rowField = (0, ast_1.extractColumnish)(column);
+        const columnName = (0, ast_1.extractColumnish)(column);
+        pivot.rowField = columnName;
+        pivot.rowFieldType = columns.find((c) => c.field === columnName)?.fieldType;
     }
     else if (aliasMap) {
         const match = ast.groupby.find(isAlias);
@@ -434,6 +443,7 @@ function convertGroupBy(ast, prevPivot = null, schemaTables) {
         if (matchColumnish) {
             const actualColumnName = aliasMap[matchColumnish];
             pivot.rowField = actualColumnName;
+            pivot.rowFieldType = columns.find((c) => c.field === actualColumnName)?.fieldType;
         }
     }
     // Otherwise, set the first groupby to rowField then set
@@ -441,6 +451,9 @@ function convertGroupBy(ast, prevPivot = null, schemaTables) {
     for (let j = 0; j < ast.groupby.length; j++) {
         const group = ast.groupby[j];
         let groupValue = (0, ast_1.extractColumnish)(group);
+        if (!groupValue || isIdColumn(groupValue)) {
+            continue;
+        }
         // check if this value is an alias, if so use concrete value
         if (groupValue && aliasMap[groupValue]) {
             groupValue = aliasMap[groupValue];
@@ -448,6 +461,7 @@ function convertGroupBy(ast, prevPivot = null, schemaTables) {
         // Try to set the rowField and columnField.
         if (!pivot.rowField) {
             pivot.rowField = groupValue;
+            pivot.rowFieldType = columns.find((c) => c.field === groupValue)?.fieldType;
         }
         else if (!pivot.columnField && groupValue !== pivot.rowField) {
             pivot.columnField = groupValue;
@@ -472,10 +486,23 @@ function convertGroupBy(ast, prevPivot = null, schemaTables) {
             },
         ]
         : null;
-    // If the AI didn't generate an aggregate, add one.
+    // If the AI didn't generate an aggregate, add one. DO NOT ADD ID FOR VALUE FIELD
     if (!pivot.valueField) {
-        pivot.valueField = columns[0].field;
-        pivot.aggregationType = 'sum';
+        for (let i = 0; i < newAst.columns.length; i++) {
+            const columnName = newAst.columns[i].expr?.column ||
+                newAst.columns[i].expr?.value ||
+                undefined;
+            if (columnName &&
+                !isIdColumn(columnName) &&
+                (0, ast_1.isNumericColumnType)(columns.find((c) => c.field === columnName)?.fieldType)) {
+                pivot.valueField = columnName;
+                pivot.aggregationType = 'sum';
+            }
+        }
+    }
+    if (pivot.rowFieldType === 'date') {
+        pivot.sort = true;
+        pivot.sortDirection = 'ASC';
     }
     return { pivot, ast: newAst };
 }
@@ -729,3 +756,8 @@ function convertRemoveSimpleParentheses(ast) {
     return { ...ast, where: node };
 }
 exports.convertRemoveSimpleParentheses = convertRemoveSimpleParentheses;
+function isIdColumn(columnName) {
+    return (columnName &&
+        (columnName.toLowerCase() === 'id' ||
+            columnName.toLowerCase().endsWith('_id')));
+}

package/dist/cjs/components/ReportBuilder/pivot.d.ts

@@ -5,6 +5,9 @@ export type Pivot = {
     aggregationType: 'sum' | 'average' | 'min' | 'max' | 'count';
     valueField: string;
     rowField?: string;
+    rowFieldType?: string;
     columnField?: string;
+    sort: boolean;
+    sortDirection: 'ASC' | 'DESC';
 } | null;
 //# sourceMappingURL=pivot.d.ts.map

package/dist/cjs/components/ReportBuilder/pivot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pivot.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/pivot.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,KAAK,GAAG;IAClB,eAAe,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,CAAC;IAC7D,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,IAAI,CAAC"}
+{"version":3,"file":"pivot.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/pivot.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,KAAK,GAAG;IAClB,eAAe,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,CAAC;IAC7D,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;IACd,aAAa,EAAE,KAAK,GAAG,MAAM,CAAC;CAC/B,GAAG,IAAI,CAAC"}

package/dist/cjs/components/ReportBuilder/ui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/ui.tsx"],"names":[],"mappings":";AAgBA;;;;;GAKG;AAEH,eAAO,MAAM,WAAW,2BAA4B,GAAG,4CA2BtD,CAAC;AAEF,eAAO,MAAM,oBAAoB,2BAA4B,GAAG,4CA2B/D,CAAC;AAEF,eAAO,MAAM,cAAc,UAAW,GAAG,4CAuBxC,CAAC;AAEF,eAAO,MAAM,uBAAuB,uCAKjC,GAAG,4CAiBL,CAAC;AAEF,eAAO,MAAM,QAAQ,sGAoEpB,CAAC;AAGF,eAAO,MAAM,mBAAmB,cAAe,GAAG,4CAEjD,CAAC;AAGF,eAAO,MAAM,sBAAsB,cAAe,GAAG,4CAEpD,CAAC;AAGF,eAAO,MAAM,YAAY,sGAgBxB,CAAC;AAGF,eAAO,MAAM,eAAe,sGAsB3B,CAAC;AAEF,eAAO,MAAM,WAAW,2BAA4B,GAAG,4CAUtD,CAAC;AAEF,wBAAgB,eAAe,CAAC,EAC9B,OAAO,EACP,QAAQ,EACR,KAAU,EACV,OAAO,EACP,MAAM,GACP,EAAE,GAAG,2CAiDL;AAED,eAAO,MAAM,YAAY,sGAkCxB,CAAC;AAGF,eAAO,MAAM,iBAAiB,+CAwE7B,CAAC;AAEF,eAAO,MAAM,iBAAiB,gDAK3B,GAAG,4CA6CL,CAAC;AAGF,eAAO,MAAM,oBAAoB,kCAAmC,GAAG,4CAiDtE,CAAC;AAGF,eAAO,MAAM,uBAAuB,+CAEnC,CAAC;AAGF,eAAO,MAAM,sBAAsB,+CAMlC,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;GAG/B,CAAC;AAEF,eAAO,MAAM,SAAS,sGAIrB,CAAC;AAEF,eAAO,MAAM,WAAW,8DAMrB,GAAG,4CAwBL,CAAC;AAEF,eAAO,MAAM,kBAAkB,4FAO5B,GAAG,4CAqBL,CAAC;AAEF,eAAO,MAAM,gBAAgB,sFAO1B,GAAG,4CAqBL,CAAC;AAEF,eAAO,MAAM,UAAU,sTAuBpB,GAAG,4CAqFL,CAAC;AAEF,eAAO,MAAM,gBAAgB,oDAK1B,GAAG,4CAeL,CAAC"}
+{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/ui.tsx"],"names":[],"mappings":";AAiBA;;;;;GAKG;AAEH,eAAO,MAAM,WAAW,2BAA4B,GAAG,4CA2BtD,CAAC;AAEF,eAAO,MAAM,oBAAoB,2BAA4B,GAAG,4CA2B/D,CAAC;AAEF,eAAO,MAAM,cAAc,UAAW,GAAG,4CAuBxC,CAAC;AAEF,eAAO,MAAM,uBAAuB,uCAKjC,GAAG,4CAiBL,CAAC;AAEF,eAAO,MAAM,QAAQ,sGAoEpB,CAAC;AAGF,eAAO,MAAM,mBAAmB,cAAe,GAAG,4CAEjD,CAAC;AAGF,eAAO,MAAM,sBAAsB,cAAe,GAAG,4CAEpD,CAAC;AAGF,eAAO,MAAM,YAAY,sGAiBxB,CAAC;AAGF,eAAO,MAAM,eAAe,sGAuB3B,CAAC;AAEF,eAAO,MAAM,WAAW,2BAA4B,GAAG,4CAUtD,CAAC;AAEF,wBAAgB,eAAe,CAAC,EAC9B,OAAO,EACP,QAAQ,EACR,KAAU,EACV,OAAO,EACP,MAAM,GACP,EAAE,GAAG,2CAgDL;AAED,eAAO,MAAM,YAAY,sGAkCxB,CAAC;AAGF,eAAO,MAAM,iBAAiB,+CAwE7B,CAAC;AAEF,eAAO,MAAM,iBAAiB,gDAK3B,GAAG,4CA6CL,CAAC;AAGF,eAAO,MAAM,oBAAoB,kCAAmC,GAAG,4CAiDtE,CAAC;AAGF,eAAO,MAAM,uBAAuB,+CAMnC,CAAC;AAGF,eAAO,MAAM,sBAAsB,+CAMlC,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;GAG/B,CAAC;AAEF,eAAO,MAAM,SAAS,sGAIrB,CAAC;AAEF,eAAO,MAAM,WAAW,8DAMrB,GAAG,4CAwBL,CAAC;AAEF,eAAO,MAAM,kBAAkB,4FAO5B,GAAG,4CAqBL,CAAC;AAEF,eAAO,MAAM,gBAAgB,sFAO1B,GAAG,4CAqBL,CAAC;AAEF,eAAO,MAAM,UAAU,sTAuBpB,GAAG,4CAqFL,CAAC;AAEF,eAAO,MAAM,gBAAgB,oDAK1B,GAAG,4CAeL,CAAC"}

package/dist/cjs/components/ReportBuilder/ui.js

@@ -11,6 +11,7 @@ const QuillTable_1 = __importDefault(require("../QuillTable"));
 const Context_1 = require("../../Context");
 const util_1 = require("./util");
 const csv_1 = require("../../utils/csv");
+const textProcessing_1 = require("../../utils/textProcessing");
 /**
  * This file is a collection of basic UI components that conform to the shape
  * expected by the Report Builder. Where possible, we use our existing
@@ -118,11 +119,12 @@ const QuillSidebarSubHeading = ({ label }) => ((0, jsx_runtime_1.jsx)(UiComponen
 exports.QuillSidebarSubHeading = QuillSidebarSubHeading;
 // The gray thing on the left.
 exports.QuillSidebar = (0, react_1.forwardRef)(({ children, ...props }, forwardedRef) => ((0, jsx_runtime_1.jsx)("div", { style: {
-        overflow: 'visible',
+        overflowX: 'visible',
         padding: '12px',
         width: '25%',
         height: '100%',
         maxWidth: '300px',
+        boxSizing: 'border-box',
     }, ref: forwardedRef, ...props, children: children })));
 // A big wrapper around the main content (ie. Input, Button, and Table)
 exports.CustomContainer = (0, react_1.forwardRef)(({ children, ...props }, forwardedRef) => ((0, jsx_runtime_1.jsx)("div", { style: {
@@ -137,6 +139,7 @@ exports.CustomContainer = (0, react_1.forwardRef)(({ children, ...props }, forwa
         flexGrow: 1,
         width: '75%',
         height: '100%',
+        boxSizing: 'border-box',
     }, ref: forwardedRef, ...props, children: children })));
 const QuillSelect = ({ onChange, ...props }) => {
     const handleOnChange = (value) => {
@@ -176,7 +179,6 @@ function MemoizedPopover({ onClose, children, style = {}, trigger, isOpen, }) {
                         top: 12,
                         borderRadius: 6,
                         padding: 20,
-                        overflow: 'auto',
                         ...style,
                     }, children: children }) }))] }));
 }
@@ -188,7 +190,7 @@ exports.QuillPopover = (0, react_1.forwardRef)(({ children, trigger, isOpen, onC
                     fontSize: 18,
                     margin: 0,
                     textAlign: 'left',
-                    paddingBottom: 12,
+                    marginBottom: 5,
                     color: theme?.primaryTextColor,
                     fontFamily: theme?.fontFamily,
                 }, children: title })), children] }));
@@ -264,7 +266,7 @@ const QuillSelectColumn = ({ label, selected, setSelected, children, }) => {
                             overflow: 'hidden',
                             fontFamily: theme?.fontFamily,
                             color: theme?.primaryTextColor,
-                        }, children: label })] })] }));
+                        }, children: (0, textProcessing_1.snakeCaseToTitleCase)(label) })] })] }));
 };
 exports.QuillSelectColumn = QuillSelectColumn;
 // A draggable card with a grab-handle and a column name
@@ -296,7 +298,7 @@ const QuillDraggableColumn = ({ label, children, onDelete }) => {
 exports.QuillDraggableColumn = QuillDraggableColumn;
 // Three dots animated bouncing
 const QuillButtonLoadingState = () => {
-    return (0, jsx_runtime_1.jsx)(exports.QuillButton, { children: "Loading..." });
+    return ((0, jsx_runtime_1.jsx)(exports.QuillButton, { children: (0, jsx_runtime_1.jsx)(UiComponents_1.LoadingSpinner, {}) }));
 };
 exports.QuillButtonLoadingState = QuillButtonLoadingState;
 // Loading state for the table

package/dist/cjs/components/ReportBuilder/util.d.ts

@@ -73,4 +73,5 @@ export declare const getDateFilterInfo: (node: any) => {
     intervalType: any;
     intervalPaths: any;
 };
+export declare function removeNonSelectedTableReferences(ast: any, table: string): any;
 //# sourceMappingURL=util.d.ts.map

package/dist/cjs/components/ReportBuilder/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/util.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,eAAO,MAAM,qBAAqB,SAAU,GAAG,YAW9C,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,WAa1C;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,WAK5C;AAGD,eAAO,MAAM,WAAW,SAAU,GAAG,YAuBpC,CAAC;AAKF,eAAO,MAAM,oBAAoB,SAAU,GAAG,QAE7C,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG;;;;;;;;EAU3C;AAKD,eAAO,MAAM,eAAe,QAAS,GAAG,QAMvC,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,WAiBvD;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,GAAG,iBAQjD;AAED,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI,CAOf;AAQD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI,CAWf;AAED,wBAAgB,gCAAgC,CAC9C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI,CAOf;AAMD,eAAO,MAAM,mBAAmB,SAAU,GAAG,gBAAgB,MAAM,YA4BlE,CAAC;AAIF,eAAO,MAAM,2BAA2B,SAAU,GAAG,YAUpD,CAAC;AAIF,eAAO,MAAM,oBAAoB,SACzB,GAAG,gBACK,MAAM,KACnB,OAmBF,CAAC;AAEF,eAAO,MAAM,qBAAqB,SAAU,GAAG,gBAAgB,MAAM,QAYpE,CAAC;AAEF,eAAO,MAAM,4BAA4B,SAAU,GAAG,KAAG,OAUxD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,SAAU,GAAG,QA4B3C,CAAC;AAGF,eAAO,MAAM,UAAU,eAAgB,MAAM,SAe5C,CAAC;AAmBF;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,MAAM,UAsBvE;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,UAgB9C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,MAAM,sBAetE;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,SAAU,GAAG,YAU1C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,SAAU,GAAG,YAOxC,CAAC;AAEF,wBAAgB,aAAa,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,WAehD;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,GAAG,GACV,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS,CAyB1C;AAED,eAAO,MAAM,QAAQ,QAAS,GAAG,QAAoC,CAAC;AAEtE,eAAO,MAAM,QAAQ,MAAO,MAAM,WAA2C,CAAC;AA4L9E,eAAO,MAAM,iBAAiB,SAAU,GAAG;;;;;;;CAc1C,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/util.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,eAAO,MAAM,qBAAqB,SAAU,GAAG,YAW9C,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,WAa1C;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,WAK5C;AAGD,eAAO,MAAM,WAAW,SAAU,GAAG,YAuBpC,CAAC;AAKF,eAAO,MAAM,oBAAoB,SAAU,GAAG,QAE7C,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG;;;;;;;;EAU3C;AAKD,eAAO,MAAM,eAAe,QAAS,GAAG,QAMvC,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,WAiBvD;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,GAAG,iBAQjD;AAED,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI,CAOf;AAQD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI,CAWf;AAED,wBAAgB,gCAAgC,CAC9C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI,CAOf;AAMD,eAAO,MAAM,mBAAmB,SAAU,GAAG,gBAAgB,MAAM,YA4BlE,CAAC;AAIF,eAAO,MAAM,2BAA2B,SAAU,GAAG,YAUpD,CAAC;AAIF,eAAO,MAAM,oBAAoB,SACzB,GAAG,gBACK,MAAM,KACnB,OAoBF,CAAC;AAEF,eAAO,MAAM,qBAAqB,SAAU,GAAG,gBAAgB,MAAM,QAYpE,CAAC;AAEF,eAAO,MAAM,4BAA4B,SAAU,GAAG,KAAG,OAUxD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,SAAU,GAAG,QA4B3C,CAAC;AAGF,eAAO,MAAM,UAAU,eAAgB,MAAM,SAe5C,CAAC;AAmBF;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,MAAM,UAsBvE;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,UAgB9C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,MAAM,sBAmBtE;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,SAAU,GAAG,YAU1C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,SAAU,GAAG,YAOxC,CAAC;AAEF,wBAAgB,aAAa,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,WAehD;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,GAAG,GACV,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS,CAyB1C;AAED,eAAO,MAAM,QAAQ,QAAS,GAAG,QAAoC,CAAC;AAEtE,eAAO,MAAM,QAAQ,MAAO,MAAM,WAA2C,CAAC;AA4L9E,eAAO,MAAM,iBAAiB,SAAU,GAAG;;;;;;;CAc1C,CAAC;AAqCF,wBAAgB,gCAAgC,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,OAQvE"}

package/dist/cjs/components/ReportBuilder/util.js

@@ -1,9 +1,10 @@
 "use strict";
 // A collection of reusable, pure, utility functions for the Report Builder.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDateFilterInfo = exports.trimEndS = exports.deepCopy = exports.getPostgresBasicType = exports.showNodeAsRow = exports.isExtractEquals = exports.isDateTruncEquals = exports.tryConvertDateEquality = exports.extractSuffixToString = exports.dateTruncSuffixToString = exports.newUTCDate = exports.isColumnComparison = exports.isTheCurrentIntervalBigQuery = exports.isThePreviousInterval = exports.isTheCurrentInterval = exports.isInTheLastIntervalBigQuery = exports.isInTheLastInterval = exports.getInThePreviousIntervalSentence = exports.getInTheLastIntervalSentence = exports.getInTheCurrentIntervalSentence = exports.formatDateComparisonNode = exports.areObjectsEqualish = exports.isColumnDateish = exports.generateColumnExpr = exports.isColumnReferenceish = exports.isDateTrunc = exports.hasTopLevelOrBoolean = exports.isTopLevelBoolean = exports.isNodeEmptyCollection = void 0;
+exports.removeNonSelectedTableReferences = exports.getDateFilterInfo = exports.trimEndS = exports.deepCopy = exports.getPostgresBasicType = exports.showNodeAsRow = exports.isExtractEquals = exports.isDateTruncEquals = exports.tryConvertDateEquality = exports.extractSuffixToString = exports.dateTruncSuffixToString = exports.newUTCDate = exports.isColumnComparison = exports.isTheCurrentIntervalBigQuery = exports.isThePreviousInterval = exports.isTheCurrentInterval = exports.isInTheLastIntervalBigQuery = exports.isInTheLastInterval = exports.getInThePreviousIntervalSentence = exports.getInTheLastIntervalSentence = exports.getInTheCurrentIntervalSentence = exports.formatDateComparisonNode = exports.areObjectsEqualish = exports.isColumnDateish = exports.generateColumnExpr = exports.isColumnReferenceish = exports.isDateTrunc = exports.hasTopLevelOrBoolean = exports.isTopLevelBoolean = exports.isNodeEmptyCollection = void 0;
 const date_fns_1 = require("date-fns");
 const bigDateMap_1 = require("./bigDateMap");
+const textProcessing_1 = require("../../utils/textProcessing");
 /**
  * A node that is "in" or "not in" where none of the variants are selected.
  */
@@ -132,7 +133,7 @@ function formatDateComparisonNode(node) {
 exports.formatDateComparisonNode = formatDateComparisonNode;
 function getInTheCurrentIntervalSentence(node, databaseType) {
     if (databaseType === 'BigQuery') {
-        const dateColumn = node.left.args.value[0].column;
+        const dateColumn = (0, textProcessing_1.snakeCaseToTitleCase)(node.left.args.value[0].column);
         const periodValue = node.left.args.value[1].column.toLowerCase();
         return `${dateColumn} in the current ${periodValue}`;
     }
@@ -146,7 +147,7 @@ const BIG_QUERY_DAY_TO_INTERVAL_MAP = {
 };
 function getInTheLastIntervalSentence(node, databaseType) {
     if (databaseType === 'BigQuery') {
-        const dateColumn = node.left.column;
+        const dateColumn = (0, textProcessing_1.snakeCaseToTitleCase)(node.left.column);
         const amount = node.right.args.value[1].expr.value;
         let unit = node.right.args.value[1].unit.toLowerCase();
         if (unit.includes('*')) {
@@ -159,7 +160,7 @@ function getInTheLastIntervalSentence(node, databaseType) {
 exports.getInTheLastIntervalSentence = getInTheLastIntervalSentence;
 function getInThePreviousIntervalSentence(node, databaseType) {
     if (databaseType === 'BigQuery') {
-        const dateColumn = node.left.args.value[0].column;
+        const dateColumn = (0, textProcessing_1.snakeCaseToTitleCase)(node.left.args.value[0].column);
         const periodValue = node.left.args.value[1].column.toLowerCase();
         return `${dateColumn} in the previous ${periodValue}`;
     }
@@ -218,6 +219,7 @@ const isTheCurrentInterval = (node, databaseType) => {
     const isInsideOfDateTrunc = ['AND'].includes(node.operator) &&
         (node.left.operator === '=' || node.left.type === 'double_quote_string') &&
         node.right.operator === '=' &&
+        node.right.name &&
         node.right.name.toLowerCase() === 'date_trunc' &&
         node.args.value[0].type === 'single_quote_string' &&
         node.args.value[1].type === 'binary_expr' &&
@@ -380,14 +382,14 @@ function tryConvertDateEquality(node, databaseType) {
     if ((0, exports.isDateTruncEquals)(node)) {
         const columnNode = node.left.args.value[1];
         const columnName = columnNode.column ?? columnNode.value;
-        const cleanColumnName = columnName.replaceAll('_at', '');
+        const cleanColumnName = (0, textProcessing_1.snakeCaseToTitleCase)(columnName.replaceAll('_at', ''));
         const prettyDateSuffix = dateTruncSuffixToString(node, databaseType);
         return `${cleanColumnName} ${prettyDateSuffix}`;
     }
     else if ((0, exports.isExtractEquals)(node)) {
         const columnNode = node.left.args.source;
         const columnName = columnNode.column ?? columnNode.value;
-        const cleanColumnName = columnName.replaceAll('_at', '');
+        const cleanColumnName = (0, textProcessing_1.snakeCaseToTitleCase)(columnName.replaceAll('_at', ''));
         const prettyDateSuffix = extractSuffixToString(node);
         return `${cleanColumnName} ${prettyDateSuffix}`;
     }
@@ -646,3 +648,50 @@ const getDateFilterInfo = (node) => {
     };
 };
 exports.getDateFilterInfo = getDateFilterInfo;
+// NEED TO UPDATE FOR MORE POTENTIAL CASES
+function getNodeTable(node) {
+    if (node.table) {
+        return node.table;
+    }
+    if (node.args && node.args.value[0].table) {
+        return node.args.value[0].table;
+    }
+    return null;
+}
+// Recursively remove filters that don't apply to the given table
+function removeNonSelectedTableFilters(node, table) {
+    if (node.left.type !== 'binary_expr') {
+        const referencedTable = getNodeTable(node.left);
+        if (referencedTable && referencedTable !== table) {
+            return null;
+        }
+        else {
+            return node;
+        }
+    }
+    node.left = removeNonSelectedTableFilters(node.left, table);
+    node.right = removeNonSelectedTableFilters(node.right, table);
+    if (node.left && node.right) {
+        return node;
+    }
+    else if (node.left) {
+        return node.left;
+    }
+    else if (node.right) {
+        return node.right;
+    }
+    else {
+        return null;
+    }
+}
+function removeNonSelectedTableReferences(ast, table) {
+    ast.columns = ast.columns.filter((col) => {
+        return col.table === table || col.expr.table === table || !col.expr.table;
+    });
+    if (!ast.where)
+        return ast;
+    ast.where = removeNonSelectedTableFilters(ast.where, table);
+    console.log(ast);
+    return ast;
+}
+exports.removeNonSelectedTableReferences = removeNonSelectedTableReferences;

package/dist/cjs/components/UiComponents.d.ts

@@ -14,6 +14,7 @@ export interface SelectComponentProps {
 export interface ButtonComponentProps {
     onClick: () => void;
     label: string;
+    isLoading?: boolean | undefined;
     primary?: boolean;
     width?: string;
 }
@@ -67,10 +68,11 @@ export declare const MemoizedTextInput: ({ value, onChange, placeholder, id }: {
     placeholder: any;
     id: any;
 }) => import("react/jsx-runtime").JSX.Element;
-export declare const MemoizedButton: ({ label, onClick, primary }: {
+export declare const MemoizedButton: ({ label, onClick, primary, isLoading, }: {
     label: any;
     onClick: any;
     primary?: boolean | undefined;
+    isLoading?: boolean | undefined;
 }) => import("react/jsx-runtime").JSX.Element;
 export declare const MemoizedSecondaryButton: ({ label, onClick }: {
     label: any;

package/dist/cjs/components/UiComponents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UiComponents.d.ts","sourceRoot":"","sources":["../../../src/components/UiComponents.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"UiComponents.d.ts","sourceRoot":"","sources":["../../../src/components/UiComponents.tsx"],"names":[],"mappings":"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"}

package/dist/cjs/components/UiComponents.js

@@ -31,7 +31,7 @@ const MemoizedTextInput = ({ value, onChange, placeholder, id }) => {
     .quill-text-input {
         background-color: white;
         height: 40px;
-       width: 180px;
+       width: 100%;
        color: #384151;
        border: 1px solid #e7e7e7;
        border-radius: 6px;
@@ -41,11 +41,11 @@ const MemoizedTextInput = ({ value, onChange, placeholder, id }) => {
        padding-right: 12px;
        padding-top: 0px;
        padding-bottom: 0px;
-       box-sizing: content-box;
+       box-sizing: border-box;
     }` }), (0, jsx_runtime_1.jsx)("input", { id: id, className: "quill-text-input", type: "text", value: value, onChange: (event) => onChange(event.target.value), placeholder: placeholder, style: { fontFamily: theme?.fontFamily } })] }));
 };
 exports.MemoizedTextInput = MemoizedTextInput;
-const MemoizedButton = ({ label, onClick, primary = true }) => {
+const MemoizedButton = ({ label, onClick, primary = true, isLoading = false, }) => {
     const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
     return ((0, jsx_runtime_1.jsxs)("button", { className: "quill-button", onClick: onClick, style: { fontFamily: theme?.fontFamily }, children: [(0, jsx_runtime_1.jsx)("style", { children: `
     .quill-button {
@@ -65,7 +65,7 @@ const MemoizedButton = ({ label, onClick, primary = true }) => {
     .quill-button:hover {
       background-color: rgba(56, 65, 81, 0.9);
       border-radius: 6px;
-    }` }), label] }));
+    }` }), isLoading ? ((0, jsx_runtime_1.jsx)("div", { style: { padding: '0px 16px' }, children: (0, jsx_runtime_1.jsx)(exports.LoadingSpinner, {}) })) : (label)] }));
 };
 exports.MemoizedButton = MemoizedButton;
 const MemoizedSecondaryButton = ({ label, onClick }) => {

package/dist/cjs/hooks/useQuill.js

@@ -43,7 +43,7 @@ const useQuill = (chartId) => {
                     };
                     const resp = await (0, dataFetcher_1.getData)(client, 'itempost', 'same-origin', hostedBody, cloudBody);
                     if (resp) {
-                        if (resp.name === 'error') {
+                        if (resp.name === 'error' || resp.errorMessage) {
                             setError(JSON.stringify(resp));
                         }
                         else {

package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts

@@ -8,7 +8,7 @@ export interface Pivot {
     title?: string;
     triggerButtonText?: string;
 }
-export declare const PivotModal: ({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotAggregation, setPivotAggregation, popUpTitle, setPopUpTitle, selectedTable, SelectComponent, ButtonComponent, PopoverComponent, HeaderComponent, LabelComponent, TextComponent, selectedPivotIndex, setSelectedPivotIndex, removePivot, selectPivot, showUpdatePivot, setShowUpdatePivot, data, columns, theme, isOpen, setIsOpen, dateRange, createdPivots, setCreatedPivots, recommendedPivots, setRecommendedPivots, triggerButtonText, showPivotEditButton, showEditOnPivotClick, selectPivotOnEdit, showTrigger, rightAlign, parentRef, recommendPivotCount, }: {
+export declare const PivotModal: ({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotAggregation, setPivotAggregation, popUpTitle, setPopUpTitle, selectedTable, SelectComponent, ButtonComponent, SecondaryButtonComponent, PopoverComponent, HeaderComponent, LabelComponent, TextComponent, selectedPivotIndex, setSelectedPivotIndex, removePivot, selectPivot, showUpdatePivot, setShowUpdatePivot, data, columns, theme, isOpen, setIsOpen, dateRange, createdPivots, setCreatedPivots, recommendedPivots, setRecommendedPivots, triggerButtonText, showPivotEditButton, showEditOnPivotClick, selectPivotOnEdit, showTrigger, rightAlign, parentRef, recommendPivotCount, }: {
     pivotRowField: any;
     setPivotRowField: any;
     pivotColumnField: any;
@@ -22,6 +22,7 @@ export declare const PivotModal: ({ pivotRowField, setPivotRowField, pivotColumn
     selectedTable: any;
     SelectComponent: any;
     ButtonComponent: any;
+    SecondaryButtonComponent: any;
     PopoverComponent: any;
     HeaderComponent: any;
     LabelComponent: any;

package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"AA+BA,MAAM,WAAW,KAAK;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAkBD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6CAwwBtB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,KAAK,KAAA,EAAE,IAAI,KAAA,EAAE,MAAM,KAAA,OAyB1D;AAkHD,wBAAgB,WAAW,CAAC,SAAS,KAAA,WAYpC;AAgCD,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,GAAG,EACT,SAAS,EAAE,GAAG,EACd,YAAY,EAAE,OAAO,EACrB,QAAQ,SAAK,EACb,SAAS,GAAE,GAAU;;;;;;EA2YtB"}
+{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"AA+BA,MAAM,WAAW,KAAK;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAkBD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6CAqtBtB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,KAAK,KAAA,EAAE,IAAI,KAAA,EAAE,MAAM,KAAA,OAyB1D;AAkHD,wBAAgB,WAAW,CAAC,SAAS,KAAA,WAYpC;AAgCD,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,GAAG,EACT,SAAS,EAAE,GAAG,EACd,YAAY,EAAE,OAAO,EACrB,QAAQ,SAAK,EACb,SAAS,GAAE,GAAU;;;;;;EA6atB"}