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.

Custom exercises: the target muscle is the primary tapped first, not the topmost one on the map (QA C10)

Duarte Santoscc116bdbcc01
diff --git a/frontend/src/sheets.custom-target.test.jsx b/frontend/src/sheets.custom-target.test.jsx
new file mode 100644
index 000000000..2b87ee70e
--- /dev/null
+++ b/frontend/src/sheets.custom-target.test.jsx
@@ -0,0 +1,113 @@
+// @vitest-environment happy-dom
+// QA C10. Since the muscles of a custom exercise are stored in the map's order (83b2a14), the
+// one-word target `tg` was silently taken from the sorted list: a hip thrust with Traps as an
+// extra primary became a "Traps" exercise in the library, the picker and the Muscles view, and
+// tap order no longer let the user correct it. The target is the primary picked first; an edit
+// keeps the old target while it is still a primary.
+import React, { act } from 'react'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { createRoot } from 'react-dom/client'
+import { EXIDX, registerCustom } from './lib/exercises.js'
+import { DEF, useStore } from './store/useStore.js'
+import { useUI } from './store/useUI.js'
+import { _setLangState } from './lib/i18n-core.js'
+import { bindUI } from './components/ui.jsx'
+import { customExSheet } from './sheets.jsx'
+
+bindUI(useUI) // the multi-select rows open their sheet through the shared controls
+
+const mounted = []
+const S = () => useStore.getState().S
+
+// Renders whatever sheet is on top and returns its host element.
+function renderTop() {
+ const sheet = useUI.getState().sheets.at(-1)
+ const host = document.createElement('div')
+ document.body.appendChild(host)
+ const root = createRoot(host)
+ mounted.push(root)
+ act(() => root.render(sheet.render(() => useUI.getState().closeSheet(sheet.id))))
+ return host
+}
+function type(el, value) {
+ Object.getOwnPropertyDescriptor(el.constructor.prototype, 'value').set.call(el, value)
+ el.dispatchEvent(new Event('input', { bubbles: true }))
+}
+const byText = (host, sel, text) => [...host.querySelectorAll(sel)].find(e => e.textContent.trim() === text)
+const click = (host, sel, text) => {
+ const el = byText(host, sel, text)
+ if (!el) throw new Error(`nothing with text "${text}"`)
+ act(() => el.click())
+}
+// The form's multi-select rows open a nested sheet; tap the given labels there, in order, then Done.
+function pickMuscles(form, rowTitle, labels) {
+ const row = [...form.querySelectorAll('.lrow')].find(e => e.textContent.includes(rowTitle))
+ act(() => row.click())
+ const sub = renderTop()
+ for (const l of labels) click(sub, 'button', l)
+ click(sub, 'button', 'Done')
+}
+const custom = (over = {}) => ({
+ id: 'cqa1', n: 'QA Custom Thrust', bp: 'upper legs', eq: 'barbell', custom: true, desc: '',
+ tg: 'gluteal', sm: ['forearm', 'hip-flexors'], primaries: ['gluteal'], secondaries: ['forearm', 'hip-flexors'],
+ muscleGroups: ['gluteal', 'forearm', 'hip-flexors'], ...over,
+})
+function seed(ex) {
+ useStore.setState(s => ({ S: { ...s.S, customEx: [ex] } }))
+ registerCustom([ex])
+}
+
+beforeEach(() => {
+ globalThis.IS_REACT_ACT_ENVIRONMENT = true
+ useUI.setState({ sheets: [], toastMsg: '' })
+ useStore.setState({ S: structuredClone(DEF), user: null })
+ registerCustom([])
+ _setLangState('en', null, null, null)
+ document.body.innerHTML = ''
+})
+
+afterEach(() => {
+ act(() => { mounted.splice(0).forEach(root => root.unmount()) })
+ _setLangState('en', null, null, null)
+ registerCustom([])
+})
+
+describe('custom exercise target (QA C10)', () => {
+ it('is the primary tapped first, while the stored list keeps the map order', () => {
+ customExSheet(null)
+ const form = renderTop()
+ act(() => type(form.querySelector('input.input'), 'QA Hip Thrust Pull'))
+ click(form, '.chip', 'upper legs')
+ click(form, '.chip', 'barbell')
+ pickMuscles(form, 'Primary muscle groups', ['Hamstrings', 'Glutes', 'Traps'])
+ click(form, 'button', 'Create exercise')
+ const c = S().customEx.find(x => x.n === 'QA Hip Thrust Pull')
+ expect(c.primaries).toEqual(['trapezius', 'gluteal', 'hamstring'])
+ expect(c.tg).toBe('hamstring')
+ expect(c.muscleGroups).toEqual(['trapezius', 'gluteal', 'hamstring'])
+ })
+
+ it('survives an edit that adds a primary higher up the body', () => {
+ const ex = custom({ tg: 'hamstring', primaries: ['gluteal', 'hamstring'], secondaries: [], sm: [], muscleGroups: ['gluteal', 'hamstring'] })
+ seed(ex)
+ customExSheet(EXIDX[ex.id])
+ const form = renderTop()
+ pickMuscles(form, 'Primary muscle groups', ['Traps'])
+ click(form, 'button', 'Save')
+ const c = S().customEx[0]
+ expect(c.primaries).toEqual(['trapezius', 'gluteal', 'hamstring'])
+ expect(c.tg).toBe('hamstring')
+ })
+
+ it('moves to another primary only when the old target is dropped', () => {
+ const ex = custom({ tg: 'hamstring', primaries: ['gluteal', 'hamstring'], secondaries: [], sm: [], muscleGroups: ['gluteal', 'hamstring'] })
+ seed(ex)
+ customExSheet(EXIDX[ex.id])
+ const form = renderTop()
+ pickMuscles(form, 'Primary muscle groups', ['Hamstrings']) // untick it
+ click(form, 'button', 'Save')
+ const c = S().customEx[0]
+ expect(c.primaries).toEqual(['gluteal'])
+ expect(c.tg).toBe('gluteal')
+ })
+})
diff --git a/frontend/src/sheets.jsx b/frontend/src/sheets.jsx
index 019bd8894..6b872a58a 100644
--- a/frontend/src/sheets.jsx
+++ b/frontend/src/sheets.jsx
@@ -795,13 +795,17 @@ function CustomExForm({ existing, prefill, onDone, close }) {
const prim = bp === 'cardio' ? ['cardiovascular system'] : inMuscleOrder(primaries)
const sm = inMuscleOrder(secondaries.filter(m => !prim.includes(m)))
const groups = [...prim, ...sm]
+ // The one-word target (the library row, the picker, the Muscles view) is not the sorted list's
+ // head — a hip thrust with Traps as an extra primary is not a Traps exercise. It is the primary
+ // tapped first, and an edit keeps the exercise's target as long as that muscle is still a primary.
+ const tg = (existing && prim.includes(existing.tg)) ? existing.tg : (primaries.find(m => prim.includes(m)) || prim[0] || '')
let id = existing && existing.id
if (existing) update(s => { const c = (s.customEx || []).find(x => x.id === id); if (c) {
- c.n = name; c.bp = bp; c.desc = d; c.tg = prim[0] || ''; c.sm = sm; c.muscleGroups = groups; c.primaries = prim; c.secondaries = sm; c.eq = eq
+ c.n = name; c.bp = bp; c.desc = d; c.tg = tg; c.sm = sm; c.muscleGroups = groups; c.primaries = prim; c.secondaries = sm; c.eq = eq
} })
else {
id = 'c' + uid()
- update(s => { (s.customEx = s.customEx || []).push({ id, n: name, bp, desc: d, tg: prim[0] || '', sm, muscleGroups: groups, primaries: prim, secondaries: sm, eq, custom: true }) })
+ update(s => { (s.customEx = s.customEx || []).push({ id, n: name, bp, desc: d, tg, sm, muscleGroups: groups, primaries: prim, secondaries: sm, eq, custom: true }) })
}
close()
toast(existing ? t('Saved') : t('“{0}” created', name))