@quillsql/admin 1.6.3 → 1.7.0

package/dist/esm/hooks/useLongLoading.js

@@ -0,0 +1,64 @@
+import { useEffect, useState } from 'react';
+import { useAdmin } from '../AdminProvider';
+export function useLongLoading(isLoading, meta) {
+    const { origin, expectedLoadTime = 5000, abnormalLoadTime = 15000, loadDescription, } = meta;
+    const [isLongLoading, setIsLongLoading] = useState(false);
+    const [isAbnormalLoading, setIsAbnormalLoading] = useState(false);
+    const { eventTracking } = useAdmin();
+    useEffect(() => {
+        let longTimer = null;
+        let abnormalTimer = null;
+        if (isLoading) {
+            // Set timer for long loading
+            longTimer = setTimeout(() => {
+                setIsLongLoading(true);
+                eventTracking?.logError?.({
+                    type: 'timeout',
+                    severity: 'medium',
+                    message: `${origin} loading is taking longer than expected`,
+                    errorData: {
+                        loadDescription,
+                        expectedLoadTime,
+                        currentTime: Date.now(),
+                    },
+                });
+                // Set timer for abnormal loading
+                abnormalTimer = setTimeout(() => {
+                    setIsAbnormalLoading(true);
+                    eventTracking?.logError?.({
+                        type: 'timeout',
+                        severity: 'high',
+                        message: `${origin} loading is taking abnormally long`,
+                        errorData: {
+                            loadDescription,
+                            expectedLoadTime,
+                            abnormalLoadTime,
+                            currentTime: Date.now(),
+                        },
+                    });
+                }, abnormalLoadTime - expectedLoadTime);
+            }, expectedLoadTime);
+        }
+        else {
+            setIsLongLoading(false);
+            setIsAbnormalLoading(false);
+        }
+        return () => {
+            if (longTimer)
+                clearTimeout(longTimer);
+            if (abnormalTimer)
+                clearTimeout(abnormalTimer);
+        };
+    }, [
+        isLoading,
+        origin,
+        expectedLoadTime,
+        abnormalLoadTime,
+        loadDescription,
+        eventTracking,
+    ]);
+    return {
+        isLongLoading,
+        isAbnormalLoading,
+    };
+}

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

