@quillsql/react 2.12.39 → 2.12.40

package/dist/esm/components/UiComponents.js

@@ -461,7 +461,7 @@ export const QuillFilterContainerComponent = ({ children, }) => {
             gap: 12,
         }, children: children }));
 };
-export const QuillUserFilterModalComponent = ({ isOpen, setIsOpen, children, triggerLabel, title, }) => {
+export const QuillModalComponent = ({ isOpen, setIsOpen, children, triggerLabel, title, }) => {
     const [theme] = useContext(ThemeContext);
     const [rightAlignment, setRightAlignment] = useState('auto');
     const modalRef = useRef(null);
@@ -502,28 +502,70 @@ export const QuillUserFilterModalComponent = ({ isOpen, setIsOpen, children, tri
             }
         }
     };
-    return (_jsxs("div", { style: { position: 'relative', marginLeft: 10 }, children: [_jsx(MemoizedSecondaryButton, { onClick: () => setIsOpen(true), label: triggerLabel || '' }), isOpen && (_jsx("div", { id: "quill-popover-modal", ref: modalRef, style: { position: 'relative', top: 10 }, children: _jsxs("div", { ref: popoverRef, style: {
-                        background: theme?.backgroundColor || 'white',
-                        position: 'absolute',
-                        boxShadow: '0px 1px 12px 0px #E7E7E705',
-                        border: theme
-                            ? `${theme.borderWidth || 1}px solid ${theme.borderColor || '#E7E7E7'}`
-                            : '1px solid #E7E7E7',
-                        boxSizing: 'content-box',
-                        zIndex: 999,
-                        // top: 12,
-                        borderRadius: 6,
-                        padding: 15,
-                        right: rightAlignment,
-                    }, children: [_jsx("h1", { style: {
-                                fontWeight: '600',
-                                fontSize: 18,
-                                margin: 0,
-                                textAlign: 'left',
-                                marginBottom: 5,
-                                color: theme?.primaryTextColor,
-                                fontFamily: theme?.fontFamily,
-                            }, children: title }), children] }) }))] }));
+    return (_jsxs("div", { style: { position: 'relative' }, children: [_jsx(MemoizedSecondaryButton, { onClick: () => setIsOpen(true), label: triggerLabel || '' }), title && title === 'Filters'
+                ? isOpen && (_jsx("div", { id: "quill-popover-modal", ref: modalRef, style: { position: 'relative', top: 10 }, children: _jsxs("div", { ref: popoverRef, style: {
+                            background: theme?.backgroundColor || 'white',
+                            position: 'absolute',
+                            boxShadow: '0px 1px 12px 0px #E7E7E705',
+                            border: theme
+                                ? `${theme.borderWidth || 1}px solid ${theme.borderColor || '#E7E7E7'}`
+                                : '1px solid #E7E7E7',
+                            boxSizing: 'content-box',
+                            zIndex: 999,
+                            // top: 12,
+                            borderRadius: 6,
+                            padding: 15,
+                            right: rightAlignment,
+                        }, children: [_jsx("h1", { style: {
+                                    fontWeight: '600',
+                                    fontSize: 18,
+                                    margin: 0,
+                                    textAlign: 'left',
+                                    marginBottom: 5,
+                                    color: theme?.primaryTextColor,
+                                    fontFamily: theme?.fontFamily,
+                                }, children: title }), children] }) }))
+                : isOpen && (_jsxs("div", { children: [_jsx("div", { style: {
+                                position: 'fixed',
+                                top: '0',
+                                right: '0',
+                                bottom: '0',
+                                left: '0',
+                                zIndex: '50',
+                                backgroundColor: 'rgba(255, 255, 255, 0.8)',
+                                backdropFilter: 'blur(5px)',
+                            }, onClick: () => {
+                                setIsOpen(false);
+                            } }), _jsx("div", { style: {
+                                position: 'fixed',
+                                left: '50%',
+                                top: '50%',
+                                zIndex: '50',
+                                maxHeight: '90vh',
+                                minWidth: 462,
+                                maxWidth: '90vw',
+                                display: 'flex',
+                                transform: 'translateX(-50%) translateY(-50%)',
+                                background: 'white',
+                                borderRadius: 8,
+                                borderStyle: 'solid',
+                                borderWidth: 1,
+                                borderColor: '#e7e7e7',
+                                padding: 30,
+                                overflow: 'auto',
+                            }, children: _jsxs("div", { style: {
+                                    display: 'flex',
+                                    flexDirection: 'column',
+                                    minWidth: '60vw',
+                                }, children: [_jsx("h1", { style: {
+                                            fontWeight: '600',
+                                            fontSize: 18,
+                                            margin: 0,
+                                            textAlign: 'left',
+                                            marginBottom: 20,
+                                            color: theme?.primaryTextColor,
+                                            fontFamily: theme?.fontFamily,
+                                        }, children: title }), children] }) })] }))] }));
 };
 export const QuillChartBuilderFormContainer = ({ children, }) => {
     return (_jsx("div", { style: {

package/dist/esm/hooks/useDashboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,kBAAmB,MAAM;;;;qCAYtB,MAAM;CAyEjC,CAAC"}
+{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,kBAAmB,MAAM;;;;qCAWtB,MAAM;CA4EjC,CAAC"}

package/dist/esm/hooks/useDashboard.js

@@ -6,9 +6,8 @@ export const useDashboard = (dashboardName) => {
     // if (dashboardName === undefined || dashboardName === null) {
     //   throw new Error('useDashboard requires a dashboard name parameter');
     // }
-    const [isLoading, setIsLoading] = useState(false);
+    const [isLoading, setIsLoading] = useState(true);
     const [error, setError] = useState(null);
-    const [data, setData] = useState(null);
     const [client] = useContext(ClientContext);
     const handleReload = async (overrideDashboardName, fetchFromServer = false) => {
         await getDashboards(overrideDashboardName ?? dashboardName, fetchFromServer);
@@ -18,7 +17,6 @@ export const useDashboard = (dashboardName) => {
             dashboardData &&
             dashboardData[dashboardName] &&
             dashboardData[dashboardName].newQueries) {
-            setData(dashboardData[dashboardName]);
             setIsLoading(false);
             return;
         }
@@ -51,7 +49,6 @@ export const useDashboard = (dashboardName) => {
                 id: dashboardName,
                 data: { ...resp },
             });
-            setData(resp);
             setIsLoading(false);
             setError(null);
         }
@@ -65,5 +62,10 @@ export const useDashboard = (dashboardName) => {
     useEffect(() => {
         getDashboards(dashboardName, true);
     }, [dashboardName, client]);
-    return { data, isLoading, error, reload: handleReload };
+    return {
+        data: isLoading ? null : dashboardData[dashboardName],
+        isLoading,
+        error,
+        reload: handleReload,
+    };
 };

package/dist/esm/models/Report.d.ts

@@ -93,6 +93,10 @@ export interface QuillReportInternal extends QuillReport {
     itemQuery?: string[];
     /** An array of tables referenced by the report used */
     referencedTables?: string[];
+    /** An mapping of table to the columns referenced in the table. */
+    referencedColumns?: {
+        [table: string]: string[];
+    };
     /** An error message used for internal purposes */
     error?: string;
     /** An admin error message used for internal purposes */

package/dist/esm/models/Report.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Report.d.ts","sourceRoot":"","sources":["../../../src/models/Report.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C;;;;;;;;;GASG;AACH,MAAM,WAAW,WAAW;IAC1B,8BAA8B;IAC9B,EAAE,EAAE,MAAM,CAAC;IAEX,8BAA8B;IAC9B,IAAI,EAAE,MAAM,CAAC;IAEb,wDAAwD;IACxD,aAAa,EAAE,MAAM,CAAC;IAEtB,0DAA0D;IAC1D,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,CAAC;IAElC,0DAA0D;IAC1D,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB,8BAA8B;IAC9B,SAAS,EAAE,MAAM,CAAC;IAElB,uEAAuE;IACvE,SAAS,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAEnD,4CAA4C;IAC5C,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAEpB,8BAA8B;IAC9B,UAAU,EAAE,MAAM,CAAC;IAEnB,gDAAgD;IAChD,UAAU,EAAE,MAAM,CAAC;IAEnB,0CAA0C;IAC1C,WAAW,EAAE,UAAU,CAAC;IAExB;;OAEG;IACH,WAAW,EAAE;QACX,gCAAgC;QAChC,KAAK,EAAE,MAAM,CAAC;QAEd,uCAAuC;QACvC,KAAK,EAAE,MAAM,CAAC;QAEd,4CAA4C;QAC5C,MAAM,EAAE,UAAU,CAAC;KACpB,EAAE,CAAC;IAEJ;;;;;;;;OAQG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,CAAC;IAEzC,6DAA6D;IAC7D,cAAc,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAGvC,UAAU,CAAC,EAAE,UAAU,CAAC;IAGxB,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAG5C,QAAQ,EAAE,MAAM,CAAC;IAGjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD,0BAA0B;IAC1B,SAAS,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,CAAC;IAExC;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IAExB,uGAAuG;IACvG,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IAErB,uDAAuD;IACvD,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE5B,kDAAkD;IAClD,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,wDAAwD;IACxD,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB"}
+{"version":3,"file":"Report.d.ts","sourceRoot":"","sources":["../../../src/models/Report.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C;;;;;;;;;GASG;AACH,MAAM,WAAW,WAAW;IAC1B,8BAA8B;IAC9B,EAAE,EAAE,MAAM,CAAC;IAEX,8BAA8B;IAC9B,IAAI,EAAE,MAAM,CAAC;IAEb,wDAAwD;IACxD,aAAa,EAAE,MAAM,CAAC;IAEtB,0DAA0D;IAC1D,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,CAAC;IAElC,0DAA0D;IAC1D,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB,8BAA8B;IAC9B,SAAS,EAAE,MAAM,CAAC;IAElB,uEAAuE;IACvE,SAAS,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAEnD,4CAA4C;IAC5C,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAEpB,8BAA8B;IAC9B,UAAU,EAAE,MAAM,CAAC;IAEnB,gDAAgD;IAChD,UAAU,EAAE,MAAM,CAAC;IAEnB,0CAA0C;IAC1C,WAAW,EAAE,UAAU,CAAC;IAExB;;OAEG;IACH,WAAW,EAAE;QACX,gCAAgC;QAChC,KAAK,EAAE,MAAM,CAAC;QAEd,uCAAuC;QACvC,KAAK,EAAE,MAAM,CAAC;QAEd,4CAA4C;QAC5C,MAAM,EAAE,UAAU,CAAC;KACpB,EAAE,CAAC;IAEJ;;;;;;;;OAQG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,CAAC;IAEzC,6DAA6D;IAC7D,cAAc,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAGvC,UAAU,CAAC,EAAE,UAAU,CAAC;IAGxB,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAG5C,QAAQ,EAAE,MAAM,CAAC;IAGjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD,0BAA0B;IAC1B,SAAS,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAAE,CAAC;IAExC;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IAExB,uGAAuG;IACvG,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IAErB,uDAAuD;IACvD,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE5B,kEAAkE;IAClE,iBAAiB,CAAC,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC;IAElD,kDAAkD;IAClD,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,wDAAwD;IACxD,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB"}

package/dist/esm/utils/dashboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AA+BpE;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,CAAC,EAAE,GAAG,EACZ,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CAyC9B;AAgHD,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC,GAAG,CAAC,CA2Bd"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AA+BpE;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,CAAC,EAAE,GAAG,EACZ,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CA2C9B;AAgHD,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC,GAAG,CAAC,CA2Bd"}

package/dist/esm/utils/dashboard.js

@@ -65,6 +65,8 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
         sort: item.sort,
         itemQuery: item.itemQuery,
         queryString: item.queryString,
+        referencedTables: item?.referencedTables || [],
+        referencedColumns: item?.referencedColumns || {},
     };
 }
 /**

package/dist/esm/utils/dates.d.ts

@@ -14,7 +14,7 @@ export declare function getComparisonInterval(comparisonRange: {
 export declare function getDateBucketFromRange(dateRange: {
     start: Date;
     end: Date;
-}): "year" | "month" | "week" | "day";
+}): "month" | "week" | "year" | "day";
 export declare function parseDateByDatabaseType(date: any, databaseType: string): Date;
 export declare function getDateFormatFromBucket(dateBucket: string): string;
 //# sourceMappingURL=dates.d.ts.map

package/dist/esm/utils/filterProcessing.d.ts

@@ -2,7 +2,7 @@ import { Filter } from '../models/Filter';
 export declare function findAndProcessDateFilter(filters: any[]): any;
 export declare function processFilterFromBackend(filter: any): any;
 export declare function updateFilter(filter: any, value?: any, comparison?: any): any;
-export declare const getType: (t: string) => "string" | "boolean" | "numeric" | "date";
+export declare const getType: (t: string) => "string" | "boolean" | "date" | "numeric";
 /**
  * Returns a sentence to describe a Filter
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.12.39",
+  "version": "2.12.40",
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",