optimise state check

Author: sdairs

apps/web/src/app/[id]/page.tsx

@@ -24,7 +24,10 @@ export default function AppPage({ params }: { params: Promise<{ id: string }> })
       setError(undefined);
       try {
         const state = await checkToolState(token, TOOLS[id].ds);
-        setToolState(state);
+        console.log(id);
+        console.log(state);
+        console.log(state[id]);
+        setToolState(state[id]);
         setIsValidToken(true);
       } catch (error) {
         if (error instanceof InvalidTokenError) {

apps/web/src/components/sidebar.tsx

@@ -81,12 +81,10 @@ function SidebarContent({ activeAppId }: { activeAppId?: string }) {
       setIsLoading(true);
       setError(undefined);
       try {
-        const states = await Promise.all(
-          Object.values(TOOLS).map(async (app) => {
-            const state = await checkToolState(token, app.ds);
-            return [app.id, state] as const;
-          })
-        );
+        const allStates = await checkToolState(token);
+        const states = Object.values(TOOLS).map((app) => {
+          return [app.id, allStates[app.ds]] as const;
+        });
         setToolStates(Object.fromEntries(states));
       } catch (error) {
         if (error instanceof InvalidTokenError) {

apps/web/src/lib/tinybird.ts

@@ -60,27 +60,55 @@ export async function query(token: string, sql: string): Promise<QueryResult> {
   return data;
 }
 
-export async function checkToolState(token: string, datasource: string): Promise<ToolState> {
+export async function checkToolState(token: string, datasource?: string): Promise<Record<string, ToolState>> {
   try {
-    // First check if data source exists
+    // Get all data sources
     const sources = await listDataSources(token);
-    const exists = sources.some(source => source.name === datasource);
+    const sourceNames = new Set(sources.map(source => source.name));
+    
+    // If a specific datasource is requested, only check that one
+    if (datasource) {
+      let state: ToolState = 'available';
+      if (sourceNames.has(datasource)) {
+        state = 'installed';
+        const rows = await query(token, `SELECT count(*) as count FROM ${datasource} FORMAT JSON`);
+        if (rows.data[0]?.count > 0) {
+          state = 'configured';
+        }
+      }
+      return { [datasource]: state };
+    }
 
-    if (!exists) {
-      return 'available';
+    // Build a query to check counts for all sources at once
+    const sourcesArray = Array.from(sourceNames);
+    if (sourcesArray.length === 0) {
+      return {};
     }
 
-    // Then check if it has data
-    const result = await query(token, `SELECT count(*) as count FROM ${datasource} FORMAT JSON`);
-    const hasData = result.data[0]?.count > 0;
+    const unionQuery = sourcesArray
+      .map(name => `SELECT '${name}' as source, count(*) as count FROM ${name}`)
+      .join(' UNION ALL ');
+
+    console.log(unionQuery);
+    
+    const result = await query(token, `${unionQuery} FORMAT JSON`);
+    console.log(result);
+    
+    // Convert results to state map
+    const stateMap: Record<string, ToolState> = {};
+    result.data.forEach(row => {
+      stateMap[row.source] = row.count > 0 ? 'configured' : 'installed';
+    });
+    console.log(stateMap);
 
-    return hasData ? 'configured' : 'installed';
+    // Add available state for any datasource not in Tinybird
+    return stateMap;
   } catch (error) {
     if (error instanceof InvalidTokenError) {
       throw error;
     }
-    console.error('Error checking tool state:', error);
-    return 'available';
+    console.error('Error checking tool states:', error);
+    return {};
   }
 }