@quillsql/admin 1.6.4 → 1.7.1

package/dist/esm/modals/CodePreview.js

@@ -1,14 +1,14 @@
 import { createElement as _createElement } from "react";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { Chart, Dashboard, Table, useDashboards, useExport, useQuill, } from '@quillsql/react';
-import { useAdmin } from '../AdminProvider';
+import { useAdmin } from '../hooks/useAdmin';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import QuillTab from '../components/QuillTab';
 import { QuillSelectComponentWithCombo } from '../components/QuillSelectWithCombo';
 import { Highlight, themes } from 'prism-react-renderer';
 import { MemoizedButton } from '../components/UiComponents';
 export default function CodePreview({ ModalComponent, isOpen, setIsOpen, }) {
-    const { state } = useAdmin();
+    const { state, eventTracking } = useAdmin();
     const { dashboards } = useDashboards();
     const parentRef = useRef(null);
     const [modalWidth, setModalWidth] = useState(200);
@@ -16,6 +16,7 @@ export default function CodePreview({ ModalComponent, isOpen, setIsOpen, }) {
     const [toggleMode, setToggleMode] = useState('Dashboard');
     const [selectedReportId, setSelectedReportId] = useState(null);
     const [hideCode, setHideCode] = useState(false);
+    const [initialSizeIsSet, setInitialSizeIsSet] = useState(false);
     const selectedDashboardObject = useMemo(() => {
         return dashboards?.find((elem) => elem.name === state.selectedDashboard);
     }, [dashboards, state.selectedDashboard]);
@@ -28,6 +29,7 @@ export default function CodePreview({ ModalComponent, isOpen, setIsOpen, }) {
             setModalWidth(window.innerWidth - 80);
         }
         setModalHeight(window.innerHeight - 80);
+        setInitialSizeIsSet(true);
     }, []);
     useEffect(() => {
         handleResize();
@@ -51,11 +53,14 @@ export default function CodePreview({ ModalComponent, isOpen, setIsOpen, }) {
             ? `import { Dashboard } from '@quillsql/react' \n\nfunction DashboardPage() { \n\n\treturn ( \n\t\t // TODO: make sure all Quill Components are children of <QuillProvider /> \n\t\t<Dashboard \n\t\t\tname="${state.selectedDashboard}" \n\t\t\t// TODO: use id to navigate to report detail page \n\t\t\tonClickReport={report => console.log("Quill Report ID: ", report.id)} \n\t\t/>  \n\t); \n}`
             : `import { Chart, Table } from '@quillsql/react' \n\nfunction ReportDetail() { \n\tconst { reportId } = useRouter() // TODO: replace with your navigation router \n\tconst { data, loading, error } = useQuill(reportId) \n\tconst { downloadCSV } = useExport(reportId) \n\n\treturn ( \n\t\t// TODO: make sure all Quill Components are children of <QuillProvider /> \n\t\t<>\n\t\t\t<h1>{data.name}</h1>\n\t\t\t<Chart reportId={reportId} />\n\t\t\t<YourButton onClick={downloadCSV}>Download CSV</Button>\n\t\t\t<Table reportId={reportId} autoHide />\n\t\t</> \n\t); \n}`;
         navigator.clipboard.writeText(code);
+        eventTracking?.logEvent?.('embed-preview-copy-code', {
+            dashboardName: state.selectedDashboard,
+        });
     };
     if (!state.selectedDashboard) {
         return null;
     }
-    return (_jsx("div", { ref: parentRef, children: _jsx(ModalComponent, { isOpen: isOpen, setIsOpen: setIsOpen, title: "Embed Preview", width: modalWidth, height: modalHeight, children: _jsxs("div", { style: { paddingLeft: 20, paddingRight: 20 }, children: [_jsx("div", { style: {
+    return (_jsx("div", { ref: parentRef, style: { visibility: initialSizeIsSet ? 'visible' : 'hidden' }, children: _jsx(ModalComponent, { isOpen: isOpen, setIsOpen: setIsOpen, title: "Embed Preview", width: modalWidth, height: modalHeight, children: _jsxs("div", { style: { paddingLeft: 20, paddingRight: 20 }, children: [_jsx("div", { style: {
                             display: 'flex',
                             flexDirection: 'row',
                             alignItems: 'center',

package/dist/esm/modals/CreateEnvironmentModal.d.ts

@@ -0,0 +1,5 @@
+export default function CreateEnvironmentModal({ showCreateEnvironmentModal, setShowCreateEnvironmentModal, }: {
+    showCreateEnvironmentModal: boolean;
+    setShowCreateEnvironmentModal: (show: boolean) => void;
+}): import("react/jsx-runtime").JSX.Element;
+//# sourceMappingURL=CreateEnvironmentModal.d.ts.map

package/dist/esm/modals/CreateEnvironmentModal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CreateEnvironmentModal.d.ts","sourceRoot":"","sources":["../../../src/modals/CreateEnvironmentModal.tsx"],"names":[],"mappings":"AAIA,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAC7C,0BAA0B,EAC1B,6BAA6B,GAC9B,EAAE;IACD,0BAA0B,EAAE,OAAO,CAAC;IACpC,6BAA6B,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;CACxD,2CAuBA"}

package/dist/esm/modals/CreateEnvironmentModal.js

@@ -0,0 +1,15 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useAdmin } from '../hooks/useAdmin';
+import { ModalPrimitive } from '../primitives';
+import CreateEnvironment from '../public_components/CreateEnvironment';
+export default function CreateEnvironmentModal({ showCreateEnvironmentModal, setShowCreateEnvironmentModal, }) {
+    const { onOnboardComplete } = useAdmin();
+    return (_jsx(ModalPrimitive, { isOpen: showCreateEnvironmentModal, onClose: () => {
+            if (confirm('Are you sure you want to close this modal? Changes will not be saved.')) {
+                setShowCreateEnvironmentModal(false);
+            }
+        }, children: _jsx(CreateEnvironment, { onOnboardComplete: (client) => {
+                setShowCreateEnvironmentModal(false);
+                onOnboardComplete?.(client);
+            } }) }));
+}

package/dist/esm/modals/EditEnvironmentModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EditEnvironmentModal.d.ts","sourceRoot":"","sources":["../../../src/modals/EditEnvironmentModal.tsx"],"names":[],"mappings":"AAAA,OAAc,EACZ,yBAAyB,EACzB,aAAa,EAGd,MAAM,OAAO,CAAC;AAGf,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAQ3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAsB1E,wBAAgB,oBAAoB,CAAC,EACnC,MAAM,EACN,SAAS,EACT,MAAM,EACN,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,wBAAwB,GACzB,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,cAAc,EAAE,GAAG,CAAC;IACpB,kBAAkB,EACd,yBAAyB,CACvB,uBAAuB,GAAG,aAAa,CAAC,gBAAgB,CAAC,CAC1D,GACD,CAAC,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC,CAAC;IACtD,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC9D,eAAe,EAAE,GAAG,CAAC;IACrB,wBAAwB,EAAE,GAAG,CAAC;CAC/B,2CAy4BA"}
+{"version":3,"file":"EditEnvironmentModal.d.ts","sourceRoot":"","sources":["../../../src/modals/EditEnvironmentModal.tsx"],"names":[],"mappings":"AAAA,OAAc,EACZ,yBAAyB,EACzB,aAAa,EAGd,MAAM,OAAO,CAAC;AAGf,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAQ3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAQ1E,wBAAgB,oBAAoB,CAAC,EACnC,MAAM,EACN,SAAS,EACT,MAAM,EACN,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,wBAAwB,GACzB,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,cAAc,EAAE,GAAG,CAAC;IACpB,kBAAkB,EACd,yBAAyB,CACvB,uBAAuB,GAAG,aAAa,CAAC,gBAAgB,CAAC,CAC1D,GACD,CAAC,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC,CAAC;IACtD,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC9D,eAAe,EAAE,GAAG,CAAC;IACrB,wBAAwB,EAAE,GAAG,CAAC;CAC/B,2CAi9BA"}

package/dist/esm/modals/EditEnvironmentModal.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { useMemo, useState, } from 'react';
 import InputLabel from '../components/InputLabel';
 import CardSection from '../components/CardSection';
-import { useAdmin } from '../AdminProvider';
+import { useAdmin } from '../hooks/useAdmin';
 import CheckCircleIcon from '../icons/CheckCircleIcon';
 import { getDatabaseConnectionFormat, } from '../utils/databases';
 import ConnectDatabase from '../forms/client_onboard/ConnectDatabase';
@@ -10,32 +10,35 @@ import { SINGLE_TENANT } from '../utils/constants';
 import { EditTenant } from '../components/Tenants/EditTenant';
 import { getTableColumnsBySchema } from '../api/ConnectionClient';
 import { useDashboardManager } from '../hooks/useDashboardManager';
-const header1Style = {
-    fontWeight: '600',
-    fontSize: '18px',
-    marginBottom: '6px',
-    color: '#000000',
-};
-const header2Style = {
-    fontWeight: '500',
-    fontSize: '13px',
-    color: '#595959',
-    marginBottom: '4px',
-};
 export function EditEnvironmentModal({ isOpen, setIsOpen, onSave, ModalComponent, TextInputComponent, ButtonComponent, HeaderComponent, SecondaryButtonComponent, }) {
-    const { state, dispatch, setClient, getToken, quillFetchWithToken } = useAdmin();
+    const { state, dispatch, setClient, getToken, quillFetchWithToken, eventTracking, } = useAdmin();
     const { setSelectedDashboard } = useDashboardManager();
     const [selectedEnvironmentName, setSelectedEnvironmentName] = useState(state.client.name);
     const [copied, setCopied] = useState(false);
     const [isSubmitTenantLoading, setSubmitTenantLoading] = useState(false);
     const [validationError, setValidationError] = useState(undefined);
     const [formError, setFormError] = useState(undefined);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const [connectionDetails, setConnectionDetails] = useState(getDatabaseConnectionFormat(state.client.databaseType));
+    const connectionDetails = useMemo(() => {
+        return getDatabaseConnectionFormat(state.client?.databaseType || '');
+    }, [state.client?.databaseType]);
     const [tenantToEdit, setTenantToEdit] = useState(undefined);
     const [fetchSchemasLoading, setFetchSchemasLoading] = useState(false);
     const [createNewTenant, setCreateNewTenant] = useState(false);
     const [isConnectDatabaseModalOpen, setIsConnectDatabaseModalOpen] = useState(false);
+    const header1Style = {
+        fontWeight: '600',
+        fontSize: '18px',
+        marginBottom: '6px',
+        color: state.theme?.primaryTextColor,
+        fontFamily: state.theme?.fontFamily,
+    };
+    const header2Style = {
+        fontWeight: '500',
+        fontSize: '13px',
+        marginBottom: '4px',
+        fontFamily: state.theme?.fontFamily,
+        color: state.theme?.secondaryTextColor,
+    };
     const tenantRequest = async (tenant, mode) => {
         if (!tenant.clientId) {
             throw new Error('Client ID is required on tenant');
@@ -80,11 +83,27 @@ export function EditEnvironmentModal({ isOpen, setIsOpen, onSave, ModalComponent
                 if (!results.length) {
                     setFormError(`No rows were returned from this ${tenant.tenantTableQuery ? 'query' : 'table'}`);
                 }
+                const uniqueIds = new Set(results?.map((r) => r.id));
+                if (uniqueIds.size < results?.length) {
+                    setFormError('Duplicate tenant IDs found in results. Each tenant must have a unique ID.');
+                    return [];
+                }
                 return results;
             }
         }
         catch (e) {
             setFormError(e.message);
+            eventTracking?.logError?.({
+                type: 'bug', // TODO: determine type
+                severity: 'high',
+                message: 'Error validating tenant',
+                errorMessage: e.message,
+                errorStack: e.stack,
+                errorData: {
+                    caller: 'EditEnvironmentModal',
+                    function: 'onValidateEditTenant',
+                },
+            });
             throw e;
         }
         finally {
@@ -199,6 +218,17 @@ export function EditEnvironmentModal({ isOpen, setIsOpen, onSave, ModalComponent
             }, 50);
         }
         catch (e) {
+            eventTracking?.logError?.({
+                type: 'bug', // TODO: determine type
+                severity: 'high',
+                message: 'Error submitting tenant',
+                errorMessage: e.message,
+                errorStack: e.stack,
+                errorData: {
+                    caller: 'EditEnvironmentModal',
+                    function: 'onSubmitEditTenant',
+                },
+            });
             setFormError(e.message);
         }
         finally {
@@ -244,6 +274,17 @@ export function EditEnvironmentModal({ isOpen, setIsOpen, onSave, ModalComponent
         }
         catch (e) {
             console.log('error', e);
+            eventTracking?.logError?.({
+                type: 'bug', // TODO: determine type
+                severity: 'high',
+                message: 'Error deleting tenant',
+                errorMessage: e.message,
+                errorStack: e.stack,
+                errorData: {
+                    caller: 'EditEnvironmentModal',
+                    function: 'onDeleteTenant',
+                },
+            });
             setValidationError('Error deleting tenant');
         }
         finally {
@@ -338,6 +379,17 @@ export function EditEnvironmentModal({ isOpen, setIsOpen, onSave, ModalComponent
             setIsConnectDatabaseModalOpen(false);
         }
         catch (e) {
+            eventTracking?.logError?.({
+                type: 'bug', // TODO: determine type
+                severity: 'high',
+                message: 'Error updating environment',
+                errorMessage: e.message,
+                errorStack: e.stack,
+                errorData: {
+                    caller: 'EditEnvironmentModal',
+                    function: 'handleUpdateEnvironment',
+                },
+            });
             setIsConnectDatabaseModalOpen(false);
             setValidationError(e.message);
         }

package/dist/esm/modals/EditFiltersModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EditFiltersModal.d.ts","sourceRoot":"","sources":["../../../src/modals/EditFiltersModal.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAwC,MAAM,OAAO,CAAC;AAExE,OAAO,EACL,oBAAoB,EAKrB,MAAM,iBAAiB,CAAC;AAczB,OAAO,EAEL,oBAAoB,EACrB,MAAM,4BAA4B,CAAC;AAOpC,OAA2B,EACzB,uBAAuB,EACxB,MAAM,kCAAkC,CAAC;AAY1C,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AAqBvF,wBAAgB,gBAAgB,CAAC,EAC/B,MAAM,EACN,qBAAqB,EACrB,SAAS,EACT,MAAM,EACN,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,eAAe,EACf,SAAS,EACT,wBAAwB,EACxB,cAAc,EACd,gBAAgB,GACjB,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,SAAS,EAAE,GAAG,CAAC;IACf,MAAM,EAAE,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,cAAc,EAAE,GAAG,CAAC;IACpB,kBAAkB,EAAE,KAAK,CAAC,yBAAyB,CAAC,uBAAuB,CAAC,CAAC;IAC7E,eAAe,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC9D,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC9D,SAAS,EAAE,GAAG,CAAC;IACf,wBAAwB,EAAE,CAAC,KAAK,EAAE,6BAA6B,KAAK,SAAS,CAAC;IAC9E,cAAc,EAAE,GAAG,CAAC;IACpB,gBAAgB,EAAE,MAAM,IAAI,CAAC;CAC9B,2CAokFA"}
+{"version":3,"file":"EditFiltersModal.d.ts","sourceRoot":"","sources":["../../../src/modals/EditFiltersModal.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAwC,MAAM,OAAO,CAAC;AAExE,OAAO,EACL,oBAAoB,EAKrB,MAAM,iBAAiB,CAAC;AAczB,OAAO,EAEL,oBAAoB,EACrB,MAAM,4BAA4B,CAAC;AAOpC,OAA2B,EACzB,uBAAuB,EACxB,MAAM,kCAAkC,CAAC;AAY1C,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AAsBvF,wBAAgB,gBAAgB,CAAC,EAC/B,MAAM,EACN,qBAAqB,EACrB,SAAS,EACT,MAAM,EACN,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,eAAe,EACf,SAAS,EACT,wBAAwB,EACxB,cAAc,EACd,gBAAgB,GACjB,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,SAAS,EAAE,GAAG,CAAC;IACf,MAAM,EAAE,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,cAAc,EAAE,GAAG,CAAC;IACpB,kBAAkB,EAAE,KAAK,CAAC,yBAAyB,CAAC,uBAAuB,CAAC,CAAC;IAC7E,eAAe,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC9D,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC9D,SAAS,EAAE,GAAG,CAAC;IACf,wBAAwB,EAAE,CAAC,KAAK,EAAE,6BAA6B,KAAK,SAAS,CAAC;IAC9E,cAAc,EAAE,GAAG,CAAC;IACpB,gBAAgB,EAAE,MAAM,IAAI,CAAC;CAC9B,2CA2kFA"}

package/dist/esm/modals/EditFiltersModal.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect, useMemo, useRef, useState } from 'react';
-import { useAdmin } from '../AdminProvider';
-import { useDashboard, useDashboards, } from '@quillsql/react';
+import { useAdmin } from '../hooks/useAdmin';
+import { useDashboardInternal, useDashboards, } from '@quillsql/react';
 import { SAVED_QUERIES_DASHBOARD, 
 // DateRangeOption,
 // InitialDateRangeOptions,
@@ -47,7 +47,7 @@ const intervalTypeOptions = [
 export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onSave, ModalComponent, TextInputComponent, ButtonComponent, HeaderComponent, SelectComponent, dashNames, SecondaryButtonComponent, ErrorComponent, openPromoteModal, }) {
     const { state } = useAdmin();
     const { dashboards, deleteDashboard, updateDashboard } = useDashboards();
-    const { data: selectedDashboard } = useDashboard(selectedDashboardName);
+    const { data: selectedDashboard } = useDashboardInternal(selectedDashboardName);
     const [isDateComparison, setIsDateComparison] = useState(false);
     const [currentDashboardName, setCurrentDashboardName] = useState(selectedDashboardName);
     const [newFilters, setNewFilters] = useState([]);
@@ -379,7 +379,8 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
             return 'Dashboard name cannot be empty';
         if (newFilters?.some((f) => !f.label || !f.table || !f.field))
             return 'Filters must have a label, table, and field';
-        if (newFilters
+        if ((newFilters ?? [])
+            .concat(newDateFilter ? [newDateFilter] : [])
             ?.map((f) => f.label)
             .filter((label, index, self) => self.indexOf(label) !== index).length)
             return 'Filters must have unique labels';
@@ -422,14 +423,15 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
             .join(' ') ?? '');
     };
     const handleSubmitDashboardChanges = async () => {
-        const validationErrorMessages = validateDashboard(newFilters, dashNames, currentDashboardName, newDateFilter ? { ...newDateFilter, comparison: isDateComparison } : null, { ...selectedDashboard, name: currentDashboardName });
+        const validationErrorMessages = validateDashboard(newFilters, dashNames, currentDashboardName, newDateFilter ? { ...newDateFilter, comparison: isDateComparison } : null, selectedDashboard);
         if (validationErrorMessages.length !== 0) {
             setValidationError(validationErrorMessages);
             return;
         }
         const updatedFilters = newFilters.map((filter) => {
             const table = filteredTables.find((table) => table?.name === filter?.table);
-            const filterType = getPostgresBasicType(table.columns.find((col) => col?.name === filter?.field));
+            const column = table?.columns.find((col) => col.field === filter?.field);
+            const filterType = column ? getPostgresBasicType(column) : 'string';
             return {
                 table: filter.table,
                 field: filter.field,
@@ -1236,10 +1238,10 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
                                                                     })
                                                                         .map((column) => {
                                                                         return {
-                                                                            label: column.name,
-                                                                            value: column.name,
+                                                                            label: column.label || column.field,
+                                                                            value: column.field,
                                                                         };
-                                                                    })
+                                                                    }) || []
                                                                     : [], onChange: (event) => {
                                                                     // Capitalize the label
                                                                     const e = event.target.value;
@@ -1306,5 +1308,7 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
                                 flexDirection: 'row',
                                 justifyContent: 'space-between',
                                 alignItems: 'center',
-                            }, children: [_jsx(ButtonComponent, { onClick: handleSubmitDashboardChanges, label: "Save changes", disabled: !!dashboardValidationError, tooltipText: dashboardValidationError }), validationError.length !== 0 && (_jsx(ErrorComponent, { errorMessage: validationError && validationError[0] }))] })] }) }) }) }));
+                            }, children: [_jsx(ButtonComponent, { onClick: handleSubmitDashboardChanges, label: "Save changes", disabled: !!dashboardValidationError, tooltipText: dashboardValidationError }), validationError.length !== 0 && (_jsx(ErrorComponent, { errorMessage: validationError && validationError[0], containerStyle: {
+                                        marginLeft: 4,
+                                    } }))] })] }) }) }) }));
 }

package/dist/esm/modals/NewDashboardModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NewDashboardModal.d.ts","sourceRoot":"","sources":["../../../src/modals/NewDashboardModal.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,oBAAoB,EAAiB,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAYlE,wBAAgB,iBAAiB,CAAC,EAChC,MAAM,EACN,SAAS,EACT,MAAM,EACN,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,eAAe,EACf,SAAS,EACT,wBAAwB,GACzB,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,GAAG,CAAC;IACf,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,cAAc,EAAE,GAAG,CAAC;IACpB,kBAAkB,EAAE,GAAG,CAAC;IACxB,eAAe,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC9D,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC9D,SAAS,EAAE,GAAG,CAAC;IACf,wBAAwB,EAAE,GAAG,CAAC;CAC/B,2CAqoBA"}
+{"version":3,"file":"NewDashboardModal.d.ts","sourceRoot":"","sources":["../../../src/modals/NewDashboardModal.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,oBAAoB,EAAiB,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAYlE,wBAAgB,iBAAiB,CAAC,EAChC,MAAM,EACN,SAAS,EACT,MAAM,EACN,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,eAAe,EACf,SAAS,EACT,wBAAwB,GACzB,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,GAAG,CAAC;IACf,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,cAAc,EAAE,GAAG,CAAC;IACpB,kBAAkB,EAAE,GAAG,CAAC;IACxB,eAAe,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC9D,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC9D,SAAS,EAAE,GAAG,CAAC;IACf,wBAAwB,EAAE,GAAG,CAAC;CAC/B,2CAgqBA"}

package/dist/esm/modals/NewDashboardModal.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useState, useMemo } from 'react';
+import { useState, useMemo, useCallback } from 'react';
 import InputLabel from '../components/InputLabel';
 import CardSection from '../components/CardSection';
-import { useAdmin } from '../AdminProvider';
+import { useAdmin } from '../hooks/useAdmin';
 import { SINGLE_TENANT } from '../utils/constants';
 // import TogglePrimitive from '../primitives/TogglePrimitive';
 import { delay } from '../utils/delay';
@@ -25,6 +25,7 @@ export function NewDashboardModal({ isOpen, setIsOpen, onSave, ModalComponent, T
     const [initialRange, setInitialRange] = useState({ label: 'Last 30 days', value: 'LAST_30_DAYS' });
     const [newDateFilter, setNewDateFilter] = useState(undefined);
     const [tenantKey, setTenantKey] = useState(state.client?.ownerTenantFields?.[0]);
+    const [isSubmitting, setIsSubmitting] = useState(false);
     const ownerTenants = useMemo(() => state.client?.allTenantTypes?.filter((tenant) => state.client?.ownerTenantFields?.includes(tenant.tenantField)), [state.client?.allTenantTypes, state.client?.ownerTenantFields]);
     const filteredTables = useMemo(() => {
         return state.tables.filter((table) => {
@@ -37,12 +38,16 @@ export function NewDashboardModal({ isOpen, setIsOpen, onSave, ModalComponent, T
         return (newFilters.some((filter) => !filter.label || !filter.table || !filter.field) ||
             newDateFilter?.label === '' ||
             !tenantKey ||
-            !selectedDashboardName);
-    }, [newFilters, newDateFilter, selectedDashboardName]);
+            !selectedDashboardName ||
+            isSubmitting);
+    }, [newFilters, newDateFilter, selectedDashboardName, isSubmitting]);
     const handleAddFilter = async () => {
         setNewFilters([...newFilters, {}]);
     };
-    const handleSubmitDashboardChanges = async () => {
+    const handleSubmitDashboardChanges = useCallback(async () => {
+        if (isSubmitting) {
+            return; // Prevent double submission
+        }
         if (!selectedDashboardName ||
             newFilters.some((filter) => !filter.label) ||
             (Object.keys(newDateFilter ?? {}).length && !newDateFilter?.label)) {
@@ -101,26 +106,47 @@ export function NewDashboardModal({ isOpen, setIsOpen, onSave, ModalComponent, T
             alert('Your dashboard must have an owner');
             return;
         }
-        await createDashboard({
-            name: selectedDashboardName.trim(),
-            filters: updatedFilters,
-            dateFilter: newDateFilter
-                ? {
-                    ...newDateFilter,
-                    // comparison: isDateComparison,
-                    comparison: false,
-                    primaryRange: initialRange,
-                }
-                : undefined,
-            dashboardOwners: [tenantKey],
-        });
-        onSave(selectedDashboardName, tenantKey);
-        await delay(200);
-        setIsOpen(false);
-        setSelectedDashboardName('');
-        setNewFilters([]);
-        // setIsDateComparison(false);
-    };
+        setIsSubmitting(true);
+        try {
+            await createDashboard({
+                name: selectedDashboardName.trim(),
+                filters: updatedFilters,
+                dateFilter: newDateFilter
+                    ? {
+                        ...newDateFilter,
+                        // comparison: isDateComparison,
+                        comparison: false,
+                        primaryRange: initialRange,
+                    }
+                    : undefined,
+                dashboardOwners: [tenantKey],
+            });
+            onSave(selectedDashboardName, tenantKey);
+            await delay(200);
+            setIsOpen(false);
+            setSelectedDashboardName('');
+            setNewFilters([]);
+            // setIsDateComparison(false);
+        }
+        catch (error) {
+            console.error('Error creating dashboard:', error);
+            // Optionally show an error message to the user
+        }
+        finally {
+            setIsSubmitting(false);
+        }
+    }, [
+        isSubmitting,
+        selectedDashboardName,
+        newFilters,
+        newDateFilter,
+        dashNames,
+        tenantKey,
+        initialRange,
+        createDashboard,
+        onSave,
+        setIsOpen,
+    ]);
     const handleDeleteFilter = (index) => {
         setNewFilters(newFilters.filter((_, i) => i !== index));
     };
@@ -239,13 +265,13 @@ export function NewDashboardModal({ isOpen, setIsOpen, onSave, ModalComponent, T
                                             }, children: [index === 0 && _jsx(InputLabel, { children: "Field" }), _jsx(SelectComponent, { value: filter?.field ?? '', options: filter?.table
                                                         ? filteredTables
                                                             .find((t) => t.name === filter.table)
-                                                            .columns.filter((column) => convertFieldTypeToJSType(column.fieldType) === 'string')
+                                                            ?.columns.filter((column) => convertFieldTypeToJSType(column.fieldType) === 'string')
                                                             .map((column) => {
                                                             return {
-                                                                label: column.name,
-                                                                value: column.name,
+                                                                label: column.label || column.field,
+                                                                value: column.field,
                                                             };
-                                                        })
+                                                        }) || []
                                                         : [], onChange: (e) => {
                                                         // Capitalize the label
                                                         const updatedFilters = newFilters.map((otherFilter, i) => index === i
@@ -291,5 +317,5 @@ export function NewDashboardModal({ isOpen, setIsOpen, onSave, ModalComponent, T
                                                                     cursor: 'pointer',
                                                                     width: '100%',
                                                                 }, children: _jsx("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 24 24", fill: "#4C5462", width: "20", height: "20", children: _jsx("path", { fillRule: "evenodd", d: "M5.47 5.47a.75.75 0 011.06 0L12 10.94l5.47-5.47a.75.75 0 111.06 1.06L13.06 12l5.47 5.47a.75.75 0 11-1.06 1.06L12 13.06l-5.47 5.47a.75.75 0 01-1.06-1.06L10.94 12 5.47 6.53a.75.75 0 010-1.06z", clipRule: "evenodd" }) }) })] }) })] })] }));
