salman/igny8
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

metrics to always show total fixed

Browse Source
This commit is contained in:
IGNY8 VPS (Salman)
2026-01-15 06:28:29 +00:00
parent a8309078c6
commit ee4749c6c6
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/src/pages/Planner/Clusters.tsx
View File

@@ -49,6 +49,8 @@ export default function Clusters() {
const [totalImagesCount, setTotalImagesCount] = useState(0); const [totalImagesCount, setTotalImagesCount] = useState(0);
const [totalVolume, setTotalVolume] = useState(0); const [totalVolume, setTotalVolume] = useState(0);
const [totalKeywords, setTotalKeywords] = useState(0); const [totalKeywords, setTotalKeywords] = useState(0);
// Actual total count (unfiltered) for header metrics - not affected by filters
const [actualTotalClusters, setActualTotalClusters] = useState(0);
// Dynamic filter options (loaded from backend based on current data) // Dynamic filter options (loaded from backend based on current data)
// Initialize as undefined to distinguish "not loaded yet" from "loaded but empty array" // Initialize as undefined to distinguish "not loaded yet" from "loaded but empty array"
@@ -175,7 +177,7 @@ export default function Clusters() {
fetchImages({ page_size: 1 }), fetchImages({ page_size: 1 }),
]); ]);
setTotalCount(allRes.count || 0); setActualTotalClusters(allRes.count || 0); // Store actual total (unfiltered) for header metrics
setTotalWithIdeas(mappedRes.count || 0); setTotalWithIdeas(mappedRes.count || 0);
setTotalReady(newRes.count || 0); setTotalReady(newRes.count || 0);
setTotalImagesCount(imagesRes.count || 0); setTotalImagesCount(imagesRes.count || 0);
@@ -471,8 +473,9 @@ export default function Clusters() {
handleRowAction, handleRowAction,
]); ]);
// Calculate header metrics - use totalWithIdeas/totalReady from API calls (not page data) // Calculate header metrics - use actualTotalClusters/totalWithIdeas/totalReady from API calls (not page data)
// This ensures metrics show correct totals across all pages, not just current page // This ensures metrics show correct totals across all pages, not just current page
// Note: actualTotalClusters is NOT affected by filters - it always shows the true total
const headerMetrics = useMemo(() => { const headerMetrics = useMemo(() => {
if (!pageConfig?.headerMetrics) return []; if (!pageConfig?.headerMetrics) return [];
@@ -482,7 +485,8 @@ export default function Clusters() {
switch (metric.label) { switch (metric.label) {
case 'Clusters': case 'Clusters':
value = totalCount || 0; // Use actualTotalClusters (unfiltered) for header metrics - not affected by filters
value = actualTotalClusters || 0;
break; break;
case 'New': case 'New':
// Use totalReady from loadTotalMetrics() (clusters without ideas) // Use totalReady from loadTotalMetrics() (clusters without ideas)
@@ -507,7 +511,7 @@ export default function Clusters() {
tooltip: (metric as any).tooltip, tooltip: (metric as any).tooltip,
}; };
}); });
}, [pageConfig?.headerMetrics, clusters, totalCount, totalReady, totalWithIdeas, totalVolume, totalKeywords]); }, [pageConfig?.headerMetrics, clusters, totalCount, totalReady, totalWithIdeas, totalVolume, totalKeywords, actualTotalClusters]);
const resetForm = useCallback(() => { const resetForm = useCallback(() => {
setFormData({ setFormData({

12
frontend/src/pages/Planner/Ideas.tsx
View File

@@ -50,6 +50,8 @@ export default function Ideas() {
const [totalInTasks, setTotalInTasks] = useState(0); const [totalInTasks, setTotalInTasks] = useState(0);
const [totalPending, setTotalPending] = useState(0); const [totalPending, setTotalPending] = useState(0);
const [totalImagesCount, setTotalImagesCount] = useState(0); const [totalImagesCount, setTotalImagesCount] = useState(0);
// Actual total count (unfiltered) for header metrics - not affected by filters
const [actualTotalIdeas, setActualTotalIdeas] = useState(0);
// Dynamic filter options // Dynamic filter options
// Initialize as undefined to distinguish "not loaded yet" from "loaded but empty array" // Initialize as undefined to distinguish "not loaded yet" from "loaded but empty array"
@@ -178,7 +180,7 @@ export default function Ideas() {
fetchImages({ page_size: 1 }), fetchImages({ page_size: 1 }),
]); ]);
setTotalCount(allRes.count || 0); setActualTotalIdeas(allRes.count || 0); // Store actual total (unfiltered) for header metrics
setTotalInTasks((queuedRes.count || 0) + (completedRes.count || 0)); setTotalInTasks((queuedRes.count || 0) + (completedRes.count || 0));
setTotalPending(newRes.count || 0); setTotalPending(newRes.count || 0);
setTotalImagesCount(imagesRes.count || 0); setTotalImagesCount(imagesRes.count || 0);
@@ -359,8 +361,9 @@ export default function Ideas() {
}); });
}, [clusters, activeSector, formData, searchTerm, statusFilter, clusterFilter, structureFilter, typeFilter, statusOptions, contentTypeOptions, contentStructureOptions, clusterOptions]); }, [clusters, activeSector, formData, searchTerm, statusFilter, clusterFilter, structureFilter, typeFilter, statusOptions, contentTypeOptions, contentStructureOptions, clusterOptions]);
// Calculate header metrics - use totalInTasks/totalPending from API calls (not page data) // Calculate header metrics - use actualTotalIdeas/totalInTasks/totalPending from API calls (not page data)
// This ensures metrics show correct totals across all pages, not just current page // This ensures metrics show correct totals across all pages, not just current page
// Note: actualTotalIdeas is NOT affected by filters - it always shows the true total
const headerMetrics = useMemo(() => { const headerMetrics = useMemo(() => {
if (!pageConfig?.headerMetrics) return []; if (!pageConfig?.headerMetrics) return [];
@@ -370,7 +373,8 @@ export default function Ideas() {
switch (metric.label) { switch (metric.label) {
case 'Ideas': case 'Ideas':
value = totalCount || 0; // Use actualTotalIdeas (unfiltered) for header metrics - not affected by filters
value = actualTotalIdeas || 0;
break; break;
case 'New': case 'New':
// Use totalPending from loadTotalMetrics() (ideas with status='new') // Use totalPending from loadTotalMetrics() (ideas with status='new')
@@ -395,7 +399,7 @@ export default function Ideas() {
tooltip: (metric as any).tooltip, tooltip: (metric as any).tooltip,
}; };
}); });
}, [pageConfig?.headerMetrics, ideas, totalCount, totalPending, totalInTasks]); }, [pageConfig?.headerMetrics, ideas, totalCount, totalPending, totalInTasks, actualTotalIdeas]);
const resetForm = useCallback(() => { const resetForm = useCallback(() => {
setFormData({ setFormData({

12
frontend/src/pages/Planner/Keywords.tsx
View File

@@ -55,6 +55,8 @@ export default function Keywords() {
const [totalUnmapped, setTotalUnmapped] = useState(0); const [totalUnmapped, setTotalUnmapped] = useState(0);
const [totalVolume, setTotalVolume] = useState(0); const [totalVolume, setTotalVolume] = useState(0);
const [totalImagesCount, setTotalImagesCount] = useState(0); const [totalImagesCount, setTotalImagesCount] = useState(0);
// Actual total count (unfiltered) for header metrics - not affected by filters
const [actualTotalKeywords, setActualTotalKeywords] = useState(0);
// Dynamic filter options (loaded from backend based on current data) // Dynamic filter options (loaded from backend based on current data)
// Initialize as undefined to distinguish "not loaded yet" from "loaded but empty array" // Initialize as undefined to distinguish "not loaded yet" from "loaded but empty array"
@@ -218,7 +220,7 @@ export default function Keywords() {
fetchPlannerKeywordStats(activeSite.id), fetchPlannerKeywordStats(activeSite.id),
]); ]);
setTotalCount(allRes.count || 0); setActualTotalKeywords(allRes.count || 0); // Store actual total (unfiltered) for header metrics
setTotalClustered(mappedRes.count || 0); setTotalClustered(mappedRes.count || 0);
setTotalUnmapped(newRes.count || 0); setTotalUnmapped(newRes.count || 0);
setTotalImagesCount(imagesRes.count || 0); setTotalImagesCount(imagesRes.count || 0);
@@ -628,8 +630,9 @@ export default function Keywords() {
difficultyOptions, difficultyOptions,
]); ]);
// Calculate header metrics - use totalClustered/totalUnmapped from API calls (not page data) // Calculate header metrics - use actualTotalKeywords/totalClustered/totalUnmapped from API calls (not page data)
// This ensures metrics show correct totals across all pages, not just current page // This ensures metrics show correct totals across all pages, not just current page
// Note: actualTotalKeywords is NOT affected by filters - it always shows the true total
const headerMetrics = useMemo(() => { const headerMetrics = useMemo(() => {
if (!pageConfig?.headerMetrics) return []; if (!pageConfig?.headerMetrics) return [];
@@ -639,7 +642,8 @@ export default function Keywords() {
switch (metric.label) { switch (metric.label) {
case 'Keywords': case 'Keywords':
value = totalCount || 0; // Use actualTotalKeywords (unfiltered) for header metrics - not affected by filters
value = actualTotalKeywords || 0;
break; break;
case 'Clustered': case 'Clustered':
// Use totalClustered from loadTotalMetrics() instead of filtering page data // Use totalClustered from loadTotalMetrics() instead of filtering page data
@@ -664,7 +668,7 @@ export default function Keywords() {
tooltip: (metric as any).tooltip, tooltip: (metric as any).tooltip,
}; };
}); });
}, [pageConfig?.headerMetrics, keywords, totalCount, clusters, totalClustered, totalUnmapped, totalVolume]); }, [pageConfig?.headerMetrics, keywords, totalCount, clusters, totalClustered, totalUnmapped, totalVolume, actualTotalKeywords]);
// Calculate workflow insights based on UX doc principles // Calculate workflow insights based on UX doc principles
const workflowStats = useMemo(() => { const workflowStats = useMemo(() => {