@quillsql/react 2.11.9 → 2.11.12

package/dist/esm/components/Dashboard/MetricComponent.js

@@ -1,15 +1,22 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-export default function DashboardItem({ dashboardItem, onClickDashboardItem, theme, style, children, }) {
+import { COMPARISON_OPTIONS } from '../../DateRangePicker/dateRangePickerUtils';
+import { valueFormatter } from '../../utils/valueFormatter';
+import ChartError from '../Chart/ChartError';
+import ChartSkeleton from '../Chart/ChartSkeleton';
+export default function QuillMetricComponent({ dashboardItem, onClickDashboardItem, error, isLoading, theme, style, }) {
+    const data = dashboardItem;
+    const isComparison = data.rows.length > 0 &&
+        Object.keys(data.rows[0]).includes(`comparison_${data.xAxisField}`);
+    const primaryMetricLabel = data?.filtersApplied?.date_range?.preset?.label;
+    const comparisonKey = data?.filtersApplied?.date_range?.comparisonRange?.value;
+    const comparisonLabel = COMPARISON_OPTIONS.find((opt) => opt.value === comparisonKey)?.text;
     return (_jsx("div", { onClick: onClickDashboardItem
             ? () => onClickDashboardItem(dashboardItem)
             : () => { }, style: {
-            // height: '100%',
             cursor: 'pointer',
             boxSizing: 'content-box',
-            paddingRight: 25,
-            minHeight: 400,
             borderRadius: 8,
-            paddingTop: 20,
+            paddingBottom: 30,
             ...style,
         }, children: _jsx("div", { style: {
                 width: '100%',
@@ -30,7 +37,7 @@ export default function DashboardItem({ dashboardItem, onClickDashboardItem, the
                                 flexDirection: 'row',
                                 justifyContent: 'space-between',
                                 boxSizing: 'content-box',
-                                paddingBottom: 20,
+                                paddingBottom: 5,
                             }, children: [_jsx("div", { style: {
                                         fontFamily: theme.fontFamily,
                                         color: theme.primaryTextColor,
@@ -53,10 +60,96 @@ export default function DashboardItem({ dashboardItem, onClickDashboardItem, the
                                         display: 'flex',
                                         alignItems: 'center',
                                         justifyContent: 'flex-end',
-                                    }, children: 'view report →' })) : null] }), _jsx("div", { style: {
+                                    }, children: 'view report →' })) : null] }), isLoading ? (_jsx(ChartSkeleton, {})) : error ? (_jsx(ChartError, {})) : data.rows?.length === 0 ||
+                            data.rows[0][data.xAxisField] === null ? (_jsx("div", { style: {
+                                display: 'flex',
+                                flex: '1 0 auto',
+                                height: style?.height ?? '100%',
+                                margin: 'auto',
+                                justifyContent: 'center',
+                                alignItems: 'center',
+                                fontSize: 13,
+                                color: theme.secondaryTextColor,
+                                maxWidth: '100%',
+                                width: '100%',
+                                ...style,
+                            }, children: "No results" })) : (_jsx("div", { style: {
                                 padding: 0,
                                 height: '100%',
                                 width: '100%',
                                 boxSizing: 'content-box',
-                            }, children: children })] }) }) }) }, dashboardItem?.name));
+                            }, children: _jsxs("div", { style: {
+                                    fontFamily: theme?.fontFamily,
+                                    fontSize: 32,
+                                    color: theme?.primaryTextColor,
+                                    fontWeight: '600',
+                                    textOverflow: 'ellipsis',
+                                    margin: 0,
+                                    whiteSpace: 'nowrap',
+                                    boxSizing: 'content-box',
+                                    maxWidth: '100%',
+                                    textAlign: 'left',
+                                    overflow: 'hidden',
+                                    height: '100%',
+                                    display: 'flex',
+                                    width: '100%',
+                                    flexDirection: 'row',
+                                }, children: [_jsxs("div", { style: {
+                                            display: 'flex',
+                                            gap: 4,
+                                            alignItems: 'baseline',
+                                            marginRight: 'auto',
+                                        }, children: [_jsx("span", { children: data.rows.length > 0 &&
+                                                    valueFormatter({
+                                                        value: data.rows[0][data.xAxisField] ?? 0,
+                                                        field: data.xAxisField,
+                                                        fields: [
+                                                            {
+                                                                field: data.xAxisField,
+                                                                format: data.xAxisFormat,
+                                                                label: data.xAxisLabel,
+                                                                _id: data.id || 'dummy',
+                                                            },
+                                                        ],
+                                                    }) }), isComparison && (_jsx("span", { style: {
+                                                    fontSize: 13,
+                                                    fontWeight: '500',
+                                                    fontFamily: theme?.fontFamily,
+                                                    color: theme?.primaryTextColor,
+                                                    marginLeft: 2,
+                                                }, children: primaryMetricLabel
+                                                    ? `in ${primaryMetricLabel.toLowerCase()}`
+                                                    : 'this period' }))] }), isComparison && (_jsxs("div", { style: {
+                                            display: 'flex',
+                                            gap: 4,
+                                            alignItems: 'baseline',
+                                            paddingTop: 4,
+                                            color: theme?.secondaryTextColor,
+                                        }, children: [_jsx("span", { style: {
+                                                    fontSize: 28,
+                                                    fontWeight: '500',
+                                                    fontFamily: theme?.fontFamily,
+                                                    color: theme?.secondaryTextColor,
+                                                }, children: data.rows.length > 0 &&
+                                                    valueFormatter({
+                                                        value: data.rows[0][`comparison_${data.xAxisField}`] ??
+                                                            0,
+                                                        field: data.xAxisField,
+                                                        fields: [
+                                                            {
+                                                                field: data.xAxisField,
+                                                                format: data.xAxisFormat,
+                                                                label: data.xAxisLabel,
+                                                                _id: data.id || 'dummy',
+                                                            },
+                                                        ],
+                                                    }) }), _jsx("span", { style: {
+                                                    fontSize: 13,
+                                                    fontWeight: '500',
+                                                    fontFamily: theme?.fontFamily,
+                                                    color: theme?.secondaryTextColor,
+                                                    marginLeft: 2,
+                                                }, children: comparisonLabel
+                                                    ? 'in ' + comparisonLabel.toLowerCase()
+                                                    : 'previous period' })] }))] }) }))] }) }) }) }, dashboardItem?.name));
 }

