diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ProgressionChange.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ProgressionChange.tsx index c23aea943d..20dc2b3897 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ProgressionChange.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ProgressionChange.tsx @@ -54,7 +54,7 @@ export const ProgressionChange: FC = ({ const sourceId = isCreate ? change.payload.sourceMilestone - : change.payload.sourceMilestoneId || change.payload.sourceMilestone; + : change.payload.sourceMilestoneId; if (!sourceId) return null; diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ReleasePlanChange.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ReleasePlanChange.tsx index d29d8c23d7..c165d89e28 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ReleasePlanChange.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ReleasePlanChange.tsx @@ -239,7 +239,6 @@ const AddReleasePlan: FC<{ ); }; - const ConsolidatedProgressionChanges: FC<{ feature: IChangeRequestFeature; currentReleasePlan?: IReleasePlan; @@ -312,8 +311,7 @@ const ConsolidatedProgressionChanges: FC<{ .map((change) => change.action === 'createMilestoneProgression' ? change.payload.sourceMilestone - : change.payload.sourceMilestoneId || - change.payload.sourceMilestone, + : change.payload.sourceMilestoneId, ) .filter((id): id is string => Boolean(id)), ); @@ -321,11 +319,7 @@ const ConsolidatedProgressionChanges: FC<{ const milestonesWithDeletedAutomation = new Set( progressionChanges .filter((change) => change.action === 'deleteMilestoneProgression') - .map( - (change) => - change.payload.sourceMilestoneId || - change.payload.sourceMilestone, - ) + .map((change) => change.payload.sourceMilestoneId) .filter((id): id is string => Boolean(id)), ); @@ -333,8 +327,7 @@ const ConsolidatedProgressionChanges: FC<{ const sourceId = change.action === 'createMilestoneProgression' ? change.payload.sourceMilestone - : change.payload.sourceMilestoneId || - change.payload.sourceMilestone; + : change.payload.sourceMilestoneId; const sourceName = basePlan.milestones.find((milestone) => milestone.id === sourceId) ?.name || sourceId; diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/useModifiedReleasePlan.ts b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/useModifiedReleasePlan.ts index c324f7046f..311a23b3ed 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/useModifiedReleasePlan.ts +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/useModifiedReleasePlan.ts @@ -17,7 +17,6 @@ export const useModifiedReleasePlan = ( return { ...basePlan, milestones: basePlan.milestones.map((milestone) => { - // Find if there's a progression change for this milestone const createChange = progressionChanges.find( (change): change is IChangeRequestCreateMilestoneProgression => change.action === 'createMilestoneProgression' && @@ -26,31 +25,14 @@ export const useModifiedReleasePlan = ( const updateChange = progressionChanges.find( (change): change is IChangeRequestUpdateMilestoneProgression => change.action === 'updateMilestoneProgression' && - (change.payload.sourceMilestoneId === milestone.id || - change.payload.sourceMilestone === milestone.id), + change.payload.sourceMilestoneId === 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.sourceMilestoneId === milestone.id, ); - // Check for conflicting changes (delete + create/update for same milestone) - if (deleteChange && (createChange || updateChange)) { - console.warn( - '[useModifiedReleasePlan] Conflicting changes detected for milestone:', - { - milestone: milestone.name, - hasCreate: !!createChange, - hasUpdate: !!updateChange, - hasDelete: !!deleteChange, - }, - ); - } - - // If there's a delete change, remove the transition condition - // Delete takes precedence over create/update if (deleteChange) { return { ...milestone, diff --git a/frontend/src/component/changeRequest/changeRequest.types.ts b/frontend/src/component/changeRequest/changeRequest.types.ts index a5f96c3f91..909ff664e5 100644 --- a/frontend/src/component/changeRequest/changeRequest.types.ts +++ b/frontend/src/component/changeRequest/changeRequest.types.ts @@ -304,13 +304,11 @@ type ChangeRequestCreateMilestoneProgression = type ChangeRequestUpdateMilestoneProgression = UpdateMilestoneProgressionSchema & { sourceMilestoneId?: string; - sourceMilestone?: string; // Backward compatibility for existing change requests snapshot?: IReleasePlan; }; type ChangeRequestDeleteMilestoneProgression = { sourceMilestoneId?: string; - sourceMilestone?: string; // Backward compatibility for existing change requests snapshot?: IReleasePlan; }; diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlan.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlan.tsx index 5a6d73feec..ad5df12c0e 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlan.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlan.tsx @@ -146,15 +146,10 @@ export const ReleasePlan = ({ const progressionChange = featureInChangeRequest.changes.find( (change: any) => (change.action === 'updateMilestoneProgression' && - (change.payload.sourceMilestoneId === - sourceMilestoneId || - change.payload.sourceMilestone === - sourceMilestoneId)) || + change.payload.sourceMilestoneId === + sourceMilestoneId) || (change.action === 'deleteMilestoneProgression' && - (change.payload.sourceMilestoneId === - sourceMilestoneId || - change.payload.sourceMilestone === - sourceMilestoneId)), + change.payload.sourceMilestoneId === sourceMilestoneId), ); if (progressionChange) {