M-029 Pass 1 batch 2: migrate 5 two-mutation pages to useTrackedMutation

Drains 10 more useMutation sites (52 -> 42). Each migration declares explicit

invalidates per the M-009 contract.

Pages migrated:

  - DashboardPage.tsx        previewDigest + sendDigest both 'noop' (read-only

                              preview / fire-and-forget email — no client cache impact)

  - DiscoveryPage.tsx        claim + dismiss both invalidate

                              [['discovered-certificates'], ['discovery-summary']]

  - NotificationsPage.tsx    markRead + requeue both invalidate [['notifications']]

  - TargetDetailPage.tsx     update + testConnection both invalidate [['target', id]]

  - TargetsPage.tsx          createTarget + deleteTarget both invalidate [['targets']]

Verification:

  legacy useMutation count   52 -> 42 (-10)

  useTrackedMutation count    4 -> 14 (+10)

Closes 14 of 56 sites toward M-029 Pass 1 completion.
This commit is contained in:
shankar0123
2026-04-27 02:40:54 +00:00
parent e9f809b7f9
commit e0a3d50f5e
5 changed files with 34 additions and 31 deletions
+10 -3
View File
@@ -1,5 +1,6 @@
import { useState } from 'react'; import { useState } from 'react';
import { useQuery, useMutation } from '@tanstack/react-query'; import { useQuery } from '@tanstack/react-query';
import { useTrackedMutation } from '../hooks/useTrackedMutation';
import { useNavigate, useSearchParams } from 'react-router-dom'; import { useNavigate, useSearchParams } from 'react-router-dom';
import { import {
BarChart, Bar, LineChart, Line, PieChart, Pie, Cell, BarChart, Bar, LineChart, Line, PieChart, Pie, Cell,
@@ -81,15 +82,21 @@ function DigestCard() {
const [previewHtml, setPreviewHtml] = useState<string | null>(null); const [previewHtml, setPreviewHtml] = useState<string | null>(null);
const [showPreview, setShowPreview] = useState(false); const [showPreview, setShowPreview] = useState(false);
const previewMutation = useMutation({ const previewMutation = useTrackedMutation({
mutationFn: previewDigest, mutationFn: previewDigest,
invalidates: 'noop',
noopReason: 'previewDigest is read-only — server renders HTML; no cached query touched',
onSuccess: (html) => { onSuccess: (html) => {
setPreviewHtml(html); setPreviewHtml(html);
setShowPreview(true); setShowPreview(true);
}, },
}); });
const sendMutation = useMutation({ mutationFn: sendDigest }); const sendMutation = useTrackedMutation({
mutationFn: sendDigest,
invalidates: 'noop',
noopReason: 'sendDigest dispatches an email server-side; no cached client query reflects digest-send state',
});
return ( return (
<> <>
+6 -10
View File
@@ -1,5 +1,6 @@
import { useState } from 'react'; import { useState } from 'react';
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'; import { useQuery } from '@tanstack/react-query';
import { useTrackedMutation } from '../hooks/useTrackedMutation';
import { import {
getDiscoveredCertificates, getDiscoveredCertificates,
getDiscoverySummary, getDiscoverySummary,
@@ -110,7 +111,6 @@ export default function DiscoveryPage() {
const [agentFilter, setAgentFilter] = useState(''); const [agentFilter, setAgentFilter] = useState('');
const [claimingCert, setClaimingCert] = useState<DiscoveredCertificate | null>(null); const [claimingCert, setClaimingCert] = useState<DiscoveredCertificate | null>(null);
const [showScans, setShowScans] = useState(false); const [showScans, setShowScans] = useState(false);
const queryClient = useQueryClient();
const params: Record<string, string> = {}; const params: Record<string, string> = {};
if (statusFilter) params.status = statusFilter; if (statusFilter) params.status = statusFilter;
@@ -139,22 +139,18 @@ export default function DiscoveryPage() {
queryFn: () => getAgents({ per_page: '200' }), queryFn: () => getAgents({ per_page: '200' }),
}); });
const claimMutation = useMutation({ const claimMutation = useTrackedMutation({
mutationFn: ({ id, managedCertId }: { id: string; managedCertId: string }) => mutationFn: ({ id, managedCertId }: { id: string; managedCertId: string }) =>
claimDiscoveredCertificate(id, managedCertId), claimDiscoveredCertificate(id, managedCertId),
invalidates: [['discovered-certificates'], ['discovery-summary']],
onSuccess: () => { onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['discovered-certificates'] });
queryClient.invalidateQueries({ queryKey: ['discovery-summary'] });
setClaimingCert(null); setClaimingCert(null);
}, },
}); });
const dismissMutation = useMutation({ const dismissMutation = useTrackedMutation({
mutationFn: dismissDiscoveredCertificate, mutationFn: dismissDiscoveredCertificate,
onSuccess: () => { invalidates: [['discovered-certificates'], ['discovery-summary']],
queryClient.invalidateQueries({ queryKey: ['discovered-certificates'] });
queryClient.invalidateQueries({ queryKey: ['discovery-summary'] });
},
}); });
const formatExpiry = (notAfter?: string) => { const formatExpiry = (notAfter?: string) => {
+6 -6
View File
@@ -1,5 +1,6 @@
import { useState, useMemo } from 'react'; import { useState, useMemo } from 'react';
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'; import { useQuery } from '@tanstack/react-query';
import { useTrackedMutation } from '../hooks/useTrackedMutation';
import { getNotifications, markNotificationRead, requeueNotification } from '../api/client'; import { getNotifications, markNotificationRead, requeueNotification } from '../api/client';
import PageHeader from '../components/PageHeader'; import PageHeader from '../components/PageHeader';
import StatusBadge from '../components/StatusBadge'; import StatusBadge from '../components/StatusBadge';
@@ -22,7 +23,6 @@ export default function NotificationsPage() {
const [typeFilter, setTypeFilter] = useState(''); const [typeFilter, setTypeFilter] = useState('');
const [statusFilter, setStatusFilter] = useState(''); const [statusFilter, setStatusFilter] = useState('');
const [activeTab, setActiveTab] = useState<ActiveTab>('all'); const [activeTab, setActiveTab] = useState<ActiveTab>('all');
const queryClient = useQueryClient();
const { data, isLoading, error, refetch } = useQuery({ const { data, isLoading, error, refetch } = useQuery({
// I-005: queryKey carries the active tab so TanStack Query treats // I-005: queryKey carries the active tab so TanStack Query treats
@@ -43,9 +43,9 @@ export default function NotificationsPage() {
refetchInterval: 30000, refetchInterval: 30000,
}); });
const markRead = useMutation({ const markRead = useTrackedMutation({
mutationFn: markNotificationRead, mutationFn: markNotificationRead,
onSuccess: () => queryClient.invalidateQueries({ queryKey: ['notifications'] }), invalidates: [['notifications']],
}); });
// I-005: requeue a dead notification. Invalidates both tab cache entries // I-005: requeue a dead notification. Invalidates both tab cache entries
@@ -60,9 +60,9 @@ export default function NotificationsPage() {
// assertion fails on the extra argument. Keep the arrow even if the context // assertion fails on the extra argument. Keep the arrow even if the context
// object later becomes structurally empty — the contract pins a single-arg // object later becomes structurally empty — the contract pins a single-arg
// call and the page must not leak mutation machinery into API boundaries. // call and the page must not leak mutation machinery into API boundaries.
const requeue = useMutation({ const requeue = useTrackedMutation({
mutationFn: (id: string) => requeueNotification(id), mutationFn: (id: string) => requeueNotification(id),
onSuccess: () => queryClient.invalidateQueries({ queryKey: ['notifications'] }), invalidates: [['notifications']],
}); });
const notifications = data?.data || []; const notifications = data?.data || [];
+6 -8
View File
@@ -1,6 +1,7 @@
import { useState } from 'react'; import { useState } from 'react';
import { useParams, Link } from 'react-router-dom'; import { useParams, Link } from 'react-router-dom';
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'; import { useQuery } from '@tanstack/react-query';
import { useTrackedMutation } from '../hooks/useTrackedMutation';
import { getTarget, getJobs, updateTarget, testTargetConnection } from '../api/client'; import { getTarget, getJobs, updateTarget, testTargetConnection } from '../api/client';
import PageHeader from '../components/PageHeader'; import PageHeader from '../components/PageHeader';
import StatusBadge from '../components/StatusBadge'; import StatusBadge from '../components/StatusBadge';
@@ -70,23 +71,20 @@ function SourceBadge({ source }: { source?: string }) {
export default function TargetDetailPage() { export default function TargetDetailPage() {
const { id } = useParams<{ id: string }>(); const { id } = useParams<{ id: string }>();
const queryClient = useQueryClient();
const [isEditing, setIsEditing] = useState(false); const [isEditing, setIsEditing] = useState(false);
const [editName, setEditName] = useState(''); const [editName, setEditName] = useState('');
const updateMutation = useMutation({ const updateMutation = useTrackedMutation({
mutationFn: (data: Partial<{ name: string }>) => updateTarget(id!, data), mutationFn: (data: Partial<{ name: string }>) => updateTarget(id!, data),
invalidates: [['target', id]],
onSuccess: () => { onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['target', id] });
setIsEditing(false); setIsEditing(false);
}, },
}); });
const testMutation = useMutation({ const testMutation = useTrackedMutation({
mutationFn: () => testTargetConnection(id!), mutationFn: () => testTargetConnection(id!),
onSuccess: () => { invalidates: [['target', id]],
queryClient.invalidateQueries({ queryKey: ['target', id] });
},
}); });
const { data: target, isLoading, error, refetch } = useQuery({ const { data: target, isLoading, error, refetch } = useQuery({
+6 -4
View File
@@ -1,6 +1,7 @@
import { useState } from 'react'; import { useState } from 'react';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; import { useQuery, useQueryClient } from '@tanstack/react-query';
import { useTrackedMutation } from '../hooks/useTrackedMutation';
import { getTargets, createTarget, deleteTarget, getAgents } from '../api/client'; import { getTargets, createTarget, deleteTarget, getAgents } from '../api/client';
import PageHeader from '../components/PageHeader'; import PageHeader from '../components/PageHeader';
import DataTable from '../components/DataTable'; import DataTable from '../components/DataTable';
@@ -242,13 +243,14 @@ function CreateTargetWizard({ onClose, onSuccess }: { onClose: () => void; onSuc
return result; return result;
}; };
const mutation = useMutation({ const mutation = useTrackedMutation({
mutationFn: () => createTarget({ mutationFn: () => createTarget({
name, name,
type: targetType, type: targetType,
agent_id: agentId, agent_id: agentId,
config: buildConfigPayload(), config: buildConfigPayload(),
}), }),
invalidates: [['targets']],
onSuccess: () => onSuccess(), onSuccess: () => onSuccess(),
onError: (err: Error) => setError(err.message), onError: (err: Error) => setError(err.message),
}); });
@@ -407,9 +409,9 @@ export default function TargetsPage() {
queryFn: () => getTargets(), queryFn: () => getTargets(),
}); });
const deleteMutation = useMutation({ const deleteMutation = useTrackedMutation({
mutationFn: deleteTarget, mutationFn: deleteTarget,
onSuccess: () => queryClient.invalidateQueries({ queryKey: ['targets'] }), invalidates: [['targets']],
}); });
const columns: Column<Target>[] = [ const columns: Column<Target>[] = [