Add new exercise lots (#1228)

* refactor(models/enum): change order of attributes * feat(backend): add new exercise lot * feat(frontend): handle new exercise lot * ci: Run CI * chore(utils/common): add personal bests to exercise lot * build(models/enum): add new dependency * refactor(backend): associate named meta * feat(backend): add new personal best type * chore(frontend): adapt to new gql schema * ci: Run CI * refactor(backend): move to using enum meta * refactor(backend): move to using enum meta for metadata group lots * fix(frontend): display stuff regardless * chore(models/common): change order of attributes * chore(models/common): add newline
IgnisDa · Feb 2, 2025 · a353de9 · a353de9
1 parent 654c3f5
commit a353de9
Show file tree

Hide file tree

Showing 17 changed files with 396 additions and 308 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/frontend/app/components/fitness.tsx b/apps/frontend/app/components/fitness.tsx
@@ -65,6 +65,11 @@ export const getSetStatisticsTextToDisplay = (
 	unit: UserUnitSystem,
 ) => {
 	return match(lot)
+		.with(ExerciseLot.Reps, () => [`${statistic.reps} reps`, undefined])
+		.with(ExerciseLot.RepsAndDuration, () => [
+			`${statistic.reps} reps for ${Number(statistic.duration).toFixed(2)} min`,
+			undefined,
+		])
 		.with(ExerciseLot.DistanceAndDuration, () => [
 			`${displayDistanceWithUnit(unit, statistic.distance)} for ${Number(
 				statistic.duration,
@@ -75,13 +80,16 @@ export const getSetStatisticsTextToDisplay = (
 			`${Number(statistic.duration).toFixed(2)} min`,
 			undefined,
 		])
-		.with(ExerciseLot.Reps, () => [`${statistic.reps} reps`, undefined])
 		.with(ExerciseLot.RepsAndWeight, () => [
 			statistic.weight && statistic.weight !== "0"
 				? `${displayWeightWithUnit(unit, statistic.weight)} × ${statistic.reps}`
 				: `${statistic.reps} reps`,
 			statistic.oneRm ? `${Number(statistic.oneRm).toFixed(1)} RM` : null,
 		])
+		.with(ExerciseLot.RepsAndDurationAndDistance, () => [
+			`${displayDistanceWithUnit(unit, statistic.distance)} × ${statistic.reps}`,
+			`${Number(statistic.duration).toFixed(2)} min`,
+		])
 		.exhaustive();
 };
 

diff --git a/apps/frontend/app/routes/_dashboard.fitness.$action.tsx b/apps/frontend/app/routes/_dashboard.fitness.$action.tsx
@@ -1461,10 +1461,17 @@ const ExerciseDisplay = (props: {
 
 	const exerciseHistory = userExerciseDetails?.history;
 	const [durationCol, distanceCol, weightCol, repsCol] = match(exercise.lot)
-		.with(ExerciseLot.DistanceAndDuration, () => [true, true, false, false])
+		.with(ExerciseLot.Reps, () => [false, false, false, true])
 		.with(ExerciseLot.Duration, () => [true, false, false, false])
 		.with(ExerciseLot.RepsAndWeight, () => [false, false, true, true])
-		.with(ExerciseLot.Reps, () => [false, false, false, true])
+		.with(ExerciseLot.RepsAndDuration, () => [true, false, false, true])
+		.with(ExerciseLot.DistanceAndDuration, () => [true, true, false, false])
+		.with(ExerciseLot.RepsAndDurationAndDistance, () => [
+			true,
+			true,
+			false,
+			true,
+		])
 		.exhaustive();
 	const toBeDisplayedColumns =
 		[durationCol, distanceCol, weightCol, repsCol].filter(Boolean).length + 1;
@@ -2289,24 +2296,37 @@ const SetDisplay = (props: {
 										variant={set.confirmedAt ? "filled" : "outline"}
 										disabled={
 											!match(exercise.lot)
+												.with(ExerciseLot.Reps, () =>
+													isString(set.statistic.reps),
+												)
+												.with(ExerciseLot.Duration, () =>
+													isString(set.statistic.duration),
+												)
+												.with(
+													ExerciseLot.RepsAndDuration,
+													() =>
+														isString(set.statistic.reps) &&
+														isString(set.statistic.duration),
+												)
 												.with(
 													ExerciseLot.DistanceAndDuration,
 													() =>
 														isString(set.statistic.distance) &&
 														isString(set.statistic.duration),
 												)
-												.with(ExerciseLot.Duration, () =>
-													isString(set.statistic.duration),
-												)
-												.with(ExerciseLot.Reps, () =>
-													isString(set.statistic.reps),
-												)
 												.with(
 													ExerciseLot.RepsAndWeight,
 													() =>
 														isString(set.statistic.reps) &&
 														isString(set.statistic.weight),
 												)
+												.with(
+													ExerciseLot.RepsAndDurationAndDistance,
+													() =>
+														isString(set.statistic.reps) &&
+														isString(set.statistic.duration) &&
+														isString(set.statistic.distance),
+												)
 												.exhaustive()
 										}
 										onClick={async () => {

diff --git a/apps/frontend/app/routes/_dashboard.fitness.exercises.item.$id._index.tsx b/apps/frontend/app/routes/_dashboard.fitness.exercises.item.$id._index.tsx
@@ -531,6 +531,10 @@ export default function Page() {
 														WorkoutSetPersonalBest.Weight,
 														() => stat?.weight,
 													)
+													.with(
+														WorkoutSetPersonalBest.Distance,
+														() => stat?.distance,
+													)
 													.exhaustive();
 												return {
 													name: dayjsLib(h.workoutEndOn).format("DD/MM/YYYY"),
@@ -745,6 +749,9 @@ const DisplayPersonalBest = (props: {
 						displayWeightWithUnit(unitSystem, set.statistic.weight),
 					)
 					.with(WorkoutSetPersonalBest.Pace, () => `${set.statistic.pace}/min`)
+					.with(WorkoutSetPersonalBest.Distance, () =>
+						displayDistanceWithUnit(unitSystem, set.statistic.distance),
+					)
 					.exhaustive()}
 			</Text>
 			<Group>

diff --git a/apps/frontend/app/routes/_dashboard.media.$action.$lot.tsx b/apps/frontend/app/routes/_dashboard.media.$action.$lot.tsx
@@ -336,50 +336,46 @@ export default function Page() {
 								<FiltersModalForm />
 							</FiltersModal>
 						</Group>
-						{loaderData.mediaList.list.response.details.total > 0 ? (
-							<>
-								<DisplayListDetailsAndRefresh
-									cacheId={loaderData.mediaList.list.cacheId}
-									total={loaderData.mediaList.list.response.details.total}
-								/>
-								{(loaderData.mediaList?.url.startDateRange ||
-									loaderData.mediaList?.url.endDateRange) &&
-								!coreDetails.isServerKeyValidated ? (
-									<ProRequiredAlert alertText="Ryot Pro is required to filter by dates" />
-								) : (
-									<ApplicationGrid>
-										{loaderData.mediaList.list.response.items.map((item) => {
-											const becItem = {
-												entityId: item,
-												entityLot: EntityLot.Metadata,
-											};
-											const isAdded = bulkEditingCollection.isAdded(becItem);
-											return (
-												<MetadataDisplayItem
-													key={item}
-													metadataId={item}
-													rightLabelHistory
-													topRight={
-														bulkEditingState &&
-														bulkEditingState.data.action === "add" ? (
-															<ActionIcon
-																variant={isAdded ? "filled" : "transparent"}
-																color="green"
-																onClick={() => {
-																	if (isAdded) bulkEditingState.remove(becItem);
-																	else bulkEditingState.add(becItem);
-																}}
-															>
-																<IconCheck size={18} />
-															</ActionIcon>
-														) : undefined
-													}
-												/>
-											);
-										})}
-									</ApplicationGrid>
-								)}
-							</>
+						<DisplayListDetailsAndRefresh
+							cacheId={loaderData.mediaList.list.cacheId}
+							total={loaderData.mediaList.list.response.details.total}
+						/>
+						{(loaderData.mediaList?.url.startDateRange ||
+							loaderData.mediaList?.url.endDateRange) &&
+						!coreDetails.isServerKeyValidated ? (
+							<ProRequiredAlert alertText="Ryot Pro is required to filter by dates" />
+						) : loaderData.mediaList.list.response.details.total > 0 ? (
+							<ApplicationGrid>
+								{loaderData.mediaList.list.response.items.map((item) => {
+									const becItem = {
+										entityId: item,
+										entityLot: EntityLot.Metadata,
+									};
+									const isAdded = bulkEditingCollection.isAdded(becItem);
+									return (
+										<MetadataDisplayItem
+											key={item}
+											metadataId={item}
+											rightLabelHistory
+											topRight={
+												bulkEditingState &&
+												bulkEditingState.data.action === "add" ? (
+													<ActionIcon
+														variant={isAdded ? "filled" : "transparent"}
+														color="green"
+														onClick={() => {
+															if (isAdded) bulkEditingState.remove(becItem);
+															else bulkEditingState.add(becItem);
+														}}
+													>
+														<IconCheck size={18} />
+													</ActionIcon>
+												) : undefined
+											}
+										/>
+									);
+								})}
+							</ApplicationGrid>
 						) : (
 							<Text>You do not have any saved yet</Text>
 						)}

diff --git a/crates/models/common/src/lib.rs b/crates/models/common/src/lib.rs
@@ -91,6 +91,7 @@ pub enum DefaultCollection {
 
 meta! {
     DefaultCollection, (Option<Vec<CollectionExtraInformation>>, &'static str);
+
     Watchlist, (None, "Things I want to watch in the future.");
     InProgress, (None, "Media items that I am currently watching.");
     Completed, (None, "Media items that I have completed.");
@@ -109,15 +110,15 @@ meta! {
     Reminders, (Some(
         vec![
             CollectionExtraInformation {
-                name: "Reminder".to_string(),
                 required: Some(true),
+                name: "Reminder".to_string(),
                 lot: CollectionExtraInformationLot::Date,
                 description: "When do you want to be reminded?".to_string(),
                 ..Default::default()
             },
             CollectionExtraInformation {
-                name: "Text".to_string(),
                 required: Some(true),
+                name: "Text".to_string(),
                 lot: CollectionExtraInformationLot::String,
                 description: "What do you want to be reminded about?".to_string(),
                 ..Default::default()

diff --git a/crates/models/enum/Cargo.toml b/crates/models/enum/Cargo.toml
@@ -5,6 +5,7 @@ edition = "2021"
 
 [dependencies]
 async-graphql = { workspace = true }
+enum_meta = { workspace = true }
 schematic = { workspace = true }
 sea-orm = { workspace = true }
 sea-orm-migration = { workspace = true }