package/dist/esm/components/Dashboard/TableComponent.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
-export default function DashboardItem({ dashboardItem, onClickDashboardItem, isLoading, theme, style, children, }: any): JSX.Element;
+export default function QuillTableComponent({ dashboardItem, onClickDashboardItem, isLoading, error, theme, style, children, }: any): JSX.Element;
 //# sourceMappingURL=TableComponent.d.ts.map

package/dist/esm/components/Dashboard/TableComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TableComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/TableComponent.tsx"],"names":[],"mappings":";AAAA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EACpC,aAAa,EACb,oBAAoB,EACpB,SAAS,EACT,KAAK,EACL,KAAK,EACL,QAAQ,GACT,EAAE,GAAG,GAAG,GAAG,CAAC,OAAO,CA8DnB"}
+{"version":3,"file":"TableComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/TableComponent.tsx"],"names":[],"mappings":";AASA,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,aAAa,EACb,oBAAoB,EACpB,SAAS,EACT,KAAK,EACL,KAAK,EACL,KAAK,EACL,QAAQ,GACT,EAAE,GAAG,GAAG,GAAG,CAAC,OAAO,CAiKnB"}

package/dist/esm/components/Dashboard/TableComponent.js

@@ -1,5 +1,62 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-export default function DashboardItem({ dashboardItem, onClickDashboardItem, isLoading, theme, style, children, }) {
+import { useContext, useMemo } from 'react';
+import { downloadCSV } from '../../utils/csv';
+import QuillTable from '../QuillTable';
+import { generatePivotTable } from '../../internals/ReportBuilder/PivotModal';
+import { DashboardFiltersContext } from '../../Context';
+import { quillFormat } from '../../utils/valueFormatter';
+import ChartSkeleton from '../Chart/ChartSkeleton';
+import ChartError from '../Chart/ChartError';
+export default function QuillTableComponent({ dashboardItem, onClickDashboardItem, isLoading, error, theme, style, children, }) {
+    const { dashboardFilters } = useContext(DashboardFiltersContext);
+    const config = dashboardItem;
+    const data = dashboardItem;
+    const dateFilter = Object.values(dashboardFilters).find((filter) => filter.filterType == 'date_range');
+    const pivotTable = useMemo(() => {
+        const pivot = config?.pivot;
+        const data = config;
+        return pivot && data?.rows
+            ? generatePivotTable(pivot, JSON.parse(JSON.stringify(data.rows)), // deep copy
+            dateFilter
+                ? [dateFilter.startDate || null, dateFilter.endDate || null, null]
+                : [null, null, null], Boolean(dateFilter?.comparisonRange?.startDate), -1, dateFilter?.comparisonRange?.startDate
+                ? [
+                    dateFilter?.comparisonRange.startDate,
+                    dateFilter?.comparisonRange.endDate,
+                    null,
+                ]
+                : [null, null, null])
+            : null;
+    }, [config?.pivot]);
+    const columns = pivotTable?.columns ?? data.columns ?? data.yAxisFields;
+    const rows = pivotTable?.rows ?? data.rows ?? [];
+    // FOR PIVOTS - ADD THE RIGHT FIELD TYPE FOR THE VALUE COLUMNS
+    const valueFieldType = config?.pivot?.valueFieldType || undefined;
+    // Walk through data.columns and pick off the labels from yAxisFields
+    columns.forEach((col, index) => {
+        // ADD THE RIGHT FIELD TYPE FOR THE VALUE COLUMNS
+        if (valueFieldType && index !== 0) {
+            col.format = valueFieldType;
+        }
+        if (!data.yAxisFields)
+            return;
+        const matchingCol = data.yAxisFields.find((c) => c.field === col.field);
+        if (!col.label && matchingCol) {
+            col.label = matchingCol.label;
+            col.format = matchingCol.format;
+        }
+    });
+    const formattedRows = rows.map((row) => {
+        return columns.reduce((formattedRow, column) => {
+            // Apply the format function to each field in the row
+            const formattedValue = quillFormat({
+                value: row[column.field],
+                format: column.format,
+            });
+            formattedRow[column.field] = formattedValue;
+            return formattedRow;
+        }, {});
+    });
     return (_jsxs("div", { style: {
             cursor: 'pointer',
             ...style,
@@ -34,5 +91,20 @@ export default function DashboardItem({ dashboardItem, onClickDashboardItem, isL
                             display: 'flex',
                             alignItems: 'center',
                             justifyContent: 'flex-end',
-                        }, children: 'view report →' })) : null] }), children] }, dashboardItem?.name));
+                        }, children: 'view report →' })) : null] }), isLoading ? (_jsx(ChartSkeleton, { containerStyle: {
+                    width: '100%',
+                    height: '400px',
+                } })) : error ? (_jsx(ChartError, { containerStyle: {
+                    width: '100%',
+                    height: '400px',
+                } })) : (_jsx(QuillTable, { rows: formattedRows ?? [], columns: columns ?? data.yAxisFields, rowsPerPage: config?.rowsPerPage || 10, containerStyle: {
+                    width: '100%',
+                    height: '400px',
+                }, showDownloadCSVButton: true, downloadCSV: () => {
+                    downloadCSV({
+                        rows: pivotTable?.rows ?? data.rows ?? [],
+                        fields: columns ?? data.yAxisFields,
+                        name: data.name || '',
+                    });
+                } }))] }, dashboardItem?.name));
 }

