+ {candidateInteraction === 'button' && typeof onCandidatePeek === 'function' && candRows.length > 0 ? (
+
+ ) : candidateInteraction === 'link' && candRows.length > 0 ? (
+
Zeit / Steuerung
diff --git a/frontend/src/components/ExerciseFullContent.jsx b/frontend/src/components/ExerciseFullContent.jsx
index 9615ac1..6458396 100644
--- a/frontend/src/components/ExerciseFullContent.jsx
+++ b/frontend/src/components/ExerciseFullContent.jsx
@@ -54,9 +54,18 @@ function metaParts(exercise) {
}
/**
- * @param {{ exercise?: object|null, loading?: boolean, error?: string|null, exerciseId?: number, variantId?: number|string|null, planningComboMethodProfile?: object|null, catalogMethodProfileSnapshot?: object|null }} props
+ * @param {{ exercise?: object|null, loading?: boolean, error?: string|null, exerciseId?: number, variantId?: number|string|null, planningComboMethodProfile?: object|null, catalogMethodProfileSnapshot?: object|null, onCandidateExercisePeek?: (exerciseId: number) => void }} props
*/
-export default function ExerciseFullContent({ exercise, loading, error, exerciseId, variantId, planningComboMethodProfile, catalogMethodProfileSnapshot }) {
+export default function ExerciseFullContent({
+ exercise,
+ loading,
+ error,
+ exerciseId,
+ variantId,
+ planningComboMethodProfile,
+ catalogMethodProfileSnapshot,
+ onCandidateExercisePeek,
+}) {
if (loading) {
return (
@@ -129,6 +138,7 @@ export default function ExerciseFullContent({ exercise, loading, error, exercise
combinationSlots={exercise.combination_slots}
methodArchetype={exercise.method_archetype}
methodProfile={coachComboProfile}
+ onOpenCandidatePeek={onCandidateExercisePeek}
/>
) : null}
{exercise.title}
diff --git a/frontend/src/components/ExercisePeekModal.jsx b/frontend/src/components/ExercisePeekModal.jsx
index e3efdb8..9fae195 100644
--- a/frontend/src/components/ExercisePeekModal.jsx
+++ b/frontend/src/components/ExercisePeekModal.jsx
@@ -1,7 +1,8 @@
/**
* Schnellansicht einer Übung aus dem Katalog (ohne die Planungsseite zu verlassen).
+ * Unterstützt Drill-down zu Kandidaten-Übungen bei Kombinationen inkl. „Zurück“ (PWA-sicher).
*/
-import React, { useEffect, useMemo, useState } from 'react'
+import React, { useEffect, useMemo, useRef, useState } from 'react'
import { Link } from 'react-router-dom'
import api from '../utils/api'
import ExerciseRichTextBlock from './ExerciseRichTextBlock'
@@ -25,6 +26,8 @@ function TagMini({ exercise }) {
)
}
+/** @typedef {{ exerciseId: number, variantId?: number | null, peekExtras?: object | null }} PeekStackEntry */
+
export default function ExercisePeekModal({
open,
exerciseId,
@@ -37,36 +40,37 @@ export default function ExercisePeekModal({
const [loading, setLoading] = useState(false)
const [err, setErr] = useState(null)
const [exercise, setExercise] = useState(null)
+ /** @type {[PeekStackEntry[], React.Dispatch
>]} */
+ const [stack, setStack] = useState([])
- const variant =
- variantId != null && variantId !== '' && exercise?.variants?.length
- ? exercise.variants.find((v) => String(v.id) === String(variantId)) || null
- : null
-
- const isCombination =
- exercise &&
- String(exercise.exercise_kind || 'simple').toLowerCase().trim() === 'combination'
-
- const comboMethodProfileEffective = useMemo(() => {
- if (!exercise || !isCombination) return {}
- const fromPeek =
- peekExtras?.catalog_method_profile &&
- typeof peekExtras.catalog_method_profile === 'object' &&
- !Array.isArray(peekExtras.catalog_method_profile) &&
- Object.keys(peekExtras.catalog_method_profile).length > 0
- ? peekExtras.catalog_method_profile
- : exercise.method_profile || {}
- return effectiveComboMethodProfile(fromPeek, peekExtras?.planning_method_profile ?? null)
- }, [exercise, isCombination, peekExtras])
+ /** @type {React.MutableRefObject} */
+ const wasOpenRef = useRef(false)
useEffect(() => {
if (!open) {
- setExercise(null)
- setErr(null)
+ setStack([])
+ wasOpenRef.current = false
return
}
- if (!exerciseId) {
- setErr('Keine Übung gewählt')
+ if (exerciseId == null || exerciseId === '') return
+ if (!wasOpenRef.current) {
+ wasOpenRef.current = true
+ setStack([
+ {
+ exerciseId: Number(exerciseId),
+ variantId: variantId ?? null,
+ peekExtras: peekExtras ?? null,
+ },
+ ])
+ }
+ }, [open, exerciseId, variantId, peekExtras])
+
+ const top = stack.length ? stack[stack.length - 1] : null
+
+ useEffect(() => {
+ if (!open || !top?.exerciseId) {
+ setExercise(null)
+ setErr(null)
return
}
let cancelled = false
@@ -74,7 +78,7 @@ export default function ExercisePeekModal({
setLoading(true)
setErr(null)
try {
- const data = await api.getExercise(exerciseId)
+ const data = await api.getExercise(top.exerciseId)
if (!cancelled) setExercise(data)
} catch (e) {
if (!cancelled) setErr(e.message || 'Laden fehlgeschlagen')
@@ -85,7 +89,40 @@ export default function ExercisePeekModal({
return () => {
cancelled = true
}
- }, [open, exerciseId, variantId])
+ }, [open, top?.exerciseId])
+
+ const variant =
+ top?.variantId != null &&
+ top.variantId !== '' &&
+ exercise?.variants?.length
+ ? exercise.variants.find((v) => String(v.id) === String(top.variantId)) || null
+ : null
+
+ const isCombination =
+ exercise && String(exercise.exercise_kind || 'simple').toLowerCase().trim() === 'combination'
+
+ const comboMethodProfileEffective = useMemo(() => {
+ if (!exercise || !isCombination) return {}
+ const fromPeek =
+ top?.peekExtras?.catalog_method_profile &&
+ typeof top.peekExtras.catalog_method_profile === 'object' &&
+ !Array.isArray(top.peekExtras.catalog_method_profile) &&
+ Object.keys(top.peekExtras.catalog_method_profile).length > 0
+ ? top.peekExtras.catalog_method_profile
+ : exercise.method_profile || {}
+ return effectiveComboMethodProfile(fromPeek, top?.peekExtras?.planning_method_profile ?? null)
+ }, [exercise, isCombination, top?.peekExtras])
+
+ const planningAdjustedBadge =
+ top?.peekExtras?.planning_method_profile != null &&
+ typeof top.peekExtras.planning_method_profile === 'object' &&
+ !Array.isArray(top.peekExtras.planning_method_profile)
+
+ const pushCandidatePeek = (id) => {
+ const n = Number(id)
+ if (!Number.isFinite(n)) return
+ setStack((s) => [...s, { exerciseId: n, variantId: null, peekExtras: null }])
+ }
if (!open) return null
@@ -107,9 +144,19 @@ export default function ExercisePeekModal({
}}
onClick={(e) => e.stopPropagation()}
>
-
-
- {loading ? '…' : exercise?.title || titleFallback || `Übung #${exerciseId}`}
+
+ {stack.length > 1 ? (
+
+ ) : null}
+
+ {loading ? '…' : exercise?.title || titleFallback || (top?.exerciseId != null ? `Übung #${top.exerciseId}` : 'Übung')}
- {exerciseId && (
+ {top?.exerciseId != null ? (
-
+
Vollständige Übungsseite öffnen
- )}
+ ) : null}
)
diff --git a/frontend/src/components/TrainingUnitSectionsEditor.jsx b/frontend/src/components/TrainingUnitSectionsEditor.jsx
index f6fdea9..995802d 100644
--- a/frontend/src/components/TrainingUnitSectionsEditor.jsx
+++ b/frontend/src/components/TrainingUnitSectionsEditor.jsx
@@ -1596,6 +1596,12 @@ export default function TrainingUnitSectionsEditor({
typeof comboPlanningModalItem.planning_method_profile === 'object' &&
!Array.isArray(comboPlanningModalItem.planning_method_profile)
}
+ candidateInteraction={onPeekExercise ? 'button' : 'none'}
+ onCandidatePeek={
+ onPeekExercise
+ ? (exId) => onPeekExercise(Number(exId), null, undefined)
+ : undefined
+ }
/>
) : (
diff --git a/frontend/src/pages/ExerciseDetailPage.jsx b/frontend/src/pages/ExerciseDetailPage.jsx
index 3888320..aa35822 100644
--- a/frontend/src/pages/ExerciseDetailPage.jsx
+++ b/frontend/src/pages/ExerciseDetailPage.jsx
@@ -5,7 +5,6 @@ import ExerciseRichTextBlock from '../components/ExerciseRichTextBlock'
import ExerciseAttachmentMediaStrip from '../components/ExerciseAttachmentMediaStrip'
import CombinationPlanBracket from '../components/CombinationPlanBracket'
import { formatSkillLevelSlug } from '../constants/skillLevels'
-import { sortCombinationSlotsForDisplay } from '../constants/combinationArchetypes'
function TagRow({ exercise }) {
const tags = []
@@ -52,28 +51,6 @@ function metaParts(exercise) {
return parts
}
-/** Eindeutige Kandidaten-Übungen für Schnellnavigation unter der Klammerdarstellung */
-function flattenCombinationCandidateLinks(slots) {
- const rows = []
- const seen = new Set()
- sortCombinationSlotsForDisplay(slots || []).forEach((s) => {
- const cands =
- s.candidates && s.candidates.length
- ? s.candidates
- : (s.candidate_exercise_ids || []).map((id) => ({
- exercise_id: id,
- title: null,
- }))
- cands.forEach((c) => {
- const eid = c.exercise_id
- if (eid == null || seen.has(eid)) return
- seen.add(eid)
- rows.push({ exercise_id: eid, title: (c.title || '').trim() || null })
- })
- })
- return rows
-}
-
function ExerciseDetailPage() {
const { id } = useParams()
const navigate = useNavigate()
@@ -135,9 +112,6 @@ function ExerciseDetailPage() {
(exercise.exercise_kind || '').toLowerCase().trim() === 'combination' &&
Array.isArray(exercise.combination_slots) &&
exercise.combination_slots.length > 0
- const combinationCandidateLinks = isCombinationDetail
- ? flattenCombinationCandidateLinks(exercise.combination_slots)
- : []
const catalogMethodProfileForBracket =
exercise.method_profile &&
typeof exercise.method_profile === 'object' &&
@@ -186,20 +160,9 @@ function ExerciseDetailPage() {
methodProfile={catalogMethodProfileForBracket}
combinationSlots={exercise.combination_slots}
planningAdjusted={false}
+ candidateInteraction="link"
/>