fix: correct order card display, auto refresh from history page

BWJ2310 · BWJ2310 · commit 193eda66ee6f · 2025-09-22T20:51:27.000-06:00
diff --git a/deploy-agents.sh b/deploy-agents.sh
@@ -0,0 +1,56 @@
+/Users/bruzwj/Downloads/.env.local#!/bin/bash
+
+# Deployment script for Supabase Edge Functions
+# Run this when Docker is working properly
+if [ -f .env.local ]; then
+  # Load environment variables, handling = signs and quotes properly
+  set -a
+  source .env.local
+  set +a
+fi
+
+echo "🚀 Deploying Supabase Edge Functions..."
+
+# Debug: Check if variables are loaded
+echo "Debug: SUPABASE_ACCESS_TOKEN is ${#SUPABASE_ACCESS_TOKEN} characters long"
+echo "Debug: SUPABASE_PROJECT_REF = $SUPABASE_PROJECT_REF"
+
+# Ensure variables are set
+if [ -z "$SUPABASE_ACCESS_TOKEN" ]; then
+  echo "Error: SUPABASE_ACCESS_TOKEN not found in .env.local"
+  exit 1
+fi
+
+if [ -z "$SUPABASE_PROJECT_REF" ]; then
+  echo "Error: SUPABASE_PROJECT_REF not found in .env.local"
+  exit 1
+fi
+
+
+# Deploy all agent functions
+agents=(
+  "agent-macro-analyst"
+  "agent-market-analyst"
+  "agent-news-analyst"
+  "agent-social-media-analyst"
+  "agent-fundamentals-analyst"
+  "agent-bull-researcher"
+  "agent-bear-researcher"
+  "agent-research-manager"
+  "agent-trader"
+  "agent-risky-analyst"
+  "agent-safe-analyst"
+  "agent-neutral-analyst"
+  "agent-risk-manager"
+  "analysis-portfolio-manager"
+  "rebalance-portfolio-manager"
+  "opportunity-agent"
+)
+
+echo "📦 Deploying agent functions..."
+for agent in "${agents[@]}"; do
+  echo "  📦 Deploying $agent..."
+  SUPABASE_ACCESS_TOKEN=$SUPABASE_ACCESS_TOKEN npx supabase functions deploy $agent --project-ref $SUPABASE_PROJECT_REF
+done
+
+echo "✅ All functions deployed successfully!"
diff --git a/src/components/RebalanceHistoryTable.tsx b/src/components/RebalanceHistoryTable.tsx
@@ -93,11 +93,13 @@ export default function RebalanceHistoryTable() {
   const [cancelling, setCancelling] = useState(false);
   const [deleting, setDeleting] = useState(false);
   const [analysisData, setAnalysisData] = useState<{ [key: string]: any[] }>({});
+  const [activeTab, setActiveTab] = useState<string>("all");
 
   // Date filter states - default to today (using local date to avoid timezone issues)
   const today = new Date();
   const todayString = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
   const [selectedDate, setSelectedDate] = useState<string>(todayString);
+  const isTodaySelected = selectedDate === todayString;
 
   // Track if initial data has been loaded
   const [initialLoadComplete, setInitialLoadComplete] = useState(false);
@@ -132,11 +134,11 @@ export default function RebalanceHistoryTable() {
     }
   }, [user, selectedDate]); // Reload when selectedDate changes
 