-                            }) })), _jsx("div", { style: { height: 12 } }), _jsx(SecondaryButtonComponent, { onClick: handleAddFilter, label: "Add filter +" })] }), _jsx("div", { style: { height: 18 } }), _jsx("div", { style: { maxWidth: 230 }, children: _jsx(ButtonComponent, { onClick: handleSubmitDashboardChanges, label: 'Create', disabled: saveButtonDisabled }) })] }) }));
+                            }) })), _jsx("div", { style: { height: 12 } }), _jsx(SecondaryButtonComponent, { onClick: handleAddFilter, label: "Add filter +" })] }), _jsx("div", { style: { height: 18 } }), _jsx("div", { style: { maxWidth: 230 }, children: _jsx(ButtonComponent, { onClick: handleSubmitDashboardChanges, label: isSubmitting ? 'Creating...' : 'Create', disabled: saveButtonDisabled }) })] }) }));
 }

package/dist/esm/modals/PromoteDashboardModal.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from 'react';
-import { useAdmin } from '../AdminProvider';
+import { useAdmin } from '../hooks/useAdmin';
 export function PromoteDashboardModal({ isOpen, setIsOpen, autoPromoteVirtualTables, setAutoPromoteVirtualTables, handlePromote, ModalComponent, ButtonComponent, SelectComponent, CheckboxComponent, HeaderComponent, ErrorComponent, }) {
     const { state } = useAdmin();
     const [validationError, setValidationError] = useState('');

package/dist/esm/modals/PromoteReportModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PromoteReportModal.d.ts","sourceRoot":"","sources":["../../../src/modals/PromoteReportModal.tsx"],"names":[],"mappings":"AAIA,UAAU,kBAAkB;IAC1B,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACzC,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,iBAAiB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,oBAAoB,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,EACzC,cAAc,EACd,eAAe,EACf,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,MAAM,EACN,SAAS,EACT,QAAQ,EACR,eAAe,EACf,oBAAoB,GACrB,EAAE,kBAAkB,2CA4LpB"}
+{"version":3,"file":"PromoteReportModal.d.ts","sourceRoot":"","sources":["../../../src/modals/PromoteReportModal.tsx"],"names":[],"mappings":"AAIA,UAAU,kBAAkB;IAC1B,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACzC,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,iBAAiB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,oBAAoB,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,EACzC,cAAc,EACd,eAAe,EACf,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,MAAM,EACN,SAAS,EACT,QAAQ,EACR,eAAe,EACf,oBAAoB,GACrB,EAAE,kBAAkB,2CA2MpB"}

package/dist/esm/modals/PromoteReportModal.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState } from 'react';
-import { useAdmin } from '../AdminProvider';
+import { useAdmin } from '../hooks/useAdmin';
 import { useDashboards } from '@quillsql/react';
 export default function PromoteReportModal({ ModalComponent, HeaderComponent, ButtonComponent, SelectComponent, CheckboxComponent, isOpen, setIsOpen, reportId, currentClientId, currentDashboardName, }) {
-    const { state, quillFetchWithToken } = useAdmin();
+    const { state, quillFetchWithToken, eventTracking } = useAdmin();
     const { dashboards } = useDashboards();
     const [selectedClientId, setSelectedClientId] = useState(currentClientId);
     const [dashboardName, setDashboardName] = useState(null);
@@ -48,7 +48,7 @@ export default function PromoteReportModal({ ModalComponent, HeaderComponent, Bu
                     dashboardName: dashboardName,
                     itemId: reportId,
                     skipWarning,
-                    addMissingTables: autoPromoteVirtualTables,
+                    addMissingTables: autoPromoteVirtualTables && currentClientId !== selectedClientId,
                 },
                 adminMode: true,
             });
