Skip to content

Open-source gym & body-weight tracker, now in the App Store (iPhone + Apple Watch) and as an Android APK. Plan routines, log workouts, see which muscles are trained, import from Strong/Hevy/FitNotes. Self-host it or use it on the phone alone.

Workout: give one set its own rest from its set menu (#609)

Duarte Santos8e09016cf353
diff --git a/frontend/src/lib/finish-workout.js b/frontend/src/lib/finish-workout.js
index 5700f7116..ccd7ed3c9 100644
--- a/frontend/src/lib/finish-workout.js
+++ b/frontend/src/lib/finish-workout.js
@@ -19,8 +19,9 @@ import { hasCompletedWork, isSideSet } from './workout-model.js'
function finishedRow(set) {
if (!set) return set
const sideMarked = isSideSet(set) && (set.sides.L.weightOrigin != null || set.sides.R.weightOrigin != null)
- if (set.planSec == null && set.weightOrigin == null && !sideMarked) return set
- const { planSec, weightOrigin, ...rest } = set
+ // A set's own rest (#609) was for this session only, so it isn't kept with the workout.
+ if (set.planSec == null && set.weightOrigin == null && set.restSec === undefined && !sideMarked) return set
+ const { planSec, weightOrigin, restSec: _ownRest, ...rest } = set
if (sideMarked) {
const side = ({ weightOrigin: _, ...kept }) => kept
rest.sides = { ...rest.sides, L: side(rest.sides.L), R: side(rest.sides.R) }
diff --git a/frontend/src/lib/finish-workout.test.js b/frontend/src/lib/finish-workout.test.js
index 375f3d9c5..b452070e7 100644
--- a/frontend/src/lib/finish-workout.test.js
+++ b/frontend/src/lib/finish-workout.test.js
@@ -43,6 +43,16 @@ describe('completed workout boundary', () => {
expect(JSON.stringify(sets)).not.toContain('planSec')
})
+ // A set's own rest (#609) is picked for this session; the saved workout doesn't carry it, so
+ // a next session started from it rests as the exercise does.
+ it('never stores a set\'s own rest', () => {
+ const active = { id: 'a', d: '2026-10-19', start: 1000, entries: [{ id: '0025', sets: [
+ { done: true, w: 100, r: 5, restSec: 0 }, { done: true, w: 100, r: 5, restSec: 240 }, { done: true, w: 100, r: 5 },
+ ] }] }
+ const sets = buildCompletedWorkout(active, { end: 2000 }).entries[0].sets
+ expect(sets).toEqual([{ done: true, w: 100, r: 5 }, { done: true, w: 100, r: 5 }, { done: true, w: 100, r: 5 }])
+ })
+
// weightOrigin marks a load typed by hand during the session so a later edit of an earlier set
// does not cascade over it (#209). History has nothing left to cascade: the saved rows carry
// only the loads, and the plan the session was built from (`planned`) is kept as it was.
diff --git a/frontend/src/lib/pt-br-locale.test.js b/frontend/src/lib/pt-br-locale.test.js
index d2f18ccf6..75ff7dc8a 100644
--- a/frontend/src/lib/pt-br-locale.test.js
+++ b/frontend/src/lib/pt-br-locale.test.js
@@ -41,7 +41,7 @@ describe('Brazilian Portuguese locale', () => {
// has to be taught is a number nobody reads. What the numbers stood for is asserted above.
// If the hash fails, review the changed keys and wording before accepting a new one. From
// frontend/: node scripts/pt-br-inheritance-fingerprint.mjs --list
- expect(fingerprint, 'pt-PT inheritance changed; review the inherited pt-BR wording').toBe('57ae0940e749d01ac22840eedf78d47364c519830fd405ed66538ca86e918ded')
+ expect(fingerprint, 'pt-PT inheritance changed; review the inherited pt-BR wording').toBe('6e261b98c69ff8a01c0c30e745a6c3bb0231b62ca9d5bd255c1b23bef862f525')
})
// pt-PT labelled Unpair 'Desfazer': Undo, in Portuguese (it is pt-BR's Undo), on the button that
diff --git a/frontend/src/lib/supersetFlow.js b/frontend/src/lib/supersetFlow.js
index fed8607be..b3feae90c 100644
--- a/frontend/src/lib/supersetFlow.js
+++ b/frontend/src/lib/supersetFlow.js
@@ -140,6 +140,15 @@ export function warmupRestSecFor(entry, setIdx, workRestSec, profileSec) {
return all > 0 ? all : workRestSec
}
+/**
+ * One set's own rest, picked from its set menu for this session (#609), or null for none.
+ * 0 is a real choice ("No timer"), so only a missing or broken field means "as the exercise".
+ */
+export function ownSetRest(row) {
+ const v = row?.restSec
+ return typeof v === 'number' && Number.isFinite(v) && v >= 0 ? Math.round(v) : null
+}
+
/**
* The break between the two sides of one per-side set, or null for none. An exercise may set its
* own `sideRestSec` (optional, Discord "set-specific rest timers"). Without it nothing changes:
diff --git a/frontend/src/lib/supersetFlow.test.js b/frontend/src/lib/supersetFlow.test.js
index 1ac560ab2..2aea88aad 100644
--- a/frontend/src/lib/supersetFlow.test.js
+++ b/frontend/src/lib/supersetFlow.test.js
@@ -1,5 +1,5 @@
import { describe, expect, it } from 'vitest'
-import { insertionIndexAfterCurrentUnit, nextUnfinishedUnit, setProgressHighWater, supersetFlowStep, restAfterSet, restOnRecheck, restSecFor, warmupRestSecFor, sideRestFor, stepUnitIndex, advanceAfterTimedRest } from './supersetFlow.js'
+import { insertionIndexAfterCurrentUnit, nextUnfinishedUnit, setProgressHighWater, supersetFlowStep, restAfterSet, restOnRecheck, restSecFor, warmupRestSecFor, sideRestFor, ownSetRest, stepUnitIndex, advanceAfterTimedRest } from './supersetFlow.js'
const entry = done => ({ sets: done.map(value => ({ done: value })) })
@@ -156,6 +156,12 @@ describe('set-specific rests (Discord: rest for warm-ups and between sides)', ()
expect(sideRestFor({}, { timed: true, restAfter: 5, switchSec: 10 })).toBe(5)
expect(sideRestFor({ sideRestSec: 0 }, { timed: true, restAfter: 0, switchSec: 10 })).toBeNull()
})
+ it('a set\'s own rest: a number of 0 or more, anything else is none (#609)', () => {
+ expect(ownSetRest({ restSec: 0 })).toBe(0)
+ expect(ownSetRest({ restSec: 90.4 })).toBe(90)
+ for (const v of [undefined, null, -5, '60', NaN]) expect(ownSetRest({ restSec: v }), String(v)).toBeNull()
+ expect(ownSetRest(undefined)).toBeNull()
+ })
it('"no timer" between sides turns a hold\'s switch pause off, set rest or not (#636)', () => {
expect(sideRestFor({ sideRestOff: true }, { timed: true, restAfter: 90, switchSec: 10 })).toBeNull()
expect(sideRestFor({ sideRestOff: true, sideRestSec: 20 }, { timed: true, restAfter: 90, switchSec: 10 })).toBeNull()
diff --git a/frontend/src/locales/ar.js b/frontend/src/locales/ar.js
index 4286a4bcb..22d23b574 100644
--- a/frontend/src/locales/ar.js
+++ b/frontend/src/locales/ar.js
@@ -2528,4 +2528,6 @@ export default {
'Every Coach run is one request on your provider account. 0 means no limit.': 'كل تشغيل للمدرب هو طلب واحد على حساب مزودك. تعني 0 بلا حد.',
'Max message length': 'الحد الأقصى لطول الرسالة',
'How long a message, refinement or review note can be.': 'كم يمكن أن يطول نص رسالة أو طلب تعديل أو ملاحظة مراجعة.',
+ // --- one set's own rest (#609) ---
+ 'Rest after this set': 'الراحة بعد هذه المجموعة',
}
diff --git a/frontend/src/locales/bn.js b/frontend/src/locales/bn.js
index a67f72f0a..6dc992150 100644
--- a/frontend/src/locales/bn.js
+++ b/frontend/src/locales/bn.js
@@ -2552,4 +2552,6 @@ export default {
'Every Coach run is one request on your provider account. 0 means no limit.': 'কোচের প্রতিটি রান আপনার প্রদানকারীর অ্যাকাউন্টে একটি অনুরোধ। 0 মানে কোনো সীমা নেই।',
'Max message length': 'সর্বোচ্চ বার্তার দৈর্ঘ্য',
'How long a message, refinement or review note can be.': 'একটি বার্তা, পরিমার্জনার অনুরোধ বা পর্যালোচনা নোট কত দীর্ঘ হতে পারে।',
+ // --- one set's own rest (#609) ---
+ 'Rest after this set': 'এই সেটের পরে বিশ্রাম',
}
diff --git a/frontend/src/locales/de.js b/frontend/src/locales/de.js
index 0ba41b4bc..0fda33680 100644
--- a/frontend/src/locales/de.js
+++ b/frontend/src/locales/de.js
@@ -2493,4 +2493,6 @@ export default {
'Every Coach run is one request on your provider account. 0 means no limit.': 'Jeder Coach-Lauf ist eine Anfrage über dein Anbieterkonto. 0 bedeutet kein Limit.',
'Max message length': 'Maximale Nachrichtenlänge',
'How long a message, refinement or review note can be.': 'Wie lang eine Nachricht, ein Überarbeitungswunsch oder eine Analyse-Notiz sein darf.',
+ // --- one set's own rest (#609) ---
+ 'Rest after this set': 'Pause nach diesem Satz',
}
diff --git a/frontend/src/locales/es.js b/frontend/src/locales/es.js
index 4488dd196..de66ef21a 100644
--- a/frontend/src/locales/es.js
+++ b/frontend/src/locales/es.js
@@ -2473,4 +2473,6 @@ export default {
'Every Coach run is one request on your provider account. 0 means no limit.': 'Cada ejecución del Entrenador es una solicitud en tu cuenta del proveedor. 0 significa sin límite.',
'Max message length': 'Longitud máxima del mensaje',
'How long a message, refinement or review note can be.': 'Cuánto puede tener un mensaje, una petición de refinamiento o una nota de análisis.',
+ // --- one set's own rest (#609) ---
+ 'Rest after this set': 'Descanso tras esta serie',
}
diff --git a/frontend/src/locales/fr.js b/frontend/src/locales/fr.js
index 9ea1434c6..1f06a9de0 100644
--- a/frontend/src/locales/fr.js
+++ b/frontend/src/locales/fr.js
@@ -2473,4 +2473,6 @@ export default {
'Every Coach run is one request on your provider account. 0 means no limit.': 'Chaque exécution du Coach est une requête sur ton compte fournisseur. 0 signifie aucune limite.',
'Max message length': 'Longueur maximale du message',
'How long a message, refinement or review note can be.': 'La longueur autorisée d’un message, d’une demande de révision ou d’une note d’analyse.',
+ // --- one set's own rest (#609) ---
+ 'Rest after this set': 'Repos après cette série',
}
diff --git a/frontend/src/locales/hi.js b/frontend/src/locales/hi.js
index 6bf7e5409..2738cb47c 100644
--- a/frontend/src/locales/hi.js
+++ b/frontend/src/locales/hi.js
@@ -2473,4 +2473,6 @@ export default {
'Every Coach run is one request on your provider account. 0 means no limit.': 'कोच का हर रन आपके प्रदाता खाते पर एक अनुरोध है। 0 का अर्थ है कोई सीमा नहीं।',
'Max message length': 'अधिकतम संदेश लंबाई',
'How long a message, refinement or review note can be.': 'संदेश, सुधार अनुरोध या समीक्षा नोट कितना लंबा हो सकता है।',
+ // --- one set's own rest (#609) ---
+ 'Rest after this set': 'इस सेट के बाद आराम',
}
diff --git a/frontend/src/locales/hu.js b/frontend/src/locales/hu.js
index bdb424b94..e70dd0b6c 100644
--- a/frontend/src/locales/hu.js
+++ b/frontend/src/locales/hu.js
@@ -2476,4 +2476,6 @@ export default {
'Every Coach run is one request on your provider account. 0 means no limit.': 'Minden Edző-futtatás egy kérés a szolgáltatói fiókodon. A 0 azt jelenti, nincs korlát.',
'Max message length': 'Max. üzenethossz',
'How long a message, refinement or review note can be.': 'Milyen hosszú lehet egy üzenet, finomítási kérés vagy elemzési megjegyzés.',
+ // --- one set's own rest (#609) ---
+ 'Rest after this set': 'Pihenő e sorozat után',
}
diff --git a/frontend/src/locales/it.js b/frontend/src/locales/it.js
index 0bca92695..b7a787604 100644
--- a/frontend/src/locales/it.js
+++ b/frontend/src/locales/it.js
@@ -2473,4 +2473,6 @@ export default {
'Every Coach run is one request on your provider account. 0 means no limit.': 'Ogni esecuzione del Coach è una richiesta sul tuo account del provider. 0 significa nessun limite.',
'Max message length': 'Lunghezza massima del messaggio',
'How long a message, refinement or review note can be.': 'Quanto può essere lungo un messaggio, una richiesta di revisione o una nota di analisi.',
+ // --- one set's own rest (#609) ---
+ 'Rest after this set': 'Recupero dopo questa serie',
}
diff --git a/frontend/src/locales/ko.js b/frontend/src/locales/ko.js
index 03ed893ad..d580347aa 100644
--- a/frontend/src/locales/ko.js
+++ b/frontend/src/locales/ko.js
@@ -2473,4 +2473,6 @@ export default {
'Every Coach run is one request on your provider account. 0 means no limit.': '코치 실행은 매번 제공자 계정으로 보내는 한 번의 요청입니다. 0은 무제한을 뜻합니다.',
'Max message length': '최대 메시지 길이',
'How long a message, refinement or review note can be.': '메시지, 수정 요청 또는 리뷰 메모의 최대 길이입니다.',
+ // --- one set's own rest (#609) ---
+ 'Rest after this set': '이 세트 후 휴식',
}
diff --git a/frontend/src/locales/pl.js b/frontend/src/locales/pl.js
index 7f305ca60..27d7262b2 100644
--- a/frontend/src/locales/pl.js
+++ b/frontend/src/locales/pl.js
@@ -2473,4 +2473,6 @@ export default {
'Every Coach run is one request on your provider account. 0 means no limit.': 'Każde uruchomienie Trenera to jedno żądanie na Twoim koncie dostawcy. 0 oznacza brak limitu.',
'Max message length': 'Maksymalna długość wiadomości',
'How long a message, refinement or review note can be.': 'Jak długi może być komunikat, prośba o korektę lub notatka z analizy.',
+ // --- one set's own rest (#609) ---
+ 'Rest after this set': 'Przerwa po tej serii',
}
diff --git a/frontend/src/locales/pt.js b/frontend/src/locales/pt.js
index d521a142c..96f77b58f 100644
--- a/frontend/src/locales/pt.js
+++ b/frontend/src/locales/pt.js
@@ -2473,4 +2473,6 @@ export default {
'Every Coach run is one request on your provider account. 0 means no limit.': 'Cada execução do Treinador é um pedido na tua conta do fornecedor. 0 significa sem limite.',
'Max message length': 'Comprimento máximo da mensagem',
'How long a message, refinement or review note can be.': 'Quanto pode ter uma mensagem, um pedido de revisão ou uma nota de análise.',
+ // --- one set's own rest (#609) ---
+ 'Rest after this set': 'Descanso depois desta série',
}
diff --git a/frontend/src/locales/ru.js b/frontend/src/locales/ru.js
index eec0a9015..24a256a35 100644
--- a/frontend/src/locales/ru.js
+++ b/frontend/src/locales/ru.js
@@ -2477,4 +2477,6 @@ export default {
'Every Coach run is one request on your provider account. 0 means no limit.': 'Каждый запуск Тренера это один запрос с вашего аккаунта у провайдера. 0 означает без ограничений.',
'Max message length': 'Макс. длина сообщения',
'How long a message, refinement or review note can be.': 'Насколько длинным может быть сообщение, просьба о доработке или заметка к разбору.',
+ // --- one set's own rest (#609) ---
+ 'Rest after this set': 'Отдых после этого подхода',
}
diff --git a/frontend/src/locales/th.js b/frontend/src/locales/th.js
index 1125796c0..48fadf23b 100644
--- a/frontend/src/locales/th.js
+++ b/frontend/src/locales/th.js
@@ -2484,4 +2484,6 @@ export default {
'Every Coach run is one request on your provider account. 0 means no limit.': 'โค้ชแต่ละครั้งคือหนึ่งคำขอในบัญชีผู้ให้บริการของคุณ 0 หมายถึงไม่จำกัด',
'Max message length': 'ความยาวข้อความสูงสุด',
'How long a message, refinement or review note can be.': 'ข้อความ คำขอปรับแก้ หรือบันทึกการวิเคราะห์ยาวได้เท่าใด',
+ // --- one set's own rest (#609) ---
+ 'Rest after this set': 'พักหลังเซ็ตนี้',
}
diff --git a/frontend/src/locales/tr.js b/frontend/src/locales/tr.js
index 5e7ae78bb..847b92543 100644
--- a/frontend/src/locales/tr.js
+++ b/frontend/src/locales/tr.js
@@ -2473,4 +2473,6 @@ export default {
'Every Coach run is one request on your provider account. 0 means no limit.': 'Her Koç çalıştırması sağlayıcı hesabında bir istektir. 0 sınırsız demektir.',
'Max message length': 'Maks. mesaj uzunluğu',
'How long a message, refinement or review note can be.': 'Bir mesajın, iyileştirme isteğinin veya inceleme notunun ne kadar uzun olabileceği.',
+ // --- one set's own rest (#609) ---
+ 'Rest after this set': 'Bu setten sonra dinlenme',
}
diff --git a/frontend/src/locales/uk.js b/frontend/src/locales/uk.js
index cf1f25d31..6df36ed07 100644
--- a/frontend/src/locales/uk.js
+++ b/frontend/src/locales/uk.js
@@ -2470,4 +2470,6 @@ export default {
'Every Coach run is one request on your provider account. 0 means no limit.': 'Кожен запуск Тренера це один запит з твого акаунта в постачальника. 0 означає без обмежень.',
'Max message length': 'Макс. довжина повідомлення',
'How long a message, refinement or review note can be.': 'Наскільки довгим може бути повідомлення, прохання про доопрацювання чи нотатка до розбору.',
+ // --- one set's own rest (#609) ---
+ 'Rest after this set': 'Відпочинок після цього підходу',
}
diff --git a/frontend/src/locales/zh-TW.js b/frontend/src/locales/zh-TW.js
index 3e1e61e9c..41d37ff8d 100644
--- a/frontend/src/locales/zh-TW.js
+++ b/frontend/src/locales/zh-TW.js
@@ -2466,4 +2466,6 @@ export default {
'Every Coach run is one request on your provider account. 0 means no limit.': '教練每執行一次,就會向你的提供商帳戶發出一次請求。0 代表不限制。',
'Max message length': '最大訊息長度',
'How long a message, refinement or review note can be.': '訊息、修改要求或評論備註可以有多長。',
+ // --- one set's own rest (#609) ---
+ 'Rest after this set': '這一組後的休息',
}
diff --git a/frontend/src/locales/zh.js b/frontend/src/locales/zh.js
index 61e79dc84..55a66efb2 100644
--- a/frontend/src/locales/zh.js
+++ b/frontend/src/locales/zh.js
@@ -2473,4 +2473,6 @@ export default {
'Every Coach run is one request on your provider account. 0 means no limit.': '教练每次运行都会向你的提供商账户发送一次请求。0 表示不限制。',
'Max message length': '最大消息长度',
'How long a message, refinement or review note can be.': '消息、修改要求或点评备注可以有多长。',
+ // --- one set's own rest (#609) ---
+ 'Rest after this set': '这一组后的休息',
}
diff --git a/frontend/src/views/Workout.jsx b/frontend/src/views/Workout.jsx
index 1c255bb1a..058fe85f6 100644
--- a/frontend/src/views/Workout.jsx
+++ b/frontend/src/views/Workout.jsx
@@ -17,7 +17,7 @@ import { pinState } from '../lib/queue.js'
import { t, tn, exerciseNameFor, exerciseNameClass } from '../lib/i18n.js'
import { api, beacon } from '../lib/api.js'
import { pyramidRestFor, maxRecordAt, isPyramid, pyramidLabel } from '../lib/pyramid.js'
-import { insertionIndexAfterCurrentUnit, nextUnfinishedUnit, setProgressHighWater, supersetFlowStep, restAfterSet, restOnRecheck, restSecFor, warmupRestSecFor, sideRestFor, stepUnitIndex, advanceAfterTimedRest } from '../lib/supersetFlow.js'
+import { insertionIndexAfterCurrentUnit, nextUnfinishedUnit, setProgressHighWater, supersetFlowStep, restAfterSet, restOnRecheck, restSecFor, warmupRestSecFor, sideRestFor, ownSetRest, stepUnitIndex, advanceAfterTimedRest } from '../lib/supersetFlow.js'
import Media from '../components/Media.jsx'
import WorkoutScrollAnchor from '../components/WorkoutScrollAnchor.jsx'
import WorkoutChips from '../components/WorkoutChips.jsx'
@@ -130,6 +130,21 @@ function ExerciseBlock({ entryIdx, compact, dense, editing, onToggle, onToggleSi
const on = !isFailureSet(e.sets[i])
for (let j = start; j < start + count; j++) if (isFailureSet(e.sets[j]) !== on) e.sets[j] = toggleFailure(e.sets[j])
}, true)
+ // One set's own rest for this session (#609): null takes it away, 0 is "No timer". It sits on
+ // the set's first row, the one the rest flow reads (ownSetRest). The wheel may outlive the
+ // set it was opened for, so a Done after the rows moved or the workout changed does nothing.
+ const setRestAt = (i, sec) => {
+ const at = useStore.getState().S.active
+ const ref = { id: at?.id, entryId: at?.entries?.[entryIdx]?.id, rows: at?.entries?.[entryIdx]?.sets?.length }
+ return () => update(s => {
+ const e = s.active?.entries?.[entryIdx]
+ if (!e || s.active.id !== ref.id || e.id !== ref.entryId || e.sets.length !== ref.rows) return
+ const row = e.sets[setSpanAt(e.sets, i)[0]]
+ if (!row) return
+ if (sec == null) delete row.restSec
+ else row.restSec = Math.max(0, Math.min(REST_MAX, Math.round(sec)))
+ }, true)
+ }
const addDropRow = i => mutSet(i, row => {
// A unilateral set drops per side (issue #60): addSideDrop seeds each side from its own weight.
if (isSideSet(row)) {
@@ -435,9 +450,34 @@ function ExerciseBlock({ entryIdx, compact, dense, editing, onToggle, onToggleSi
// counting every row and making the second half look like an extra set.
const setNumOf = (s, i) => setNumberAt(entry.sets, i)
const sideTagOf = s => s.side === 'L' ? t('Left') : s.side === 'R' ? t('Right') : null
+ // What a set rests without a rest of its own, as the flow works it out (restSecFor,
+ // warmupRestSecFor), so the set menu can name it.
+ const setRestDefault = i => {
+ const all = S.active?.entries || []
+ const unit = supersetUnits(all).find(u => u.includes(entryIdx)) || [entryIdx]
+ const work = restSecFor(all, unit, S.restSec, { idx: entryIdx, sec: pyramidRestFor(entry.target, entry.sets, i) })
+ return warmupRestSecFor(entry, i, work, S.warmupRestSec)
+ }
+ const openSetRest = i => {
+ const start = setSpanAt(entry.sets, i)[0]
+ const own = ownSetRest(entry.sets[start])
+ const dflt = t('Default ({0})', fmtRest(setRestDefault(start)))
+ menuSheet({
+ title: t('Rest after this set'),
+ items: [
+ { icon: 'timer', label: dflt, on: own == null, onClick: setRestAt(start, null) },
+ { icon: 'pause', label: t('No timer'), on: own === 0, onClick: setRestAt(start, 0) },
+ { icon: 'clock', label: t('Pick a time'), on: own > 0, onClick: () => {
+ const save = sec => setRestAt(start, sec > 0 ? sec : 0)()
+ durationSheet({ title: t('Rest after this set'), value: own > 0 ? own : setRestDefault(start), max: REST_MAX, off: t('No timer'), onDone: save })
+ } },
+ ],
+ })
+ }
const openSetMenu = (s, i) => {
const warm = isWarmupRow(s)
const sideTag = sideTagOf(s)
+ const ownRestHere = ownSetRest(entry.sets[setSpanAt(entry.sets, i)[0]])
menuSheet({
title: warm ? t('Warm-up') : sideTag ? t('Set {0} ({1})', setNumOf(s, i), sideTag) : t('Set {0}', setNumOf(s, i)),
subtitle: setLabel(entry.id, s, entry.target, speedUnit),
@@ -452,6 +492,8 @@ function ExerciseBlock({ entryIdx, compact, dense, editing, onToggle, onToggleSi
// as RIR 0 wherever effort is read, unless a rating was logged on the set. A timed
// per-side pair is one set, so both halves get it.
!warm && mode !== 'cardio' && { icon: 'gauge', label: t('Taken to failure'), sub: t('Nothing left in the tank'), on: isFailureSet(s), onClick: () => toggleFailureAt(i) },
+ // Just this set's rest, this session (#609): a long one before the top set, none after a light one.
+ !editing && { icon: 'timer', label: t('Rest after this set'), sub: ownRestHere == null ? t('Default ({0})', fmtRest(setRestDefault(i))) : ownRestHere === 0 ? t('No timer') : fmtRest(ownRestHere), onClick: () => openSetRest(i) },
] },
{ title: t('Add to this set'), items: [
!warm && mode === 'reps' && !isRestPauseSet(s) && { icon: 'arrowDown', label: t('Drop set'), sub: t('+ Drop'), onClick: () => addDropRow(i) },
@@ -1777,7 +1819,9 @@ function ActiveWorkout() {
const restSec = restSecFor(fresh.entries, freshUnit || [idx], S.restSec, setRest)
// A warm-up ramp set may rest shorter than a work set (the exercise's warmupRestSec, else the
// profile's); the last ramp set, into the first work set, still gets the working rest.
- const restAfter = warmupRestSecFor(fresh.entries[idx], i, restSec, useStore.getState().S.warmupRestSec)
+ // A set given its own rest in its menu (#609) keeps it, whatever the exercise would rest.
+ const ownRest = ownSetRest(fresh.entries[idx].sets[setSpanAt(fresh.entries[idx].sets, i)[0]])
+ const restAfter = ownRest ?? warmupRestSecFor(fresh.entries[idx], i, restSec, useStore.getState().S.warmupRestSec)
// A re-check of finished work must not navigate or reopen a sheet, but it may still owe
// you a rest — see restOnRecheck, and the other half of issue #3. A rest that already ran
diff --git a/frontend/src/views/Workout.test.jsx b/frontend/src/views/Workout.test.jsx
index 014462541..a1f91236f 100644
--- a/frontend/src/views/Workout.test.jsx
+++ b/frontend/src/views/Workout.test.jsx
@@ -2929,7 +2929,7 @@ describe('workout controls: the more menu and the set menu', () => {
it('opens a per-set menu from the set number with drop, burst and remove', async () => {
await mount([exercise('plain-bench', [false, false])])
await act(async () => { container.querySelector('button[aria-label="Set 2"]').dispatchEvent(new dom.Event('click', { bubbles: true })) })
- expect(menuItemsOf(lastMenu()).map(it => it.label)).toEqual(['Make it a warm-up set', 'Taken to failure', 'Drop set', 'Rest-pause burst', 'Copy this set', 'Remove this set'])
+ expect(menuItemsOf(lastMenu()).map(it => it.label)).toEqual(['Make it a warm-up set', 'Taken to failure', 'Rest after this set', 'Drop set', 'Rest-pause burst', 'Copy this set', 'Remove this set'])
expect(item('Make it a warm-up set').icon).toBe('sunrise')
await act(async () => { item('Drop set').onClick() })
@@ -2940,6 +2940,52 @@ describe('workout controls: the more menu and the set menu', () => {
expect(mocks.S.active.entries[0].sets.length).toBe(1)
})
+ // #609: one set's rest, from its menu, this session only.
+ it('gives one set its own rest: No timer, a picked time, and back to the default', async () => {
+ await mount([exercise('ramped-squat', [false, false, false, false], {
+ target: { mode: 'reps', reps: 6, weight: 125, bodyweight: false, restSec: 150 },
+ sets: [{ w: 125, r: 6, done: false }, { w: 125, r: 6, done: false }, { w: 125, r: 6, done: false }, { w: 125, r: 6, done: false }],
+ })])
+ const openSet = async label => { await act(async () => { container.querySelector(`button[aria-label="${label}"]`).dispatchEvent(new dom.Event('click', { bubbles: true })) }) }
+ await openSet('Set 1')
+ expect(item('Rest after this set').sub).toBe('Default (2:30)')
+ await act(async () => { item('Rest after this set').onClick() })
+ expect(menuItemsOf(lastMenu()).map(it => it.label)).toEqual(['Default (2:30)', 'No timer', 'Pick a time'])
+ await act(async () => { item('No timer').onClick() })
+ expect(mocks.S.active.entries[0].sets[0].restSec).toBe(0)
+
+ await openSet('Set 2')
+ await act(async () => { item('Rest after this set').onClick() })
+ await act(async () => { item('Pick a time').onClick() })
+ const wheel = mocks.durationSheet.mock.calls.at(-1)[0]
+ expect(wheel).toMatchObject({ title: 'Rest after this set', value: 150, off: 'No timer' })
+ await act(async () => { wheel.onDone(240) })
+ expect(mocks.S.active.entries[0].sets[1].restSec).toBe(240)
+ await rerender()
+ await openSet('Set 2')
+ expect(item('Rest after this set').sub).toBe('4:00')
+
+ // The flow rests what the set says; an untouched set rests the exercise's rest.
+ await toggleSet(0)
+ expect(mocks.startRest).toHaveBeenLastCalledWith(0, 0, { forSet: 0 })
+ await toggleSet(1)
+ expect(mocks.startRest).toHaveBeenLastCalledWith(240, 0, { forSet: 1 })
+ await toggleSet(2)
+ expect(mocks.startRest).toHaveBeenLastCalledWith(150, 0, { forSet: 2 })
+
+ // Default takes it away again.
+ await openSet('Set 2')
+ await act(async () => { item('Rest after this set').onClick() })
+ await act(async () => { item('Default (2:30)').onClick() })
+ expect('restSec' in mocks.S.active.entries[0].sets[1]).toBe(false)
+ })
+
+ it('has no set rest in the editor of a saved workout', async () => {
+ await mount([exercise('plain-bench', [true, true])], 0, { active: { editingWorkoutId: 'saved' } })
+ await act(async () => { container.querySelector('button[aria-label="Set 1"]').dispatchEvent(new dom.Event('click', { bubbles: true })) })
+ expect(item('Rest after this set')).toBeFalsy()
+ })
+
it('marks a set as taken to failure from its menu, with an F on its number, and back', async () => {
await mount([exercise('plain-bench', [false, false])])
const openSet = async label => { await act(async () => { container.querySelector(`button[aria-label="${label}"]`).dispatchEvent(new dom.Event('click', { bubbles: true })) }) }