04-06: Plan persistence improvements and implement draft persistence
- Created 04-06-PLAN.md outlining persistence improvements phases - Phase 04-06-01: Draft persistence via localStorage - Added useDraftWorkout hook for auto-saving/loading drafts - Integrated hook into WorkoutEditPage - Added draft recovery prompt UI - Drafts cleared after successful save - Phase 04-06-02: Save error handling & retry (scaffolding) - Added error state and syncStatus tracking - Added handleRetry() for failed saves - Error banner with retry button - Phase 04-06-03: Sync status UI (scaffolding) - Added visual feedback for save progress - Status indicators: saving, saved, error - Disabled UI during save to prevent conflicts - Created comprehensive styles for new UI components Status: 04-06-01 complete and integrated. Ready for testing.
This commit is contained in:
@@ -1,13 +1,27 @@
|
||||
import { useState } from 'react'
|
||||
import { Icon } from '../components/Icons'
|
||||
import ExercisePicker from '../components/ExercisePicker'
|
||||
import { useDraftWorkout } from '../hooks/useDraftWorkout'
|
||||
import './WorkoutEditPage.css'
|
||||
|
||||
export default function WorkoutEditPage({ workout, onBack, onSave }) {
|
||||
const [exercises, setExercises] = useState(workout.exercises || [])
|
||||
const { exercises, setExercises, clearDraft, hasDraft, restoreDraft } =
|
||||
useDraftWorkout(workout.id, workout.exercises || [])
|
||||
|
||||
const [pickerOpen, setPickerOpen] = useState(false)
|
||||
const [swapIndex, setSwapIndex] = useState(null) // null = adding, number = swapping
|
||||
const [saving, setSaving] = useState(false)
|
||||
const [error, setError] = useState(null)
|
||||
const [syncStatus, setSyncStatus] = useState('idle') // idle | saving | saved | error
|
||||
const [draftPromptShown, setDraftPromptShown] = useState(false)
|
||||
|
||||
// Show draft recovery prompt on first render
|
||||
const handleRecoverDraft = () => {
|
||||
if (hasDraft && !draftPromptShown) {
|
||||
setDraftPromptShown(true)
|
||||
// Prompt is shown via conditional rendering below
|
||||
}
|
||||
}
|
||||
|
||||
const handleOpenPicker = (index = null) => {
|
||||
setSwapIndex(index)
|
||||
@@ -54,10 +68,14 @@ export default function WorkoutEditPage({ workout, onBack, onSave }) {
|
||||
}
|
||||
return ex
|
||||
}))
|
||||
// Clear error state on user edit
|
||||
if (error) setError(null)
|
||||
}
|
||||
|
||||
const handleSave = async () => {
|
||||
setSaving(true)
|
||||
setSyncStatus('saving')
|
||||
setError(null)
|
||||
try {
|
||||
// Format for API
|
||||
const payload = {
|
||||
@@ -69,29 +87,119 @@ export default function WorkoutEditPage({ workout, onBack, onSave }) {
|
||||
}))
|
||||
}
|
||||
await onSave(workout.id, payload)
|
||||
|
||||
// Success: clear draft and show confirmation
|
||||
clearDraft()
|
||||
setSyncStatus('saved')
|
||||
|
||||
// Reset status after 2 seconds
|
||||
setTimeout(() => setSyncStatus('idle'), 2000)
|
||||
} catch (err) {
|
||||
console.error('Failed to save workout:', err)
|
||||
setError(err.message || 'Sparning misslyckades. Försök igen.')
|
||||
setSyncStatus('error')
|
||||
// Keep draft on error so user doesn't lose work
|
||||
} finally {
|
||||
setSaving(false)
|
||||
}
|
||||
}
|
||||
|
||||
const handleRetry = () => {
|
||||
handleSave()
|
||||
}
|
||||
|
||||
const handleDiscardDraft = () => {
|
||||
clearDraft()
|
||||
setDraftPromptShown(true)
|
||||
// Reset exercises to original
|
||||
setExercises(workout.exercises || [])
|
||||
}
|
||||
|
||||
// Show draft recovery prompt if we have a draft and haven't shown it yet
|
||||
const showDraftPrompt = hasDraft && !draftPromptShown
|
||||
if (showDraftPrompt) {
|
||||
handleRecoverDraft()
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="edit-page">
|
||||
{/* Draft Recovery Prompt */}
|
||||
{showDraftPrompt && (
|
||||
<div className="draft-prompt-overlay">
|
||||
<div className="draft-prompt-modal">
|
||||
<h2>Du har sparat ändringar</h2>
|
||||
<p>Vi hittade ett utkast från din senaste redigering. Vill du fortsätta eller börja om?</p>
|
||||
<div className="draft-prompt-actions">
|
||||
<button
|
||||
className="btn btn-secondary"
|
||||
onClick={handleDiscardDraft}
|
||||
>
|
||||
Börja om
|
||||
</button>
|
||||
<button
|
||||
className="btn btn-primary"
|
||||
onClick={() => setDraftPromptShown(true)}
|
||||
>
|
||||
Fortsätt redigering
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<header className="page-header">
|
||||
<button className="back-btn" onClick={onBack}>
|
||||
<button className="back-btn" onClick={onBack} disabled={saving}>
|
||||
<Icon name="arrowLeft" size={18} /> Avbryt
|
||||
</button>
|
||||
<h1>Redigera pass</h1>
|
||||
<button
|
||||
className="save-header-btn"
|
||||
onClick={handleSave}
|
||||
disabled={saving}
|
||||
>
|
||||
{saving ? 'Sparar...' : 'Spara'}
|
||||
</button>
|
||||
<div className="save-header-group">
|
||||
{syncStatus === 'saved' && (
|
||||
<span className="sync-status saved">
|
||||
<Icon name="checkmark" size={16} /> Sparat
|
||||
</span>
|
||||
)}
|
||||
{syncStatus === 'error' && (
|
||||
<span className="sync-status error">
|
||||
<Icon name="alert" size={16} /> Fel
|
||||
</span>
|
||||
)}
|
||||
<button
|
||||
className="save-header-btn"
|
||||
onClick={handleSave}
|
||||
disabled={saving}
|
||||
>
|
||||
{syncStatus === 'saving' && (
|
||||
<>
|
||||
<Icon name="spinner" size={16} /> Sparar...
|
||||
</>
|
||||
)}
|
||||
{syncStatus !== 'saving' && 'Spara'}
|
||||
</button>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
{/* Error Banner */}
|
||||
{error && (
|
||||
<div className="error-banner">
|
||||
<div className="error-message">
|
||||
<Icon name="alert" size={18} />
|
||||
<span>{error}</span>
|
||||
</div>
|
||||
<div className="error-actions">
|
||||
<button className="btn-retry" onClick={handleRetry}>
|
||||
Försök igen
|
||||
</button>
|
||||
<button
|
||||
className="btn-close"
|
||||
onClick={() => setError(null)}
|
||||
aria-label="Stäng"
|
||||
>
|
||||
×
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<main className="edit-main">
|
||||
<div className="workout-meta-card">
|
||||
<h2>{workout.name}</h2>
|
||||
@@ -111,6 +219,7 @@ export default function WorkoutEditPage({ workout, onBack, onSave }) {
|
||||
className="icon-btn"
|
||||
onClick={() => handleOpenPicker(i)}
|
||||
aria-label="Byt övning"
|
||||
disabled={saving}
|
||||
>
|
||||
<Icon name="swap" size={18} />
|
||||
</button>
|
||||
@@ -118,6 +227,7 @@ export default function WorkoutEditPage({ workout, onBack, onSave }) {
|
||||
className="icon-btn delete"
|
||||
onClick={() => handleRemove(i)}
|
||||
aria-label="Ta bort övning"
|
||||
disabled={saving}
|
||||
>
|
||||
<Icon name="trash" size={18} />
|
||||
</button>
|
||||
@@ -132,6 +242,7 @@ export default function WorkoutEditPage({ workout, onBack, onSave }) {
|
||||
value={ex.sets}
|
||||
onChange={e => handleUpdate(i, 'sets', e.target.value)}
|
||||
min="1"
|
||||
disabled={saving}
|
||||
/>
|
||||
</div>
|
||||
<div className="setting-group">
|
||||
@@ -141,6 +252,7 @@ export default function WorkoutEditPage({ workout, onBack, onSave }) {
|
||||
value={ex.reps_min}
|
||||
onChange={e => handleUpdate(i, 'reps_min', e.target.value)}
|
||||
min="1"
|
||||
disabled={saving}
|
||||
/>
|
||||
</div>
|
||||
<div className="setting-group">
|
||||
@@ -150,6 +262,7 @@ export default function WorkoutEditPage({ workout, onBack, onSave }) {
|
||||
value={ex.reps_max}
|
||||
onChange={e => handleUpdate(i, 'reps_max', e.target.value)}
|
||||
min="1"
|
||||
disabled={saving}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
@@ -157,7 +270,11 @@ export default function WorkoutEditPage({ workout, onBack, onSave }) {
|
||||
))}
|
||||
</div>
|
||||
|
||||
<button className="add-exercise-btn" onClick={() => handleOpenPicker(null)}>
|
||||
<button
|
||||
className="add-exercise-btn"
|
||||
onClick={() => handleOpenPicker(null)}
|
||||
disabled={saving}
|
||||
>
|
||||
<Icon name="plus" size={20} />
|
||||
Lägg till övning
|
||||
</button>
|
||||
|
||||
Reference in New Issue
Block a user