@@ -78,6 +78,17 @@ export default function PromoteReportModal({ ModalComponent, HeaderComponent, Bu
             alert('Report promoted successfully.');
         }
         catch (error) {
+            eventTracking?.logError?.({
+                type: 'bug', // TODO: determine type
+                severity: 'high',
+                message: 'Error promoting report',
+                errorMessage: error.message,
+                errorStack: error.stack,
+                errorData: {
+                    caller: 'PromoteReportModal',
+                    function: 'handlePromote',
+                },
+            });
             console.error('Promotion failed:', error);
         }
     };
@@ -112,13 +123,13 @@ export default function PromoteReportModal({ ModalComponent, HeaderComponent, Bu
                                 display: 'flex',
                                 justifyContent: 'space-between',
                                 gap: 12,
-                            }, children: [_jsx(CheckboxComponent, { label: "Add missing tables", isChecked: autoPromoteVirtualTables, onChange: () => {
+                            }, children: [_jsx(CheckboxComponent, { label: "Add missing tables", isChecked: autoPromoteVirtualTables && currentClientId !== selectedClientId, onChange: () => {
                                         setAutoPromoteVirtualTables(!autoPromoteVirtualTables);
                                     }, labelStyle: {
                                         color: '#666666',
                                         fontSize: '13px',
                                         fontWeight: 400,
-                                    } }), _jsx(ButtonComponent, { onClick: () => {
+                                    }, disabled: currentClientId === selectedClientId }), _jsx(ButtonComponent, { onClick: () => {
                                         handlePromote();
                                         setIsOpen(false);
                                     }, label: "Promote Report", disabled: !selectedClientId || !dashboardName, width: 160 })] })] })] }) }));

