-
-
- ← Zurück zur Modul‑Bibliothek
-
-
+
{isNew ? 'Neues Trainingsmodul' : 'Trainingsmodul bearbeiten'}
Reihenfolge der Positionen entspricht der späteren Übernahme in einen Abschnitt der Einheit (Kopie).
@@ -670,7 +685,7 @@ export default function TrainingModuleEditPage() {
saving={saving}
onSave={() => handleSave()}
onSaveAndClose={handleSaveAndClose}
- onCancel={() => navigate('/planning/training-modules')}
+ onCancel={goBack}
cancelLabel="Abbrechen"
/>
diff --git a/frontend/src/pages/TrainingUnitEditPage.jsx b/frontend/src/pages/TrainingUnitEditPage.jsx
index 45b0745..ae5841e 100644
--- a/frontend/src/pages/TrainingUnitEditPage.jsx
+++ b/frontend/src/pages/TrainingUnitEditPage.jsx
@@ -33,6 +33,7 @@ import PageFormEditorChrome from '../components/PageFormEditorChrome'
import UnsavedChangesPrompt from '../components/UnsavedChangesPrompt'
import { useBeforeUnloadWhen, useUnsavedChangesBlocker } from '../hooks/useUnsavedChangesBlocker'
import { buildPlanUnitEditPath, planningHubPathFromReturnState } from '../utils/planningUnitRoutes'
+import { goNavReturn, buildCurrentLocationReturnContext } from '../utils/navReturnContext'
export default function TrainingUnitEditPage() {
const { id: routeId } = useParams()
@@ -119,8 +120,16 @@ export default function TrainingUnitEditPage() {
const [saveModuleOpen, setSaveModuleOpen] = useState(false)
const goBack = useCallback(() => {
- navigate(planningHubPathFromReturnState(location.state?.planningReturn))
- }, [location.state, navigate])
+ goNavReturn(navigate, location, {
+ path: planningHubPathFromReturnState(location.state?.planningReturn),
+ label: 'Zurück zur Planung',
+ })
+ }, [location, navigate])
+
+ const moduleSaveReturnContext = useMemo(
+ () => buildCurrentLocationReturnContext(location, 'Zurück zur Trainingseinheit'),
+ [location]
+ )
const planningClubId = useMemo(() => {
const gid = Number(formData.group_id)
@@ -731,6 +740,7 @@ export default function TrainingUnitEditPage() {
onSuccess={() => setSaveModuleOpen(false)}
unitId={editingUnit?.id}
planningModalClubId={planningClubId}
+ returnContext={moduleSaveReturnContext}
/>
|object} hubState */
+export function buildPlanningHubReturnContext(hubState = {}) {
+ const payload = buildPlanningHubReturnState(hubState)
+ return buildNavReturnContext({
+ path: planningHubPathFromReturnState(payload),
+ label: 'Zurück zur Planung',
+ kind: 'planningHub',
+ payload,
+ })
+}
+
+/** Legacy planningReturn → appReturn */
+export function appReturnFromPlanningReturn(planningReturn) {
+ if (!planningReturn || planningReturn.v !== 1) return null
+ return buildPlanningHubReturnContext(planningReturn)
+}
+
+/**
+ * @param {import('react-router-dom').Location|{ state?: object }|null|undefined} location
+ */
+export function readNavReturnFromLocation(location) {
+ const state = location?.state
+ if (!state || typeof state !== 'object') return null
+ const raw = state[NAV_RETURN_STATE_KEY]
+ if (raw?.v === 1 && raw.path && raw.label) return raw
+ if (state.planningReturn) return appReturnFromPlanningReturn(state.planningReturn)
+ return null
+}
+
+/**
+ * @param {import('react-router-dom').Location|{ state?: object }|null|undefined} location
+ * @param {{ path: string, label: string }|null|undefined} fallback
+ */
+export function resolveNavReturnTarget(location, fallback) {
+ const ctx = readNavReturnFromLocation(location)
+ if (ctx?.path && ctx?.label) {
+ return { path: ctx.path, label: ctx.label, fromContext: true }
+ }
+ if (fallback?.path && fallback?.label) {
+ return { path: fallback.path, label: fallback.label, fromContext: false }
+ }
+ return null
+}
+
+/**
+ * @param {import('react-router-dom').NavigateFunction} navigate
+ * @param {import('react-router-dom').Location|{ state?: object }|null|undefined} location
+ * @param {{ path?: string, label?: string }|null|undefined} fallback
+ */
+export function goNavReturn(navigate, location, fallback) {
+ const target = resolveNavReturnTarget(location, fallback)
+ if (target?.fromContext && target.path) {
+ navigate(target.path)
+ return
+ }
+ if (typeof window !== 'undefined' && window.history.length > 1) {
+ navigate(-1)
+ return
+ }
+ if (fallback?.path) {
+ navigate(fallback.path)
+ return
+ }
+ navigate('/')
+}
+
+/**
+ * @param {import('react-router-dom').NavigateFunction} navigate
+ * @param {string} to
+ * @param {ReturnType|null|undefined} returnContext
+ * @param {object} [options]
+ */
+export function navigateWithAppReturn(navigate, to, returnContext, options = {}) {
+ const state = { ...(options.state || {}) }
+ if (returnContext) state[NAV_RETURN_STATE_KEY] = returnContext
+ navigate(to, { ...options, state })
+}
+
+/**
+ * Bestehenden appReturn (oder Legacy planningReturn) beim Weiterleiten erhalten.
+ */
+export function preserveAppReturnOnNavigate(navigate, location, to, options = {}) {
+ const existing = readNavReturnFromLocation(location)
+ const state = { ...(options.state || {}) }
+ if (existing) state[NAV_RETURN_STATE_KEY] = existing
+ navigate(to, { ...options, state })
+}
diff --git a/frontend/src/utils/navReturnContext.test.js b/frontend/src/utils/navReturnContext.test.js
new file mode 100644
index 0000000..a9dc92f
--- /dev/null
+++ b/frontend/src/utils/navReturnContext.test.js
@@ -0,0 +1,85 @@
+import { describe, expect, it, vi } from 'vitest'
+import {
+ appReturnFromPlanningReturn,
+ buildExercisesListReturnContext,
+ buildNavReturnContext,
+ buildPlanningHubReturnContext,
+ goNavReturn,
+ readNavReturnFromLocation,
+ resolveNavReturnTarget,
+} from './navReturnContext.js'
+
+describe('navReturnContext', () => {
+ it('buildNavReturnContext requires path and label', () => {
+ expect(buildNavReturnContext({ path: '/x', label: 'Zurück' })).toEqual({
+ v: 1,
+ path: '/x',
+ label: 'Zurück',
+ })
+ expect(buildNavReturnContext({ path: '', label: 'X' })).toBeNull()
+ })
+
+ it('buildExercisesListReturnContext', () => {
+ const ctx = buildExercisesListReturnContext()
+ expect(ctx.path).toBe('/exercises')
+ expect(ctx.kind).toBe('exerciseList')
+ })
+
+ it('readNavReturnFromLocation prefers appReturn', () => {
+ const ctx = buildExercisesListReturnContext()
+ expect(readNavReturnFromLocation({ state: { appReturn: ctx } })).toEqual(ctx)
+ })
+
+ it('readNavReturnFromLocation bridges planningReturn', () => {
+ const loc = {
+ state: {
+ planningReturn: {
+ v: 1,
+ selectedGroupId: '3',
+ planView: 'list',
+ calendarMonthStr: '',
+ startDate: '',
+ endDate: '',
+ planScope: 'group',
+ assignedToMeOnly: false,
+ },
+ },
+ }
+ const ctx = readNavReturnFromLocation(loc)
+ expect(ctx?.kind).toBe('planningHub')
+ expect(ctx?.path).toContain('/planning')
+ expect(ctx?.label).toBe('Zurück zur Planung')
+ })
+
+ it('appReturnFromPlanningReturn', () => {
+ const ctx = appReturnFromPlanningReturn({
+ v: 1,
+ selectedGroupId: '',
+ planView: 'calendar',
+ calendarMonthStr: '2026-05',
+ startDate: '',
+ endDate: '',
+ planScope: 'group',
+ assignedToMeOnly: false,
+ })
+ expect(ctx?.path).toContain('month=2026-05')
+ })
+
+ it('resolveNavReturnTarget uses fallback when no state', () => {
+ const fb = { path: '/planning/training-modules', label: 'Zurück zur Modul-Bibliothek' }
+ expect(resolveNavReturnTarget({ state: null }, fb)).toEqual({ ...fb, fromContext: false })
+ })
+
+ it('goNavReturn navigates to context path first', () => {
+ const navigate = vi.fn()
+ const ctx = buildExercisesListReturnContext()
+ goNavReturn(navigate, { state: { appReturn: ctx } }, null)
+ expect(navigate).toHaveBeenCalledWith('/exercises')
+ })
+
+ it('buildPlanningHubReturnContext', () => {
+ const ctx = buildPlanningHubReturnContext({ selectedGroupId: '7', planView: 'list' })
+ expect(ctx?.path).toContain('group=7')
+ expect(ctx?.kind).toBe('planningHub')
+ })
+})