@@ -1 +1 @@
-{"version":3,"file":"useOnClickOutside.d.ts","sourceRoot":"","sources":["../../../src/hooks/useOnClickOutside.tsx"],"names":[],"mappings":"AAEA,QAAA,MAAM,iBAAiB,QAChB,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,WAC3B;IAAE,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI,CAAA;CAAE,cACnB,OAAO,SA2BpB,CAAC;AAEF,eAAO,MAAM,kBAAkB,YAAa,WAAW,KAAG,MAoBzD,CAAC;AAqBF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"useOnClickOutside.d.ts","sourceRoot":"","sources":["../../../src/hooks/useOnClickOutside.tsx"],"names":[],"mappings":"AAEA,QAAA,MAAM,iBAAiB,GACrB,KAAK,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,EACpC,SAAS;IAAE,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI,CAAA;CAAE,EAC/B,YAAY,OAAO,SA2BpB,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,SAAS,WAAW,KAAG,MAoBzD,CAAC;AAqBF,eAAe,iBAAiB,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"useThrottle.d.ts","sourceRoot":"","sources":["../../../src/hooks/useThrottle.tsx"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,UAAU,WAAW,CACjC,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,EAClC,KAAK,EAAE,MAAM,aAGI,GAAG,EAAE,UAOvB"}
+{"version":3,"file":"useThrottle.d.ts","sourceRoot":"","sources":["../../../src/hooks/useThrottle.tsx"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,UAAU,WAAW,CACjC,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,EAClC,KAAK,EAAE,MAAM,IAGL,GAAG,MAAM,GAAG,EAAE,UAOvB"}

package/dist/esm/icons/ArrowDownHeadIcon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArrowDownHeadIcon.d.ts","sourceRoot":"","sources":["../../../src/icons/ArrowDownHeadIcon.tsx"],"names":[],"mappings":"AAAA,QAAA,MAAM,iBAAiB;;6CActB,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"ArrowDownHeadIcon.d.ts","sourceRoot":"","sources":["../../../src/icons/ArrowDownHeadIcon.tsx"],"names":[],"mappings":"AAAA,QAAA,MAAM,iBAAiB,GAAI;;CAAY,4CActC,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

package/dist/esm/icons/CheckCircleIcon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CheckCircleIcon.d.ts","sourceRoot":"","sources":["../../../src/icons/CheckCircleIcon.tsx"],"names":[],"mappings":"AAAA,QAAA,MAAM,eAAe;;6CAepB,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"CheckCircleIcon.d.ts","sourceRoot":"","sources":["../../../src/icons/CheckCircleIcon.tsx"],"names":[],"mappings":"AAAA,QAAA,MAAM,eAAe,GAAI;;CAAY,4CAepC,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/dist/esm/icons/ExclamationFilledIcon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExclamationFilledIcon.d.ts","sourceRoot":"","sources":["../../../src/icons/ExclamationFilledIcon.tsx"],"names":[],"mappings":"AAEA,QAAA,MAAM,qBAAqB;;6CAa1B,CAAC;AAEF,eAAe,qBAAqB,CAAC"}
+{"version":3,"file":"ExclamationFilledIcon.d.ts","sourceRoot":"","sources":["../../../src/icons/ExclamationFilledIcon.tsx"],"names":[],"mappings":"AAEA,QAAA,MAAM,qBAAqB,GAAI;;CAAY,4CAa1C,CAAC;AAEF,eAAe,qBAAqB,CAAC"}

package/dist/esm/icons/ExteriorLinkIcon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExteriorLinkIcon.d.ts","sourceRoot":"","sources":["../../../src/icons/ExteriorLinkIcon.tsx"],"names":[],"mappings":"AAAA,QAAA,MAAM,gBAAgB;;6CAcrB,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"ExteriorLinkIcon.d.ts","sourceRoot":"","sources":["../../../src/icons/ExteriorLinkIcon.tsx"],"names":[],"mappings":"AAAA,QAAA,MAAM,gBAAgB,GAAI;;CAAY,4CAcrC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/dist/esm/icons/QuestionMarkCircleIcon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QuestionMarkCircleIcon.d.ts","sourceRoot":"","sources":["../../../src/icons/QuestionMarkCircleIcon.tsx"],"names":[],"mappings":"AAAA,QAAA,MAAM,sBAAsB;;6CAgB3B,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"QuestionMarkCircleIcon.d.ts","sourceRoot":"","sources":["../../../src/icons/QuestionMarkCircleIcon.tsx"],"names":[],"mappings":"AAAA,QAAA,MAAM,sBAAsB,GAAI;;CAAY,4CAgB3C,CAAC;AAEF,eAAe,sBAAsB,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"CodePreview.d.ts","sourceRoot":"","sources":["../../../src/modals/CodePreview.tsx"],"names":[],"mappings":"AAeA,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,cAAc,EACd,MAAM,EACN,SAAS,GACV,EAAE;IACD,cAAc,EAAE,GAAG,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;CACtC,kDA4OA"}
+{"version":3,"file":"CodePreview.d.ts","sourceRoot":"","sources":["../../../src/modals/CodePreview.tsx"],"names":[],"mappings":"AAeA,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,cAAc,EACd,MAAM,EACN,SAAS,GACV,EAAE;IACD,cAAc,EAAE,GAAG,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;CACtC,kDAoPA"}

package/dist/esm/modals/CodePreview.js

@@ -8,7 +8,7 @@ import { QuillSelectComponentWithCombo } from '../components/QuillSelectWithComb
 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 '../AdminProvider';
+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,2CAg4BA"}
+{"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

@@ -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 {
@@ -268,7 +309,7 @@ export function EditEnvironmentModal({ isOpen, setIsOpen, onSave, ModalComponent
                     loading: true,
                 },
             });
-            const schema = await getTableColumnsBySchema(state.queryEndpoint, state.client._id, getToken);
+            const schema = await getTableColumnsBySchema(state.isSelfHosted, state.queryEndpoint, state.client._id, state.client.databaseType, getToken, state.client.schemaNames ?? [], state.queryHeaders);
             // If any of the tenants point to a table that no longer exists, throw an error
             const tenantTables = state.client.allTenantTypes?.filter((t) => t.tenantTable !== undefined);
             const tables = schema.columnsByTable.map((t) => t.tableName);
@@ -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);
         }
@@ -346,6 +398,10 @@ export function EditEnvironmentModal({ isOpen, setIsOpen, onSave, ModalComponent
         }
     };
     const handleDeleteEnvironment = async () => {
+        if (state.clients.length === 1) {
+            alert('You cannot delete the only environment');
+            return;
+        }
         if (confirm('Are you sure? All dashboards in this environment will also be deleted. This action cannot be undone.')) {
             await quillFetchWithToken({
                 client: {
@@ -365,7 +421,7 @@ export function EditEnvironmentModal({ isOpen, setIsOpen, onSave, ModalComponent
                 payload: state.clients.filter((c) => c._id !== state.client._id),
             });
             setSelectedDashboard(null);
-            setClient(state.clients[0]);
+            setClient(state.clients.filter((c) => c._id !== state.client._id)[0]);
             setIsOpen(false);
             onSave();
         }
@@ -407,6 +463,7 @@ export function EditEnvironmentModal({ isOpen, setIsOpen, onSave, ModalComponent
                                             // padding: '2px 8px',
                                             fontSize: 12,
                                             font: 'monospace',
+                                            fontFamily: state.theme.fontFamily,
                                             fontWeight: 300,
                                             width: 'fit-content',
                                         }, children: "Dashboard Owner" })), _jsx("div", { style: {

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,14 +1,14 @@
 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 { useDashboardInternal, useDashboards, } from '@quillsql/react';
 import { SAVED_QUERIES_DASHBOARD, 
 // DateRangeOption,
 // InitialDateRangeOptions,
 SINGLE_TENANT,
 // defaultDateRange,
  } from '../utils/constants';
-import { defaultTheme, getPostgresBasicType } from '../Admin';
+import { getPostgresBasicType } from '../Admin';
 import InputLabel from '../components/InputLabel';
 import CardSection from '../components/CardSection';
 import { SegmentedControl } from '../components/SegmentedControl';
@@ -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,
@@ -632,7 +634,7 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
                                                                             // ) ?? initialRange,
                                                                             selectablePresetOptions.find((option) => option.value === e) ??
                                                                                 initialRange);
-                                                                        }, options: selectablePresetOptions, theme: defaultTheme, hideEmptyOption: true })] }) }), _jsx("div", { style: {
+                                                                        }, options: selectablePresetOptions, theme: state.theme, hideEmptyOption: true })] }) }), _jsx("div", { style: {
                                                                 display: 'flex',
                                                                 flexDirection: 'row',
                                                                 gap: '10px',
@@ -673,12 +675,12 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
                                                     }, children: _jsxs("div", { style: {
                                                             display: 'flex',
                                                             flexDirection: 'column',
-                                                            fontFamily: defaultTheme.fontFamily,
+                                                            fontFamily: state.theme.fontFamily,
                                                             gap: 8,
                                                         }, children: [_jsx("h3", { style: {
                                                                     fontSize: 14,
                                                                     fontWeight: 600,
-                                                                    color: defaultTheme.primaryTextColor,
+                                                                    color: state.theme.primaryTextColor,
                                                                 }, children: "Recurring" }), _jsxs("div", { style: {
                                                                     display: 'flex',
                                                                     flexDirection: 'row',
@@ -762,7 +764,7 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
                                                                                 }, width: "78px", number: true, max: 9999, min: 0, step: 1 })] }))] }), _jsx("h3", { style: {
                                                                     fontSize: 14,
                                                                     fontWeight: 600,
-                                                                    color: defaultTheme.primaryTextColor,
+                                                                    color: state.theme.primaryTextColor,
                                                                 }, children: "Standard" }), _jsxs("div", { style: {
                                                                     display: 'flex',
                                                                     flexDirection: 'row',
@@ -872,7 +874,7 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
                                                                                     ...newDateFilter,
                                                                                     presetOptions: updatedOptions,
                                                                                 });
-                                                                            }, theme: defaultTheme, hideEmptyOption: true })] }), _jsxs("div", { style: {
+                                                                            }, theme: state.theme, hideEmptyOption: true })] }), _jsxs("div", { style: {
                                                                         display: 'flex',
                                                                         flexDirection: 'column',
                                                                     }, children: [index === 0 && _jsx(InputLabel, { children: "Value" }), interval.type === 'week' && (_jsx("div", { style: { width: 200, visibility: 'hidden' } })), interval.type === 'relative' && (_jsxs("div", { style: {
@@ -926,7 +928,7 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
                                                                                             ...newDateFilter,
                                                                                             presetOptions: updatedOptions,
                                                                                         });
-                                                                                    }, theme: defaultTheme, hideEmptyOption: true, style: {
+                                                                                    }, theme: state.theme, hideEmptyOption: true, style: {
                                                                                         width: 120,
                                                                                         maxWidth: 120,
                                                                                         minWidth: 120,
@@ -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;
@@ -1270,7 +1272,7 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
                                                                         alignItems: 'center',
                                                                         width: '100%',
                                                                         gap: 10,
-                                                                    }, children: _jsx(SegmentedControl, { theme: defaultTheme, value: filter && filter.stringFilterType
+                                                                    }, children: _jsx(SegmentedControl, { theme: state.theme, value: filter && filter.stringFilterType
                                                                             ? filter.stringFilterType
                                                                             : 'default', onChange: (e) => {
                                                                             const updatedFilters = newFilters.map((otherFilter, i) => index === i
@@ -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"}