package/dist/esm/modals/PromoteViewModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PromoteViewModal.d.ts","sourceRoot":"","sources":["../../../src/modals/PromoteViewModal.tsx"],"names":[],"mappings":"AAIA,UAAU,wBAAwB;IAChC,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACzC,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,GAAG,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,GAAG,EAAE,CAAC;CAChB;AAED,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAAC,EAC/C,cAAc,EACd,eAAe,EACf,eAAe,EACf,MAAM,EACN,SAAS,EACT,QAAQ,EACR,MAAM,EACN,OAAO,EACP,IAAI,GACL,EAAE,wBAAwB,2CA2H1B"}
+{"version":3,"file":"PromoteViewModal.d.ts","sourceRoot":"","sources":["../../../src/modals/PromoteViewModal.tsx"],"names":[],"mappings":"AAIA,UAAU,wBAAwB;IAChC,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACzC,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,GAAG,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,GAAG,EAAE,CAAC;CAChB;AAED,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAAC,EAC/C,cAAc,EACd,eAAe,EACf,eAAe,EACf,MAAM,EACN,SAAS,EACT,QAAQ,EACR,MAAM,EACN,OAAO,EACP,IAAI,GACL,EAAE,wBAAwB,2CAsI1B"}

package/dist/esm/modals/PromoteViewModal.js

