+ {loggedGroups.map((group) => {
+ // Group-level rendering: circuits render once per group
+ if (group.groupType === 'CIRCUIT') {
+ const circuitExercises = group.activities.map((a) => ({
+ name: exerciseNames[a.exerciseId] ?? 'Unknown',
+ targetReps: DEFAULT_CIRCUIT_REPS,
+ }))
+ // Hard focus: only render the active block in SET mode.
+ if (group.id !== activeFocusId) return null
+ return (
+
+ {
+ const activity = group.activities[exerciseIndex]
+ if (!activity) {
+ console.error('[strength-workout-view] onExerciseDone: no activity at index', { exerciseIndex, round, groupId: group.id })
+ setPageError('Failed to record circuit set. Please log it manually.')
+ return
+ }
+ try {
+ // Pass restSeconds: 0 -- CircuitPanel runs its own inter-exercise
+ // and inter-round rest, so the global rest timer must not fire.
+ await confirmSet(
+ activity.id,
+ {
+ loggedActivityId: activity.id,
+ setNumber: round,
+ setType: 'WORKING',
+ completed: true,
+ actualReps,
+ },
+ 0,
+ )
+ } catch (err) {
+ console.error('[strength-workout-view] Failed to log circuit set:', err)
+ setPageError('Failed to save circuit set.')
+ }
+ }}
+ onComplete={() => {
+ // Per-set logging happens in onExerciseDone; nothing to do here.
+ }}
+ />
+
+ )
+ }
+
+ return group.activities.map((activity) => {
+ const exercise = exerciseMap[activity.exerciseId]
+ const modality = getExerciseModality(exercise, group.groupType)
+
+ // Cardio and ruck activities do not have a collapsed done state --
+ // hide them when skipped.
+ if (
+ skippedActivityIds.has(activity.id) &&
+ (modality === 'cardio' || modality === 'ruck')
+ ) {
+ return null
+ }
+
+ // Cardio panel
+ if (modality === 'cardio' && exercise) {
+ return (
+
+ {
+ try {
+ await confirmSet(activity.id, {
+ loggedActivityId: activity.id,
+ setNumber: 1,
+ setType: 'WORKING',
+ completed: true,
+ actualDuration: { seconds: data.durationSeconds },
+ actualDistance: data.distance
+ ? { value: parseFloat(data.distance), unit: 'mi' }
+ : undefined,
+ actualHeartRate: data.heartRate
+ ? parseInt(data.heartRate, 10)
+ : undefined,
+ })
+ } catch (err) {
+ console.error('[strength-workout-view] cardio confirmSet:', err)
+ setPageError('Failed to save cardio session.')
+ }
+ }}
+ />
+
+ )
+ }
+
+ // Ruck panel
+ if (modality === 'ruck') {
+ return (
+
+ {
+ try {
+ await confirmSet(activity.id, {
+ loggedActivityId: activity.id,
+ setNumber: 1,
+ setType: 'WORKING',
+ completed: true,
+ actualDuration: { seconds: data.durationSeconds },
+ actualDistance: data.distance
+ ? { value: parseFloat(data.distance), unit: 'mi' }
+ : undefined,
+ ruckLoad: data.loadWeight
+ ? { value: parseFloat(data.loadWeight), unit: 'lb' }
+ : undefined,
+ elevationGain: data.elevation
+ ? { value: parseFloat(data.elevation), unit: 'm' }
+ : undefined,
+ })
+ } catch (err) {
+ console.error('[strength-workout-view] ruck confirmSet:', err)
+ setPageError('Failed to save ruck session.')
+ }
+ }}
+ />
+
+ )
+ }
+
+ // Standard strength exercise block
+ const confirmedSets = activity.sets.filter((s) => s.completed)
+ const lastConfirmedSet =
+ confirmedSets.length > 0 ? confirmedSets[confirmedSets.length - 1] : undefined
+
+ // Build set row data: confirmed sets + one empty row for the next set
+ const setRows: SetRowData[] = [
+ ...activity.sets.map((set, idx) => ({
+ id: set.id,
+ setNumber: idx + 1,
+ weight: set.actualWeight?.value?.toString(),
+ reps: set.actualReps?.toString(),
+ confirmed: set.completed,
+ prescribedWeight: set.prescribed?.weight ?? undefined,
+ prescribedReps: set.prescribed?.reps ?? undefined,
+ })),
+ ]
+
+ // Carry-forward prescribed values for the pending input row.
+ const lastSetWithPrescription = [...activity.sets]
+ .reverse()
+ .find((s) => s.prescribed != null)
+ const nextPrescribedWeight =
+ lastSetWithPrescription?.prescribed?.weight ?? undefined
+ const nextPrescribedReps = lastSetWithPrescription?.prescribed?.reps ?? undefined
+
+ // Show a pending input row by default for the first set; subsequent
+ // rows require an explicit ADD SET tap. Don't add a pending row if
+ // there's already an unconfirmed (completed: false) set in the list --
+ // that happens when the user un-confirms a set.
+ const hasUncompletedSets = activity.sets.some((s) => !s.completed)
+ if (
+ (confirmedSets.length === 0 && !hasUncompletedSets) ||
+ pendingInputs[activity.id]
+ ) {
+ const nextSetNumber = setRows.length + 1
+ setRows.push({
+ id: `pending-${activity.id}-${nextSetNumber}`,
+ setNumber: nextSetNumber,
+ weight:
+ lastConfirmedSet?.actualWeight?.value?.toString() ??
+ nextPrescribedWeight?.value?.toString(),
+ reps:
+ lastConfirmedSet?.actualReps?.toString() ??
+ (nextPrescribedReps != null ? String(nextPrescribedReps) : undefined),
+ confirmed: false,
+ prescribedWeight: nextPrescribedWeight,
+ prescribedReps: nextPrescribedReps,
+ isPending: true,
+ })
+ }
+
+ const isDone =
+ skippedActivityIds.has(activity.id) &&
+ !expandedDoneActivityIds.has(activity.id)
+
+ return (
+
+ handleExpandDone(activity.id)}
+ onAddSet={() =>
+ setPendingInputs((prev) => ({ ...prev, [activity.id]: true }))
+ }
+ onDeleteSet={(setId) => {
+ if (setId.startsWith('pending-')) {
+ setPendingInputs((prev) => ({ ...prev, [activity.id]: false }))
+ } else {
+ deleteSet(activity.id, setId).catch((err) => {
+ console.error('[workout-page] deleteSet failed:', { activityId: activity.id, setId, err })
+ setPageError('Failed to delete set. Please try again.')
+ })
+ }
+ }}
+ onUnconfirmSet={handleUnconfirmSet}
+ onSkipExercise={() => handleMarkDone(activity.id)}
+ onRemoveExercise={() => {
+ removeActivity(activity.id).catch((err) => {
+ console.error('[workout-page] removeActivity failed:', { activityId: activity.id, err })
+ setPageError('Failed to remove exercise. Please try again.')
+ })
+ }}
+ />
+
+ )
+ })
+ })}
+