get the mesocycle in runes too

WhyAsh5114 · Jun 23, 2024 · 5884244 · 5884244
1 parent 6c2ddd6
commit 5884244
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/src/routes/mesocycles/[mesocycleId]/edit-split/exercises/+page.svelte b/src/routes/mesocycles/[mesocycleId]/edit-split/exercises/+page.svelte
@@ -16,6 +16,7 @@
 	import DndComponent from '$lib/components/mesocycleAndExerciseSplit/DndComponent.svelte';
 	import SwapExercisesDialog from '$lib/components/mesocycleAndExerciseSplit/SwapExercisesDialog.svelte';
 	import ExerciseSplitDrawer from '$lib/components/mesocycleAndExerciseSplit/ExerciseSplitDrawer.svelte';
+	import type { Mesocycle } from '@prisma/client';
 
 	let swapDialogOpen = $state(false);
 	let reordering = $state(false);
@@ -68,6 +69,7 @@
 				</div>
 				<ExerciseSplitDrawer
 					context="mesocycle"
+					mesocycle={mesocycleExerciseSplitRunes.mesocycle as Mesocycle}
 					addExercise={mesocycleExerciseSplitRunes.addExercise}
 					editExercise={mesocycleExerciseSplitRunes.editExercise}
 					setEditingExercise={mesocycleExerciseSplitRunes.setEditingExercise}

diff --git a/src/routes/mesocycles/[mesocycleId]/edit-split/mesocycleExerciseSplitRunes.svelte.ts b/src/routes/mesocycles/[mesocycleId]/edit-split/mesocycleExerciseSplitRunes.svelte.ts
@@ -1,4 +1,4 @@
-import type { Prisma } from '@prisma/client';
+import type { Mesocycle, Prisma } from '@prisma/client';
 
 export type FullMesocycleWithExerciseSplit = Prisma.MesocycleGetPayload<{
 	include: { mesocycleExerciseSplitDays: { include: { mesocycleSplitDayExercises: true } } };
@@ -12,7 +12,7 @@ type MesocycleExerciseTemplateWithoutIds =
 	Prisma.MesocycleExerciseTemplateCreateWithoutMesocycleExerciseSplitDayInput;
 
 export function createMesocycleExerciseSplitRunes() {
-	let mesocycleId: string | null = $state(null);
+	let mesocycle: Mesocycle | null = $state(null);
 	let splitDays: MesocycleExerciseSplitDayWithoutIds[] = $state(
 		Array.from({ length: 7 }).map(() => ({ name: '', isRestDay: false }))
 	);
@@ -24,7 +24,7 @@ export function createMesocycleExerciseSplitRunes() {
 
 	if (globalThis.localStorage) {
 		const savedState = localStorage.getItem('mesocycleExerciseSplitRunes');
-		if (savedState) ({ splitDays, splitExercises, mesocycleId } = JSON.parse(savedState));
+		if (savedState) ({ splitDays, splitExercises, mesocycle } = JSON.parse(savedState));
 	}
 
 	function addSplitDay() {
@@ -129,12 +129,12 @@ export function createMesocycleExerciseSplitRunes() {
 	function saveStoresToLocalStorage() {
 		localStorage.setItem(
 			'mesocycleExerciseSplitRunes',
-			JSON.stringify({ splitDays, splitExercises, mesocycleId })
+			JSON.stringify({ splitDays, splitExercises, mesocycle })
 		);
 	}
 
 	function resetStores() {
-		mesocycleId = null;
+		mesocycle = null;
 		splitDays = Array.from({ length: 7 }).map(() => ({ name: '', isRestDay: false }));
 		splitExercises = [];
 		selectedSplitDayIndex = 0;
@@ -145,10 +145,11 @@ export function createMesocycleExerciseSplitRunes() {
 
 	function loadExerciseSplit(mesocycleWithExerciseSplit: FullMesocycleWithExerciseSplit) {
 		// Same mesocycle, don't reset and load new data, reuse and continue editing
-		if (mesocycleWithExerciseSplit.id === mesocycleId) return;
+		if (mesocycleWithExerciseSplit.id === mesocycle?.id) return;
 
 		resetStores();
-		mesocycleId = mesocycleWithExerciseSplit.id;
+		const { mesocycleExerciseSplitDays, ...mesocycleData } = mesocycleWithExerciseSplit;
+		mesocycle = mesocycleData;
 		splitDays = mesocycleWithExerciseSplit.mesocycleExerciseSplitDays.map((splitDay) => {
 			const { id, mesocycleId, ...rest } = splitDay;
 			return rest;
@@ -163,12 +164,6 @@ export function createMesocycleExerciseSplitRunes() {
 	}
 
 	return {
-		get mesocycleId() {
-			return mesocycleId;
-		},
-		set mesocycleId(value) {
-			mesocycleId = value;
-		},
 		get splitDays() {
 			return splitDays;
 		},
@@ -190,6 +185,7 @@ export function createMesocycleExerciseSplitRunes() {
 		get copiedExercises() {
 			return copiedExercises;
 		},
+		mesocycle,
 		addSplitDay,
 		removeSplitDay,
 		toggleSplitDay,