realtimex-crm 0.5.0 → 0.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "realtimex-crm",
-  "version": "0.5.0",
+  "version": "0.5.3",
   "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",
@@ -65,8 +65,6 @@
     "prettier": "prettier --config ./.prettierrc.json --check \"**/*.{js,json,ts,tsx,css,md,html}\"",
     "registry:build": "npx shadcn build",
     "registry:gen": "node ./scripts/generate-registry.mjs",
-    "setup:gen": "cat supabase/migrations/*.sql > public/setup.sql && echo 'Generated public/setup.sql from migrations'",
-    "db:migrate": "node ./scripts/auto-migrate.mjs",
     "ghpages:deploy": "node ./scripts/ghpages-deploy.mjs",
     "supabase:remote:init": "node ./scripts/supabase-remote-init.mjs",
     "prepare": "husky"

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

@@ -2,58 +2,26 @@ 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: initError,
-    isPending: isCheckingInit,
+    error,
+    isPending,
   } = useQuery({
     queryKey: ["init"],
     queryFn: async () => {
       return dataProvider.isInitialized();
     },
-    enabled: healthStatus?.isHealthy === true,
   });
 
-  // 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 />;
+  if (isPending) return <LoginSkeleton />;
+  if (error) return <LoginPage />;
+  if (isInitialized) return <LoginPage />;
 
-  // Not initialized yet, go to signup
   return <Navigate to="/sign-up" />;
 };

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

@@ -1,4 +1,5 @@
 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";
