realtimex-crm 0.3.0 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "realtimex-crm",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "RealTimeX CRM - A full-featured CRM built with React, shadcn-admin-kit, and Supabase. Fork of Atomic CRM with RealTimeX App SDK integration.",
   "type": "module",
   "main": "./dist/index.js",

package/src/components/atomic-crm/login/StartPage.tsx

@@ -2,26 +2,58 @@ import { useQuery } from "@tanstack/react-query";
 import { useDataProvider } from "ra-core";
 import { Navigate } from "react-router-dom";
 import { LoginPage } from "@/components/admin/login-page";
+import { checkDatabaseHealth } from "@/lib/database-health-check";
+import { getSupabaseConfig } from "@/lib/supabase-config";
+import { DatabaseSetupGuide } from "../setup/DatabaseSetupGuide";
 
 import type { CrmDataProvider } from "../providers/types";
 import { LoginSkeleton } from "./LoginSkeleton";
 
 export const StartPage = () => {
   const dataProvider = useDataProvider<CrmDataProvider>();
+
+  // First check database health
+  const {
+    data: healthStatus,
+    error: healthError,
+    isPending: isCheckingHealth,
+  } = useQuery({
+    queryKey: ["database-health"],
+    queryFn: checkDatabaseHealth,
+  });
+
+  // Then check if initialized (only if database is healthy)
   const {
     data: isInitialized,
-    error,
-    isPending,
+    error: initError,
+    isPending: isCheckingInit,
   } = useQuery({
     queryKey: ["init"],
     queryFn: async () => {
       return dataProvider.isInitialized();
     },
+    enabled: healthStatus?.isHealthy === true,
   });
 
-  if (isPending) return <LoginSkeleton />;
-  if (error) return <LoginPage />;
-  if (isInitialized) return <LoginPage />;
+  // Show loading state
+  if (isCheckingHealth || isCheckingInit) return <LoginSkeleton />;
+
+  // Show database setup guide if schema is missing
+  if (healthStatus && !healthStatus.isHealthy) {
+    const config = getSupabaseConfig();
+    if (config) {
+      return (
+        <DatabaseSetupGuide
+          missingTables={healthStatus.missingTables}
+          supabaseUrl={config.url}
+        />
+      );
+    }
+  }
+
+  // Show login page if there's an error or already initialized
+  if (healthError || initError || isInitialized) return <LoginPage />;
 
+  // Not initialized yet, go to signup
   return <Navigate to="/sign-up" />;
 };

package/src/components/atomic-crm/root/DatabaseHealthCheck.tsx

@@ -1,5 +1,4 @@
 import { useEffect, useState } from "react";
-import { useDataProvider } from "ra-core";
 import { checkDatabaseHealth, DatabaseHealthStatus } from "@/lib/database-health-check";
 import { getSupabaseConfig } from "@/lib/supabase-config";
 import { DatabaseSetupGuide } from "../setup/DatabaseSetupGuide";
@@ -9,7 +8,6 @@ interface DatabaseHealthCheckProps {
 }
 
 export function DatabaseHealthCheck({ children }: DatabaseHealthCheckProps) {
-  const dataProvider = useDataProvider();
   const [healthStatus, setHealthStatus] = useState<DatabaseHealthStatus | null>(null);
   const [isChecking, setIsChecking] = useState(true);
 
@@ -18,7 +16,7 @@ export function DatabaseHealthCheck({ children }: DatabaseHealthCheckProps) {
 
     async function checkHealth() {
       try {
-        const status = await checkDatabaseHealth(dataProvider);
+        const status = await checkDatabaseHealth();
         if (!cancelled) {
           setHealthStatus(status);
           setIsChecking(false);
@@ -36,7 +34,7 @@ export function DatabaseHealthCheck({ children }: DatabaseHealthCheckProps) {
     return () => {
       cancelled = true;
     };
-  }, [dataProvider]);
+  }, []);
 
   // Show loading state
   if (isChecking) {

package/src/lib/database-health-check.ts

@@ -1,4 +1,4 @@
-import { DataProvider } from "ra-core";
+import { supabase } from "@/components/atomic-crm/providers/supabase/supabase";
 
 export interface DatabaseHealthStatus {
   isHealthy: boolean;
@@ -8,10 +8,11 @@ export interface DatabaseHealthStatus {
 
 /**
  * Check if the database has the required schema
+ * This function directly queries the Supabase client to avoid data provider
+ * transformations (e.g., contacts -> contacts_summary) that would fail
+ * if the database schema doesn't exist yet.
  */
-export async function checkDatabaseHealth(
-  dataProvider: DataProvider,
-): Promise<DatabaseHealthStatus> {
+export async function checkDatabaseHealth(): Promise<DatabaseHealthStatus> {
   const requiredTables = [
     "contacts",
     "companies",
@@ -26,23 +27,31 @@ export async function checkDatabaseHealth(
   const missingTables: string[] = [];
 
   try {
-    // Try to query each table
+    // Try to query each table directly via Supabase client
     for (const table of requiredTables) {
       try {
-        await dataProvider.getList(table, {
-          pagination: { page: 1, perPage: 1 },
-          sort: { field: "id", order: "ASC" },
-          filter: {},
-        });
-      } catch (error: any) {
-        // Check if it's a "table not found" error
-        if (
-          error?.message?.includes("Could not find the table") ||
-          error?.message?.includes("relation") ||
-          error?.message?.includes("does not exist")
-        ) {
-          missingTables.push(table);
+        const { error } = await supabase
+          .from(table)
+          .select("id")
+          .limit(1);
+
+        if (error) {
+          // Check if it's a "table not found" error
+          if (
+            error.message?.includes("Could not find the table") ||
+            error.message?.includes("relation") ||
+            error.message?.includes("does not exist") ||
+            error.code === "PGRST200" // PostgREST error code for missing table
+          ) {
+            missingTables.push(table);
+          } else {
+            // Some other error - log it but don't fail health check
+            console.warn(`Unexpected error querying ${table}:`, error);
+          }
         }
+      } catch (error: any) {
+        console.warn(`Failed to query ${table}:`, error);
+        missingTables.push(table);
       }
     }