@quillsql/react 2.11.16 → 2.11.18

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

@@ -5,14 +5,21 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const QuillSelect_1 = require("../QuillSelect");
 const UiComponents_1 = require("../UiComponents");
-const Context_1 = require("../../Context");
 const textProcessing_1 = require("../../utils/textProcessing");
 const SORT_VALUE_TO_LABEL = {
     ASC: 'ascending',
     DESC: 'descending',
 };
-const SortSentence = ({ sortData, keyPrefix, columns, handleDelete, setEditPopoverKey, setOpenPopover, setActiveEditItem, setIsPending, setActivePath, onSave, popoverTitle = 'Edit Sort', SortPopover, EditPopover, Select = QuillSelect_1.QuillSelectComponent, Button = UiComponents_1.MemoizedButton, SecondaryButton = UiComponents_1.MemoizedSecondaryButton, children, }) => {
+const SortSentence = ({ sortData, keyPrefix, columns, handleDelete, setEditPopoverKey, setOpenPopover, setActiveEditItem, setIsPending, setActivePath, onSave, popoverTitle = 'Edit Sort', SortPopover, EditPopover, Select = QuillSelect_1.QuillSelectComponent, Button = UiComponents_1.MemoizedButton, SecondaryButton = UiComponents_1.MemoizedSecondaryButton, }) => {
     const [isOpen, setIsOpen] = (0, react_1.useState)(false);
+    const handleSetIsOpen = (isOpen) => {
+        setIsOpen(isOpen);
+        if (!isOpen) {
+            setIsPending(false);
+            setActiveEditItem(null);
+            setActivePath(null);
+        }
+    };
     const handleClickDelete = (e) => {
         e.stopPropagation(); // don't call onClick handler
         setIsPending(false);
@@ -24,38 +31,29 @@ const SortSentence = ({ sortData, keyPrefix, columns, handleDelete, setEditPopov
     if (!sortData && (!sortData.expr.column || !sortData.expr.value)) {
         return null;
     }
-    return ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(SortPopover
-        // @ts-ignore
-        , { 
-            // @ts-ignore
-            filterLabel: `${(0, textProcessing_1.snakeCaseToTitleCase)(sortData.expr.column) || (0, textProcessing_1.snakeCaseToTitleCase)(sortData.expr.value)} ${SORT_VALUE_TO_LABEL[sortData.type]}`, onClickDelete: handleClickDelete, popoverTitle: popoverTitle, popoverChildren: (0, jsx_runtime_1.jsx)(EditPopover, { onSave: (column, direction) => {
+    return ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(SortPopover, { isOpen: isOpen, setIsOpen: handleSetIsOpen, sortLabel: `${(0, textProcessing_1.snakeCaseToTitleCase)(sortData.expr.column) || (0, textProcessing_1.snakeCaseToTitleCase)(sortData.expr.value)} ${SORT_VALUE_TO_LABEL[sortData.type]}`, onClickDelete: handleClickDelete, popoverTitle: popoverTitle, popoverChildren: (0, jsx_runtime_1.jsx)(EditPopover, { onSave: (column, direction) => {
                     setIsOpen(false);
                     onSave(column, direction);
-                }, columns: columns, isEdit: true, onDelete: handleClickDelete, column: sortData.expr.column || sortData.expr.value, Select: Select, Button: Button, SecondaryButton: SecondaryButton }), isOpen: isOpen, setIsOpen: setIsOpen, onDelete: () => {
-                setIsPending(false);
-                setActiveEditItem(null);
-                setActivePath(null);
-            } }) }));
+                }, columns: columns, isEdit: true, onDelete: handleClickDelete, column: sortData.expr.column || sortData.expr.value, Select: Select, Button: Button, SecondaryButton: SecondaryButton }) }) }));
 };
 exports.SortSentence = SortSentence;
 const AddSortPopover = ({ onSave, columns, isEdit, onDelete, column, Select = QuillSelect_1.QuillSelectComponent, Button = UiComponents_1.MemoizedButton, SecondaryButton = UiComponents_1.MemoizedSecondaryButton, }) => {
     const [sortColumn, setSortColumn] = (0, react_1.useState)(column || '');
     const [sortDirection, setSortDirection] = (0, react_1.useState)('ASC');
-    const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
     return ((0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex', flexDirection: 'column', gap: 12 }, children: [(0, jsx_runtime_1.jsxs)("div", { style: {
                     display: 'flex',
                     flexDirection: 'row',
                     gap: 12,
                     padding: '6px 0px',
-                }, children: [(0, jsx_runtime_1.jsx)(Select, { theme: theme, value: sortColumn, onChange: (value) => {
-                            setSortColumn(value);
+                }, children: [(0, jsx_runtime_1.jsx)(Select, { value: sortColumn, onChange: (e) => {
+                            setSortColumn(e.target.value);
                         }, options: [
                             ...columns.map((column) => ({
                                 label: (0, textProcessing_1.snakeCaseToTitleCase)(column.split('.')[1] || ''),
                                 value: column.split('.')[1],
                             })),
-                        ] }), (0, jsx_runtime_1.jsx)(Select, { theme: theme, value: sortDirection, onChange: (value) => {
-                            setSortDirection(value);
+                        ] }), (0, jsx_runtime_1.jsx)(Select, { value: sortDirection, onChange: (e) => {
+                            setSortDirection(e.target.value);
                         }, options: [
                             { label: 'Ascending', value: 'ASC' },
                             { label: 'Descending', value: 'DESC' },

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

@@ -251,7 +251,7 @@ exports.DATE_DESCRIPTION_MAP = {
                 },
             },
         },
-    })]: (node) => `${cleanDateFieldName(node.left.args.value[1].column)} in the last ${node.right.right.expr.value.toLowerCase()}`,
+    })]: (node) => `${cleanDateFieldName(node.left.args.value[1].column)} in the previous ${node.right.right.expr.value.toLowerCase()}`,
     [JSON.stringify({
         type: 'binary_expr',
         left: {

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

@@ -3,6 +3,7 @@ import { Pivot } from './pivot';
 import { TableInfo } from './schema';
 export declare function convertDateComparison(node: NSP.Select): NSP.Select;
 export declare function recursiveSearchAndReplace(node: any, search: string, replace: string): void;
+export declare function recursiveSearchAndReplaceByKey(node: any, search: string, replace: string, searchKey: string): void;
 /**
  * Takes a bigquery AST as input, cleans it, and returns a Select AST.
  */
@@ -20,8 +21,9 @@ export declare function convertGroupBy(ast: AST, prevPivot: Pivot | undefined, s
     pivot: Pivot;
 } | {
     pivot: Partial<{
-        aggregationType: "sum" | "average" | "count" | "min" | "max";
+        aggregationType: "sum" | "average" | "count" | "min" | "max" | "avg";
         valueField: string;
+        valueFieldType?: string | undefined;
         rowField?: string | undefined;
         rowFieldType?: string | undefined;
         columnField?: string | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/convert.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,IAAI,GAAG,EACpB,GAAG,EAMJ,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAc,SAAS,EAAE,MAAM,UAAU,CAAC;AASjD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAuBlE;AAGD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,QAahB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,CAuCpD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,YAAY,EAAE,SAAS,EAAE,GACxB,GAAG,CAAC,MAAM,CAwBZ;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,GAAG,EACR,SAAS,mBAAc,EACvB,YAAY,EAAE,SAAS,EAAE;;;;;;;;;;;;;;EA8b1B;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;;;EA6G5D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,OAyJtE;AAID,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAY1E"}
+{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/convert.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,IAAI,GAAG,EACpB,GAAG,EAMJ,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAc,SAAS,EAAE,MAAM,UAAU,CAAC;AASjD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAuBlE;AAGD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,QAahB;AAGD,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,QAalB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,CA2CpD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,YAAY,EAAE,SAAS,EAAE,GACxB,GAAG,CAAC,MAAM,CAwBZ;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,GAAG,EACR,SAAS,mBAAc,EACvB,YAAY,EAAE,SAAS,EAAE;;;;;;;;;;;;;;;EAwd1B;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;;;EA6G5D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,OAyJtE;AAID,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAY1E"}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertRemoveSimpleParentheses = exports.convertStringComparison = exports.applyPivot = exports.convertGroupBy = exports.convertWildcardColumns = exports.convertBigQuery = exports.recursiveSearchAndReplace = exports.convertDateComparison = void 0;
+exports.convertRemoveSimpleParentheses = exports.convertStringComparison = exports.applyPivot = exports.convertGroupBy = exports.convertWildcardColumns = exports.convertBigQuery = exports.recursiveSearchAndReplaceByKey = exports.recursiveSearchAndReplace = exports.convertDateComparison = void 0;
 const ast_1 = require("./ast");
 const util_1 = require("./util");
 // Helper functions that preprocess the AST.
@@ -49,6 +49,21 @@ function recursiveSearchAndReplace(node, search, replace) {
     }
 }
 exports.recursiveSearchAndReplace = recursiveSearchAndReplace;
+// THIS IS USED TO REPLACE UNITS IN INTERVALS FOR BIGQUERY
+function recursiveSearchAndReplaceByKey(node, search, replace, searchKey) {
+    if (typeof node !== 'object') {
+        return;
+    }
+    if (node) {
+        Object.keys(node).forEach((key) => {
+            recursiveSearchAndReplaceByKey(node[key], search, replace, searchKey);
+            if (searchKey === key && node[key] === search) {
+                node[key] = replace;
+            }
+        });
+    }
+}
+exports.recursiveSearchAndReplaceByKey = recursiveSearchAndReplaceByKey;
 /**
  * Takes a bigquery AST as input, cleans it, and returns a Select AST.
  */
@@ -71,6 +86,10 @@ function convertBigQuery(ast) {
         recursiveSearchAndReplace(newAst.where, 'CURRENT_DATE', 'CURRENT_TIMESTAMP');
         recursiveSearchAndReplace(newAst.where, 'DATE_TRUNC', 'TIMESTAMP_TRUNC');
         recursiveSearchAndReplace(newAst.where, 'DATE', 'TIMESTAMP');
+        // JANK: If anyone is here this is how you have to do intervals in BigQuery no joke
+        recursiveSearchAndReplaceByKey(newAst.where, 'year', '* 365 DAY', 'unit');
+        recursiveSearchAndReplaceByKey(newAst.where, 'week', '* 7 DAY', 'unit');
+        recursiveSearchAndReplaceByKey(newAst.where, 'month', '* 30 DAY', 'unit');
         // TODO: handle joins nicely
         if (newAst.from?.length > 1) {
             newAst.from = [newAst.from[0]];
@@ -180,8 +199,11 @@ function convertGroupBy(ast, prevPivot = null, schemaTables) {
                 else if (column.expr?.args?.expr) {
                     columnName = column.expr?.args?.expr?.value;
                 }
-                if (column.expr.type === 'aggr_func' && !isIdColumn(columnName)) {
+                if (column.expr.type === 'aggr_func' && !(0, util_1.isIdColumn)(columnName)) {
                     pivot.aggregationType = column.expr.name.toLowerCase();
+                    if (pivot.aggregationType === 'avg') {
+                        pivot.aggregationType = 'average';
+                    }
                     pivot.valueField =
                         column.expr.args?.expr?.value || column.expr.args?.expr?.column;
                     if (column.expr.args.expr.type === 'column_ref') {
@@ -197,15 +219,23 @@ function convertGroupBy(ast, prevPivot = null, schemaTables) {
                 }
             }
             if (columnName === '*') {
-                // TODO: make valueField be a number
+                // Use the first numeric column found, if none found, use the first column
+                let columnForValueField = columns.find((c) => {
+                    return (0, ast_1.isNumericColumnType)(c.fieldType) && !(0, util_1.isIdColumn)(c.field);
+                });
+                if (!columnForValueField) {
+                    columnForValueField = columns[0];
+                }
                 for (let i = 0; i < columns.length; i++) {
-                    if (!isIdColumn(columns[i]?.field) &&
+                    if (!(0, util_1.isIdColumn)(columns[i]?.field) &&
                         (0, ast_1.isNumericColumnType)(columns[i]?.fieldType)) {
-                        pivot.valueField = columns[i].field;
-                        columnName = columns[i].field;
+                        columnForValueField = columns[i];
                         break;
                     }
                 }
+                pivot.valueField = columnForValueField.field;
+                pivot.valueFieldType = 'number';
+                columnName = columnForValueField.field;
             }
             newColumns.push({
                 type: 'expr',
@@ -234,9 +264,12 @@ 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;
-                if (!isIdColumn(columnName)) {
+                if (!(0, util_1.isIdColumn)(columnName)) {
                     pivot.valueField = columnName;
                     pivot.aggregationType = column?.expr?.name?.toLowerCase();
+                    if (pivot.aggregationType === 'avg') {
+                        pivot.aggregationType = 'average';
+                    }
                 }
                 const findByName = (x) => [x.expr?.value, x.expr?.column].includes(columnName);
                 if (!newColumns.find(findByName)) {
@@ -254,7 +287,7 @@ 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;
-                if (!isIdColumn(condColumnName)) {
+                if (!(0, util_1.isIdColumn)(condColumnName)) {
                     pivot.columnField = condColumnName;
                 }
                 const findByColName = (x) => [x.expr?.value, x.expr?.column].includes(condColumnName);
@@ -283,19 +316,27 @@ function convertGroupBy(ast, prevPivot = null, schemaTables) {
                 const columnName = columnNode?.value || columnNode?.column;
                 // if count(*), make the value field an actual column
                 if (columnName === '*') {
-                    const numericColumn = columns.find((c) => {
-                        return (0, ast_1.isNumericColumnType)(c.fieldType) && !isIdColumn(c.field);
+                    let columnForValueField = columns.find((c) => {
+                        return (0, ast_1.isNumericColumnType)(c.fieldType) && !(0, util_1.isIdColumn)(c.field);
                     });
-                    pivot.valueField = numericColumn?.field;
+                    // if there aren't any numeric columns use the first column
+                    if (!column) {
+                        columnForValueField = columns[0];
+                    }
+                    pivot.valueField = columnForValueField?.field;
+                    pivot.valueFieldType = 'number';
                     pivot.aggregationType = column?.expr?.name.toLowerCase();
-                    const findByName = (x) => [x.expr?.value, x.expr?.column].includes(numericColumn.field);
+                    if (pivot.aggregationType === 'avg') {
+                        pivot.aggregationType = 'average';
+                    }
+                    const findByName = (x) => [x.expr?.value, x.expr?.column].includes(columnForValueField.field);
                     if (!newColumns.find(findByName)) {
                         newColumns.push({
                             type: 'expr',
                             expr: {
                                 type: 'column_ref',
                                 table: null,
-                                column: numericColumn?.field || '',
+                                column: columnForValueField?.field || '',
                             },
                             as: null,
                         });
@@ -304,9 +345,12 @@ 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) &&
-                        !isIdColumn(columnName)) {
+                        !(0, util_1.isIdColumn)(columnName)) {
                         pivot.valueField = columnName;
                         pivot.aggregationType = column?.expr?.name.toLowerCase();
+                        if (pivot.aggregationType === 'avg') {
+                            pivot.aggregationType = 'average';
+                        }
                     }
                     const findByName = (x) => [x.expr?.value, x.expr?.column].includes(columnName);
                     if (!newColumns.find(findByName)) {
@@ -459,7 +503,7 @@ 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)) {
+        if (!groupValue || (0, util_1.isIdColumn)(groupValue)) {
             continue;
         }
         // check if this value is an alias, if so use concrete value
@@ -501,7 +545,7 @@ function convertGroupBy(ast, prevPivot = null, schemaTables) {
                 newAst.columns[i].expr?.value ||
                 undefined;
             if (columnName &&
-                !isIdColumn(columnName) &&
+                !(0, util_1.isIdColumn)(columnName) &&
                 (0, ast_1.isNumericColumnType)(columns.find((c) => c.field === columnName)?.fieldType)) {
                 pivot.valueField = columnName;
                 pivot.aggregationType = 'sum';
@@ -782,8 +826,3 @@ 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/operators.d.ts

@@ -17,6 +17,8 @@ export declare const OPERATOR_GROUPS: {
     between: string;
     'IS NOT': string;
     IS: string;
+    EQUALS: string;
+    equals: string;
 };
 export declare const getDefaultOperatorSubtrees: (key: any, operator: any, left: any, right: any, databaseType: string) => any;
 export declare const DEFAULT_OPERATOR_SUBTREES: {
@@ -416,29 +418,32 @@ export declare const DEFAULT_BIG_QUERY_OPERATOR_SUBTREES: {
             name: string;
             args: {
                 type: string;
-                value: ({
-                    type: string;
-                    value: string;
-                    table?: undefined;
-                    column?: undefined;
-                } | {
+                value: {
                     type: string;
                     table: null;
                     column: string;
-                    value?: undefined;
-                })[];
+                }[];
             };
+            over: null;
         };
         right: {
             type: string;
             name: string;
             args: {
                 type: string;
-                value: {
+                value: ({
                     type: string;
                     value: string;
-                }[];
+                    table?: undefined;
+                    column?: undefined;
+                } | {
+                    type: string;
+                    table: null;
+                    column: string;
+                    value?: undefined;
+                })[];
             };
+            over: null;
         };
     };
 };

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

@@ -1 +1 @@
-{"version":3,"file":"operators.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/operators.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;CAmB3B,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAChC,GAAG,YACE,GAAG,QACP,GAAG,SACF,GAAG,gBACI,MAAM,QA8DrB,CAAC;AAEF,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoQrC,CAAC;AAEF,eAAO,MAAM,mCAAmC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+L/C,CAAC"}
+{"version":3,"file":"operators.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/operators.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;CAqB3B,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAChC,GAAG,YACE,GAAG,QACP,GAAG,SACF,GAAG,gBACI,MAAM,QAoErB,CAAC;AAEF,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoQrC,CAAC;AAEF,eAAO,MAAM,mCAAmC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmM/C,CAAC"}

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

@@ -24,6 +24,8 @@ exports.OPERATOR_GROUPS = {
     between: 'in_the_last',
     'IS NOT': 'null_comp',
     IS: 'null_comp',
+    EQUALS: 'equals',
+    equals: 'equals',
 };
 const getDefaultOperatorSubtrees = (key, operator, left, right, databaseType) => {
     let result = exports.DEFAULT_OPERATOR_SUBTREES[key];
@@ -84,7 +86,14 @@ const getDefaultOperatorSubtrees = (key, operator, left, right, databaseType) =>
         result.left.column = left;
     }
     else if (key === 'equals') {
-        result.left.args.value[1].column = left;
+        if (databaseType === 'BigQuery') {
+            result = exports.DEFAULT_BIG_QUERY_OPERATOR_SUBTREES['equals'];
+            result.left.args.value[0].column = left;
+            result.left.column = left;
+        }
+        else {
+            result.left.args.value[1].column = left;
+        }
     }
     else if (key === 'date') {
         result.operator = operator;
@@ -515,38 +524,42 @@ exports.DEFAULT_BIG_QUERY_OPERATOR_SUBTREES = {
         operator: '=',
         left: {
             type: 'function',
-            name: 'date_trunc',
+            name: 'timestamp_trunc',
             args: {
                 type: 'expr_list',
                 value: [
                     {
-                        type: 'single_quote_string',
-                        value: 'month',
+                        type: 'column_ref',
+                        table: null,
+                        column: '',
                     },
                     {
                         type: 'column_ref',
                         table: null,
-                        column: '',
+                        column: 'YEAR',
                     },
                 ],
             },
+            over: null,
         },
         right: {
             type: 'function',
-            name: 'date_trunc',
+            name: 'timestamp_trunc',
             args: {
                 type: 'expr_list',
                 value: [
-                    {
-                        type: 'single_quote_string',
-                        value: 'month',
-                    },
                     {
                         type: 'timestamp',
                         value: '2024-01-01',
                     },
+                    {
+                        type: 'column_ref',
+                        table: null,
+                        column: 'YEAR',
+                    },
                 ],
             },
+            over: null,
         },
     },
 };

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

@@ -2,8 +2,9 @@
  * Represents the metadata of a pivot table.
  */
 export type Pivot = {
-    aggregationType: 'sum' | 'average' | 'min' | 'max' | 'count';
+    aggregationType: 'sum' | 'average' | 'min' | 'max' | 'count' | 'avg';
     valueField: string;
+    valueFieldType?: string;
     rowField?: string;
     rowFieldType?: string;
     columnField?: string;

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,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"}
+{"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,GAAG,KAAK,CAAC;IACrE,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,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

@@ -1,4 +1,5 @@
-/// <reference types="react" />
+import { ReactNode } from 'react';
+import { SidebarComponentProps, ContainerComponentProps } from '../UiComponents';
 /**
  * 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
@@ -9,26 +10,89 @@ export declare const QuillButton: ({ children, ...props }: any) => import("react
 export declare const QuillSecondaryButton: ({ children, ...props }: any) => import("react/jsx-runtime").JSX.Element;
 export declare const QuillReportBuilderTable: ({ rows, columns, error, ...props }: any) => import("react/jsx-runtime").JSX.Element;
 export declare const QuillTag: import("react").ForwardRefExoticComponent<Omit<any, "ref"> & import("react").RefAttributes<unknown>>;
-export declare const QuillSidebarHeading: ({ label }: any) => import("react/jsx-runtime").JSX.Element;
-export declare const QuillSidebarSubHeading: ({ label }: any) => import("react/jsx-runtime").JSX.Element;
-export declare const QuillSidebar: import("react").ForwardRefExoticComponent<Omit<any, "ref"> & import("react").RefAttributes<unknown>>;
-export declare const CustomContainer: import("react").ForwardRefExoticComponent<Omit<any, "ref"> & import("react").RefAttributes<unknown>>;
-export declare const QuillSelect: ({ onChange, ...props }: any) => import("react/jsx-runtime").JSX.Element;
-export declare function MemoizedPopover({ onClose, children, style, trigger, isOpen, }: any): import("react/jsx-runtime").JSX.Element;
-export declare const QuillPopover: import("react").ForwardRefExoticComponent<Omit<any, "ref"> & import("react").RefAttributes<unknown>>;
+export interface SidebarHeadingComponentProps {
+    label: string;
+}
+export declare const QuillSidebarHeading: ({ label, }: SidebarHeadingComponentProps) => import("react/jsx-runtime").JSX.Element;
+export declare const QuillSidebar: ({ children }: SidebarComponentProps) => import("react/jsx-runtime").JSX.Element;
+export declare const CustomContainer: ({ children }: ContainerComponentProps) => import("react/jsx-runtime").JSX.Element;
 export declare const QuillHandleButton: () => import("react/jsx-runtime").JSX.Element;
-export declare const QuillSelectColumn: ({ label, selected, setSelected, children, }: any) => import("react/jsx-runtime").JSX.Element;
-export declare const QuillDraggableColumn: ({ label, children, onDelete }: any) => import("react/jsx-runtime").JSX.Element;
+export interface SelectColumnComponentProps {
+    label: string;
+    isSelected: boolean;
+    setSelected: () => void;
+    DragHandle: ({ dragIcon }: {
+        dragIcon: () => JSX.Element;
+    }) => JSX.Element;
+}
+export declare const QuillSelectColumn: ({ label, isSelected, setSelected, DragHandle, }: SelectColumnComponentProps) => import("react/jsx-runtime").JSX.Element;
+/**
+ * Props for a draggable card with a grab-handle and a column name.
+ */
+export interface DraggableColumnComponentProps {
+    label: string;
+    onDelete: () => void;
+    DragHandle: ({ dragIcon }: {
+        dragIcon: () => JSX.Element;
+    }) => JSX.Element;
+}
+/**
+ * A draggable card with a grab-handle and a column name
+ */
+export declare const QuillDraggableColumn: ({ label, onDelete, DragHandle, }: DraggableColumnComponentProps) => import("react/jsx-runtime").JSX.Element;
 export declare const QuillButtonLoadingState: () => import("react/jsx-runtime").JSX.Element;
 export declare const QuillTableLoadingState: () => import("react/jsx-runtime").JSX.Element;
-export declare const DEFAULT_TAB_OPTIONS: {
-    label: string;
-    value: string;
-}[];
-export declare const QuillTabs: import("react").ForwardRefExoticComponent<Omit<any, "ref"> & import("react").RefAttributes<unknown>>;
 export declare const EditPopover: ({ onSave, onDelete, Button, renderNode, activeEditItem, }: any) => import("react/jsx-runtime").JSX.Element;
-export declare const QuillFilterPopover: ({ filterLabel, onClickDeleteFilter, popoverTitle, popoverChildren, isOpen, setIsOpen, }: any) => import("react/jsx-runtime").JSX.Element;
-export declare const QuillSortPopover: ({ filterLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }: any) => import("react/jsx-runtime").JSX.Element;
-export declare const TagWrapper: ({ isCard, isRow, editPopoverKey, keyPrefix, formData, activeEditItem, setEditPopoverKey, setActiveEditItem, setActivePath, setOpenPopover, setIsPending, clearCheckboxes, fetchSqlQuery, handleDelete, setCheckboxes, handleReplaceSubtree, FilterPopover, getByKey, EditPopover, Button, renderNode, children, }: any) => import("react/jsx-runtime").JSX.Element;
+export interface FilterPopoverComponentProps {
+    isOpen: boolean;
+    setIsOpen: (isOpen: boolean) => void;
+    popoverTitle?: string;
+    popoverChildren: ReactNode;
+    filterLabel: string;
+    onClickDelete: (e: React.MouseEvent<HTMLElement>) => void;
+}
+export declare const QuillFilterPopover: ({ filterLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }: FilterPopoverComponentProps) => import("react/jsx-runtime").JSX.Element;
+export interface SortPopoverComponentProps {
+    isOpen: boolean;
+    setIsOpen: (isOpen: boolean) => void;
+    popoverTitle?: string;
+    popoverChildren: ReactNode;
+    sortLabel: string;
+    onClickDelete: (e: React.MouseEvent<HTMLElement>) => void;
+}
+export declare const QuillSortPopover: ({ sortLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }: SortPopoverComponentProps) => import("react/jsx-runtime").JSX.Element;
+export interface LimitPopoverComponentProps {
+    isOpen: boolean;
+    setIsOpen: (isOpen: boolean) => void;
+    popoverTitle?: string;
+    popoverChildren: ReactNode;
+    limitLabel: string;
+    onClickDelete: (e: React.MouseEvent<HTMLElement>) => void;
+}
+export declare const QuillLimitPopover: ({ limitLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }: LimitPopoverComponentProps) => import("react/jsx-runtime").JSX.Element;
+export interface TagWrapperProps {
+    isCard: boolean;
+    isRow: boolean;
+    editPopoverKey: string;
+    keyPrefix: string;
+    formData: any;
+    activeEditItem: any;
+    setEditPopoverKey: any;
+    setActiveEditItem: any;
+    setActivePath: any;
+    setOpenPopover: any;
+    setIsPending: any;
+    clearCheckboxes: any;
+    handleDelete: any;
+    setCheckboxes: any;
+    handleReplaceSubtree: any;
+    FilterPopover: (props: FilterPopoverComponentProps) => JSX.Element;
+    getByKey: any;
+    EditPopover: any;
+    Button: any;
+    renderNode: any;
+    children: any;
+}
+export declare const TagWrapper: ({ isCard, isRow, editPopoverKey, keyPrefix, formData, activeEditItem, setEditPopoverKey, setActiveEditItem, setActivePath, setOpenPopover, setIsPending, clearCheckboxes, handleDelete, setCheckboxes, handleReplaceSubtree, FilterPopover, getByKey, EditPopover, Button, renderNode, children, }: TagWrapperProps) => import("react/jsx-runtime").JSX.Element;
 export declare const AddFilterPopover: ({ onSave, Button, renderNode, activeEditItem, }: any) => import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=ui.d.ts.map

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":";AAiBA;;;;;GAKG;AAEH,eAAO,MAAM,WAAW,2BAA4B,GAAG,4CA2BtD,CAAC;AAEF,eAAO,MAAM,oBAAoB,2BAA4B,GAAG,4CA2B/D,CAAC;AAEF,eAAO,MAAM,uBAAuB,uCAKjC,GAAG,4CAiBL,CAAC;AAEF,eAAO,MAAM,QAAQ,sGAoFpB,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,4CA+BL,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,4CAsBL,CAAC"}
+{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/ui.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAc,SAAS,EAAmC,MAAM,OAAO,CAAC;AAC/E,OAAO,EAKL,qBAAqB,EACrB,uBAAuB,EAExB,MAAM,iBAAiB,CAAC;AAQzB;;;;;GAKG;AAEH,eAAO,MAAM,WAAW,2BAA4B,GAAG,4CA2BtD,CAAC;AAEF,eAAO,MAAM,oBAAoB,2BAA4B,GAAG,4CA2B/D,CAAC;AAGF,eAAO,MAAM,uBAAuB,uCAKjC,GAAG,4CAiBL,CAAC;AAEF,eAAO,MAAM,QAAQ,sGAkFpB,CAAC;AAEF,MAAM,WAAW,4BAA4B;IAC3C,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,eAAO,MAAM,mBAAmB,eAE7B,4BAA4B,4CAAqC,CAAC;AAGrE,eAAO,MAAM,YAAY,iBAAkB,qBAAqB,4CAa/D,CAAC;AAGF,eAAO,MAAM,eAAe,iBAAkB,uBAAuB,4CAmBpE,CAAC;AAGF,eAAO,MAAM,iBAAiB,+CAuE7B,CAAC;AAEF,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE;QAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,OAAO,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;CAC5E;AAED,eAAO,MAAM,iBAAiB,oDAK3B,0BAA0B,4CA4C5B,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE;QAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,OAAO,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;CAC5E;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,qCAI9B,6BAA6B,4CAiD/B,CAAC;AAGF,eAAO,MAAM,uBAAuB,+CAMnC,CAAC;AAGF,eAAO,MAAM,sBAAsB,+CAMlC,CAAC;AAEF,eAAO,MAAM,WAAW,8DAMrB,GAAG,4CA+BL,CAAC;AAEF,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,SAAS,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;CAC3D;AAED,eAAO,MAAM,kBAAkB,sFAO5B,2BAA2B,4CAmB7B,CAAC;AAEF,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,SAAS,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;CAC3D;AAED,eAAO,MAAM,gBAAgB,oFAO1B,yBAAyB,4CAkB3B,CAAC;AAEF,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,SAAS,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;CAC3D;AAED,eAAO,MAAM,iBAAiB,qFAO3B,0BAA0B,4CAkB5B,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,GAAG,CAAC;IACd,cAAc,EAAE,GAAG,CAAC;IACpB,iBAAiB,EAAE,GAAG,CAAC;IACvB,iBAAiB,EAAE,GAAG,CAAC;IACvB,aAAa,EAAE,GAAG,CAAC;IACnB,cAAc,EAAE,GAAG,CAAC;IACpB,YAAY,EAAE,GAAG,CAAC;IAClB,eAAe,EAAE,GAAG,CAAC;IACrB,YAAY,EAAE,GAAG,CAAC;IAClB,aAAa,EAAE,GAAG,CAAC;IACnB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,aAAa,EAAE,CAAC,KAAK,EAAE,2BAA2B,KAAK,GAAG,CAAC,OAAO,CAAC;IACnE,QAAQ,EAAE,GAAG,CAAC;IACd,WAAW,EAAE,GAAG,CAAC;IACjB,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,EAAE,GAAG,CAAC;IAChB,QAAQ,EAAE,GAAG,CAAC;CACf;AAED,eAAO,MAAM,UAAU,uSAsBpB,eAAe,4CA8FjB,CAAC;AAEF,eAAO,MAAM,gBAAgB,oDAK1B,GAAG,4CAsBL,CAAC"}