@@ -8,6 +9,7 @@ interface DatabaseHealthCheckProps {
 }
 
 export function DatabaseHealthCheck({ children }: DatabaseHealthCheckProps) {
+  const dataProvider = useDataProvider();
   const [healthStatus, setHealthStatus] = useState<DatabaseHealthStatus | null>(null);
   const [isChecking, setIsChecking] = useState(true);
 
@@ -16,7 +18,7 @@ export function DatabaseHealthCheck({ children }: DatabaseHealthCheckProps) {
 
     async function checkHealth() {
       try {
-        const status = await checkDatabaseHealth();
+        const status = await checkDatabaseHealth(dataProvider);
         if (!cancelled) {
           setHealthStatus(status);
           setIsChecking(false);
@@ -34,7 +36,7 @@ export function DatabaseHealthCheck({ children }: DatabaseHealthCheckProps) {
     return () => {
       cancelled = true;
     };
-  }, []);
+  }, [dataProvider]);
 
   // Show loading state
   if (isChecking) {

package/src/components/atomic-crm/setup/DatabaseSetupGuide.tsx

@@ -61,50 +61,56 @@ export function DatabaseSetupGuide({
             </div>
           </div>
 
-          {/* Option 1: Automatic Migration */}
+          {/* Option 1: Supabase CLI */}
           <div className="space-y-3">
             <div className="flex items-center gap-2">
               <div className="flex items-center justify-center w-6 h-6 rounded-full bg-primary text-primary-foreground text-sm font-bold">
                 1
               </div>
-              <h3 className="font-semibold">Automatic Migration (Recommended)</h3>
+              <h3 className="font-semibold">Using Supabase CLI (Recommended)</h3>
             </div>
             <div className="ml-8 space-y-3">
-              <p className="text-sm text-muted-foreground">
-                Run the automated migration script from your terminal:
-              </p>
+              <div>
+                <p className="text-sm text-muted-foreground mb-2">
+                  Install Supabase CLI:
+                </p>
+                <pre className="bg-muted p-3 rounded text-sm overflow-x-auto">
+                  npm install -g supabase
+                </pre>
+              </div>
+
+              <div>
+                <p className="text-sm text-muted-foreground mb-2">
+                  Clone the RealTimeX CRM repository to get migrations:
+                </p>
+                <pre className="bg-muted p-3 rounded text-sm overflow-x-auto">
+                  git clone https://github.com/therealtimex/realtimex-crm.git
+                  {"\n"}cd realtimex-crm
+                </pre>
+              </div>
 
-              <div className="space-y-3">
-                <div>
-                  <p className="text-sm text-muted-foreground mb-2 font-semibold">
-                    If you used the CLI to create your project:
-                  </p>
-                  <pre className="bg-muted p-3 rounded text-sm overflow-x-auto">
-                    npm run db:migrate
-                  </pre>
-                </div>
+              <div>
+                <p className="text-sm text-muted-foreground mb-2">
+                  Link to your Supabase project:
+                </p>
+                <pre className="bg-muted p-3 rounded text-sm overflow-x-auto">
+                  supabase link --project-ref {projectRef || "YOUR_PROJECT_REF"}
+                </pre>
+              </div>
 
-                <div>
-                  <p className="text-sm text-muted-foreground mb-2 font-semibold">
-                    Or clone the repository first:
-                  </p>
-                  <pre className="bg-muted p-3 rounded text-sm overflow-x-auto">
-                    git clone https://github.com/therealtimex/realtimex-crm.git{"\n"}
-                    cd realtimex-crm{"\n"}
-                    npm install{"\n"}
-                    npm run db:migrate
-                  </pre>
-                </div>
+              <div>
+                <p className="text-sm text-muted-foreground mb-2">
+                  Push the migrations:
+                </p>
+                <pre className="bg-muted p-3 rounded text-sm overflow-x-auto">
+                  supabase db push
+                </pre>
+              </div>
 
-                <div className="text-sm text-muted-foreground space-y-2">
-                  <p>The script will:</p>
-                  <ul className="list-disc list-inside ml-2 space-y-1">
-                    <li>Install Supabase CLI if needed</li>
-                    <li>Link your project using Project ID and Database Password</li>
-                    <li>Apply all migrations automatically</li>
-                    <li>Take about 5-10 seconds to complete</li>
-                  </ul>
-                </div>
+              <div>
+                <p className="text-sm text-muted-foreground mb-2">
+                  Reload this page after migrations are complete.
+                </p>
               </div>
             </div>
           </div>
@@ -115,24 +121,23 @@ export function DatabaseSetupGuide({
               <div className="flex items-center justify-center w-6 h-6 rounded-full bg-primary text-primary-foreground text-sm font-bold">
                 2
               </div>
-              <h3 className="font-semibold">Manual SQL Editor</h3>
+              <h3 className="font-semibold">Using Supabase SQL Editor</h3>
             </div>
             <div className="ml-8 space-y-3">
               <p className="text-sm text-muted-foreground">
-                Copy and paste SQL directly into Supabase:
+                Manually run the SQL migrations in your Supabase SQL Editor:
               </p>
 
               <ol className="list-decimal list-inside space-y-2 text-sm text-muted-foreground">
                 <li>
-                  Download{" "}
+                  Download migrations from{" "}
                   <a
-                    href="https://raw.githubusercontent.com/therealtimex/realtimex-crm/main/public/setup.sql"
+                    href="https://github.com/therealtimex/realtimex-crm/tree/main/supabase/migrations"
                     target="_blank"
                     rel="noopener noreferrer"
                     className="text-primary hover:underline inline-flex items-center gap-1"
-                    download="setup.sql"
                   >
-                    setup.sql
+                    GitHub
                     <ExternalLink className="h-3 w-3" />
                   </a>
                 </li>
@@ -148,9 +153,12 @@ export function DatabaseSetupGuide({
                     <ExternalLink className="h-3 w-3" />
                   </a>
                 </li>
-                <li>Copy all contents from setup.sql and paste into the editor</li>
-                <li>Click "Run" to execute</li>
-                <li>Reload this page after completion</li>
+                <li>
+                  Run each migration file in order (by date in filename)
+                </li>
+                <li>
+                  Reload this page after all migrations are complete
+                </li>
               </ol>
 
               {projectRef && (
@@ -168,61 +176,6 @@ export function DatabaseSetupGuide({
             </div>
           </div>
 
-          {/* Option 3: Supabase CLI Manual */}
-          <div className="space-y-3">
-            <div className="flex items-center gap-2">
-              <div className="flex items-center justify-center w-6 h-6 rounded-full bg-primary text-primary-foreground text-sm font-bold">
-                3
-              </div>
-              <h3 className="font-semibold">Advanced: Manual CLI Setup</h3>
-            </div>
-            <div className="ml-8 space-y-3">
-              <div>
-                <p className="text-sm text-muted-foreground mb-2">
-                  Install Supabase CLI:
-                </p>
-                <pre className="bg-muted p-3 rounded text-sm overflow-x-auto">
-                  npm install -g supabase
-                </pre>
-              </div>
-
-              <div>
-                <p className="text-sm text-muted-foreground mb-2">
-                  Clone the RealTimeX CRM repository to get migrations:
-                </p>
-                <pre className="bg-muted p-3 rounded text-sm overflow-x-auto">
-                  git clone https://github.com/therealtimex/realtimex-crm.git
-                  {"\n"}cd realtimex-crm
-                </pre>
-              </div>
-
-              <div>
-                <p className="text-sm text-muted-foreground mb-2">
-                  Link to your Supabase project:
-                </p>
-                <pre className="bg-muted p-3 rounded text-sm overflow-x-auto">
-                  supabase link --project-ref {projectRef || "YOUR_PROJECT_REF"}
-                </pre>
-              </div>
-
-              <div>
-                <p className="text-sm text-muted-foreground mb-2">
-                  Push the migrations:
-                </p>
-                <pre className="bg-muted p-3 rounded text-sm overflow-x-auto">
-                  supabase db push
-                </pre>
-              </div>
-
-              <div>
-                <p className="text-sm text-muted-foreground mb-2">
-                  Reload this page after migrations are complete.
-                </p>
-              </div>
-            </div>
-          </div>
-
-
           {/* Verification */}
           <div className="space-y-3 pt-4 border-t">
             <h3 className="font-semibold">After Setup</h3>

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

@@ -1,4 +1,4 @@
-import { supabase } from "@/components/atomic-crm/providers/supabase/supabase";
+import { DataProvider } from "ra-core";
 
 export interface DatabaseHealthStatus {
   isHealthy: boolean;
@@ -8,11 +8,10 @@ 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(): Promise<DatabaseHealthStatus> {
+export async function checkDatabaseHealth(
+  dataProvider: DataProvider,
+): Promise<DatabaseHealthStatus> {
   const requiredTables = [
     "contacts",
     "companies",
@@ -27,31 +26,23 @@ export async function checkDatabaseHealth(): Promise<DatabaseHealthStatus> {
   const missingTables: string[] = [];
 
   try {
-    // Try to query each table directly via Supabase client
+    // Try to query each table
     for (const table of requiredTables) {
       try {
-        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);
-          }
-        }
+        await dataProvider.getList(table, {
+          pagination: { page: 1, perPage: 1 },
+          sort: { field: "id", order: "ASC" },
+          filter: {},
+        });
       } catch (error: any) {
-        console.warn(`Failed to query ${table}:`, error);
-        missingTables.push(table);
+        // 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);
+        }
       }
     }