update: source display in analysis insight, correctly showing decisions in analysis detail, correctly shows approved trade order in rebalance detail modal

Author: BWJ2310

src/components/AnalysisDetailModal.tsx

@@ -500,11 +500,20 @@ export default function AnalysisDetailModal({ ticker, analysisId, isOpen, onClos
             <>
               {/* Analysis Summary Bar */}
               {(() => {
-                // Determine which decision to display based on analysis type
-                const isRebalanceAnalysis = !!analysisData.rebalance_request_id;
-                const displayDecision = isRebalanceAnalysis
-                  ? analysisData.decision
-                  : (analysisData.agent_insights?.portfolioManager?.finalDecision?.action || analysisData.decision);
+                // Debug to see what data we have
+                console.log('Analysis Summary Bar - agent_insights:', analysisData.agent_insights);
+                console.log('Analysis Summary Bar - portfolioManager:', analysisData.agent_insights?.portfolioManager);
+                console.log('Analysis Summary Bar - tradeOrder:', analysisData.tradeOrder);
+                
+                // Always show portfolio manager's decision if available, otherwise fall back to the main decision
+                // Check multiple possible locations for the portfolio manager's decision
+                const displayDecision = analysisData.tradeOrder?.action ||  // From actual trade order
+                                       analysisData.agent_insights?.portfolioManager?.finalDecision?.action || 
+                                       analysisData.agent_insights?.portfolioManager?.decision?.action ||
+                                       analysisData.agent_insights?.portfolioManager?.action ||
+                                       analysisData.decision;
+                
+                console.log('Display decision resolved to:', displayDecision);
 
                 const shouldShow = displayDecision || analysisData.confidence !== undefined || analysisData.startedAt;
 

src/components/PortfolioPositions.tsx

@@ -4,12 +4,13 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
-import { TrendingUp, TrendingDown, RefreshCw, Loader2, Eye, Activity, Clock, AlertCircle, AlertTriangle } from "lucide-react";
+import { TrendingUp, TrendingDown, RefreshCw, Loader2, Eye, Activity, Clock, AlertCircle, AlertTriangle, Lock } from "lucide-react";
 import { alpacaAPI } from "@/lib/alpaca";
 import { useAuth } from "@/lib/auth";
 import { supabase } from "@/lib/supabase";
 import { useToast } from "@/hooks/use-toast";
 import { useAlpacaConnectionStore } from "@/hooks/useAlpacaConnection";
+import { useRBAC } from "@/hooks/useRBAC";
 import {
   AlertDialog,
   AlertDialogContent,
@@ -52,6 +53,7 @@ export default function PortfolioPositions({ onSelectStock, selectedStock }: Por
   const { apiSettings, isAuthenticated, user } = useAuth();
   const { toast } = useToast();
   const { isConnected: isAlpacaConnected } = useAlpacaConnectionStore();
+  const { hasRebalanceAccess } = useRBAC();
   const [positions, setPositions] = useState<Position[]>([]);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
@@ -63,6 +65,7 @@ export default function PortfolioPositions({ onSelectStock, selectedStock }: Por
   const [runningRebalance, setRunningRebalance] = useState<string | null>(null); // Store rebalance_request_id
   const [runningAnalysesCount, setRunningAnalysesCount] = useState(0);
   const [showAnalysisAlert, setShowAnalysisAlert] = useState(false);
+  const [showRebalanceAccessAlert, setShowRebalanceAccessAlert] = useState(false);
 
   // Use ref to track previous running rebalance
   const previousRunningRef = useRef<string | null>(null);
@@ -73,6 +76,12 @@ export default function PortfolioPositions({ onSelectStock, selectedStock }: Por
       return;
     }
 
+    // Check if user has rebalance access
+    if (!hasRebalanceAccess()) {
+      setShowRebalanceAccessAlert(true);
+      return;
+    }
+    
     // Check if there are running analyses
     if (runningAnalysesCount > 0) {
       setShowAnalysisAlert(true);
@@ -379,6 +388,11 @@ export default function PortfolioPositions({ onSelectStock, selectedStock }: Por
                       <AlertTriangle className="h-4 w-4 mr-1" />
                       Connection Error
                     </>
+                  ) : !hasRebalanceAccess() ? (
+                    <>
+                      <Lock className="h-4 w-4 mr-1" />
+                      Rebalance
+                    </>
                   ) : (
                     <>
                       <RefreshCw className="h-4 w-4 mr-1" />
@@ -667,6 +681,31 @@ export default function PortfolioPositions({ onSelectStock, selectedStock }: Por
           </AlertDialogFooter>
         </AlertDialogContent>
       </AlertDialog>
+      
+      {/* No Rebalance Access Alert Dialog */}
+      <AlertDialog open={showRebalanceAccessAlert} onOpenChange={setShowRebalanceAccessAlert}>
+        <AlertDialogContent>
+          <AlertDialogHeader>
+            <AlertDialogTitle className="flex items-center gap-2">
+              <Lock className="h-5 w-5 text-yellow-500" />
+              Rebalance Access Required
+            </AlertDialogTitle>
+            <AlertDialogDescription className="space-y-2">
+              <p>
+                Your current subscription plan doesn't include portfolio rebalancing features.
+              </p>
+              <p>
+                Please upgrade your plan to access portfolio rebalancing capabilities.
+              </p>
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <AlertDialogFooter>
+            <AlertDialogAction onClick={() => setShowRebalanceAccessAlert(false)}>
+              OK
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
     </>
   );
 }

src/components/RebalanceDetailModal.tsx

@@ -272,9 +272,12 @@ export default function RebalanceDetailModal({ rebalanceId, isOpen, onClose, reb
         // Fetch order statuses for all positions in this rebalance
         const { data: tradingActions } = await supabase
           .from('trading_actions')
-          .select('id, ticker, status, metadata')
+          .select('*')  // Select all fields including metadata
           .eq('rebalance_request_id', rebalanceId)
           .eq('user_id', user.id);
+        
+        // Store tradingActions for later use (even if empty)
+        let tradingActionsData = tradingActions || [];
 
         if (tradingActions && tradingActions.length > 0) {
           const newOrderStatuses = new Map();
@@ -650,7 +653,10 @@ export default function RebalanceDetailModal({ rebalanceId, isOpen, onClose, reb
           // Include opportunity reasoning for insights tab access
           opportunity_reasoning: rebalanceRequest.opportunity_reasoning,
 
-          relatedAnalyses: rebalanceAnalyses || []
+          relatedAnalyses: rebalanceAnalyses || [],
+          
+          // Include trading_actions data for proper status tracking
+          trading_actions: tradingActionsData
         };
 
         if (mounted) {

src/components/analysis-detail/AnalysisActionsTab.tsx

@@ -39,26 +39,34 @@ export default function AnalysisActionsTab({
     );
   }
 
+  // Get the portfolio manager's decision - check all possible locations
+  const portfolioManagerDecision = analysisData.tradeOrder?.action ||  // From actual trade order
+                                   analysisData.agent_insights?.portfolioManager?.finalDecision?.action || 
+                                   analysisData.agent_insights?.portfolioManager?.decision?.action ||
+                                   analysisData.agent_insights?.portfolioManager?.action ||
+                                   analysisData.agent_insights?.portfolioManager?.decision || 
+                                   analysisData.decision;
+
   return (
     <div className="space-y-4">
       {/* Summary Cards */}
       <div className="grid grid-cols-3 gap-4">
         <Card className="p-4">
           <div className="flex items-center justify-between">
-            <span className="text-sm text-muted-foreground">Decision</span>
-            {analysisData.decision === 'BUY' ? (
+            <span className="text-sm text-muted-foreground">Portfolio Decision</span>
+            {portfolioManagerDecision === 'BUY' ? (
               <TrendingUp className="w-4 h-4 text-green-500" />
-            ) : analysisData.decision === 'SELL' ? (
+            ) : portfolioManagerDecision === 'SELL' ? (
               <TrendingDown className="w-4 h-4 text-red-500" />
             ) : (
               <Activity className="w-4 h-4 text-gray-500" />
             )}
           </div>
-          <p className={`text-lg font-semibold ${analysisData.decision === 'BUY' ? 'text-green-600' :
-              analysisData.decision === 'SELL' ? 'text-red-600' :
+          <p className={`text-lg font-semibold ${portfolioManagerDecision === 'BUY' ? 'text-green-600' :
+              portfolioManagerDecision === 'SELL' ? 'text-red-600' :
                 'text-gray-600'
             }`}>
-            {analysisData.decision}
+            {portfolioManagerDecision || 'HOLD'}
           </p>
         </Card>
         <Card className="p-4">

src/components/analysis-detail/AnalysisInsightsTab.tsx

@@ -26,6 +26,7 @@ import {
 import MarkdownRenderer from "../MarkdownRenderer";
 import MarketAnalystInsight from "./MarketAnalystInsight";
 import FundamentalsAnalystInsight from "./FundamentalsAnalystInsight";
+import SourcesSection, { CompactSourceBadges } from "./SourcesSection";
 
 interface AnalysisInsightsTabProps {
   analysisData: any;
@@ -456,6 +457,10 @@ export default function AnalysisInsightsTab({
           );
         }
 
+        // Check if this agent has sources (News, Social Media, Fundamentals, Macro analysts)
+        const hasPerplefinaSources = ['newsAnalyst', 'socialMediaAnalyst', 'fundamentalsAnalyst', 'macroAnalyst'].includes(agent);
+        const sources = hasPerplefinaSources && insight?.sources ? insight.sources : null;
+
         // Default rendering for all other agents
         const isCollapsed = collapsedCards.has(agent);
         return (
@@ -464,14 +469,24 @@ export default function AnalysisInsightsTab({
               <CollapsibleTrigger asChild>
                 <CardHeader className="bg-muted/30 cursor-pointer hover:bg-muted/40 transition-colors">
                   <CardTitle className="text-base flex items-center justify-between">
-                    <div className="flex items-center gap-2">
+                    <div className="flex items-center gap-2 flex-1 min-w-0">
                       {getAgentIcon(agent)}
-                      {formatAgentName(agent)}
+                      <span className="shrink-0">{formatAgentName(agent)}</span>
+                      
+                      {/* Show compact source badges when collapsed */}
+                      {isCollapsed && sources && sources.length > 0 && (
+                        <CompactSourceBadges 
+                          sources={sources} 
+                          agentName={formatAgentName(agent)}
+                          maxVisible={3}
+                          showLabels={false}
+                        />
+                      )}
                     </div>
                     <Button
                       variant="ghost"
                       size="sm"
-                      className="h-6 w-6 p-0"
+                      className="h-6 w-6 p-0 shrink-0"
                       onClick={(e) => {
                         e.stopPropagation();
                         toggleCollapse(agent);
@@ -485,6 +500,14 @@ export default function AnalysisInsightsTab({
               <CollapsibleContent>
                 <CardContent className="pt-4">
                   <MarkdownRenderer content={insightContent} />
+                  
+                  {/* Show sources using the new compact component */}
+                  {sources && sources.length > 0 && (
+                    <SourcesSection 
+                      sources={sources} 
+                      agentName={formatAgentName(agent)} 
+                    />
+                  )}
                 </CardContent>
               </CollapsibleContent>
             </Card>