-  // Separate useEffect for polling running rebalances only
+  // Separate useEffect for real-time updates on running rebalances only
   useEffect(() => {
-    if (!user || !initialLoadComplete) return;
-    
-    // Only set up polling if there are actually running rebalances
+    if (!user || !initialLoadComplete || !isTodaySelected) return;
+
+    // Only subscribe if there are running rebalances
     if (runningRebalances.length === 0) return;
 
     // Set up real-time subscription for instant updates
@@ -158,16 +160,20 @@ export default function RebalanceHistoryTable() {
       )
       .subscribe();
 
-    // Much slower polling - every 15 seconds instead of 3 seconds
-    const interval = setInterval(() => {
-      fetchRebalanceRequests(false); // Don't show loading on polling updates
-    }, 15000); // Poll every 15 seconds for running rebalances
-
     return () => {
       subscription.unsubscribe();
-      clearInterval(interval);
     };
-  }, [user, runningRebalances.length > 0, selectedDate, initialLoadComplete]); // Use boolean comparison
+  }, [user, runningRebalances.length > 0, selectedDate, initialLoadComplete, isTodaySelected]); // Use boolean comparison
+
+  useEffect(() => {
+    if (!user || !isTodaySelected) return;
+
+    const intervalId = setInterval(() => {
+      fetchRebalanceRequests(false);
+    }, 10000);
+
+    return () => clearInterval(intervalId);
+  }, [user, selectedDate, activeTab, isTodaySelected]);
 
   const handleManualRefresh = async () => {
     setRefreshing(true);
@@ -191,11 +197,11 @@ export default function RebalanceHistoryTable() {
     }
   };
 
-  const fetchRebalanceRequests = async (isInitialLoad = false) => {
+  const fetchRebalanceRequests = async (isInitialLoad = false, withSpinner: boolean = isInitialLoad) => {
     if (!user) return;
 
     // Only show loading state on initial load or when explicitly requested
-    if (isInitialLoad) {
+    if (withSpinner) {
       setLoading(true);
     }
     
@@ -285,13 +291,20 @@ export default function RebalanceHistoryTable() {
         });
       }
     } finally {
-      if (isInitialLoad) {
+      if (withSpinner) {
         setLoading(false);
       }
       setInitialLoadComplete(true);
     }
   };
 
