@quillsql/react 2.11.9 → 2.11.12

package/dist/cjs/SQLEditor.js

@@ -14,6 +14,8 @@ const Context_1 = require("./Context");
 const QuillTable_1 = __importDefault(require("./components/QuillTable"));
 const dataFetcher_1 = require("./utils/dataFetcher");
 const ChartBuilder_1 = require("./ChartBuilder");
+const UiComponents_1 = require("./components/UiComponents");
+const ui_1 = require("./components/ReportBuilder/ui");
 function convertPostgresColumn(column) {
     let format;
     let fieldType;
@@ -129,29 +131,8 @@ const QuillButton = ({ onClick, label, theme, secondary, }) => ((0, jsx_runtime_
         fontFamily: theme?.fontFamily,
         height: 38,
     }, onClick: onClick, children: label }));
-const QuillTextInput = ({ onChange, value, id, placeholder, theme, style = {}, }) => {
-    return ((0, jsx_runtime_1.jsx)("input", { style: {
-            display: 'flex',
-            flexDirection: 'row',
-            alignItems: 'center',
-            paddingLeft: '12px',
-            paddingRight: '12px',
-            fontWeight: 'medium',
-            height: 38,
-            boxShadow: 'rgba(0, 0, 0, 0.1) 0px 1px 5px 0px',
-            width: '445px',
-            backgroundColor: theme?.backgroundColor || 'white',
-            color: theme?.primaryTextColor,
-            borderWidth: '1px',
-            borderColor: theme?.borderColor || '#E7E7E7',
-            borderStyle: 'solid',
-            borderRadius: '6px',
-            ...style
-        }, id: id, onChange: onChange, value: value, placeholder: placeholder }));
-};
-function QueryEditor({ containerStyle = { height: '100vh' }, ButtonComponent, SecondaryButtonComponent, TextInputComponent, TableComponent = QuillTable_1.default, newQueryEnabled = false, LoadingComponent, ModalComponent, defaultQuery, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, isEditMode = false, chartBuilderEnabled = false, showTableFormatOptions = false, showDateFieldOptions = false, showAccessControlOptions = false, destinationDashboard, chartBuilderTitle, chartBuilderButtonLabel, onAddToDashboardComplete, addToDashboardButtonLabel = 'Add to dashboard', dashboardItem = undefined, organizationName = undefined, chartBuilderHorizontalView = false, }) {
+function QueryEditor({ containerStyle = { height: '100vh' }, ButtonComponent = UiComponents_1.MemoizedButton, SecondaryButtonComponent = UiComponents_1.MemoizedSecondaryButton, TextInputComponent = ui_1.QuillTextInput, TableComponent = QuillTable_1.default, newQueryEnabled = false, LoadingComponent, ModalComponent, defaultQuery, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, isEditMode = false, chartBuilderEnabled = false, showTableFormatOptions = false, showDateFieldOptions = false, showAccessControlOptions = false, destinationDashboard, chartBuilderTitle, chartBuilderButtonLabel, onAddToDashboardComplete, addToDashboardButtonLabel = 'Add to dashboard', dashboardItem = undefined, organizationName = undefined, chartBuilderHorizontalView = false, }) {
     const [sqlPrompt, setSqlPrompt] = (0, react_1.useState)('');
-    const [isOpen, setIsOpen] = (0, react_1.useState)(false);
     const [client] = (0, react_1.useContext)(Context_1.ClientContext);
     const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
     const [query, setQuery] = (0, react_1.useState)(defaultQuery);
@@ -243,15 +224,6 @@ function QueryEditor({ containerStyle = { height: '100vh' }, ButtonComponent, Se
             if (resp.rows.length === 0) {
                 setErrorMessage('No data found');
             }
-            // stringify all rows that are either jsonb or json
-            resp.rows = resp.rows.map((row) => {
-                for (const key in row) {
-                    if (typeof row[key] === 'object') {
-                        row[key] = JSON.stringify(row[key]);
-                    }
-                }
-                return row;
-            });
             setRows(resp.rows && resp.rows.length ? resp.rows : []);
             if (onChangeData) {
                 onChangeData(resp.rows && resp.rows.length ? resp.rows : []);
@@ -270,13 +242,39 @@ function QueryEditor({ containerStyle = { height: '100vh' }, ButtonComponent, Se
             return;
         }
     };
-    /* all your useState and useContext calls and your useEffect hooks */
+    const handleFixWithAI = async () => {
+        try {
+            setDisplayTable(false);
+            setSqlResponseLoading(true);
+            const resp = await (0, dataFetcher_1.getDataFromCloud)(client, 'plsfix', {
+                initialQuestion: sqlPrompt,
+                brokenQuery: query,
+                errorMessage: errorMessage,
+            });
+            setErrorMessage('');
+            setQuery(resp.message);
+            setSqlResponseLoading(false);
+        }
+        catch (e) {
+            setErrorMessage('Failed to fix query');
+            setSqlResponseLoading(false);
+            console.log('ERROR: ', e);
+        }
+    };
+    const handleClickSchemaItem = async (event) => {
+        const name = event.target.textContent;
+        if (query.length > 0) {
+            await navigator.clipboard.writeText(name);
+        }
+        else {
+            setQuery(`SELECT * FROM ${name};`);
+        }
+    };
     (0, react_1.useEffect)(() => {
         if (onChangeQuery) {
             onChangeQuery(query);
         }
     }, [query]);
-    /* rest of your methods */
     return ((0, jsx_runtime_1.jsxs)("div", { style: containerStyle, children: [(!chartBuilderHorizontalView ||
                 (chartBuilderHorizontalView && !isChartBuilderOpen)) && ((0, jsx_runtime_1.jsx)("div", { style: {
                     height: '100%',
@@ -289,22 +287,23 @@ function QueryEditor({ containerStyle = { height: '100vh' }, ButtonComponent, Se
                             height: '100%',
                             flexDirection: 'row',
                             gap: 20,
-                        }, children: [(0, jsx_runtime_1.jsx)(exports.SchemaListComponent, { schema: schema, theme: theme, LoadingComponent: LoadingComponent, loading: schemaLoading }), (0, jsx_runtime_1.jsxs)("div", { style: {
+                        }, children: [(0, jsx_runtime_1.jsx)(exports.SchemaListComponent, { schema: schema, theme: theme, LoadingComponent: LoadingComponent, loading: schemaLoading, onClick: handleClickSchemaItem }), (0, jsx_runtime_1.jsxs)("div", { style: {
                                     display: 'flex',
                                     // gap: 12,
                                     flexDirection: 'column',
                                     width: 'calc(100% - 290px)',
                                     height: '100%',
                                     overflowX: 'hidden',
-                                }, children: [(0, jsx_runtime_1.jsxs)("div", { style: {
-                                            // TODO: change color
-                                            background: 'white',
+                                }, children: [(0, jsx_runtime_1.jsxs)("form", { onSubmit: (e) => {
+                                            e.preventDefault();
+                                            handleRunSqlPrompt();
+                                        }, style: {
                                             display: 'flex',
                                             flexDirection: 'row',
-                                            alignItems: 'center',
-                                            gap: '10px',
-                                            height: 80,
-                                        }, children: [(0, jsx_runtime_1.jsx)("div", { style: { minWidth: 440, flexGrow: 1 }, children: (TextInputComponent && ((0, jsx_runtime_1.jsx)(TextInputComponent, { id: "ai-search", value: sqlPrompt, style: { width: '100%' }, onChange: (e) => setSqlPrompt(e.target.value), placeholder: "Ask a question..." }))) || ((0, jsx_runtime_1.jsx)(QuillTextInput, { id: "ai-search", value: sqlPrompt, style: { width: '100%' }, onChange: (e) => setSqlPrompt(e.target.value), placeholder: "Ask a question...", theme: theme })) }), (ButtonComponent && ((0, jsx_runtime_1.jsx)(ButtonComponent, { onClick: handleRunSqlPrompt, label: "Ask AI" }))) || ((0, jsx_runtime_1.jsx)(QuillButton, { theme: theme, onClick: handleRunSqlPrompt, label: "Ask AI" }))] }), (0, jsx_runtime_1.jsx)("div", { style: { height: 'calc(50% - 40px)' }, children: (0, jsx_runtime_1.jsx)(SQLEditorComponent, { query: query, setQuery: setQuery, handleRunQuery: handleRunQuery, newQueryEnabled: newQueryEnabled, handleClearQuery: handleClearQuery, theme: theme, defineEditorTheme: defineEditorTheme, setEditorTheme: setEditorTheme, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, loading: sqlResponseLoading, LoadingComponent: LoadingComponent }) }), (0, jsx_runtime_1.jsxs)("div", { style: {
+                                            gap: 12,
+                                            paddingTop: 16,
+                                            paddingBottom: 16,
+                                        }, children: [(0, jsx_runtime_1.jsx)(TextInputComponent, { id: "ai-search", value: sqlPrompt, style: { width: '100%', fontSize: 14 }, onChange: (e) => setSqlPrompt(e.target.value), placeholder: "Ask a question..." }), (ButtonComponent && ((0, jsx_runtime_1.jsx)(ButtonComponent, { onClick: handleRunSqlPrompt, label: "Ask AI" }))) || ((0, jsx_runtime_1.jsx)(QuillButton, { theme: theme, onClick: handleRunSqlPrompt, label: "Ask AI" }))] }), (0, jsx_runtime_1.jsx)("div", { style: { height: 'calc(50% - 40px)' }, children: (0, jsx_runtime_1.jsx)(SQLEditorComponent, { query: query, setQuery: setQuery, handleRunQuery: handleRunQuery, handleFixWithAI: handleFixWithAI, newQueryEnabled: newQueryEnabled, handleClearQuery: handleClearQuery, theme: theme, defineEditorTheme: defineEditorTheme, setEditorTheme: setEditorTheme, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, loading: sqlResponseLoading, LoadingComponent: LoadingComponent }) }), (0, jsx_runtime_1.jsxs)("div", { style: {
                                             display: 'flex',
                                             flexDirection: 'column',
                                             height: 'calc(50% - 108px)',
@@ -317,16 +316,19 @@ function QueryEditor({ containerStyle = { height: '100vh' }, ButtonComponent, Se
                                                     color: theme?.primaryTextColor,
                                                     fontSize: 15,
                                                     fontWeight: '400',
-                                                }, children: (0, jsx_runtime_1.jsx)("div", { style: {
-                                                        padding: 30,
-                                                        // TODO: change color
-                                                        background: 'rgba(0,0,0,0.02)',
-                                                        display: 'inline-block',
-                                                        flex: 0,
-                                                        borderRadius: 6,
+                                                    width: '100%',
+                                                }, children: (0, jsx_runtime_1.jsxs)("div", { style: {
+                                                        display: 'flex',
+                                                        flexDirection: 'row',
+                                                        justifyContent: 'space-between',
+                                                        gap: 12,
+                                                        background: 'rgba(0,0,0,0.02)', // TODO: change color
                                                         color: theme?.primaryTextColor,
                                                         fontFamily: theme?.fontFamily,
-                                                    }, children: errorMessage }) })), errorMessage || !displayTable ? null : ((0, jsx_runtime_1.jsx)(TableComponent, { rows: rows, columns: columns, containerStyle: { height: 'calc(100%)' }, LoadingComponent: LoadingComponent, loading: sqlQueryLoading }))] }), chartBuilderEnabled && rows.length > 0 && ((0, jsx_runtime_1.jsx)("div", { style: {
+                                                        borderRadius: 6,
+                                                        padding: 20,
+                                                        width: '100%',
+                                                    }, children: [errorMessage, (SecondaryButtonComponent && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: handleFixWithAI, label: "Fix with AI" }))) || ((0, jsx_runtime_1.jsx)(QuillButton, { secondary: true, onClick: handleFixWithAI, label: "Fix with AI", theme: theme }))] }) })), errorMessage || !displayTable ? null : ((0, jsx_runtime_1.jsx)(TableComponent, { rows: rows, columns: columns, containerStyle: { height: 'calc(100%)' }, LoadingComponent: LoadingComponent, loading: sqlQueryLoading }))] }), chartBuilderEnabled && rows.length > 0 && ((0, jsx_runtime_1.jsx)("div", { style: {
                                             display: 'flex',
                                             flexDirection: 'row',
                                             alignItems: 'center',
@@ -336,7 +338,7 @@ function QueryEditor({ containerStyle = { height: '100vh' }, ButtonComponent, Se
                                         }, children: (ButtonComponent && ((0, jsx_runtime_1.jsx)(ButtonComponent, { onClick: () => setIsChartBuilderOpen(true), label: addToDashboardButtonLabel }))) || ((0, jsx_runtime_1.jsx)(QuillButton, { onClick: () => setIsChartBuilderOpen(true), label: addToDashboardButtonLabel, theme: theme })) }))] })] }) }) })), (0, jsx_runtime_1.jsx)(ChartBuilder_1.ChartBuilderWithModal, { rows: rows, columns: columns, fields: fields, query: query, horizontalView: chartBuilderHorizontalView, isEditMode: isEditMode, isOpen: isChartBuilderOpen, setIsOpen: setIsChartBuilderOpen, onAddToDashboardComplete: onAddToDashboardComplete, showTableFormatOptions: showTableFormatOptions, showDateFieldOptions: showDateFieldOptions, showAccessControlOptions: showAccessControlOptions, destinationDashboard: destinationDashboard, title: chartBuilderTitle, button: chartBuilderButtonLabel, buttonLabel: addToDashboardButtonLabel, dashboardItem: dashboardItem, organizationName: organizationName, Modal: ModalComponent, Button: ButtonComponent })] }));
 }
 exports.default = QueryEditor;
-const SQLEditorComponent = ({ query, setQuery, handleRunQuery, handleClearQuery, defineEditorTheme, setEditorTheme, ButtonComponent, SecondaryButtonComponent, newQueryEnabled, theme, loading, LoadingComponent, }) => {
+const SQLEditorComponent = ({ query, setQuery, handleRunQuery, handleFixWithAI, handleClearQuery, defineEditorTheme, setEditorTheme, ButtonComponent, SecondaryButtonComponent, newQueryEnabled, theme, loading, LoadingComponent, }) => {
     return ((0, jsx_runtime_1.jsxs)("div", { style: {
             background: theme.backgroundColor,
             // maxHeight: 700,
@@ -371,41 +373,9 @@ const SQLEditorComponent = ({ query, setQuery, handleRunQuery, handleClearQuery,
                     flexDirection: 'row',
                     alignItems: 'center',
                     height: 70,
-                }, children: (0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex' }, children: [(ButtonComponent && ((0, jsx_runtime_1.jsx)(ButtonComponent, { onClick: handleRunQuery, label: "Run query" }))) || ((0, jsx_runtime_1.jsx)(QuillButton, { onClick: handleRunQuery, label: "Run query", theme: theme })), newQueryEnabled && ((0, jsx_runtime_1.jsx)("div", { children: (SecondaryButtonComponent && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: handleClearQuery, label: "Clear query" }))) || ((0, jsx_runtime_1.jsx)(QuillButton, { secondary: true, onClick: handleClearQuery, label: "Clear query", theme: theme })) }))] }) })] }));
+                }, children: (0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex', gap: 12 }, children: [(ButtonComponent && ((0, jsx_runtime_1.jsx)(ButtonComponent, { onClick: handleRunQuery, label: "Run query" }))) || ((0, jsx_runtime_1.jsx)(QuillButton, { onClick: handleRunQuery, label: "Run query", theme: theme })), newQueryEnabled && ((0, jsx_runtime_1.jsx)("div", { children: (SecondaryButtonComponent && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: handleClearQuery, label: "Clear query" }))) || ((0, jsx_runtime_1.jsx)(QuillButton, { secondary: true, onClick: handleClearQuery, label: "Clear query", theme: theme })) }))] }) })] }));
 };
-const styles = {
-    columnHeader: {
-        boxSizing: 'border-box',
-        flex: '150 0 auto',
-        minWidth: '50px',
-        width: '150px',
-        position: 'relative',
-        cursor: 'pointer',
-        background: 'rgb(249, 250, 251)',
-        borderRight: '1px solid rgb(229, 231, 235)',
-        whiteSpace: 'nowrap',
-        display: 'flex',
-        alignItems: 'center',
-        overflowX: 'visible',
-        margin: '0px',
-        textOverflow: 'ellipsis',
-        minHeight: '36px',
-        // 2.25rem * 16px = 36px
-    },
-    columnHeaderLabel: {
-        fontFamily: 'Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"',
-        WebkitTapHighlightColor: 'transparent',
-        color: 'rgb(55, 65, 81)',
-        textDecoration: 'none',
-        fontWeight: 500,
-        fontSize: '14px', // 0.875rem * 16px = 14px
-        lineHeight: '20px', // 1.25rem * 16px = 20px
-        textOverflow: 'ellipsis',
-        whiteSpace: 'nowrap',
-        overflow: 'hidden',
-    },
-};
-const SchemaListComponent = ({ schema, theme, loading, LoadingComponent, width, }) => {
+const SchemaListComponent = ({ schema, theme, loading, LoadingComponent, width, onClick = () => { }, }) => {
     if (loading) {
         return ((0, jsx_runtime_1.jsxs)("div", { style: {
                 background: theme.backgroundColor,
@@ -433,10 +403,10 @@ const SchemaListComponent = ({ schema, theme, loading, LoadingComponent, width,
             // maxHeight: "100%",
             paddingLeft: 20,
             paddingRight: 30,
-        }, children: schema.map((elem, index) => ((0, jsx_runtime_1.jsx)(SchemaItem, { elem: elem, theme: theme, index: index }, elem.displayName + index))) }));
+        }, children: schema.map((elem, index) => ((0, jsx_runtime_1.jsx)(SchemaItem, { elem: elem, theme: theme, index: index, onClick: onClick }, elem.displayName + index))) }));
 };
 exports.SchemaListComponent = SchemaListComponent;
-function SchemaItem({ elem, theme, index }) {
+function SchemaItem({ elem, theme, index, onClick }) {
     const [isOpen, setIsOpen] = (0, react_1.useState)(index === 0);
     const schemaContainerStyle = {
         display: 'flex',
@@ -454,12 +424,11 @@ function SchemaItem({ elem, theme, index }) {
         alignItems: 'center',
         width: '100%',
         justifyContent: 'space-between',
-        cursor: 'pointer',
     };
     const schemaRowHoverStyle = {
         background: theme.selectUnderlayColor,
     };
-    return ((0, jsx_runtime_1.jsxs)("div", { style: schemaContainerStyle, children: [(0, jsx_runtime_1.jsxs)("div", { style: { ...schemaRowStyle, ...(isOpen && schemaRowHoverStyle) }, onClick: () => setIsOpen(!isOpen), children: [(0, jsx_runtime_1.jsx)("p", { style: {
+    return ((0, jsx_runtime_1.jsxs)("div", { style: schemaContainerStyle, children: [(0, jsx_runtime_1.jsxs)("div", { style: { ...schemaRowStyle, ...(isOpen && schemaRowHoverStyle) }, children: [(0, jsx_runtime_1.jsx)("p", { style: {
                             marginLeft: theme.padding,
                             fontSize: 13,
                             color: '#384151',
@@ -469,9 +438,10 @@ function SchemaItem({ elem, theme, index }) {
                             margin: 0,
                             textOverflow: 'ellipsis',
                             overflow: 'hidden',
+                            cursor: 'pointer',
                             userSelect: 'none',
                             fontFamily: theme?.fontFamily,
-                        }, title: elem.displayName, children: elem.displayName }), (0, jsx_runtime_1.jsx)("div", { style: {
+                        }, title: elem.displayName, onClick: onClick, children: elem.displayName }), (0, jsx_runtime_1.jsx)("div", { style: {
                             display: 'flex',
                             alignItems: 'center',
                             justifyContent: 'center',
@@ -481,7 +451,7 @@ function SchemaItem({ elem, theme, index }) {
                             paddingLeft: 0,
                             cursor: 'pointer',
                             userSelect: 'none',
-                        }, children: isOpen ? ((0, jsx_runtime_1.jsx)("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 24 24", width: "12", height: "12", fill: theme.secondaryTextColor, children: (0, jsx_runtime_1.jsx)("path", { fillRule: "evenodd", d: "M12.53 16.28a.75.75 0 01-1.06 0l-7.5-7.5a.75.75 0 011.06-1.06L12 14.69l6.97-6.97a.75.75 0 111.06 1.06l-7.5 7.5z", clipRule: "evenodd" }) })) : ((0, jsx_runtime_1.jsx)("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 24 24", width: "12", height: "12", fill: theme.secondaryTextColor, children: (0, jsx_runtime_1.jsx)("path", { fillRule: "evenodd", d: "M16.28 11.47a.75.75 0 010 1.06l-7.5 7.5a.75.75 0 01-1.06-1.06L14.69 12 7.72 5.03a.75.75 0 011.06-1.06l7.5 7.5z", clipRule: "evenodd" }) })) })] }), isOpen ? ((0, jsx_runtime_1.jsx)("div", { style: {
+                        }, onClick: () => setIsOpen(!isOpen), children: isOpen ? ((0, jsx_runtime_1.jsx)("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 24 24", width: "12", height: "12", fill: theme.secondaryTextColor, children: (0, jsx_runtime_1.jsx)("path", { fillRule: "evenodd", d: "M12.53 16.28a.75.75 0 01-1.06 0l-7.5-7.5a.75.75 0 011.06-1.06L12 14.69l6.97-6.97a.75.75 0 111.06 1.06l-7.5 7.5z", clipRule: "evenodd" }) })) : ((0, jsx_runtime_1.jsx)("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 24 24", width: "12", height: "12", fill: theme.secondaryTextColor, children: (0, jsx_runtime_1.jsx)("path", { fillRule: "evenodd", d: "M16.28 11.47a.75.75 0 010 1.06l-7.5 7.5a.75.75 0 01-1.06-1.06L14.69 12 7.72 5.03a.75.75 0 011.06-1.06l7.5 7.5z", clipRule: "evenodd" }) })) })] }), isOpen ? ((0, jsx_runtime_1.jsx)("div", { style: {
                     paddingBottom: theme.padding,
                     display: 'flex',
                     flexDirection: 'column',

package/dist/cjs/components/Chart/BarChart.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="react" />
+import { type ColorMapType } from '../../Chart';
 export default function BarChart({ colors, colorMap, yAxisFields, data, containerStyle, xAxisField, xAxisFormat, theme, comparison, isStacked, isAnimationActive, hideXAxis, hideYAxis, hideCartesianGrid, }: {
     colors?: string[];
-    colorMap?: any;
+    colorMap?: ColorMapType;
     yAxisFields: any[];
     data: any[];
     containerStyle?: React.CSSProperties;

package/dist/cjs/components/Chart/BarChart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BarChart.d.ts","sourceRoot":"","sources":["../../../../src/components/Chart/BarChart.tsx"],"names":[],"mappings":";AAiBA,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,EAC/B,MAAM,EACN,QAAQ,EACR,WAAW,EACX,IAAI,EACJ,cAAc,EACd,UAAU,EACV,WAAW,EACX,KAAK,EACL,UAAU,EACV,SAAS,EACT,iBAAwB,EACxB,SAAiB,EACjB,SAAiB,EACjB,iBAAyB,GAC1B,EAAE;IACD,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,WAAW,EAAE,GAAG,EAAE,CAAC;IACnB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,GAAG,CAAC;IACX,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;CAC5B,2CAwKA"}
+{"version":3,"file":"BarChart.d.ts","sourceRoot":"","sources":["../../../../src/components/Chart/BarChart.tsx"],"names":[],"mappings":";AAgBA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,EAC/B,MAAM,EACN,QAAQ,EACR,WAAW,EACX,IAAI,EACJ,cAAc,EACd,UAAU,EACV,WAAW,EACX,KAAK,EACL,UAAU,EACV,SAAS,EACT,iBAAwB,EACxB,SAAiB,EACjB,SAAiB,EACjB,iBAAyB,GAC1B,EAAE;IACD,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,WAAW,EAAE,GAAG,EAAE,CAAC;IACnB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,GAAG,CAAC;IACX,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;CAC5B,2CAgLA"}

package/dist/cjs/components/Chart/BarChart.js

@@ -28,6 +28,13 @@ function BarChart({ colors, colorMap, yAxisFields, data, containerStyle, xAxisFi
         });
         setFormattedData(curData);
     }, [data]);
+    const getCustomColor = (field) => {
+        const key = field.startsWith('comparison_') ? 'comparison' : 'primary';
+        field = field.replace('comparison_', '');
+        if (colorMap && colorMap[field])
+            return colorMap[field][key];
+        return undefined;
+    };
     if (!data || data.length === 0) {
         return ((0, jsx_runtime_1.jsx)("div", { style: {
                 display: 'flex',
@@ -44,12 +51,12 @@ function BarChart({ colors, colorMap, yAxisFields, data, containerStyle, xAxisFi
     return ((0, jsx_runtime_1.jsx)("div", { style: {
             boxSizing: 'content-box',
             ...containerStyle,
-        }, children: (0, jsx_runtime_1.jsx)(recharts_1.ResponsiveContainer, { width: "100%", height: '100%', children: (0, jsx_runtime_1.jsxs)(recharts_1.BarChart, { data: formattedData, layout: 'horizontal', children: [!hideCartesianGrid && ((0, jsx_runtime_1.jsx)(recharts_1.CartesianGrid, { horizontal: true, vertical: false, stroke: "#e5e7eb" })), (0, jsx_runtime_1.jsx)(recharts_1.YAxis, { width: 44, hide: hideYAxis, axisLine: false, tickLine: false, type: "number", domain: (0, getDomain_1.default)(data, yAxisFields), tick: { transform: 'translate(-3, 0)' }, style: {
+        }, children: (0, jsx_runtime_1.jsx)(recharts_1.ResponsiveContainer, { width: "100%", height: '100%', children: (0, jsx_runtime_1.jsxs)(recharts_1.BarChart, { data: formattedData, layout: 'horizontal', children: [!hideCartesianGrid && ((0, jsx_runtime_1.jsx)(recharts_1.CartesianGrid, { horizontal: true, vertical: false, stroke: "#e5e7eb" })), (0, jsx_runtime_1.jsx)(recharts_1.YAxis, { width: 44, hide: hideYAxis, axisLine: false, tickLine: false, type: "number", domain: (0, getDomain_1.default)(data, yAxisFields), tick: { transform: 'translate(-3, 0)' }, tickCount: 5, style: {
                             fontSize: '12px',
                             fontFamily: theme.chartLabelFontFamily,
                         }, tickFormatter: (tick) => (0, axisFormatter_1.axisFormatter)({
                             value: tick,
-                            field: yAxisFields[0].field || 'what',
+                            field: yAxisFields[0]?.field,
                             fields: yAxisFields,
                         }) }), (0, jsx_runtime_1.jsx)(recharts_1.XAxis, { hide: hideXAxis, dataKey: xAxisField, tick: { transform: 'translate(0, 6)' }, style: {
                             fontSize: '12px',
@@ -78,7 +85,7 @@ function BarChart({ colors, colorMap, yAxisFields, data, containerStyle, xAxisFi
                         }, position: { y: 0 } }), yAxisFields.map((elem) => {
                         return ((0, jsx_runtime_1.jsx)(recharts_1.Bar, { name: elem.label, dataKey: elem.field, stackId: isStacked &&
                                 (elem.field?.replace('comparison_', '') ??
-                                    'unknown'), type: "linear", fill: (colorMap && colorMap[elem.field]) ??
+                                    'unknown'), type: "linear", fill: getCustomColor(elem.field) ??
                                 (0, color_1.selectColor)(elem, colors, yAxisFields.findIndex((field) => field.field === elem.field?.replace('comparison_', ''))), isAnimationActive: isAnimationActive }, elem.field));
                     })] }) }) }));
 }

package/dist/cjs/components/Chart/LineChart.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="react" />
-export default function LineChart({ colors, colorMap, yAxisFields, data, containerStyle, xAxisField, xAxisFormat, theme, comparison, isAnimationActive, hideXAxis, hideYAxis, hideCartesianGrid, dashedComparison, customPrimaryColor, customComparisonColor, singlePointStyle, }: {
+import { type ColorMapType } from '../../Chart';
+export default function LineChart({ colors, colorMap, yAxisFields, data, containerStyle, xAxisField, xAxisFormat, theme, comparison, isAnimationActive, hideXAxis, hideYAxis, hideCartesianGrid, dashedComparison, singlePointStyle, }: {
     colors?: string[];
-    colorMap?: any;
+    colorMap?: ColorMapType;
     yAxisFields: any[];
     data: any[];
     containerStyle?: React.CSSProperties;
@@ -15,8 +16,6 @@ export default function LineChart({ colors, colorMap, yAxisFields, data, contain
     hideYAxis: boolean;
     hideCartesianGrid: boolean;
     dashedComparison: boolean;
-    customPrimaryColor: string | undefined;
-    customComparisonColor: string | undefined;
     singlePointStyle: 'dot' | 'line';
 }): import("react/jsx-runtime").JSX.Element | null;
 //# sourceMappingURL=LineChart.d.ts.map

package/dist/cjs/components/Chart/LineChart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LineChart.d.ts","sourceRoot":"","sources":["../../../../src/components/Chart/LineChart.tsx"],"names":[],"mappings":";AAiBA,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,MAAM,EACN,QAAa,EACb,WAAW,EACX,IAAI,EACJ,cAAc,EACd,UAAU,EACV,WAAW,EACX,KAAK,EACL,UAAU,EACV,iBAAwB,EACxB,SAAiB,EACjB,SAAiB,EACjB,iBAAyB,EACzB,gBAAwB,EACxB,kBAA8B,EAC9B,qBAAiC,EACjC,gBAAwB,GACzB,EAAE;IACD,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,WAAW,EAAE,GAAG,EAAE,CAAC;IACnB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,GAAG,CAAC;IACX,UAAU,EAAE,GAAG,CAAC;IAChB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,gBAAgB,EAAE,KAAK,GAAG,MAAM,CAAC;CAClC,kDAkOA"}
+{"version":3,"file":"LineChart.d.ts","sourceRoot":"","sources":["../../../../src/components/Chart/LineChart.tsx"],"names":[],"mappings":";AAgBA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,MAAM,EACN,QAAa,EACb,WAAW,EACX,IAAI,EACJ,cAAc,EACd,UAAU,EACV,WAAW,EACX,KAAK,EACL,UAAU,EACV,iBAAwB,EACxB,SAAiB,EACjB,SAAiB,EACjB,iBAAyB,EACzB,gBAAwB,EACxB,gBAAwB,GACzB,EAAE;IACD,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,WAAW,EAAE,GAAG,EAAE,CAAC;IACnB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,GAAG,CAAC;IACX,UAAU,EAAE,GAAG,CAAC;IAChB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,gBAAgB,EAAE,KAAK,GAAG,MAAM,CAAC;CAClC,kDA6OA"}

package/dist/cjs/components/Chart/LineChart.js

@@ -12,7 +12,8 @@ const color_1 = require("../../utils/color");
 const ChartTooltip_1 = __importDefault(require("../../components/Chart/ChartTooltip"));
 const getDomain_1 = __importDefault(require("../../utils/getDomain"));
 const react_1 = require("react");
-function LineChart({ colors, colorMap = {}, yAxisFields, data, containerStyle, xAxisField, xAxisFormat, theme, comparison, isAnimationActive = true, hideXAxis = false, hideYAxis = false, hideCartesianGrid = false, dashedComparison = false, customPrimaryColor = undefined, customComparisonColor = undefined, singlePointStyle = 'dot', }) {
+const crypto_1 = require("../../utils/crypto");
+function LineChart({ colors, colorMap = {}, yAxisFields, data, containerStyle, xAxisField, xAxisFormat, theme, comparison, isAnimationActive = true, hideXAxis = false, hideYAxis = false, hideCartesianGrid = false, dashedComparison = false, singlePointStyle = 'dot', }) {
     const [formattedData, setFormattedData] = (0, react_1.useState)([]);
     if (!yAxisFields || !yAxisFields.length) {
         return null;
@@ -49,19 +50,21 @@ function LineChart({ colors, colorMap = {}, yAxisFields, data, containerStyle, x
                 fontSize: 13,
                 color: theme.secondaryTextColor,
                 ...containerStyle,
-            }, children: "No results found for specified time period." }));
+            }, children: "No results" }));
     }
     // Allows the users to override the color scheme on a per-chart basis.
-    const getCustomColor = (index, field) => {
-        if (index === 0 && customPrimaryColor) {
-            return customPrimaryColor;
-        }
-        if (index === 1 && comparison && customComparisonColor) {
-            return customComparisonColor;
-        }
+    const getCustomColor = (index, field, gradient) => {
+        let key = index === 0 ? 'primary' : 'comparison';
         if (colorMap && colorMap[field]) {
-            // console.log(field, '->', colorMap[field]);
-            return colorMap[field];
+            if (index === 0 && gradient === 'start')
+                key = 'primaryGradientStart';
+            if (index === 0 && gradient === 'stop')
+                key = 'primaryGradientStop';
+            if (index === 1 && gradient === 'start')
+                key = 'comparisonGradientStart';
+            if (index === 1 && gradient === 'stop')
+                key = 'comparisonGradientStop';
+            return colorMap[field][key];
         }
         return undefined; // use the default colors from the theme
     };
@@ -77,7 +80,7 @@ function LineChart({ colors, colorMap = {}, yAxisFields, data, containerStyle, x
                                 field: xAxisField,
                                 fields: [{ field: xAxisField, format: xAxisFormat }],
                             });
-                        } }), (0, jsx_runtime_1.jsx)(recharts_1.YAxis, { hide: hideYAxis, width: 44, axisLine: false, tickLine: false, type: "number", domain: (0, getDomain_1.default)(data, yAxisFields), tick: { transform: 'translate(-3, 0)' }, style: {
+                        } }), (0, jsx_runtime_1.jsx)(recharts_1.YAxis, { hide: hideYAxis, width: 44, axisLine: false, tickLine: false, type: "number", domain: (0, getDomain_1.default)(data, yAxisFields), tick: { transform: 'translate(-3, 0)' }, tickCount: 5, style: {
                             fontSize: '12px',
                             fontFamily: theme?.chartLabelFontFamily ||
                                 theme?.fontFamily ||
@@ -109,8 +112,22 @@ function LineChart({ colors, colorMap = {}, yAxisFields, data, containerStyle, x
                                         { field: xAxisField, format: xAxisFormat },
                                     ],
                                 }), xAxisFormat: xAxisFormat, xAxisField: xAxisField, colors: colors, theme: theme }));
-                        }, position: { y: 0 } }), yAxisFields.map((elem, index) => ((0, jsx_runtime_1.jsx)("defs", { children: (0, jsx_runtime_1.jsxs)("linearGradient", { id: `gradient${elem.field}${index}`, x1: "0", y1: "0", x2: "0", y2: "1", children: [(0, jsx_runtime_1.jsx)("stop", { offset: "5%", stopColor: getCustomColor(index, elem.field) ??
-                                        (0, color_1.selectColor)(elem, colors, index), stopOpacity: 0.4 }), (0, jsx_runtime_1.jsx)("stop", { offset: "95%", stopColor: 'rgba(0,0,0,0)', stopOpacity: 0 })] }) }, `defs${elem.field + index}`))), yAxisFields.map((elem, index) => ((0, jsx_runtime_1.jsx)(recharts_1.Area, { name: elem.label, type: "linear", dataKey: elem.field, stroke: getCustomColor(index, elem.field) ??
-                            (0, color_1.selectColor)(elem, colors, index), fill: `url(#gradient${elem.field}${index})`, strokeWidth: 2, dot: false, strokeDasharray: comparison && dashedComparison && index > 0 ? '5 5' : undefined, isAnimationActive: isAnimationActive }, elem.field)))] }) }) }));
+                        }, position: { y: 0 } }), yAxisFields.map((elem, index) => {
+                        // hash the color stops so they're stable, valid html ids
+                        const gradientStart = getCustomColor(index, elem.field, 'start') ??
+                            (0, color_1.selectColor)(elem, colors, index);
+                        const gradientStop = getCustomColor(index, elem.field, 'stop') ?? '#00000000';
+                        const uniqueId = `gradient_${(0, crypto_1.hashCode)(gradientStart)}_${(0, crypto_1.hashCode)(gradientStop)}`;
+                        return ((0, jsx_runtime_1.jsx)("defs", { children: (0, jsx_runtime_1.jsxs)("linearGradient", { id: uniqueId, x1: "0", y1: "0", x2: "0", y2: "1", children: [(0, jsx_runtime_1.jsx)("stop", { offset: "5%", stopColor: gradientStart, stopOpacity: 0.4 }), (0, jsx_runtime_1.jsx)("stop", { offset: "95%", stopColor: gradientStop, stopOpacity: 0 })] }) }, `defs_${uniqueId}_${index}`));
+                    }), yAxisFields.map((elem, index) => {
+                        const gradientStart = (0, crypto_1.hashCode)(getCustomColor(index, elem.field, 'start') ??
+                            (0, color_1.selectColor)(elem, colors, index));
+                        const gradientStop = (0, crypto_1.hashCode)(getCustomColor(index, elem.field, 'stop') ?? '#00000000');
+                        const uniqueId = `gradient_${gradientStart}_${gradientStop}`;
+                        return ((0, jsx_runtime_1.jsx)(recharts_1.Area, { name: elem.label, type: "linear", dataKey: elem.field, stroke: getCustomColor(index, elem.field) ??
+                                (0, color_1.selectColor)(elem, colors, index), fill: `url(#${uniqueId})`, strokeWidth: 2, dot: false, strokeDasharray: comparison && dashedComparison && index > 0
+                                ? '5 5'
+                                : undefined, isAnimationActive: isAnimationActive }, elem.field));
+                    })] }) }) }));
 }
 exports.default = LineChart;

package/dist/cjs/components/Dashboard/ChartComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChartComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/ChartComponent.tsx"],"names":[],"mappings":";AAAA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EACpC,aAAa,EACb,oBAAoB,EACpB,KAAK,EACL,KAAK,EACL,QAAQ,GACT,EAAE,GAAG,GAAG,GAAG,CAAC,OAAO,CAqGnB"}
+{"version":3,"file":"ChartComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/ChartComponent.tsx"],"names":[],"mappings":";AAAA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EACpC,aAAa,EACb,oBAAoB,EACpB,KAAK,EACL,KAAK,EACL,QAAQ,GACT,EAAE,GAAG,GAAG,GAAG,CAAC,OAAO,CAkGnB"}

package/dist/cjs/components/Dashboard/ChartComponent.js

@@ -5,13 +5,10 @@ function DashboardItem({ dashboardItem, onClickDashboardItem, theme, style, chil
     return ((0, jsx_runtime_1.jsx)("div", { onClick: onClickDashboardItem
             ? () => onClickDashboardItem(dashboardItem)
             : () => { }, style: {
-            // height: '100%',
             cursor: 'pointer',
             boxSizing: 'content-box',
-            paddingRight: 25,
             minHeight: 400,
             borderRadius: 8,
-            paddingTop: 20,
             ...style,
         }, children: (0, jsx_runtime_1.jsx)("div", { style: {
                 width: '100%',

package/dist/cjs/components/Dashboard/DashboardSection.js

@@ -6,8 +6,8 @@ function DashboardSection({ section, children, }) {
     if (section === 'tables')
         return ((0, jsx_runtime_1.jsx)("div", { style: {
                 boxSizing: 'content-box',
-                width: `100%`,
-                gap: 20,
+                width: '100%',
+                gap: 40,
                 display: 'flex',
                 flexDirection: 'column',
             }, children: children }));
@@ -17,8 +17,8 @@ function DashboardSection({ section, children, }) {
             width: '100%',
             listStyleType: 'none',
             display: 'grid',
-            gap: 20,
-            gridTemplateColumns: `repeat(auto-fill,minmax(400px, 1fr))`,
+            gap: 40,
+            gridTemplateColumns: 'repeat(auto-fill,minmax(400px, 1fr))',
             gridTemplateRows: `repeat(${170}px)`,
         }, children: children }));
 }

package/dist/cjs/components/Dashboard/DashboardSectionContainer.js

@@ -6,7 +6,7 @@ function DashboardSectionContainer({ style, children, ...props }) {
             width: '100%',
             display: 'flex',
             flexDirection: 'column',
-            gap: 20,
+            gap: 40,
             ...style,
         }, ...props, children: children }));
 }

package/dist/cjs/components/Dashboard/DataLoader.d.ts

@@ -1,3 +1,10 @@
 /// <reference types="react" />
-export default function DataLoader({ id, children }: any): JSX.Element;
+export type DataLoaderChildProps = {
+    isLoading: boolean;
+    error: string | null;
+};
+export default function DataLoader({ id, children, }: {
+    id: string;
+    children: ({ isLoading, error }: DataLoaderChildProps) => JSX.Element;
+}): JSX.Element;
 //# sourceMappingURL=DataLoader.d.ts.map

package/dist/cjs/components/Dashboard/DataLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DataLoader.tsx"],"names":[],"mappings":";AAWA,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,GAAG,GAAG,CAAC,OAAO,CAuErE"}
+{"version":3,"file":"DataLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DataLoader.tsx"],"names":[],"mappings":";AAUA,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,EAAE,EACF,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;CACvE,GAAG,GAAG,CAAC,OAAO,CA+Ed"}

package/dist/cjs/components/Dashboard/DataLoader.js

@@ -6,13 +6,17 @@ const Chart_1 = require("../../Chart");
 const Context_1 = require("../../Context");
 const dataFetcher_1 = require("../../utils/dataFetcher");
 const merge_1 = require("../../utils/merge");
-function DataLoader({ id, children }) {
+function DataLoader({ id, children, }) {
     const [client, _] = (0, react_1.useContext)(Context_1.ClientContext);
     const { dispatch, dashboard } = (0, react_1.useContext)(Context_1.DashboardContext);
     const { dashboardFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
+    const [isLoading, setIsLoading] = (0, react_1.useState)(true);
+    const [error, setError] = (0, react_1.useState)(null);
     (0, react_1.useEffect)(() => {
         async function getChartOptions() {
+            setIsLoading(true);
             if (!(0, Chart_1.didFiltersChange)(dashboard[id], dashboardFilters)) {
+                setIsLoading(false);
                 return;
             }
             try {
@@ -43,7 +47,7 @@ function DataLoader({ id, children }) {
                     filters: minimalFilters,
                 };
                 const resp = await (0, dataFetcher_1.getData)(client, 'itempost', 'omit', hostedBody, cloudBody);
-                if (resp && resp.name !== 'error') {
+                if (resp && resp.name !== 'error' && !resp.errorMessage) {
                     if (resp.compareRows) {
                         (0, merge_1.mergeComparisonRange)(resp);
                     }
@@ -57,13 +61,18 @@ function DataLoader({ id, children }) {
                         },
                     });
                 }
+                else {
+                    setError(resp?.errorMessage);
+                }
+                setIsLoading(false);
             }
             catch (e) {
                 console.log('Error fetching chart: ', e);
+                setError(e.message);
             }
         }
         getChartOptions();
     }, [dashboardFilters, client, id]);
-    return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: children });
+    return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: children({ isLoading, error }) });
 }
 exports.default = DataLoader;

package/dist/cjs/components/Dashboard/MetricComponent.d.ts

@@ -1,3 +1,14 @@
 /// <reference types="react" />
-export default function DashboardItem({ dashboardItem, onClickDashboardItem, theme, style, children, }: any): JSX.Element;
+import { DashboardItem } from '../../Dashboard';
+interface DashboardItemProps {
+    dashboardItem: DashboardItem;
+    onClickDashboardItem?: any;
+    error?: string | null;
+    isLoading?: boolean;
+    children?: any;
+    theme?: any;
+    style?: any;
+}
+export default function QuillMetricComponent({ dashboardItem, onClickDashboardItem, error, isLoading, theme, style, }: DashboardItemProps): JSX.Element;
+export {};
 //# sourceMappingURL=MetricComponent.d.ts.map

package/dist/cjs/components/Dashboard/MetricComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MetricComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/MetricComponent.tsx"],"names":[],"mappings":";AAAA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EACpC,aAAa,EACb,oBAAoB,EACpB,KAAK,EACL,KAAK,EACL,QAAQ,GACT,EAAE,GAAG,GAAG,GAAG,CAAC,OAAO,CAsGnB"}
+{"version":3,"file":"MetricComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/MetricComponent.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAMhD,UAAU,kBAAkB;IAC1B,aAAa,EAAE,aAAa,CAAC;IAC7B,oBAAoB,CAAC,EAAE,GAAG,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,KAAK,CAAC,EAAE,GAAG,CAAC;CACb;AAED,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,EAC3C,aAAa,EACb,oBAAoB,EACpB,KAAK,EACL,SAAS,EACT,KAAK,EACL,KAAK,GACN,EAAE,kBAAkB,GAAG,GAAG,CAAC,OAAO,CAkPlC"}