@@ -1,12 +1,12 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from 'react';
 import { QuillSelectComponentWithCombo } from '../components/QuillSelectWithCombo';
-import { useAdmin } from '../AdminProvider';
+import { useAdmin } from '../hooks/useAdmin';
 export default function PromoteVirtualTableModal({ ModalComponent, HeaderComponent, ButtonComponent, isOpen, setIsOpen, clientId, client, clients, view, }) {
-    const { state, quillFetchWithToken } = useAdmin();
+    const { state, quillFetchWithToken, eventTracking } = useAdmin();
     const [selectedClientId, setClientId] = useState(undefined);
     useEffect(() => {
-        setClientId(clients[0].id);
+        setClientId(clients[0]?.id);
     }, [clients]);
     const handlePromote = async (skipWarning = false) => {
         if (!selectedClientId) {
@@ -48,6 +48,17 @@ export default function PromoteVirtualTableModal({ ModalComponent, HeaderCompone
             alert('Virtual Table promoted successfully.');
         }
         catch (error) {
+            eventTracking?.logError?.({
+                type: 'bug', // TODO: determine type
+                severity: 'high',
+                message: 'Error promoting virtual table',
+                errorMessage: error.message,
+                errorStack: error.stack,
+                errorData: {
+                    caller: 'PromoteViewModal',
+                    function: 'handlePromote',
+                },
+            });
             console.error('Promotion failed:', error);
         }
     };

package/dist/esm/modals/ReorderDashboardModal.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // @ts-nocheck
 import { useEffect, useState } from 'react';
-import { useAdmin } from '../AdminProvider';
+import { useAdmin } from '../hooks/useAdmin';
 import { QUILL_SERVER, SINGLE_TENANT } from '../utils/constants';
 import { arrayMove, rectSortingStrategy, SortableContext, sortableKeyboardCoordinates, useSortable, } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';

package/dist/esm/modals/SavedQueriesModal.js

@@ -1,7 +1,7 @@
 import { createElement as _createElement } from "react";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { useAdmin } from '../AdminProvider';
+import { useAdmin } from '../hooks/useAdmin';
 import { Dashboard } from '@quillsql/react';
 import { SecondaryButtonPrimitive } from '../primitives';
 import { parseQuillReportToQuillReportInternal, } from '../utils/report';

package/dist/esm/modals/TenantFieldModal.d.ts

@@ -0,0 +1,9 @@
+import { QuillTenant } from '../models/Tenant';
+export default function TenantFieldModal({ isOpen, setClosed, tenant, onOverride, errorType, }: {
+    isOpen: boolean;
+    setClosed: () => void;
+    tenant?: QuillTenant;
+    onOverride?: () => void;
+    errorType?: 'missing' | 'type_mismatch';
+}): import("react/jsx-runtime").JSX.Element;
+//# sourceMappingURL=TenantFieldModal.d.ts.map

package/dist/esm/modals/TenantFieldModal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TenantFieldModal.d.ts","sourceRoot":"","sources":["../../../src/modals/TenantFieldModal.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAO/C,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,MAAM,EACN,SAAS,EACT,MAAM,EACN,UAAU,EACV,SAAqB,GACtB,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,SAAS,CAAC,EAAE,SAAS,GAAG,eAAe,CAAC;CACzC,2CAwHA"}