fix: Add diff string for progressive overload

Author: LiamMorrow

app/src/components/presentation/summary/session-diff-view.tsx

@@ -181,7 +181,7 @@ function DiffChangeRow({
   const { t } = useTranslate();
   const theme = useAppTheme();
 
-  const description = getChangeDescription(change);
+  const description = getChangeDescription(t, change);
   const label = getChangeLabelKey(change);
 
   const variantColor = match(variant)
@@ -195,7 +195,7 @@ function DiffChangeRow({
       onPress={onToggle}
       title={t(label.key, label.params)}
       titleStyle={variantColor ? { color: variantColor } : undefined}
-      description={t(description.key, description.params)}
+      description={description}
       left={() => (
         <Checkbox
           disabled={disabled}

app/src/i18n/en.json

@@ -287,6 +287,8 @@
   "plan.diff.cardio_set_removed.body": "Remove set {setNumber}",
   "plan.diff.cardio_set_modified.label": "Set {setNumber}",
   "plan.diff.cardio_set_modified.body": "Set {setNumber} modified",
+  "plan.diff.progressive_overload_increase_all_evenly.label": "Evenly (amount: {amount})",
+  "plan.diff.progressive_overload_increase_lowest_set.label": "Lowest (strategy: {strategy}) (amount: {amount})",
   "plan.manage.subtitle": "Setup your workout plans",
   "plan.manage.title": "Manage plans",
   "plan.name.label": "Plan Name",

app/src/models/blueprint-diff.spec.ts

@@ -14,6 +14,7 @@ import {
   diffSessionBlueprints,
   getChangeDescription,
 } from './blueprint-diff';
+import { UseTranslateResult } from '@tolgee/react';
 
 describe('diffSessionBlueprints', () => {
   const createWeightedExercise = (
@@ -773,7 +774,15 @@ describe('getChangeDescription', () => {
     const modified = new SessionBlueprint('Workout B', [], '');
 
     const diff = diffSessionBlueprints(original, modified);
-    const translatable = getChangeDescription(diff.sessionChanges[0]!);
+    const t: UseTranslateResult['t'] = (key, params?) =>
+      ({ key, params }) as unknown as string;
+    const translatable = getChangeDescription(
+      t,
+      diff.sessionChanges[0]!,
+    ) as unknown as {
+      key: string;
+      params: unknown;
+    };
 
     expect(translatable.key).toBe('plan.diff.generic_two_value_change.body');
     expect(translatable.params).toEqual({
@@ -791,7 +800,15 @@ describe('getChangeDescription', () => {
     );
 
     const diff = diffSessionBlueprints(original, modified);
-    const translatable = getChangeDescription(diff.addedExercises[0]!);
+    const t: UseTranslateResult['t'] = (key, params?) =>
+      ({ key, params }) as unknown as string;
+    const translatable = getChangeDescription(
+      t,
+      diff.addedExercises[0]!,
+    ) as unknown as {
+      key: string;
+      params: unknown;
+    };
 
     expect(translatable.key).toBe('plan.diff.exercise_added.body');
     expect(translatable.params).toEqual({ name: 'Squat' });
@@ -824,7 +841,13 @@ describe('getChangeDescription', () => {
     const setsChange = diff.modifiedExercises[0]!.changes.find(
       (c) => c.kind === 'exerciseSets',
     );
-    const translatable = getChangeDescription(setsChange!);
+
+    const t: UseTranslateResult['t'] = (key, params?) =>
+      ({ key, params }) as unknown as string;
+    const translatable = getChangeDescription(t, setsChange!) as unknown as {
+      key: string;
+      params: unknown;
+    };
 
     expect(translatable.key).toBe('plan.diff.generic_two_value_change.body');
     expect(translatable.params).toEqual({

app/src/models/blueprint-diff.ts

@@ -5,14 +5,16 @@ import {
   CardioTarget,
   cardioTargetEquals,
   ExerciseBlueprint,
+  IncreaseStrategy,
   ProgressiveOverload,
   Rest,
   SessionBlueprint,
   WeightedExerciseBlueprint,
 } from './blueprint-models';
-import { TranslationKey } from '@tolgee/react';
+import { TranslationKey, UseTranslateResult } from '@tolgee/react';
 import { uuid } from '@/utils/uuid';
 import { EmptySession } from '@/models/session-models';
+import { localeFormatBigNumber } from '@/utils/locale-bignumber';
 
 // ============================================================================
 // Change Types
@@ -1095,80 +1097,76 @@ export interface TranslatableString {
   params?: Record<string, string | number>;
 }
 
-/**
- * Get the translation key and parameters for describing a change.
- * Use with t(result.key, result.params) in your component.
- */
-export function getChangeDescription(change: DiffChange): TranslatableString {
+export function getChangeDescription(
+  t: UseTranslateResult['t'],
+  change: DiffChange,
+): string {
   return match(change)
-    .returnType<TranslatableString>()
-    .with({ kind: 'sessionName' }, (c) => ({
-      key: 'plan.diff.generic_two_value_change.body',
-      params: { oldValue: c.oldValue, newValue: c.newValue },
-    }))
-    .with({ kind: 'sessionNotes' }, () => ({
-      key: 'plan.diff.generic_updated.body',
-    }))
-    .with({ kind: 'exercise', type: 'added' }, (c) => ({
-      key: 'plan.diff.exercise_added.body',
-      params: { name: c.exercise.name },
-    }))
-    .with({ kind: 'exercise', type: 'removed' }, (c) => ({
-      key: 'plan.diff.exercise_removed.body',
-      params: { name: c.exercise.name },
-    }))
-    .with({ kind: 'exercise', type: 'reordered' }, (c) => ({
-      key: 'plan.diff.exercise_reordered.body',
-      params: {
+    .returnType<string>()
+    .with({ kind: 'sessionName' }, (c) =>
+      t('plan.diff.generic_two_value_change.body', {
+        oldValue: c.oldValue,
+        newValue: c.newValue,
+      }),
+    )
+    .with({ kind: 'sessionNotes' }, () => t('plan.diff.generic_updated.body'))
+    .with({ kind: 'exercise', type: 'added' }, (c) =>
+      t('plan.diff.exercise_added.body', { name: c.exercise.name }),
+    )
+    .with({ kind: 'exercise', type: 'removed' }, (c) =>
+      t('plan.diff.exercise_removed.body', { name: c.exercise.name }),
+    )
+    .with({ kind: 'exercise', type: 'reordered' }, (c) =>
+      t('plan.diff.exercise_reordered.body', {
         name: c.exerciseName,
         oldPosition: c.oldIndex + 1,
         newPosition: c.newIndex + 1,
-      },
-    }))
-    .with({ kind: 'exerciseName' }, (c) => ({
-      key: 'plan.diff.generic_two_value_change.body',
-      params: { oldValue: c.oldValue, newValue: c.newValue },
-    }))
-    .with({ kind: 'exerciseSets' }, (c) => ({
-      key: 'plan.diff.generic_two_value_change.body',
-      params: { oldValue: c.oldValue, newValue: c.newValue },
-    }))
-    .with({ kind: 'exerciseReps' }, (c) => ({
-      key: 'plan.diff.generic_two_value_change.body',
-      params: { oldValue: c.oldValue, newValue: c.newValue },
-    }))
-    .with({ kind: 'progressiveOverload' }, (c) => ({
-      key: 'plan.diff.generic_two_value_change.body',
-      params: {
-        oldValue: c.oldValue.weightIncrement.toString(),
-        newValue: c.newValue.weightIncrement.toString(),
-      },
-    }))
-    .with({ kind: 'exerciseRest' }, () => ({
-      key: 'plan.diff.generic_updated.body',
-    }))
-    .with({ kind: 'exerciseSuperset' }, (c) => ({
-      key: c.newValue
-        ? 'plan.diff.generic_enabled.body'
-        : 'plan.diff.generic_disabled.body',
-    }))
-    .with({ kind: 'exerciseNotes' }, () => ({
-      key: 'plan.diff.generic_updated.body',
-    }))
-    .with({ kind: 'exerciseLink' }, () => ({
-      key: 'plan.diff.generic_updated.body',
-    }))
-    .with({ kind: 'exerciseTarget' }, () => ({
-      key: 'plan.diff.generic_updated.body',
-    }))
-    .with({ kind: 'exerciseTracking' }, (c) => ({
-      key: c.newValue
-        ? 'plan.diff.generic_enabled.body'
-        : 'plan.diff.generic_disabled.body',
-    }))
-    .with({ kind: 'exerciseType' }, (c) => ({
-      key: 'plan.diff.generic_two_value_change.body',
-      params: {
+      }),
+    )
+    .with({ kind: 'exerciseName' }, (c) =>
+      t('plan.diff.generic_two_value_change.body', {
+        oldValue: c.oldValue,
+        newValue: c.newValue,
+      }),
+    )
+    .with({ kind: 'exerciseSets' }, (c) =>
+      t('plan.diff.generic_two_value_change.body', {
+        oldValue: c.oldValue,
+        newValue: c.newValue,
+      }),
+    )
+    .with({ kind: 'exerciseReps' }, (c) =>
+      t('plan.diff.generic_two_value_change.body', {
+        oldValue: c.oldValue,
+        newValue: c.newValue,
+      }),
+    )
+    .with({ kind: 'progressiveOverload' }, (c) =>
+      t('plan.diff.generic_two_value_change.body', {
+        oldValue: stringifyProgressiveOverload(t, c.oldValue),
+        newValue: stringifyProgressiveOverload(t, c.newValue),
+      }),
+    )
+    .with({ kind: 'exerciseRest' }, () => t('plan.diff.generic_updated.body'))
+    .with({ kind: 'exerciseSuperset' }, (c) =>
+      t(
+        c.newValue
+          ? 'plan.diff.generic_enabled.body'
+          : 'plan.diff.generic_disabled.body',
+      ),
+    )
+    .with({ kind: 'exerciseNotes' }, () => t('plan.diff.generic_updated.body'))
+    .with({ kind: 'exerciseLink' }, () => t('plan.diff.generic_updated.body'))
+    .with({ kind: 'exerciseTarget' }, () => t('plan.diff.generic_updated.body'))
+    .with({ kind: 'exerciseTracking' }, (c) =>
+      t(
+        c.newValue
+          ? 'plan.diff.generic_enabled.body'
+          : 'plan.diff.generic_disabled.body',
+      ),
+    )
+    .with({ kind: 'exerciseType' }, (c) =>
+      t('plan.diff.generic_two_value_change.body', {
         oldValue:
           c.oldExercise instanceof WeightedExerciseBlueprint
             ? 'weighted'
@@ -1177,20 +1175,17 @@ export function getChangeDescription(change: DiffChange): TranslatableString {
           c.newExercise instanceof WeightedExerciseBlueprint
             ? 'weighted'
             : 'cardio',
-      },
-    }))
-    .with({ kind: 'cardioSet', type: 'added' }, (c) => ({
-      key: 'plan.diff.cardio_set_added.body',
-      params: { setNumber: c.setIndex + 1 },
-    }))
-    .with({ kind: 'cardioSet', type: 'removed' }, (c) => ({
-      key: 'plan.diff.cardio_set_removed.body',
-      params: { setNumber: c.setIndex + 1 },
-    }))
-    .with({ kind: 'cardioSetModified' }, (c) => ({
-      key: 'plan.diff.cardio_set_modified.body',
-      params: { setNumber: c.setIndex + 1 },
-    }))
+      }),
+    )
+    .with({ kind: 'cardioSet', type: 'added' }, (c) =>
+      t('plan.diff.cardio_set_added.body', { setNumber: c.setIndex + 1 }),
+    )
+    .with({ kind: 'cardioSet', type: 'removed' }, (c) =>
+      t('plan.diff.cardio_set_removed.body', { setNumber: c.setIndex + 1 }),
+    )
+    .with({ kind: 'cardioSetModified' }, (c) =>
+      t('plan.diff.cardio_set_modified.body', { setNumber: c.setIndex + 1 }),
+    )
     .exhaustive();
 }
 
@@ -1266,3 +1261,54 @@ export function getChangeLabelKey(change: DiffChange): TranslatableString {
     }))
     .exhaustive();
 }
+
+function stringifyProgressiveOverload(
+  t: UseTranslateResult['t'],
+  progressiveOverload: ProgressiveOverload,
+): string {
+  return match(progressiveOverload)
+    .returnType<string>()
+    .with({ type: 'NoProgressiveOverload' }, () =>
+      t('exercise.progressive_overload.no.label'),
+    )
+    .with({ type: 'IncreaseAllEvenlyProgressiveOverload' }, (x) =>
+      t('plan.diff.progressive_overload_increase_all_evenly.label', {
+        amount: localeFormatBigNumber(x.amount),
+      }),
+    )
+    .with({ type: 'IncreaseLowestSetProgressiveOverload' }, (x) =>
+      t('plan.diff.progressive_overload_increase_lowest_set.label', {
+        amount: localeFormatBigNumber(x.amount),
+        strategy: stringifyIncreaseStrategy(t, x.increaseStrategy),
+      }),
+    )
+    .exhaustive();
+}
+
+function stringifyIncreaseStrategy(
+  t: UseTranslateResult['t'],
+  strategy: IncreaseStrategy,
+) {
+  return match(strategy)
+    .with('all', () =>
+      t(
+        'exercise.progressive_overload.increase_lowest_set.increase_strategy.all.label',
+      ),
+    )
+    .with('first', () =>
+      t(
+        'exercise.progressive_overload.increase_lowest_set.increase_strategy.first.label',
+      ),
+    )
+    .with('middle', () =>
+      t(
+        'exercise.progressive_overload.increase_lowest_set.increase_strategy.middle.label',
+      ),
+    )
+    .with('last', () =>
+      t(
+        'exercise.progressive_overload.increase_lowest_set.increase_strategy.last.label',
+      ),
+    )
+    .exhaustive();
+}

app/src/models/blueprint-models/index.ts

@@ -474,7 +474,11 @@ export class IncreaseLowestSetProgressiveOverload {
   }
 
   equals(other: ProgressiveOverload): boolean {
-    return this.type === other.type && this.amount.isEqualTo(other.amount);
+    return (
+      this.type === other.type &&
+      this.amount.isEqualTo(other.amount) &&
+      this.increaseStrategy === other.increaseStrategy
+    );
   }
 
   applyProgressiveOverload(