package/dist/esm/components/QuillTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QuillTable.d.ts","sourceRoot":"","sources":["../../../src/components/QuillTable.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAMrD,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,OAAO,EACP,OAAO,EACP,qBAAqB,EACrB,gBAAgB,EAChB,cAAc,EACd,gBAA0C,EAC1C,WAAgB,EAChB,eAAwC,EACxC,WAAW,GACZ,EAAE,mBAAmB,2CAsZrB"}
+{"version":3,"file":"QuillTable.d.ts","sourceRoot":"","sources":["../../../src/components/QuillTable.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAMrD,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,OAAO,EACP,OAAO,EACP,qBAAqB,EACrB,gBAAgB,EAChB,cAAc,EACd,gBAA0C,EAC1C,WAAgB,EAChB,eAAwC,EACxC,WAAW,GACZ,EAAE,mBAAmB,2CAwZrB"}

package/dist/esm/components/QuillTable.js

@@ -187,7 +187,9 @@ export default function QuillTable({ rows, columns, loading, showDownloadCSVButt
                                                         overflow: 'hidden',
                                                         padding: '8px 16px',
                                                         userSelect: 'none',
-                                                    }, children: row[column.field] }) }) }, 'sqlcell' + columnIndex))) }, 'sqlrow' + rowIndex))) }))] }), _jsx("div", { style: {
+                                                    }, children: typeof row[column.field] === 'object'
+                                                        ? JSON.stringify(row[column.field])
+                                                        : row[column.field] }) }) }, 'sqlcell' + columnIndex))) }, 'sqlrow' + rowIndex))) }))] }), _jsx("div", { style: {
                             display: 'flex',
                             minWidth: '100px',
                             height: 38,

package/dist/esm/components/ReportBuilder/AddSortPopover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AddSortPopover.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/AddSortPopover.tsx"],"names":[],"mappings":"AASA,eAAO,MAAM,YAAY,iMAetB,GAAG,wDA2CL,CAAC;AAEF,eAAO,MAAM,cAAc,mDAMxB,GAAG,4CAuDL,CAAC"}
+{"version":3,"file":"AddSortPopover.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/AddSortPopover.tsx"],"names":[],"mappings":"AAWA,eAAO,MAAM,YAAY,iMAetB,GAAG,wDA2CL,CAAC;AAEF,eAAO,MAAM,cAAc,mDAMxB,GAAG,4CA0DL,CAAC"}

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

@@ -1,7 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useState } from 'react';
-import { QuillSelect } from './ui';
+import { useState, useContext } from 'react';
+import { QuillSelectComponent } from '../QuillSelect';
 import { MemoizedButton, MemoizedSecondaryButton } from '../UiComponents';
+import { ThemeContext } from '../../Context';
 const SORT_VALUE_TO_LABEL = {
     ASC: 'ascending',
     DESC: 'descending',
@@ -35,15 +36,15 @@ export const SortSentence = ({ sortData, keyPrefix, columns, handleDelete, setEd
 export const AddSortPopover = ({ onSave, columns, isEdit, onDelete, column, }) => {
     const [sortColumn, setSortColumn] = useState(column || '');
     const [sortDirection, setSortDirection] = useState('ASC');
-    return (_jsxs("div", { style: { display: 'flex', flexDirection: 'column', gap: 12 }, children: [_jsxs("div", { style: { display: 'flex', flexDirection: 'row', gap: 12 }, children: [_jsx(QuillSelect, { value: sortColumn, onChange: (value) => {
+    const [theme] = useContext(ThemeContext);
+    return (_jsxs("div", { style: { display: 'flex', flexDirection: 'column', gap: 12 }, children: [_jsxs("div", { style: { display: 'flex', flexDirection: 'row', gap: 12 }, children: [_jsx(QuillSelectComponent, { theme: theme, value: sortColumn, onChange: (value) => {
                             setSortColumn(value);
                         }, options: [
-                            { label: 'Select', value: '' },
                             ...columns.map((column) => ({
                                 label: column.split('.')[1],
                                 value: column.split('.')[1],
                             })),
-                        ] }), _jsx(QuillSelect, { value: sortDirection, onChange: (value) => {
+                        ] }), _jsx(QuillSelectComponent, { theme: theme, value: sortDirection, onChange: (value) => {
                             setSortDirection(value);
                         }, options: [
                             { label: 'Ascending', value: 'ASC' },

package/dist/esm/components/ReportBuilder/ast.d.ts

@@ -509,4 +509,8 @@ export declare const isDateishColumnType: (columnType: string | undefined) => bo
  * Returns a list of table objects from the AST.
  */
 export declare const getTableNames: (ast: AST) => string[];
+/**
+ * Returns a list of table objects from the AST.
+ */
+export declare const getTableAliases: (ast: AST) => (string | null)[];
 //# sourceMappingURL=ast.d.ts.map

package/dist/esm/components/ReportBuilder/ast.d.ts.map

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

package/dist/esm/components/ReportBuilder/ast.js

@@ -184,3 +184,11 @@ export const getTableNames = (ast) => {
         return [];
     return ast.from?.map((tbl) => tbl.table) ?? [];
 };
+/**
+ * Returns a list of table objects from the AST.
+ */
+export const getTableAliases = (ast) => {
+    if (!isSelect(ast))
+        return [];
+    return ast.from?.map((tbl) => tbl.as) ?? [];
+};

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

@@ -20,10 +20,13 @@ export declare function convertGroupBy(ast: AST, prevPivot: Pivot | undefined, s
     pivot: Pivot;
 } | {
     pivot: Partial<{
-        aggregationType: "count" | "average" | "sum" | "min" | "max";
+        aggregationType: "sum" | "average" | "count" | "min" | "max";
         valueField: string;
         rowField?: string | undefined;
+        rowFieldType?: string | undefined;
         columnField?: string | undefined;
+        sort: boolean;
+        sortDirection: "ASC" | "DESC";
     }> | null;
     ast: Partial<NSP.Select>;
 };

package/dist/esm/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;;;;;;;;;;;EAiZ1B;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,OAuItE;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;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;;;;;;;;;;;;;;EAob1B;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,OAuItE;AAID,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAY1E"}

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

@@ -173,9 +173,10 @@ export 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;
@@ -200,7 +201,7 @@ export function convertGroupBy(ast, prevPivot = null, schemaTables) {
                     table: columnTable,
                     column: columnName,
                 },
-                as: columnAs,
+                as: columnName,
             });
         }
         newAst = { ...ast };
@@ -220,8 +221,10 @@ export 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({
@@ -238,7 +241,9 @@ export 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.
@@ -261,7 +266,6 @@ export 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
@@ -284,7 +288,8 @@ export function convertGroupBy(ast, prevPivot = null, schemaTables) {
                 }
                 else {
                     // ONLY SET VALUE FIELD IF THE FIELD TYPE IS A NUMBER
-                    if (isNumericColumnType(field?.fieldType)) {
+                    if (isNumericColumnType(field?.fieldType) &&
+                        !isIdColumn(columnName)) {
                         pivot.valueField = columnName;
                         pivot.aggregationType = column?.expr?.name.toLowerCase();
                     }
@@ -415,11 +420,15 @@ export function convertGroupBy(ast, prevPivot = null, schemaTables) {
     const extractGroup = ast.groupby.find(isExtract);
     if (dateTruncGroup) {
         const column = dateTruncGroup.args?.value.find(isCol);
-        pivot.rowField = extractColumnish(column);
+        const columnName = extractColumnish(column);
+        pivot.rowField = columnName;
+        pivot.rowFieldType = columns.find((c) => c.field === columnName)?.fieldType;
     }
     else if (extractGroup) {
         const column = extractGroup.args?.source;
-        pivot.rowField = extractColumnish(column);
+        const columnName = extractColumnish(column);
+        pivot.rowField = columnName;
+        pivot.rowFieldType = columns.find((c) => c.field === columnName)?.fieldType;
     }
     else if (aliasMap) {
         const match = ast.groupby.find(isAlias);
@@ -427,6 +436,7 @@ export 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
@@ -434,6 +444,9 @@ export function convertGroupBy(ast, prevPivot = null, schemaTables) {
     for (let j = 0; j < ast.groupby.length; j++) {
         const group = ast.groupby[j];
         let groupValue = 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];
@@ -441,6 +454,7 @@ export 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;
@@ -465,10 +479,23 @@ export 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) &&
+                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 };
 }
@@ -718,3 +745,8 @@ export function convertRemoveSimpleParentheses(ast) {
     }
     return { ...ast, where: node };
 }
+function isIdColumn(columnName) {
+    return (columnName &&
+        (columnName.toLowerCase() === 'id' ||
+            columnName.toLowerCase().endsWith('_id')));
+}

package/dist/esm/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/esm/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/esm/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":";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,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/esm/components/ReportBuilder/ui.js

@@ -111,6 +111,7 @@ export const QuillSidebar = forwardRef(({ children, ...props }, forwardedRef) =>
         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)
 export const CustomContainer = forwardRef(({ children, ...props }, forwardedRef) => (_jsx("div", { style: {
@@ -125,6 +126,7 @@ export const CustomContainer = forwardRef(({ children, ...props }, forwardedRef)
         flexGrow: 1,
         width: '75%',
         height: '100%',
+        boxSizing: 'border-box',
     }, ref: forwardedRef, ...props, children: children })));
 export const QuillSelect = ({ onChange, ...props }) => {
     const handleOnChange = (value) => {
@@ -163,7 +165,6 @@ export function MemoizedPopover({ onClose, children, style = {}, trigger, isOpen
                         top: 12,
                         borderRadius: 6,
                         padding: 20,
-                        overflow: 'auto',
                         ...style,
                     }, children: children }) }))] }));
 }
@@ -279,7 +280,7 @@ export const QuillDraggableColumn = ({ label, children, onDelete }) => {
 };
 // Three dots animated bouncing
 export const QuillButtonLoadingState = () => {
-    return _jsx(QuillButton, { children: "Loading..." });
+    return (_jsx(QuillButton, { children: _jsx(LoadingSpinner, {}) }));
 };
 // Loading state for the table
 export const QuillTableLoadingState = () => {

package/dist/esm/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/esm/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":"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;AAqCF,wBAAgB,gCAAgC,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,OAQvE"}