Merge pull request #3247 from bluewave-labs/fix/empty

Fix: empty state

Author: ajhollid

client/src/Pages/Infrastructure/Monitors/index.tsx

@@ -99,6 +99,15 @@ const InfrastructureMonitors = () => {
 	const { summary, count } = monitorsWithChecksData ?? {};
 	const isLoading = monitorsWithChecksLoading;
 
+	// Check if any filters are active
+	const hasActiveFilters = Boolean(selectedStatus || selectedState || search);
+
+	// Show empty state only when there are truly no monitors (not just filtered out)
+	const effectiveTotalCount =
+		hasActiveFilters && (summary?.totalMonitors ?? 0) === 0
+			? 1
+			: (summary?.totalMonitors ?? 0);
+
 	// Delete hook
 	const { deleteFn, loading: isDeleting } = useDelete();
 
@@ -117,7 +126,7 @@ const InfrastructureMonitors = () => {
 		<MonitorBasePageWithStates
 			loading={isLoading}
 			error={monitorsWithChecksError}
-			totalCount={summary?.totalMonitors ?? 0}
+			totalCount={effectiveTotalCount}
 			page="infrastructure"
 			actionLink="/infrastructure/create"
 		>

client/src/Pages/Uptime/Monitors/index.tsx

@@ -122,11 +122,23 @@ const UptimeMonitorsPage = () => {
 
 	const isLoading = monitorsWithChecksLoading;
 
+	// Check if any filters are active
+	const hasActiveFilters = Boolean(
+		selectedTypes.length > 0 || selectedStatus || selectedState || search
+	);
+
+	// Show empty state only when there are truly no monitors (not just filtered out)
+	// If filters are active and count is 0, pass 1 to prevent empty state fallback
+	const effectiveTotalCount =
+		hasActiveFilters && (summary?.totalMonitors ?? 0) === 0
+			? 1
+			: (summary?.totalMonitors ?? 0);
+
 	return (
 		<MonitorBasePageWithStates
 			loading={isLoading}
 			error={monitorsWithChecksError}
-			totalCount={summary?.totalMonitors ?? 0}
+			totalCount={effectiveTotalCount}
 			page="uptime"
 			actionLink="/uptime/create"
 		>