@quillsql/react 2.12.40 → 2.12.42

package/dist/cjs/components/QuillMultiSelectWithCombo.js

@@ -106,13 +106,13 @@ function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, v
             minWidth: width,
         }, children: [label && ((0, jsx_runtime_1.jsx)("div", { style: {
                     fontSize: 14,
-                    color: theme.secondaryTextColor,
-                    fontFamily: theme.fontFamily,
+                    color: theme?.secondaryTextColor,
+                    fontFamily: theme?.fontFamily,
                     paddingBottom: 5,
                     fontWeight: 600,
                 }, children: label })), (0, jsx_runtime_1.jsxs)("button", { style: {
-                    fontFamily: theme.fontFamily,
-                    color: theme.primaryTextColor,
+                    fontFamily: theme?.fontFamily,
+                    color: theme?.primaryTextColor,
                     width: '100%',
                     display: 'flex',
                     alignItems: 'center',
@@ -125,15 +125,15 @@ function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, v
                     boxSizing: 'border-box',
                     borderWidth: 1,
                     borderStyle: 'solid',
-                    borderColor: theme.borderColor,
+                    borderColor: theme?.borderColor,
                     borderRadius: 6,
                     paddingTop: 9,
                     paddingBottom: 9,
                     height: 40,
                     minHeight: 40,
                     maxHeight: 40,
-                }, className: "quill-select-button", onClick: () => setShowModal((showModal) => !showModal), children: [(0, jsx_runtime_1.jsx)("style", { children: ` .quill-select-button { background: ${theme.backgroundColor}; } 
-          .quill-select-button:hover { background: ${theme.hoverBackgroundColor}; }
+                }, className: "quill-select-button", onClick: () => setShowModal((showModal) => !showModal), children: [(0, jsx_runtime_1.jsx)("style", { children: ` .quill-select-button { background: ${theme?.backgroundColor}; } 
+          .quill-select-button:hover { background: ${theme?.hoverBackgroundColor}; }
         ` }), (0, jsx_runtime_1.jsx)("span", { style: {
                             textOverflow: 'ellipsis',
                             whiteSpace: 'nowrap',
@@ -149,13 +149,13 @@ function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, v
                     boxSizing: 'border-box',
                     borderWidth: 1,
                     borderStyle: 'solid',
-                    borderColor: theme.borderColor,
+                    borderColor: theme?.borderColor,
                     borderRadius: 6,
                     background: 'white',
                     marginTop: 12,
                     zIndex: 100,
                     padding: 6,
-                    fontFamily: theme.fontFamily,
+                    fontFamily: theme?.fontFamily,
                     maxHeight: '50vh',
                     overflow: 'scroll',
                     fontSize: 14,
@@ -170,9 +170,9 @@ function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, v
                             borderWidth: 0,
                             fontSize: 14,
                             borderStyle: 'solid',
-                            borderColor: theme.borderColor,
+                            borderColor: theme?.borderColor,
                             borderRadius: 4,
-                            fontFamily: theme.fontFamily,
+                            fontFamily: theme?.fontFamily,
                             textOverflow: 'ellipsis',
                             whiteSpace: 'nowrap',
                             height: 34,

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

@@ -1 +1 @@
-{"version":3,"file":"QuillSelect.d.ts","sourceRoot":"","sources":["../../../src/components/QuillSelect.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAKtD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,EACnC,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,GACN,EAAE,oBAAoB,2CA2MtB"}
+{"version":3,"file":"QuillSelect.d.ts","sourceRoot":"","sources":["../../../src/components/QuillSelect.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAItD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,EACnC,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,GACN,EAAE,oBAAoB,2CA2MtB"}

package/dist/cjs/components/QuillSelect.js

@@ -22,13 +22,13 @@ function QuillSelectComponent({ options, value, width, onChange, label, }) {
             minWidth: width,
         }, children: [label && ((0, jsx_runtime_1.jsx)("div", { style: {
                     fontSize: 14,
-                    color: theme.secondaryTextColor,
-                    fontFamily: theme.fontFamily,
+                    color: theme?.secondaryTextColor,
+                    fontFamily: theme?.fontFamily,
                     paddingBottom: 5,
                     fontWeight: 600,
                 }, children: label })), (0, jsx_runtime_1.jsxs)("button", { style: {
-                    fontFamily: theme.fontFamily,
-                    color: theme.primaryTextColor,
+                    fontFamily: theme?.fontFamily,
+                    color: theme?.primaryTextColor,
                     width: '100%',
                     display: 'flex',
                     alignItems: 'center',
@@ -40,14 +40,14 @@ function QuillSelectComponent({ options, value, width, onChange, label, }) {
                     boxSizing: 'border-box',
                     borderWidth: 1,
                     borderStyle: 'solid',
-                    borderColor: theme.borderColor,
+                    borderColor: theme?.borderColor,
                     borderRadius: 6,
                     paddingTop: 9,
                     paddingBottom: 9,
                     height: 40,
                     minHeight: 40,
                     maxHeight: 40,
-                }, className: "quill-select-button", onClick: () => setShowModal((showModal) => !showModal), children: [(0, jsx_runtime_1.jsx)("style", { children: ` .quill-select-button { background: ${theme.backgroundColor}; } .quill-select-button:hover { background: ${theme.hoverBackgroundColor}; }` }), (0, jsx_runtime_1.jsx)("span", { style: {
+                }, className: "quill-select-button", onClick: () => setShowModal((showModal) => !showModal), children: [(0, jsx_runtime_1.jsx)("style", { children: ` .quill-select-button { background: ${theme?.backgroundColor}; } .quill-select-button:hover { background: ${theme?.hoverBackgroundColor}; }` }), (0, jsx_runtime_1.jsx)("span", { style: {
                             textOverflow: 'ellipsis',
                             whiteSpace: 'nowrap',
                             overflow: 'hidden',
@@ -59,7 +59,7 @@ function QuillSelectComponent({ options, value, width, onChange, label, }) {
                     boxSizing: 'border-box',
                     borderWidth: 1,
                     borderStyle: 'solid',
-                    borderColor: theme.borderColor,
+                    borderColor: theme?.borderColor,
                     borderRadius: 6,
                     background: 'white',
                     marginTop: 12,
@@ -68,7 +68,7 @@ function QuillSelectComponent({ options, value, width, onChange, label, }) {
                     paddingBottom: 6,
                     paddingLeft: 6,
                     paddingRight: 6,
-                    fontFamily: theme.fontFamily,
+                    fontFamily: theme?.fontFamily,
                     maxHeight: '50vh',
                     overflow: 'scroll',
                 }, children: [(0, jsx_runtime_1.jsxs)("button", { style: {
@@ -81,9 +81,9 @@ function QuillSelectComponent({ options, value, width, onChange, label, }) {
                             borderWidth: 0,
                             fontSize: 14,
                             borderStyle: 'solid',
-                            borderColor: theme.borderColor,
+                            borderColor: theme?.borderColor,
                             borderRadius: 4,
-                            fontFamily: theme.fontFamily,
+                            fontFamily: theme?.fontFamily,
                             textOverflow: 'ellipsis',
                             whiteSpace: 'nowrap',
                             overflow: 'hidden',
@@ -111,9 +111,9 @@ function QuillSelectComponent({ options, value, width, onChange, label, }) {
                             borderWidth: 0,
                             fontSize: 14,
                             borderStyle: 'solid',
-                            borderColor: theme.borderColor,
+                            borderColor: theme?.borderColor,
                             borderRadius: 4,
-                            fontFamily: theme.fontFamily,
+                            fontFamily: theme?.fontFamily,
                             textOverflow: 'ellipsis',
                             whiteSpace: 'nowrap',
                             height: 34,

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

@@ -1 +1 @@
-{"version":3,"file":"QuillSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillSelectWithCombo.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAYtD;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,EAC5C,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,GACN,EAAE,oBAAoB,2CAoPtB"}
+{"version":3,"file":"QuillSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillSelectWithCombo.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAWtD;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,EAC5C,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,GACN,EAAE,oBAAoB,2CAoPtB"}

package/dist/cjs/components/QuillSelectWithCombo.js

@@ -69,13 +69,13 @@ function QuillSelectComponentWithCombo({ options, value, width, onChange, label,
             minWidth: width,
         }, children: [label && ((0, jsx_runtime_1.jsx)("div", { style: {
                     fontSize: 14,
-                    color: theme.secondaryTextColor,
-                    fontFamily: theme.fontFamily,
+                    color: theme?.secondaryTextColor,
+                    fontFamily: theme?.fontFamily,
                     paddingBottom: 5,
                     fontWeight: 600,
                 }, children: label })), (0, jsx_runtime_1.jsxs)("button", { style: {
-                    fontFamily: theme.fontFamily,
-                    color: theme.primaryTextColor,
+                    fontFamily: theme?.fontFamily,
+                    color: theme?.primaryTextColor,
                     width: '100%',
                     display: 'flex',
                     alignItems: 'center',
@@ -87,14 +87,14 @@ function QuillSelectComponentWithCombo({ options, value, width, onChange, label,
                     boxSizing: 'border-box',
                     borderWidth: 1,
                     borderStyle: 'solid',
-                    borderColor: theme.borderColor,
+                    borderColor: theme?.borderColor,
                     borderRadius: 6,
                     paddingTop: 9,
                     paddingBottom: 9,
                     height: 40,
                     minHeight: 40,
                     maxHeight: 40,
-                }, className: "quill-select-button", onClick: () => setShowModal((showModal) => !showModal), children: [(0, jsx_runtime_1.jsx)("style", { children: ` .quill-select-button { background: ${theme.backgroundColor}; } .quill-select-button:hover { background: ${theme.hoverBackgroundColor}; }` }), (0, jsx_runtime_1.jsx)("span", { style: {
+                }, className: "quill-select-button", onClick: () => setShowModal((showModal) => !showModal), children: [(0, jsx_runtime_1.jsx)("style", { children: ` .quill-select-button { background: ${theme?.backgroundColor}; } .quill-select-button:hover { background: ${theme?.hoverBackgroundColor}; }` }), (0, jsx_runtime_1.jsx)("span", { style: {
                             textOverflow: 'ellipsis',
                             whiteSpace: 'nowrap',
                             overflow: 'hidden',
@@ -106,7 +106,7 @@ function QuillSelectComponentWithCombo({ options, value, width, onChange, label,
                     boxSizing: 'border-box',
                     borderWidth: 1,
                     borderStyle: 'solid',
-                    borderColor: theme.borderColor,
+                    borderColor: theme?.borderColor,
                     borderRadius: 6,
                     background: 'white',
                     marginTop: 12,
@@ -115,7 +115,7 @@ function QuillSelectComponentWithCombo({ options, value, width, onChange, label,
                     paddingBottom: 6,
                     paddingLeft: 6,
                     paddingRight: 6,
-                    fontFamily: theme.fontFamily,
+                    fontFamily: theme?.fontFamily,
                     maxHeight: '50vh',
                     overflow: 'scroll',
                     fontSize: 14,
@@ -131,9 +131,9 @@ function QuillSelectComponentWithCombo({ options, value, width, onChange, label,
                             borderWidth: 0,
                             fontSize: 14,
                             borderStyle: 'solid',
-                            borderColor: theme.borderColor,
+                            borderColor: theme?.borderColor,
                             borderRadius: 4,
-                            fontFamily: theme.fontFamily,
+                            fontFamily: theme?.fontFamily,
                             textOverflow: 'ellipsis',
                             whiteSpace: 'nowrap',
                             overflow: 'hidden',
@@ -161,9 +161,9 @@ function QuillSelectComponentWithCombo({ options, value, width, onChange, label,
                             borderWidth: 0,
                             fontSize: 14,
                             borderStyle: 'solid',
-                            borderColor: theme.borderColor,
+                            borderColor: theme?.borderColor,
                             borderRadius: 4,
-                            fontFamily: theme.fontFamily,
+                            fontFamily: theme?.fontFamily,
                             textOverflow: 'ellipsis',
                             whiteSpace: 'nowrap',
                             height: 34,

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

@@ -1,7 +1,10 @@
 /// <reference types="react" />
 import { Filter, Operator } from '../../models/Filter';
+import { ColumnInternal } from '../../models/Columns';
 interface FilterModalProps {
-    schema: any;
+    schema?: {
+        columns: ColumnInternal[];
+    };
     filter?: Filter;
     fieldValuesMap: {
         [key: string]: string[];

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

@@ -1 +1 @@
-{"version":3,"file":"FilterModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/FilterModal.tsx"],"names":[],"mappings":";AAIA,OAAO,EACL,MAAM,EAIN,QAAQ,EAOT,MAAM,qBAAqB,CAAC;AAM7B,UAAU,gBAAgB;IACxB,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,EACZ;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,GACzB;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;SAAE,CAAA;KAAE,CAAC;IACnD,qBAAqB,CAAC,EAAE,kBAAkB,CAAC;IAC3C,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,kBAAkB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC7C,wBAAwB,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACpD,oBAAoB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;CAChD;AAQD,KAAK,kBAAkB,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,EAAE,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,MAAM,EACN,MAAM,EACN,cAAc,EACd,qBAAqB,EACrB,cAAc,EACd,cAAc,EACd,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,wBAAwB,EACxB,oBAAoB,GACrB,EAAE,gBAAgB,2CAwvBlB"}
+{"version":3,"file":"FilterModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/FilterModal.tsx"],"names":[],"mappings":";AAIA,OAAO,EACL,MAAM,EAIN,QAAQ,EAOT,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,UAAU,gBAAgB;IACxB,MAAM,CAAC,EAAE;QAAE,OAAO,EAAE,cAAc,EAAE,CAAA;KAAE,CAAC;IACvC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,EACZ;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,GACzB;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;SAAE,CAAA;KAAE,CAAC;IACnD,qBAAqB,CAAC,EAAE,kBAAkB,CAAC;IAC3C,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,kBAAkB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC7C,wBAAwB,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACpD,oBAAoB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;CAChD;AAQD,KAAK,kBAAkB,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,EAAE,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,MAAM,EACN,MAAM,EACN,cAAc,EACd,qBAAqB,EACrB,cAAc,EACd,cAAc,EACd,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,wBAAwB,EACxB,oBAAoB,GACrB,EAAE,gBAAgB,2CAwvBlB"}

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

@@ -16,20 +16,20 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
     const [field, setField] = (0, react_1.useState)(filter ? filter.field : '');
     const [fieldOptions, setFieldOptions] = (0, react_1.useState)([]);
     const [fieldValues, setFieldValues] = (0, react_1.useState)([]);
-    const [type, setType] = (0, react_1.useState)(filter ? filter.type : '');
+    const [type, setType] = (0, react_1.useState)(filter ? filter.filterType : '');
     const [value, setValue] = (0, react_1.useState)(filter
-        ? filter.name === 'date-filter'
+        ? filter.filterType === 'date-filter'
             ? filter.value.value
             : filter.value
         : undefined);
-    const [selectedOptions, setSelectedOptions] = (0, react_1.useState)(filter && filter.name === 'string-in-filter'
+    const [selectedOptions, setSelectedOptions] = (0, react_1.useState)(filter && filter.filterType === 'string-in-filter'
         ? filter.value.map((val) => {
             return { label: val, value: val };
         })
         : []);
     const [operator, setOperator] = (0, react_1.useState)(filter ? filter.operator : '');
     const [operatorOptions, setOperatorOptions] = (0, react_1.useState)([]);
-    const [unit, setUnit] = (0, react_1.useState)(filter && filter.name === 'date-filter' ? filter.value.unit : '');
+    const [unit, setUnit] = (0, react_1.useState)(filter && filter.filterType === 'date-filter' ? filter.value.unit : '');
     const [unitOptions, setUnitOptions] = (0, react_1.useState)([]);
     const [startDate, setStartDate] = (0, react_1.useState)(filter && filter.value?.startDate
         ? filter.value.startDate.substring(0, 10)
@@ -41,7 +41,7 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
     const [table, setTable] = (0, react_1.useState)('');
     // Define all supported operator options for each field type
     const allOperatorOptions = {
-        [Filter_1.FieldTypes.Numeric]: [
+        [Filter_1.FieldTypes.Number]: [
             Filter_1.NumberOperator.EqualTo,
             Filter_1.NumberOperator.NotEqualTo,
             Filter_1.NumberOperator.GreaterThan,
@@ -82,7 +82,7 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
     // Effect hook to initialize or update fieldValues based on selected field
     (0, react_1.useEffect)(() => {
         if (filter) {
-            if (filter.name === 'string-in-filter') {
+            if (filter.filterType === 'string-in-filter') {
                 setSelectedOptions(filter.value.map((val) => {
                     return { label: val, value: val };
                 }));
@@ -94,7 +94,7 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
         if (schema && schema.columns) {
             const fo = schema.columns.map((column) => {
                 return {
-                    name: column.name,
+                    name: column.field,
                     type: column.fieldType,
                     table: column.table ?? '',
                 };
@@ -143,7 +143,7 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
                             setOperator(Filter_1.DateOperator.InTheLast);
                             setValue('90');
                             break;
-                        case 'numeric':
+                        case 'number':
                             setOperator(Filter_1.NumberOperator.EqualTo);
                             setValue('0');
                             break;
@@ -270,8 +270,8 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
                         }
                         onSubmitFilter({
                             field,
-                            name: Filter_1.FilterNames.DateFilter,
-                            type: Filter_1.FieldTypes.Date,
+                            filterType: Filter_1.FilterNames.DateFilter,
+                            fieldType: Filter_1.FieldTypes.Date,
                             operator: operator,
                             value: { value: value, unit: unit },
                             table,
@@ -284,8 +284,8 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
                         }
                         onSubmitFilter({
                             field,
-                            name: Filter_1.FilterNames.DateFilter,
-                            type: Filter_1.FieldTypes.Date,
+                            filterType: Filter_1.FilterNames.DateFilter,
+                            fieldType: Filter_1.FieldTypes.Date,
                             operator: operator,
                             value: { value: 0, unit: unit },
                             table,
@@ -298,8 +298,8 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
                         }
                         onSubmitFilter({
                             field,
-                            name: Filter_1.FilterNames.DateCustomFilter,
-                            type: Filter_1.FieldTypes.Date,
+                            filterType: Filter_1.FilterNames.DateCustomFilter,
+                            fieldType: Filter_1.FieldTypes.Date,
                             operator: operator,
                             value: { startDate, endDate },
                             table,
@@ -319,8 +319,8 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
                         }
                         onSubmitFilter({
                             field,
-                            name: Filter_1.FilterNames.DateComparisonFilter,
-                            type: Filter_1.FieldTypes.Date,
+                            filterType: Filter_1.FilterNames.DateComparisonFilter,
+                            fieldType: Filter_1.FieldTypes.Date,
                             operator: operator,
                             value,
                             table,
@@ -330,8 +330,8 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
                     case Filter_1.NullOperator.IsNull:
                         onSubmitFilter({
                             field,
-                            name: Filter_1.FilterNames.NullFilter,
-                            type: Filter_1.FieldTypes.Null,
+                            filterType: Filter_1.FilterNames.NullFilter,
+                            fieldType: Filter_1.FieldTypes.Null,
                             operator: operator,
                             value: null,
                             table,
@@ -349,8 +349,8 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
                         }
                         onSubmitFilter({
                             field,
-                            name: Filter_1.FilterNames.StringInFilter,
-                            type: Filter_1.FieldTypes.String,
+                            filterType: Filter_1.FilterNames.StringInFilter,
+                            fieldType: Filter_1.FieldTypes.String,
                             operator: operator,
                             value: selectedOptions.map((val) => val.label),
                             table,
@@ -360,8 +360,8 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
                     case Filter_1.NullOperator.IsNull:
                         onSubmitFilter({
                             field,
-                            name: Filter_1.FilterNames.NullFilter,
-                            type: Filter_1.FieldTypes.Null,
+                            filterType: Filter_1.FilterNames.NullFilter,
+                            fieldType: Filter_1.FieldTypes.Null,
                             operator: operator,
                             value: null,
                             table,
@@ -374,22 +374,22 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
                         }
                         onSubmitFilter({
                             field,
-                            name: Filter_1.FilterNames.StringFilter,
-                            type: Filter_1.FieldTypes.String,
+                            filterType: Filter_1.FilterNames.StringFilter,
+                            fieldType: Filter_1.FieldTypes.String,
                             operator: operator,
                             value,
                             table,
                         });
                 }
                 break;
-            case 'numeric':
+            case 'number':
                 switch (operator) {
                     case Filter_1.NullOperator.IsNotNull:
                     case Filter_1.NullOperator.IsNull:
                         onSubmitFilter({
                             field,
-                            name: Filter_1.FilterNames.NullFilter,
-                            type: Filter_1.FieldTypes.Null,
+                            filterType: Filter_1.FilterNames.NullFilter,
+                            fieldType: Filter_1.FieldTypes.Null,
                             operator: operator,
                             value: null,
                             table,
@@ -404,8 +404,8 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
                         }
                         onSubmitFilter({
                             field,
-                            name: Filter_1.FilterNames.NumericFilter,
-                            type: Filter_1.FieldTypes.Numeric,
+                            filterType: Filter_1.FilterNames.NumericFilter,
+                            fieldType: Filter_1.FieldTypes.Number,
                             operator: operator,
                             value,
                             table,
@@ -418,8 +418,8 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
                     case Filter_1.NullOperator.IsNull:
                         onSubmitFilter({
                             field,
-                            name: Filter_1.FilterNames.NullFilter,
-                            type: Filter_1.FieldTypes.Null,
+                            filterType: Filter_1.FilterNames.NullFilter,
+                            fieldType: Filter_1.FieldTypes.Null,
                             operator: operator,
                             value: null,
                             table,
@@ -429,8 +429,8 @@ function FilterModal({ schema, filter, fieldValuesMap, customOperatorOptions, on
                     case Filter_1.BoolOperator.NotEqualTo:
                         onSubmitFilter({
                             field,
-                            name: Filter_1.FilterNames.BooleanFilter,
-                            type: Filter_1.FieldTypes.Boolean,
+                            filterType: Filter_1.FilterNames.BooleanFilter,
+                            fieldType: Filter_1.FieldTypes.Boolean,
                             operator: operator,
                             value: value,
                             table,

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

@@ -1,7 +1,7 @@
 import { NodeSQLParser as NSP, AST } from './ast';
-import { Pivot } from './pivot';
-import { TableInfo } from './schema';
 import { ColumnInternal } from '../../models/Columns';
+import { Pivot } from '../../models/Pivot';
+import { Table } from '../../models/Tables';
 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;
@@ -12,7 +12,7 @@ export declare function convertBigQuery(ast: any): NSP.Select;
 /**
  * Replaces the wildcard column selector with their literal column names.
  */
-export declare function convertWildcardColumns(ast: NSP.Select, schemaTables: TableInfo[]): NSP.Select;
+export declare function convertWildcardColumns(ast: NSP.Select, schemaTables: Table[]): NSP.Select;
 /**
  * Take a list of AST column objects of any form and turn them into the generic select form
  */
@@ -22,37 +22,11 @@ export declare function convertASTToPivotData(ast: NSP.Select, columnInfo: Colum
  * Processes the AST and builds up a new pivot, given the old AST, the old pivot
  * and a list of tables in the schema.
  */
-export declare function convertGroupBy(ast: AST, prevPivot: Pivot | undefined, schemaTables: TableInfo[]): {
-    ast: NSP.Insert_Replace | NSP.Update | NSP.Delete | NSP.Alter | NSP.Use | NSP.Create | NSP.Drop | NSP.BigQuery;
-    pivot: Pivot;
+export declare function convertGroupBy(ast: AST, schemaTables: Table[], prevPivot?: Pivot): {
+    ast: NSP.Use | NSP.Create | NSP.Update | NSP.Insert_Replace | NSP.Alter | NSP.Delete | NSP.Drop | NSP.BigQuery;
+    pivot: Pivot | undefined;
 } | {
-    pivot: {
-        aggregationType: "count" | "average" | "avg" | "min" | "max" | "sum";
-        valueField: string;
-        valueFieldType?: string | undefined;
-        rowField?: string | undefined;
-        rowFieldType?: string | undefined;
-        columnField?: string | undefined;
-        sort: boolean;
-        sortDirection: "ASC" | "DESC";
-        sortField?: string | undefined;
-        sortFieldType?: string | undefined;
-    } | null;
-    ast: Partial<NSP.Select>;
-} | {
-    pivot: {
-        title: string;
-        aggregationType: "count" | "average" | "avg" | "min" | "max" | "sum";
-        valueField: string;
-        valueFieldType?: string | undefined;
-        rowField?: string | undefined;
-        rowFieldType?: string | undefined;
-        columnField?: string | undefined;
-        sort: boolean;
-        sortDirection: "ASC" | "DESC";
-        sortField?: string | undefined;
-        sortFieldType?: string | undefined;
-    };
+    pivot: Pivot | null;
     ast: Partial<NSP.Select>;
 };
 export declare function convertStringComparison(node: any, databaseType: string): any;

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":"AAEA,OAAO,EACL,aAAa,IAAI,GAAG,EACpB,GAAG,EAOJ,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAc,SAAS,EAAE,MAAM,UAAU,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAStD,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,CAoDpD;AAUD;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,YAAY,EAAE,SAAS,EAAE,GACxB,GAAG,CAAC,MAAM,CA8BZ;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,gBAkBrE;AAmID,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,UAAU,EAAE,cAAc,EAAE,GAC3B,KAAK,GAAG,IAAI,CAmFd;AA+BD;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,GAAG,EACR,SAAS,mBAAc,EACvB,YAAY,EAAE,SAAS,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2F1B;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,OAyNtE;AAID,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAY1E;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,OA+C5C"}
+{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/convert.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,IAAI,GAAG,EACpB,GAAG,EAOJ,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAQ5C,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,CAoDpD;AAUD;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,YAAY,EAAE,KAAK,EAAE,GACpB,GAAG,CAAC,MAAM,CA8BZ;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,gBAkBrE;AAmID,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,UAAU,EAAE,cAAc,EAAE,GAC3B,KAAK,GAAG,IAAI,CAmFd;AA+BD;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,GAAG,EACR,YAAY,EAAE,KAAK,EAAE,EACrB,SAAS,CAAC,EAAE,KAAK;;;;;;EAwFlB;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,OAyNtE;AAID,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAY1E;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,OA+C5C"}

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

@@ -5,7 +5,6 @@ const date_fns_1 = require("date-fns");
 const PivotModal_1 = require("../../internals/ReportBuilder/PivotModal");
 const ast_1 = require("./ast");
 const util_1 = require("./util");
-const columnProcessing_1 = require("../../utils/columnProcessing");
 // Helper functions that preprocess the AST.
 // Find and replace certain pre-set date comparison queries with their
 // more stable counterparts.
@@ -142,7 +141,7 @@ function convertWildcardColumns(ast, schemaTables) {
             expr: {
                 type: 'column_ref',
                 table: null,
-                column: column.name,
+                column: column.field,
             },
             as: null,
         })),
@@ -376,7 +375,7 @@ function addValueFieldToPivot(newAst, pivot, columns) {
  * Processes the AST and builds up a new pivot, given the old AST, the old pivot
  * and a list of tables in the schema.
  */
-function convertGroupBy(ast, prevPivot = null, schemaTables) {
+function convertGroupBy(ast, schemaTables, prevPivot) {
     if (!(0, ast_1.isSelect)(ast))
         return { ast, pivot: prevPivot };
     let newAst = {};
@@ -389,10 +388,7 @@ function convertGroupBy(ast, prevPivot = null, schemaTables) {
     });
     const columns = schemaTables
         .filter((t) => tableNamesInQuery.includes(t.displayName))
-        .flatMap((table) => table.columns)
-        .map((column) => {
-        return (0, columnProcessing_1.convertColumnInfoToColumnInternal)(column);
-    });
+        .flatMap((table) => table.columns);
     // If there is not GROUP BY clause in the AST, we still need to process the
     // AST but it should pass-through in nature.
     if (!ast.groupby) {

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

@@ -1,6 +1,7 @@
 import { ReactNode } from 'react';
 import { SidebarComponentProps, ContainerComponentProps } from '../UiComponents';
 import { Filter } from '../../models/Filter';
+import { ColumnInternal } from '../../models/Columns';
 /**
  * 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
@@ -98,7 +99,9 @@ export interface TagWrapperProps {
 export declare const TagWrapper: ({ isCard, isRow, editPopoverKey, keyPrefix, formData, activeEditItem, setEditPopoverKey, setActiveEditItem, setActivePath, setOpenPopover, setIsPending, clearCheckboxes, handleDelete, setCheckboxes, handleReplaceSubtree, FilterPopover, getByKey, EditPopover, Button, SecondaryButton, renderNode, children, }: TagWrapperProps) => import("react/jsx-runtime").JSX.Element;
 export declare const AddFilterPopover: ({ onSave, Button, renderNode, activeEditItem, }: any) => import("react/jsx-runtime").JSX.Element;
 export interface FilterPopoverWrapperProps {
-    schema: any;
+    schema?: {
+        columns: ColumnInternal[];
+    };
     filter: Filter;
     filterLabel: string;
     index: number;

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

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

@@ -11,7 +11,6 @@ const QuillTable_1 = __importDefault(require("../QuillTable"));
 const Context_1 = require("../../Context");
 const util_1 = require("./util");
 const csv_1 = require("../../utils/csv");
-const hooks_1 = require("../../hooks");
 /**
  * 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
@@ -107,7 +106,7 @@ exports.QuillTag = (0, react_1.forwardRef)(({ label, onClick, children, onClickD
 });
 // A heading element in the sidebar (eg. "Filters")
 const QuillSidebarHeading = ({ label, }) => {
-    const theme = (0, hooks_1.useTheme)();
+    const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
     return ((0, jsx_runtime_1.jsx)("h1", { style: {
             fontSize: 16,
             fontWeight: 600,