metricsa dn backedn fixes

frontend/src/pages/Writer/Approved.tsx

@@ -8,6 +8,7 @@ import { useNavigate } from 'react-router-dom';
 import TablePageTemplate from '../../templates/TablePageTemplate';
 import { 
   fetchContent,
+  fetchImages,
   Content,
   ContentListResponse,
   ContentFilters,
@@ -34,7 +35,12 @@ export default function Approved() {
   // Data state
   const [content, setContent] = useState<Content[]>([]);
   const [loading, setLoading] = useState(true);
-  
+
+  // Total counts for footer widget and header metrics (not page-filtered)
+  const [totalOnSite, setTotalOnSite] = useState(0);
+  const [totalPendingPublish, setTotalPendingPublish] = useState(0);
+  const [totalImagesCount, setTotalImagesCount] = useState(0);
+
   // Filter state - default to approved status
   const [searchTerm, setSearchTerm] = useState('');
   const [publishStatusFilter, setPublishStatusFilter] = useState('');
@@ -50,6 +56,36 @@ export default function Approved() {
   const [sortDirection, setSortDirection] = useState<'asc' | 'desc'>('desc');
   const [showContent, setShowContent] = useState(false);
 
+  // Load total metrics for footer widget and header metrics (not affected by pagination)
+  const loadTotalMetrics = useCallback(async () => {
+    try {
+      // Fetch all approved content to calculate totals
+      const data = await fetchContent({
+        status: 'published', // Backend uses 'published' for approved content
+        page_size: 1000, // Fetch enough to count
+      });
+
+      const allContent = data.results || [];
+      // Count by external_id presence
+      const onSite = allContent.filter(c => c.external_id).length;
+      const pending = allContent.filter(c => !c.external_id).length;
+
+      setTotalOnSite(onSite);
+      setTotalPendingPublish(pending);
+
+      // Get actual total images count
+      const imagesRes = await fetchImages({ page_size: 1 });
+      setTotalImagesCount(imagesRes.count || 0);
+    } catch (error) {
+      console.error('Error loading total metrics:', error);
+    }
+  }, []);
+
+  // Load total metrics on mount
+  useEffect(() => {
+    loadTotalMetrics();
+  }, [loadTotalMetrics]);
+
   // Load content - filtered for approved status (API still uses 'published' internally)
   const loadContent = useCallback(async () => {
     setLoading(true);
@@ -137,18 +173,17 @@ export default function Approved() {
     setCurrentPage(1);
   }, [pageSize]);
 
-  // Debounced search
+  // Debounced search - reset to page 1 when search term changes
+  // Only depend on searchTerm to avoid pagination reset on page navigation
   useEffect(() => {
     const timer = setTimeout(() => {
-      if (currentPage === 1) {
-        loadContent();
-      } else {
-        setCurrentPage(1);
-      }
+      // Always reset to page 1 when search changes
+      // The main useEffect will handle reloading when currentPage changes
+      setCurrentPage(1);
     }, 500);
 
     return () => clearTimeout(timer);
-  }, [searchTerm, currentPage, loadContent]);
+  }, [searchTerm]);
 
   // Handle sorting
   const handleSort = (field: string, direction: 'asc' | 'desc') => {
@@ -292,15 +327,38 @@ export default function Approved() {
     });
   }, [searchTerm, publishStatusFilter, activeSector, navigate]);
 
-  // Calculate header metrics
+  // Calculate header metrics - use totals from API calls (not page data)
+  // This ensures metrics show correct totals across all pages, not just current page
   const headerMetrics = useMemo(() => {
     if (!pageConfig?.headerMetrics) return [];
-    return pageConfig.headerMetrics.map((metric) => ({
-      label: metric.label,
-      value: metric.calculate({ content, totalCount }),
-      accentColor: metric.accentColor,
-    }));
-  }, [pageConfig?.headerMetrics, content, totalCount]);
+
+    // Override the calculate function to use pre-loaded totals instead of filtering page data
+    return pageConfig.headerMetrics.map((metric) => {
+      let value: number;
+
+      switch (metric.label) {
+        case 'Approved':
+          value = totalCount || 0;
+          break;
+        case 'On Site':
+          // Use totalOnSite from loadTotalMetrics()
+          value = totalOnSite;
+          break;
+        case 'Pending':
+          // Use totalPendingPublish from loadTotalMetrics()
+          value = totalPendingPublish;
+          break;
+        default:
+          value = metric.calculate({ content, totalCount });
+      }
+
+      return {
+        label: metric.label,
+        value,
+        accentColor: metric.accentColor,
+      };
+    });
+  }, [pageConfig?.headerMetrics, content, totalCount, totalOnSite, totalPendingPublish]);
 
   return (
     <>
@@ -398,7 +456,7 @@ export default function Approved() {
               fromHref: '/writer/content',
               actionLabel: 'Generate Images',
               toLabel: 'Images',
-              toValue: 0,
+              toValue: totalImagesCount,
               toHref: '/writer/images',
               progress: 0,
               color: 'purple',
@@ -431,7 +489,7 @@ export default function Approved() {
           ],
           writerItems: [
             { label: 'Content Generated', value: 0, color: 'blue' },
-            { label: 'Images Created', value: 0, color: 'purple' },
+            { label: 'Images Created', value: totalImagesCount, color: 'purple' },
             { label: 'Articles Published', value: totalCount, color: 'green' },
           ],
           analyticsHref: '/account/usage',