diff --git a/flow/cmd/mirror_status.go b/flow/cmd/mirror_status.go index c9087d1484..8fe677b0ae 100644 --- a/flow/cmd/mirror_status.go +++ b/flow/cmd/mirror_status.go @@ -350,7 +350,7 @@ func (h *FlowRequestHandler) getPartitionStatuses( ctx context.Context, flowJobName string, ) ([]*protos.PartitionStatus, error) { - q := "SELECT start_time,end_time,rows_in_partition,rows_synced FROM peerdb_stats.qrep_partitions WHERE flow_name=$1" + q := "SELECT partition_uuid,start_time,end_time,rows_in_partition,rows_synced FROM peerdb_stats.qrep_partitions WHERE flow_name=$1" rows, err := h.pool.Query(ctx, q, flowJobName) if err != nil { slog.Error(fmt.Sprintf("unable to query qrep partition - %s: %s", flowJobName, err.Error())) @@ -360,19 +360,23 @@ func (h *FlowRequestHandler) getPartitionStatuses( defer rows.Close() res := []*protos.PartitionStatus{} + var partitionId pgtype.Text var startTime pgtype.Timestamp var endTime pgtype.Timestamp var numRowsInPartition pgtype.Int8 var numRowsSynced pgtype.Int8 for rows.Next() { - if err := rows.Scan(&startTime, &endTime, &numRowsInPartition, &numRowsSynced); err != nil { + if err := rows.Scan(&partitionId, &startTime, &endTime, &numRowsInPartition, &numRowsSynced); err != nil { slog.Error(fmt.Sprintf("unable to scan qrep partition - %s: %s", flowJobName, err.Error())) return nil, fmt.Errorf("unable to scan qrep partition - %s: %w", flowJobName, err) } partitionStatus := &protos.PartitionStatus{} + if partitionId.Valid { + partitionStatus.PartitionId = partitionId.String + } if startTime.Valid { partitionStatus.StartTime = timestamppb.New(startTime.Time) } diff --git a/ui/app/mirrors/[mirrorId]/page.tsx b/ui/app/mirrors/[mirrorId]/page.tsx index 85333aa542..b3637af32c 100644 --- a/ui/app/mirrors/[mirrorId]/page.tsx +++ b/ui/app/mirrors/[mirrorId]/page.tsx @@ -19,19 +19,11 @@ import SyncStatus from './syncStatus'; type EditMirrorProps = { params: { mirrorId: string }; - searchParams?: { parentMirrorName: string }; }; -export default function ViewMirror({ - params: { mirrorId }, - searchParams, -}: EditMirrorProps) { +export default function ViewMirror({ params: { mirrorId } }: EditMirrorProps) { const [mirrorState, setMirrorState] = useState(); const [mounted, setMounted] = useState(false); - const parentMirrorName = searchParams?.parentMirrorName; - const isCloneJob = - mirrorId.startsWith('clone_') && parentMirrorName !== mirrorId; - const mirrorName = parentMirrorName ?? mirrorId; const fetchState = useCallback(async () => { const res = await getMirrorState(mirrorId); @@ -53,7 +45,7 @@ export default function ViewMirror({ let syncStatusChild = null; let actionsDropdown = null; - if (mirrorState?.cdcStatus && !isCloneJob) { + if (mirrorState?.cdcStatus) { syncStatusChild = ( -
{mirrorName}
+
{mirrorId}
{actionsDropdown} ( - + {getStatus(clone.cloneTableSummary)}