+  const handleTabChange = (value: string) => {
+    setActiveTab(value);
+    if (isTodaySelected) {
+      fetchRebalanceRequests(false);
+    }
+  };
+
   const handleDelete = async () => {
     if (!selectedRebalanceId || !user) return;
 
@@ -837,7 +850,7 @@ export default function RebalanceHistoryTable() {
             </div>
           </div>
 
-          <Tabs defaultValue="all" className="space-y-4">
+          <Tabs value={activeTab} onValueChange={handleTabChange} className="space-y-4">
             <TabsList className="grid w-full grid-cols-4">
               <TabsTrigger value="all">
                 All <span className="hidden sm:inline">({totalCount})</span>
diff --git a/src/components/ScheduleListModal.tsx b/src/components/ScheduleListModal.tsx
@@ -65,7 +65,6 @@ interface Schedule {
   timezone: string;
   selected_tickers: string[];
   include_watchlist: boolean;
-  include_all_positions: boolean;
   last_executed_at?: string;
   next_scheduled_at?: string; // Deprecated - calculated dynamically from last_executed_at + interval
   execution_count: number;
@@ -522,11 +521,7 @@ export default function ScheduleListModal({ isOpen, onClose }: ScheduleListModal
                         <div className="text-sm">
                           <p className="text-muted-foreground mb-1">Stock Selection</p>
                           <div className="flex items-center gap-2">
-                            {schedule.include_all_positions ? (
-                              <Badge variant="outline" className="text-xs">
-                                All Positions
-                              </Badge>
-                            ) : schedule.selected_tickers.length > 0 ? (
+                            {schedule.selected_tickers.length > 0 ? (
                               <Badge variant="outline" className="text-xs">
                                 {schedule.selected_tickers.length} Selected Stocks
                               </Badge>
diff --git a/src/components/UnifiedAnalysisHistory.tsx b/src/components/UnifiedAnalysisHistory.tsx
@@ -174,6 +174,7 @@ export default function UnifiedAnalysisHistory() {
   const [runningAnalyses, setRunningAnalyses] = useState<RunningAnalysisItem[]>([]);
   const [canceledAnalyses, setCanceledAnalyses] = useState<AnalysisHistoryItem[]>([]);
   const [loading, setLoading] = useState(true); // Start with loading true
+  const [activeTab, setActiveTab] = useState<string>("all");
   const [selectedTicker, setSelectedTicker] = useState<string | null>(null);
   const [selectedAnalysisDate, setSelectedAnalysisDate] = useState<string | null>(null);
   const [selectedViewAnalysisId, setSelectedViewAnalysisId] = useState<string | null>(null); // For viewing specific analysis
@@ -188,6 +189,7 @@ export default function UnifiedAnalysisHistory() {
   const today = new Date();
   const todayString = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
   const [selectedDate, setSelectedDate] = useState<string>(todayString);
+  const isTodaySelected = selectedDate === todayString;
 
   // Track if initial data has been loaded
   const [initialLoadComplete, setInitialLoadComplete] = useState(false);
@@ -221,10 +223,12 @@ export default function UnifiedAnalysisHistory() {
     });
   };
 
-  const loadAllAnalyses = async () => {
+  const loadAllAnalyses = async (withSpinner: boolean = true) => {
     if (!user) return;
 
-    setLoading(true);
+    if (withSpinner) {
+      setLoading(true);
+    }
     try {
       // Build date range for the selected date using local date parsing
       const [year, month, day] = selectedDate.split('-').map(Number);
@@ -333,7 +337,9 @@ export default function UnifiedAnalysisHistory() {
         });
       }
     } finally {
-      setLoading(false);
+      if (withSpinner) {
+        setLoading(false);
+      }
       setInitialLoadComplete(true);
     }
   };
@@ -351,17 +357,26 @@ export default function UnifiedAnalysisHistory() {
     }
   }, [isAuthenticated, user, selectedDate]); // Reload when selectedDate changes
 
+  useEffect(() => {
+    if (!isAuthenticated || !user || !isTodaySelected) return;
+
+    const intervalId = setInterval(() => {
+      loadAllAnalyses(false);
+    }, 10000);
+
+    return () => clearInterval(intervalId);
+  }, [isAuthenticated, user, selectedDate, activeTab, isTodaySelected]);
+
   // Only poll for running analyses updates, not the entire list
   useEffect(() => {
-    if (!user || !initialLoadComplete) return;
+    if (!user || !initialLoadComplete || !isTodaySelected) return;
 
     // Only set up polling if there are actually running analyses
     if (runningAnalyses.length === 0) return;
 
     let intervalId: NodeJS.Timeout;
 
-    // Much slower polling - every 15 seconds instead of 3-5 seconds
-    // Users can manually refresh if they want faster updates
+    // Poll running analyses separately every 10 seconds for live progress
     intervalId = setInterval(async () => {
       try {
         // Only check status of running analyses, don't reload everything
@@ -417,12 +432,19 @@ export default function UnifiedAnalysisHistory() {
       } catch (error) {
         console.error('Error checking running analyses:', error);
       }
-    }, 15000); // Poll every 15 seconds instead of 3-5 seconds
+    }, 10000); // Poll every 10 seconds to keep progress fresh
 
     return () => {
       if (intervalId) clearInterval(intervalId);
     };
-  }, [user, runningAnalyses.length, selectedDate, initialLoadComplete]); // Keep minimal dependencies
+  }, [user, runningAnalyses.length, selectedDate, initialLoadComplete, isTodaySelected]); // Keep minimal dependencies
+
+  const handleTabChange = (value: string) => {
+    setActiveTab(value);
+    if (isTodaySelected) {
+      loadAllAnalyses(false);
+    }
+  };
 
   const viewRunningAnalysis = (ticker: string) => {
     setSelectedTicker(ticker);
@@ -951,7 +973,7 @@ export default function UnifiedAnalysisHistory() {
             </div>
           </div>
 
-          <Tabs defaultValue="all" className="space-y-4">
+          <Tabs value={activeTab} onValueChange={handleTabChange} className="space-y-4">
             <TabsList className="grid w-full grid-cols-4">
               <TabsTrigger value="all">
                 All <span className="hidden sm:inline">({displayHistory.length + runningAnalyses.length + displayCanceled.length})</span>
diff --git a/src/components/analysis-detail/TradeOrderCard.tsx b/src/components/analysis-detail/TradeOrderCard.tsx
@@ -70,33 +70,33 @@ export default function TradeOrderCard({
   // Extract allocation values from various possible locations
   // For rejected orders, ALWAYS use the saved trade order data if available
   // to show what was intended at the time of creation, not current values
-  const beforeAllocation = (isOrderRejected && tradeOrder?.beforeAllocation !== undefined) 
+  const beforeAllocation = (isOrderRejected && tradeOrder?.beforeAllocation !== undefined)
     ? tradeOrder.beforeAllocation
-    : tradeOrder?.beforeAllocation ||
-      finalDecision?.beforeAllocation ||
-      finalDecision?.currentAllocation ||
-      finalDecision?.beforePosition?.allocation ||
-      finalDecision?.currentPosition?.allocation ||
-      portfolioManagerInsight?.currentAllocation ||
+    : tradeOrder?.beforeAllocation ??
+      finalDecision?.beforeAllocation ??
+      finalDecision?.currentAllocation ??
+      finalDecision?.beforePosition?.allocation ??
+      finalDecision?.currentPosition?.allocation ??
+      portfolioManagerInsight?.currentAllocation ??
       0;
 
   const afterAllocation = (isOrderRejected && tradeOrder?.afterAllocation !== undefined)
-    ? tradeOrder.afterAllocation  
-    : tradeOrder?.afterAllocation ||
-      finalDecision?.afterAllocation ||
-      finalDecision?.targetAllocation ||
-      finalDecision?.afterPosition?.allocation ||
-      finalDecision?.targetPosition?.allocation ||
-      finalDecision?.percentOfPortfolio ||
-      portfolioManagerInsight?.targetAllocation ||
-      portfolioManagerInsight?.percentOfPortfolio ||
+    ? tradeOrder.afterAllocation
+    : tradeOrder?.afterAllocation ??
+      finalDecision?.afterAllocation ??
+      finalDecision?.targetAllocation ??
+      finalDecision?.afterPosition?.allocation ??
+      finalDecision?.targetPosition?.allocation ??
+      finalDecision?.percentOfPortfolio ??
+      portfolioManagerInsight?.targetAllocation ??
+      portfolioManagerInsight?.percentOfPortfolio ??
       0;
 
   const percentOfPortfolio = (isOrderRejected && tradeOrder?.afterAllocation !== undefined)
     ? tradeOrder.afterAllocation
-    : tradeOrder?.afterAllocation ||
-      finalDecision?.percentOfPortfolio ||
-      finalDecision?.targetAllocation ||
+    : tradeOrder?.afterAllocation ??
+      finalDecision?.percentOfPortfolio ??
+      finalDecision?.targetAllocation ??
       afterAllocation;
 
   // Extract order size information
@@ -123,19 +123,19 @@ export default function TradeOrderCard({
   // Also extract before/after shares and values if available
   const beforeShares = (isOrderRejected && tradeOrder?.beforeShares !== undefined)
     ? tradeOrder.beforeShares
-    : tradeOrder?.beforeShares || finalDecision?.beforePosition?.shares || 0;
+    : tradeOrder?.beforeShares ?? finalDecision?.beforePosition?.shares ?? 0;
   
   const afterShares = (isOrderRejected && tradeOrder?.afterShares !== undefined)
     ? tradeOrder.afterShares
-    : tradeOrder?.afterShares || finalDecision?.afterPosition?.shares || orderShares;
+    : tradeOrder?.afterShares ?? finalDecision?.afterPosition?.shares ?? orderShares;
   
   const beforeValue = (isOrderRejected && tradeOrder?.beforeValue !== undefined)
     ? tradeOrder.beforeValue
-    : tradeOrder?.beforeValue || finalDecision?.beforePosition?.value || 0;
+    : tradeOrder?.beforeValue ?? finalDecision?.beforePosition?.value ?? 0;
   
   const afterValue = (isOrderRejected && tradeOrder?.afterValue !== undefined)
     ? tradeOrder.afterValue
-    : tradeOrder?.afterValue || finalDecision?.afterPosition?.value || orderDollarAmount;
+    : tradeOrder?.afterValue ?? finalDecision?.afterPosition?.value ?? orderDollarAmount;
 
   // Debug logging to understand data structure
   console.log('TradeOrderCard - Full analysisData:', analysisData);
