From 2330ae95329204b8d63d4292968dd0c54910e48b Mon Sep 17 00:00:00 2001
From: FredrikOseberg <fredrik.no@gmail.com>
Date: Wed, 22 Oct 2025 10:57:47 +0200
Subject: [PATCH] fix: use source milestone

---
 .../Change/ConsolidatedProgressionChanges.tsx | 19 +++----------------
 .../Changes/Change/ProgressionChange.tsx      |  5 +----
 .../Changes/Change/applyProgressionChanges.ts |  6 ++----
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ConsolidatedProgressionChanges.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ConsolidatedProgressionChanges.tsx
index e60b16cde7..8c324321f0 100644
--- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ConsolidatedProgressionChanges.tsx
+++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ConsolidatedProgressionChanges.tsx
@@ -54,12 +54,7 @@ const getMilestonesWithAutomation = (
                     change.action === 'createMilestoneProgression' ||
                     change.action === 'updateMilestoneProgression',
             )
-            .map((change) =>
-                change.action === 'createMilestoneProgression'
-                    ? change.payload.sourceMilestone
-                    : change.payload.sourceMilestoneId ||
-                      change.payload.sourceMilestone,
-            )
+            .map((change) => change.payload.sourceMilestone)
             .filter((id): id is string => Boolean(id)),
     );
 };
@@ -70,11 +65,7 @@ const getMilestonesWithDeletedAutomation = (
     return new Set(
         progressionChanges
             .filter((change) => change.action === 'deleteMilestoneProgression')
-            .map(
-                (change) =>
-                    change.payload.sourceMilestoneId ||
-                    change.payload.sourceMilestone,
-            )
+            .map((change) => change.payload.sourceMilestone)
             .filter((id): id is string => Boolean(id)),
     );
 };
@@ -84,11 +75,7 @@ const getChangeDescriptions = (
     basePlan: IReleasePlan,
 ): string[] => {
     return progressionChanges.map((change) => {
-        const sourceId =
-            change.action === 'createMilestoneProgression'
-                ? change.payload.sourceMilestone
-                : change.payload.sourceMilestoneId ||
-                  change.payload.sourceMilestone;
+        const sourceId = change.payload.sourceMilestone;
         const sourceName =
             basePlan.milestones.find((milestone) => milestone.id === sourceId)
                 ?.name || sourceId;
diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ProgressionChange.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ProgressionChange.tsx
index 811ce54152..0064dbb0e3 100644
--- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ProgressionChange.tsx
+++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ProgressionChange.tsx
@@ -51,10 +51,7 @@ export const ProgressionChange: FC<ProgressionChangeProps> = ({
     if (!basePlan) return null;
 
     const isCreate = change.action === 'createMilestoneProgression';
-
-    const sourceId = isCreate
-        ? change.payload.sourceMilestone
-        : change.payload.sourceMilestoneId || change.payload.sourceMilestone;
+    const sourceId = change.payload.sourceMilestone;
 
     if (!sourceId) return null;
 
diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/applyProgressionChanges.ts b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/applyProgressionChanges.ts
index b3c9666d84..855e4af708 100644
--- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/applyProgressionChanges.ts
+++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/applyProgressionChanges.ts
@@ -25,14 +25,12 @@ export const applyProgressionChanges = (
             const updateChange = progressionChanges.find(
                 (change): change is IChangeRequestUpdateMilestoneProgression =>
                     change.action === 'updateMilestoneProgression' &&
-                    (change.payload.sourceMilestoneId === milestone.id ||
-                        change.payload.sourceMilestone === milestone.id),
+                    change.payload.sourceMilestone === milestone.id,
             );
             const deleteChange = progressionChanges.find(
                 (change): change is IChangeRequestDeleteMilestoneProgression =>
                     change.action === 'deleteMilestoneProgression' &&
-                    (change.payload.sourceMilestoneId === milestone.id ||
-                        change.payload.sourceMilestone === milestone.id),
+                    change.payload.sourceMilestone === milestone.id,
             );
 
             if (deleteChange) {