@quillsql/admin 1.6.4 → 1.7.1

package/dist/esm/AdminProvider.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useReducer, createContext, useEffect, useContext, useState, useMemo, } from 'react';
-import { defaultTheme as quillDefaultTheme, } from './Admin';
+import { useReducer, useEffect, useState, useMemo, useRef } from 'react';
+import { defaultTheme as quillDefaultTheme, } from './models/Provider';
 import { QuillProvider } from '@quillsql/react';
 import { ALL_TENANTS, QUILL_ENDPOINTS, QUILL_QUERY_ENDPOINT, QUILL_SERVER, SINGLE_TENANT, } from './utils/constants';
 import CreateEnvironment from './public_components/CreateEnvironment';
@@ -8,7 +8,7 @@ import { getSchemaInfo } from './utils/schema';
 import { ButtonPrimitive, ModalPrimitive } from './primitives';
 import equal from 'fast-deep-equal';
 import { quillFetch, } from './utils/dataFetcher';
-const AdminContext = createContext(undefined);
+import { AdminContext } from './models/AdminContext';
 function reducer(state, action) {
     switch (action.type) {
         case 'SET_CLIENT':
@@ -101,22 +101,22 @@ function reducer(state, action) {
             return { ...state, currentTenantIdentity: action.payload };
         case 'SET_QUERY_HEADERS':
             return { ...state, queryHeaders: action.payload };
+        case 'SET_PUBLIC_KEY':
+            return { ...state, publicKey: action.payload };
+        case 'SET_CLERK_ORG_ID':
+            return { ...state, clerkOrgId: action.payload };
+        case 'SET_ALL_STATE':
+            return { ...state, ...action.payload };
         default:
             return state;
     }
 }
-const useAdmin = () => {
-    const context = useContext(AdminContext);
-    if (context === undefined) {
-        throw new Error('useAdmin must be used within an AdminProvider');
-    }
-    return { ...context, clientLoading: context.loading };
-};
-function AdminProvider({ children, publicKey, queryEndpoint = `${QUILL_SERVER}${QUILL_QUERY_ENDPOINT}`, queryHeaders, withCredentials, domainName, onOnboardComplete, flagsList, getAuthorizationToken = async () => '', theme, }) {
-    const [clientLoading, setClientLoading] = useState(false);
-    const [currentFetchingClient, setCurrentFetchingClient] = useState(undefined);
+function AdminProvider({ children, publicKey, queryEndpoint = `${QUILL_SERVER}${QUILL_QUERY_ENDPOINT}`, queryHeaders, withCredentials, clerkOrgId, onOnboardComplete, flagsList, getAuthorizationToken = async () => '', theme, eventTracking = null, onRequestAddVirtualTable, }) {
+    const [clientLoading, setClientLoading] = useState(true);
+    const currentFetchingClientRef = useRef(undefined);
     const [schemaLoading, setSchemaLoading] = useState(false);
     const [error, setError] = useState(null);
+    const publicKeyRef = useRef(undefined);
     const parsedSessionStorageAdminState = (adminState) => {
         // We store things using JSON.strigify and then restore them with JSON.parse
         // But certain objects, such as Dates, don't stringify/parse correctly
@@ -137,11 +137,31 @@ function AdminProvider({ children, publicKey, queryEndpoint = `${QUILL_SERVER}${
     };
     const initialState = useMemo(() => {
         const localState = JSON.parse(sessionStorage.getItem('quill-adminState') ?? 'null');
-        if (localState?.domainName === domainName && domainName) {
+        if (clerkOrgId && localState?.clerkOrgId === clerkOrgId) {
             return parsedSessionStorageAdminState(localState);
         }
         sessionStorage.removeItem('quill-adminState');
         sessionStorage.removeItem('quill-client');
+        const populatedTheme = {
+            ...theme,
+            fontFamily: theme?.fontFamily ?? quillDefaultTheme.fontFamily,
+            backgroundColor: theme?.backgroundColor ?? quillDefaultTheme.backgroundColor,
+            primaryTextColor: theme?.primaryTextColor ?? quillDefaultTheme.primaryTextColor,
+            secondaryTextColor: theme?.secondaryTextColor ?? quillDefaultTheme.secondaryTextColor,
+            chartLabelFontFamily: theme?.chartLabelFontFamily ?? quillDefaultTheme.chartLabelFontFamily,
+            chartLabelColor: theme?.chartLabelColor ?? quillDefaultTheme.chartLabelColor,
+            chartTickColor: theme?.chartTickColor ?? quillDefaultTheme.chartTickColor,
+            chartColors: theme?.chartColors ?? quillDefaultTheme.chartColors,
+            borderColor: theme?.borderColor ?? quillDefaultTheme.borderColor,
+            primaryButtonColor: theme?.primaryButtonColor ?? quillDefaultTheme.primaryButtonColor,
+            borderWidth: theme?.borderWidth ?? quillDefaultTheme.borderWidth,
+            buttonFontWeight: theme?.buttonFontWeight ?? quillDefaultTheme.buttonFontWeight,
+            labelFontWeight: theme?.labelFontWeight ?? quillDefaultTheme.labelFontWeight,
+            fontSize: theme?.fontSize ?? quillDefaultTheme.fontSize,
+            primaryButtonTextColor: theme?.primaryButtonTextColor ??
+                quillDefaultTheme.primaryButtonTextColor,
+            hoverBackgroundColor: theme?.hoverBackgroundColor ?? quillDefaultTheme.hoverBackgroundColor,
+        };
         return {
             loading: true,
             publicKey: publicKey || '',
@@ -163,11 +183,13 @@ function AdminProvider({ children, publicKey, queryEndpoint = `${QUILL_SERVER}${
             selectedDashboard: null,
             reportId: null,
             report: null,
-            theme: theme ?? quillDefaultTheme,
+            theme: populatedTheme,
             organizationIdSet: false,
             dateFilter: {},
-            domainName: domainName || '',
+            clerkOrgId: clerkOrgId || '',
             databaseTypeMismatch: { show: false, backendDatabaseType: '' },
+            activeSavedQueryReportId: '',
+            databaseSchema: undefined,
         };
     }, []);
     const [state, dispatch] = useReducer(reducer, initialState);
@@ -192,9 +214,11 @@ function AdminProvider({ children, publicKey, queryEndpoint = `${QUILL_SERVER}${
             ],
         };
     }, [state, flagsList, state.client]);
-    const setClient = (client, setLoadingImmediately = false) => {
-        if (setLoadingImmediately) {
+    const setClient = (client, fetchTenantInfo) => {
+        if (fetchTenantInfo) {
             setClientLoading(true);
+            fetchClient(client.clientId, false);
+            return;
         }
         dispatch({ type: 'SET_CLIENT_AND_TENANTS', payload: client });
     };
@@ -222,72 +246,74 @@ function AdminProvider({ children, publicKey, queryEndpoint = `${QUILL_SERVER}${
                 throw e;
             }
             console.error('Failed to fetch:', e);
+            eventTracking?.logError?.({
+                type: 'network',
+                severity: 'medium',
+                message: 'Failed to fetch data',
+                errorMessage: e.message,
+                errorStack: e.stack,
+                errorData: {
+                    task: task,
+                },
+            });
             return { error: 'Failed to fetch data' };
         }
     }
-    // queryHeaders prop can change dynamically, need to stay updated
-    useEffect(() => {
-        dispatch({ type: 'SET_QUERY_HEADERS', payload: queryHeaders });
-    }, [queryHeaders]);
-    useEffect(() => {
-        const client = JSON.parse(sessionStorage.getItem('quill-client') || 'null');
-        if (client?.id === publicKey) {
-            dispatch({
-                type: 'SET_CLIENT',
-                payload: { ...client, _id: publicKey },
+    async function fetchClient(publicKey, fetchAllClients = false) {
+        setClientLoading(true);
+        currentFetchingClientRef.current = publicKey;
+        try {
+            const data = await quillFetchWithToken({
+                client: {
+                    queryEndpoint,
+                    queryHeaders: queryHeaders,
+                    withCredentials: !!state.withCredentials,
+                    clientId: publicKey,
+                },
+                task: 'client',
+                metadata: {
+                    clientId: publicKey,
+                    fetchDefaultDashboard: true,
+                },
+                adminMode: true,
             });
-        }
-        async function fetchClient(publicKey) {
-            if (!publicKey) {
+            if (data.status === 'error') {
+                throw new Error(data.error);
+            }
+            const result = data.data || data;
+            if (!result.client) {
+                console.error('Client not found.');
                 return;
             }
-            setClientLoading(true);
-            setCurrentFetchingClient(publicKey);
-            try {
-                const data = await quillFetchWithToken({
-                    client: {
-                        queryEndpoint,
-                        queryHeaders: queryHeaders,
-                        withCredentials: !!state.withCredentials,
-                        clientId: publicKey,
-                    },
-                    task: 'client',
-                    metadata: {
-                        clientId: publicKey,
-                        fetchDefaultDashboard: true,
-                    },
-                    adminMode: true,
+            const allClientTenantIds = await Promise.all(result.client.allTenantTypes?.map(async (tenant) => {
+                return await getClientTenantIds({
+                    queryEndpoint,
+                    queryHeaders: state.queryHeaders,
+                    withCredentials: state.withCredentials,
+                    tenant,
+                    clientId: result.client._id,
+                    getToken: getAuthorizationToken,
                 });
-                if (data.status === 'error') {
-                    throw new Error(data.error);
-                }
-                const result = data.data || data;
-                if (!result.client) {
-                    console.error('Client not found.');
-                    return;
-                }
-                const allClientTenantIds = await Promise.all(result.client.allTenantTypes?.map(async (tenant) => {
-                    return await getClientTenantIds({
-                        queryEndpoint,
-                        queryHeaders: state.queryHeaders,
-                        withCredentials: state.withCredentials,
-                        tenant,
-                        clientId: result.client._id,
-                        getToken: getAuthorizationToken,
-                    });
-                }) ?? []);
-                const mappedTenantIds = allClientTenantIds.reduce((acc, curr) => {
-                    acc[curr.id] = curr.tenantIds;
-                    return acc;
-                }, {});
-                setClient({
-                    ...result.client,
-                    queryEndpoint: result.client.queryEndpoint ?? queryEndpoint,
-                    allTenantTypes: result.client.allTenantTypes?.map((tenant) => ({
-                        ...tenant,
-                        tenantIds: mappedTenantIds?.[tenant.id],
-                    })),
+            }) ?? []);
+            const mappedTenantIds = allClientTenantIds.reduce((acc, curr) => {
+                acc[curr.id] = curr.tenantIds;
+                return acc;
+            }, {});
+            if (result.client._id !== state.client?._id) {
+                dispatch({
+                    type: 'SET_SELECTED_DASHBOARD_NAME',
+                    payload: null,
                 });
+            }
+            setClient({
+                ...result.client,
+                queryEndpoint: result.client.queryEndpoint ?? queryEndpoint,
+                allTenantTypes: result.client.allTenantTypes?.map((tenant) => ({
+                    ...tenant,
+                    tenantIds: mappedTenantIds?.[tenant.id],
+                })),
+            });
+            if (fetchAllClients) {
                 const allClientsData = await quillFetchWithToken({
                     client: {
                         queryEndpoint,
@@ -322,21 +348,59 @@ function AdminProvider({ children, publicKey, queryEndpoint = `${QUILL_SERVER}${
                     payload: allClients,
                 });
             }
-            catch (error) {
-                console.error('ERROR:', error);
-            }
-            finally {
-                // We want this to trigger after the schema loading effect runs so the loading state doesn't flicker
-                setTimeout(() => {
-                    setClientLoading(false);
-                    setCurrentFetchingClient(undefined);
-                }, 200);
-            }
         }
-        if (currentFetchingClient === (state.client?.id ?? publicKey))
-            return;
-        fetchClient(state?.client?.id ?? publicKey);
-    }, [publicKey, state?.client?.id]);
+        catch (error) {
+            console.error('ERROR:', error);
+            eventTracking?.logError?.({
+                type: 'bug', // TODO: determine type
+                severity: 'high',
+                message: 'Error fetching client',
+                errorMessage: error.message,
+                errorStack: error.stack,
+                errorData: {
+                    caller: 'AdminProvider',
+                    function: 'fetchClient',
+                },
+            });
+        }
+        finally {
+            // We want this to trigger after the schema loading effect runs so the loading state doesn't flicker
+            setTimeout(() => {
+                setClientLoading(false);
+                currentFetchingClientRef.current = undefined;
+            }, 200);
+        }
+    }
+    // queryHeaders prop can change dynamically, need to stay updated
+    useEffect(() => {
+        dispatch({ type: 'SET_QUERY_HEADERS', payload: queryHeaders });
+    }, [queryHeaders]);
+    useEffect(() => {
+        if (clerkOrgId) {
+            dispatch({ type: 'SET_CLERK_ORG_ID', payload: clerkOrgId });
+        }
+    }, [clerkOrgId]);
+    useEffect(() => {
+        if (publicKeyRef.current !== publicKey) {
+            dispatch({ type: 'SET_ALL_STATE', payload: initialState });
+            publicKeyRef.current = publicKey;
+        }
+        const client = JSON.parse(sessionStorage.getItem('quill-client') || 'null');
+        let overridePublicKey = null;
+        if (client && client.clerkOrgId === clerkOrgId) {
+            overridePublicKey = client.id || client._id || client.publicKey;
+        }
+        const fetchPublicKey = overridePublicKey || publicKey;
+        if (!fetchPublicKey) {
+            setClientLoading(false);
+            currentFetchingClientRef.current = undefined;
+        }
+        else {
+            if (currentFetchingClientRef.current === fetchPublicKey)
+                return;
+            fetchClient(fetchPublicKey, true);
+        }
+    }, [publicKey]);
     // Session storage
     useEffect(() => {
         // Overwrite the large collections to save performance
@@ -373,11 +437,22 @@ function AdminProvider({ children, publicKey, queryEndpoint = `${QUILL_SERVER}${
                     publicKey: clientId,
                     clientId: clientId,
                     withCredentials: state.withCredentials || false,
-                }, 'svm', getAuthorizationToken, tenants);
+                }, 'svm', getAuthorizationToken, eventTracking, tenants);
                 dispatch({ type: 'SET_TABLES', payload: schema });
             }
             catch (error) {
                 console.error('ERROR:', error);
+                eventTracking?.logError?.({
+                    type: 'bug', // TODO: determine type
+                    severity: 'high',
+                    message: 'Error fetching schema',
+                    errorMessage: error.message,
+                    errorStack: error.stack,
+                    errorData: {
+                        caller: 'AdminProvider',
+                        function: 'fetchSchemaAndTables',
+                    },
+                });
             }
             finally {
                 setSchemaLoading(false);
@@ -398,9 +473,9 @@ function AdminProvider({ children, publicKey, queryEndpoint = `${QUILL_SERVER}${
             ? state.selectedTenantValues?.map((value) => value.toString())
             : undefined;
     }, [state.selectedTenantValues, state.client?.id]);
-    if (!state.client || !state.tables) {
-        return null;
-    }
+    // if (!state.client || !state.tables) {
+    //   return null;
+    // }
     return (_jsxs(AdminContext.Provider, { value: {
             state: stateWithFlagsList,
             dispatch,
@@ -408,7 +483,13 @@ function AdminProvider({ children, publicKey, queryEndpoint = `${QUILL_SERVER}${
             setClient,
             getToken: getAuthorizationToken,
             quillFetchWithToken,
-        }, children: [!state.client && !clientLoading && (_jsx(CreateEnvironment, { onOnboardComplete: onOnboardComplete })), state.client && (_jsxs(QuillProvider, { tenants: tenants, flags: flags, queryEndpoint: state.queryEndpoint, withCredentials: state.withCredentials, queryHeaders: state.queryHeaders, publicKey: state.client._id, theme: state.theme, isAdmin: true, getAuthorizationToken: getAuthorizationToken, children: [children, _jsx(ErrorModal, { error: error, setError: setError })] })), _jsx("style", { children: `/* For WebKit-based browsers (Chrome, Safari, Opera) */
+            onOnboardComplete,
+            onRequestAddVirtualTable,
+            eventTracking,
+        }, children: [!state.client && !clientLoading && (_jsx(CreateEnvironment, { onOnboardComplete: (client) => {
+                    fetchClient(client._id);
+                    onOnboardComplete?.(client);
+                } })), state.client && (_jsxs(QuillProvider, { tenants: tenants, flags: flags, queryEndpoint: state.queryEndpoint, withCredentials: state.withCredentials, queryHeaders: state.queryHeaders, publicKey: state.client._id, theme: state.theme, isAdmin: true, getAuthorizationToken: getAuthorizationToken, eventTracking: eventTracking, children: [children, _jsx(ErrorModal, { error: error, setError: setError })] })), _jsx("style", { children: `/* For WebKit-based browsers (Chrome, Safari, Opera) */
         ::-webkit-scrollbar {
           width: 0;
           height: 0;
@@ -475,4 +556,4 @@ export async function getClientTenantIds({ queryEndpoint, queryHeaders, withCred
         })),
     };
 }
-export { AdminProvider, useAdmin };
+export { AdminProvider };

package/dist/esm/api/ConnectionClient.d.ts

@@ -1,6 +1,7 @@
+import { EventTracking } from '@quillsql/react';
 import { DatabaseSchema } from '../utils/schema';
-import { Column, ColumnsByTable } from '../utils/table';
-import { QuillTenant } from '../utils/tenants';
+import { ColumnInternal, ColumnsByTable } from '../utils/table';
+import { QuillTenant } from '../models/Tenant';
 export declare function testConnectionString(queryEndpoint: string, connectionString: string, databaseType: string, getToken: () => Promise<string>, clientId?: string, queryHeaders?: HeadersInit): Promise<any>;
 export declare function getTablesBySchema(queryEndpoint: string, clientId: string, schema: string, getToken: () => Promise<string>, queryHeaders?: HeadersInit): Promise<string[] | undefined>;
 export declare function setSchemaNames(queryEndpoint: string, clientId: string, schemaNames: string[], getToken: () => Promise<string>, queryHeaders?: HeadersInit): Promise<void>;
@@ -15,13 +16,14 @@ export declare function getSchemaTables(schemas: string[], databaseType: string,
 export declare function getTableColumns(tables: {
     tableName: string;
     schemaName: string;
+    catalogName?: string;
 }[], databaseType: string, queryEndpoint: string, clientId: string, getToken: () => Promise<string>, queryHeaders?: HeadersInit): Promise<ColumnsByTable[]>;
 export declare function getTableColumnsBySchema(isSelfHosted: boolean, queryEndpoint: string, clientId: string, databaseType: string, getToken: () => Promise<string>, schemas: string[], queryHeaders?: HeadersInit): Promise<{
     columnsByTable: ColumnsByTable[];
     schema: DatabaseSchema;
 }>;
 export declare function getVirtualTables(queryEndpoint: string, tableSchemas: any, customerNameField: string, clientId: string, getToken: () => Promise<string>, queryHeaders?: HeadersInit): Promise<any>;
-export declare function getVirtualTableData(clientId: string, query: string, databaseType: string, queryEndpoint: string, getToken: () => Promise<string>, queryHeaders?: HeadersInit): Promise<any>;
+export declare function getVirtualTableData(clientId: string, query: string, databaseType: string, queryEndpoint: string, getToken: () => Promise<string>, eventTracking: EventTracking | null, queryHeaders?: HeadersInit): Promise<any>;
 export declare function getAST(query: string, clientId: string, queryEndpoint: string, getToken: () => Promise<string>, queryHeaders?: HeadersInit): Promise<any>;
 export declare function getQueryFromAI(aiPrompt: string, columnsByTable: ColumnsByTable[], queryEndpoint: string, clientId: string, getToken: () => Promise<string>, queryHeaders?: HeadersInit): Promise<string>;
 export declare function getQueryFromAiWithConnection(isSelfHosted: boolean, databaseSchema: ColumnsByTable[], queryEndpoint: string, aiPrompt: string, clientId: string, getToken: () => Promise<string>, schemaNames?: string[], queryHeaders?: HeadersInit): Promise<string>;
@@ -30,9 +32,10 @@ export declare function createVirtualTable(viewInfo: {
     query: string;
 }, client: any, tableData: {
     rows: object[];
-    fields: Column[];
+    fields: ColumnInternal[];
 } | undefined, currentTableNames: string[], clientId: string, ownerTenantFields: string[], queryEndpoint: string, queryHeaders: any, getToken: () => Promise<string>): Promise<{
     success: boolean;
     failingTenant?: QuillTenant;
+    failingTenantErrorType?: 'missing' | 'type_mismatch';
 } | any>;
 //# sourceMappingURL=ConnectionClient.d.ts.map

package/dist/esm/api/ConnectionClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConnectionClient.d.ts","sourceRoot":"","sources":["../../../src/api/ConnectionClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ConnectionClient.d.ts","sourceRoot":"","sources":["../../../src/api/ConnectionClient.ts"],"names":[],"mappings":"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"}

package/dist/esm/api/ConnectionClient.js

@@ -144,7 +144,11 @@ export async function getSchemaTables(schemas, databaseType, queryEndpoint, clie
                 schemaMap[schema] = [];
             }
             schemaMap[schema].push(row['table_name'] || row['TABLE_NAME']);
-            return { tableName: row['table_name'], schemaName: row['table_schema'] };
+            return {
+                tableName: row['table_name'] || row['TABLE_NAME'],
+                schemaName: row['table_schema'] || row['TABLE_SCHEMA'],
+                catalogName: row['table_catalog'] || row['TABLE_CATALOG'],
+            };
         });
         allTables.push(...tables);
     }
@@ -179,13 +183,13 @@ export async function getTableColumns(tables, databaseType, queryEndpoint, clien
                 columnName: row['columnName'],
                 displayName: row['columnName'],
                 fieldType: fieldType,
-                dataTypeId: fieldTypeToDataTypeID(fieldType),
+                dataTypeId: fieldTypeToDataTypeID(fieldType?.toLowerCase()),
                 field: row['columnName'],
             };
         });
         columnsByTable.push({
-            tableName: `${table.schemaName}.${table.tableName}`,
-            displayName: `${table.schemaName}.${table.tableName}`,
+            tableName: `${table.catalogName ? `${table.catalogName}.` : ''}${table.schemaName}.${table.tableName}`,
+            displayName: `${table.catalogName ? `${table.catalogName}.` : ''}${table.schemaName}.${table.tableName}`,
             columns,
         });
     }
@@ -220,7 +224,7 @@ export async function getTableColumnsBySchema(isSelfHosted, queryEndpoint, clien
         const formattedResults = results.data.columnsByTable.map((table) => {
             return {
                 tableName: table.tableName,
-                displayName: table.displayName,
+                displayName: table.displayName || table.tableName,
                 columns: table.columns.map((column) => {
                     return {
                         columnName: column.columnName,
@@ -261,7 +265,7 @@ export async function getVirtualTables(queryEndpoint, tableSchemas, customerName
     return results.notSureWhatThisIs.sqlQueries;
 }
 // TODO: Check that works with self-hosted
-export async function getVirtualTableData(clientId, query, databaseType, queryEndpoint, getToken, queryHeaders) {
+export async function getVirtualTableData(clientId, query, databaseType, queryEndpoint, getToken, eventTracking, queryHeaders) {
     let queryAst = undefined;
     try {
         const { data } = await quillFetch({
@@ -288,6 +292,16 @@ export async function getVirtualTableData(clientId, query, databaseType, queryEn
         }
     }
     catch (e) {
+        eventTracking?.logError?.({
+            type: 'network',
+            severity: 'medium',
+            message: 'Error getting AST',
+            errorMessage: e.message,
+            errorStack: e.stack,
+            errorData: {
+                function: 'getVirtualTableData',
+            },
+        });
         return {
             success: false,
             error: 'Invalid SQL Query',
@@ -453,6 +467,7 @@ export async function createVirtualTable(viewInfo, client, tableData, currentTab
         },
         getToken,
     });
+    // Check for missing tenant field
     const missingField = ownerTenantFields.find((field) => tableData &&
         !tableData.fields.find((col) => col.name === field?.replaceAll('"', '')));
     const failingTenant = client.allTenantTypes.find((tenant) => tenant.tenantField === missingField);
@@ -460,8 +475,28 @@ export async function createVirtualTable(viewInfo, client, tableData, currentTab
         return {
             success: false,
             failingTenant,
+            failingTenantErrorType: 'missing',
         };
     }
+    // Check for type mismatches
+    if (tableData) {
+        const typeMismatchedTenant = ownerTenantFields.find((owner) => {
+            const tenant = client.allTenantTypes?.find((t) => t.tenantField === owner);
+            const tableDataField = tableData.fields.find((col) => col.name === owner?.replaceAll('"', ''));
+            return ((tenant?.fieldType === 'string' &&
+                isNumberType(tableDataField?.fieldType ?? '')) ||
+                (tenant?.fieldType === 'number' &&
+                    isStringType(tableDataField?.fieldType ?? '')));
+        });
+        if (typeMismatchedTenant) {
+            const tenant = client.allTenantTypes?.find((t) => t.tenantField === typeMismatchedTenant);
+            return {
+                success: false,
+                failingTenant: tenant,
+                failingTenantErrorType: 'type_mismatch',
+            };
+        }
+    }
     if (!queryAstRaw || queryAstRaw.success === false) {
         return {
             success: false,
@@ -498,3 +533,28 @@ export async function createVirtualTable(viewInfo, client, tableData, currentTab
     });
     return { ...results.data, success: true };
 }
+// Helper functions for type checking
+function isNumberType(type) {
+    const numberTypes = [
+        'int',
+        'integer',
+        'bigint',
+        'smallint',
+        'decimal',
+        'numeric',
+        'float',
+        'double',
+        'real',
+    ];
+    return numberTypes.some((t) => type.toLowerCase().includes(t));
+}
+function isStringType(type) {
+    const stringTypes = [
+        'char',
+        'varchar',
+        'text',
+        'string',
+        'character varying',
+    ];
+    return stringTypes.some((t) => type.toLowerCase().includes(t));
+}

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

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

package/dist/esm/assets/XIcon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XIcon.d.ts","sourceRoot":"","sources":["../../../src/assets/XIcon.tsx"],"names":[],"mappings":"AAGA,QAAA,MAAM,KAAK;;6CAcV,CAAC;AACF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"XIcon.d.ts","sourceRoot":"","sources":["../../../src/assets/XIcon.tsx"],"names":[],"mappings":"AAGA,QAAA,MAAM,KAAK,GAAI;;CAAY,4CAc1B,CAAC;AACF,eAAe,KAAK,CAAC"}

package/dist/esm/components/Banner/index.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useAdmin } from '../../AdminProvider';
+import { useAdmin } from '../../hooks/useAdmin';
 import XMarkIcon from '../../icons/XMarkIcon';
 export default function Banner({ onExit }) {
     const { state } = useAdmin();

package/dist/esm/components/CardSection.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useAdmin } from '../AdminProvider';
+import { useAdmin } from '../hooks/useAdmin';
 export default function CardSection(props) {
     const { state: { theme }, } = useAdmin();
     return (_jsx("div", { style: {

package/dist/esm/components/ClipboardButton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClipboardButton.d.ts","sourceRoot":"","sources":["../../../src/components/ClipboardButton.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,aAAa,EAAY,MAAM,OAAO,CAAC;AAGvD,QAAA,MAAM,eAAe,qCAIlB;IACD,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,aAAa,CAAC;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,4CAsHA,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"ClipboardButton.d.ts","sourceRoot":"","sources":["../../../src/components/ClipboardButton.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,aAAa,EAAY,MAAM,OAAO,CAAC;AAGvD,QAAA,MAAM,eAAe,GAAI,kCAItB;IACD,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,aAAa,CAAC;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,4CAsHA,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/dist/esm/components/DashboardSelectPopover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DashboardSelectPopover.d.ts","sourceRoot":"","sources":["../../../src/components/DashboardSelectPopover.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG7C,UAAU,2BAA2B;IACnC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,UAAU,CAAC;IAClB,wBAAwB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACtD,mBAAmB,EAAE,MAAM,IAAI,CAAC;IAChC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAC7C,UAAU,EACV,YAAY,EACZ,SAAS,EACT,KAAK,EACL,wBAAwB,EACxB,mBAAmB,EACnB,SAAS,EACT,SAAS,GACV,EAAE,2BAA2B,2CAyK7B"}
+{"version":3,"file":"DashboardSelectPopover.d.ts","sourceRoot":"","sources":["../../../src/components/DashboardSelectPopover.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI7C,UAAU,2BAA2B;IACnC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,UAAU,CAAC;IAClB,wBAAwB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACtD,mBAAmB,EAAE,MAAM,IAAI,CAAC;IAChC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAC7C,UAAU,EACV,YAAY,EACZ,SAAS,EACT,KAAK,EACL,wBAAwB,EACxB,mBAAmB,EACnB,SAAS,EACT,SAAS,GACV,EAAE,2BAA2B,2CAsM7B"}