diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ConsolidatedProgressionChanges.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ConsolidatedProgressionChanges.tsx index 5ee6caea81..330c56608c 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ConsolidatedProgressionChanges.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ConsolidatedProgressionChanges.tsx @@ -29,18 +29,6 @@ type ProgressionChange = | IChangeRequestChangeMilestoneProgression | IChangeRequestDeleteMilestoneProgression; -const getFirstChangeWithSnapshot = ( - progressionChanges: ProgressionChange[], -) => { - return ( - progressionChanges.find( - (change) => - change.payload?.snapshot && - change.action === 'changeMilestoneProgression', - ) || progressionChanges.find((change) => change.payload?.snapshot) - ); -}; - const getMilestonesWithAutomation = ( progressionChanges: ProgressionChange[], ): Set => { @@ -109,10 +97,7 @@ export const ConsolidatedProgressionChanges: FC<{ if (progressionChanges.length === 0) return null; - const firstChangeWithSnapshot = - getFirstChangeWithSnapshot(progressionChanges); - const basePlan = - firstChangeWithSnapshot?.payload?.snapshot || currentReleasePlan; + const basePlan = currentReleasePlan; if (!basePlan) { return null; diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ProgressionChange.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ProgressionChange.tsx index 8108315a32..960302c2e3 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ProgressionChange.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ProgressionChange.tsx @@ -39,7 +39,7 @@ export const ProgressionChange: FC = ({ onUpdateChangeRequestSubmit, onDeleteChangeRequestSubmit, }) => { - const basePlan = change.payload.snapshot || currentReleasePlan; + const basePlan = currentReleasePlan; if (!basePlan) return null; const sourceId = change.payload.sourceMilestone; @@ -83,7 +83,9 @@ export const ProgressionChange: FC = ({ diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/applyProgressionChanges.ts b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/applyProgressionChanges.ts index a6c9d74c5a..2140f9478d 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/applyProgressionChanges.ts +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/applyProgressionChanges.ts @@ -23,8 +23,7 @@ export const applyProgressionChanges = ( 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) { diff --git a/frontend/src/component/changeRequest/changeRequest.types.ts b/frontend/src/component/changeRequest/changeRequest.types.ts index 03acf7e4e3..9fc35ffebb 100644 --- a/frontend/src/component/changeRequest/changeRequest.types.ts +++ b/frontend/src/component/changeRequest/changeRequest.types.ts @@ -2,10 +2,7 @@ import type { IFeatureVariant } from 'interfaces/featureToggle'; import type { ISegment } from 'interfaces/segment'; import type { IFeatureStrategy } from '../../interfaces/strategy.js'; import type { IUser } from '../../interfaces/user.js'; -import type { - SetStrategySortOrderSchema, - ChangeMilestoneProgressionSchema, -} from 'openapi'; +import type { SetStrategySortOrderSchema } from 'openapi'; import type { IReleasePlan } from 'interfaces/releasePlans'; type BaseChangeRequest = { @@ -287,15 +284,14 @@ type ChangeRequestStartMilestone = { snapshot?: IReleasePlan; }; -type ChangeRequestChangeMilestoneProgression = - ChangeMilestoneProgressionSchema & { - snapshot?: IReleasePlan; - }; +type ChangeRequestChangeMilestoneProgression = { + sourceMilestone: string; + targetMilestone: string; + transitionCondition: { intervalMinutes: number }; +}; type ChangeRequestDeleteMilestoneProgression = { - sourceMilestoneId?: string; - sourceMilestone?: string; // Backward compatibility for existing change requests - snapshot?: IReleasePlan; + sourceMilestone: string; }; export type ChangeRequestAddStrategy = Pick< diff --git a/frontend/src/hooks/api/actions/useChangeRequestApi/useChangeRequestApi.ts b/frontend/src/hooks/api/actions/useChangeRequestApi/useChangeRequestApi.ts index c23ca074a6..52026b109b 100644 --- a/frontend/src/hooks/api/actions/useChangeRequestApi/useChangeRequestApi.ts +++ b/frontend/src/hooks/api/actions/useChangeRequestApi/useChangeRequestApi.ts @@ -22,8 +22,7 @@ export interface IChangeSchema { | 'addReleasePlan' | 'deleteReleasePlan' | 'startMilestone' - | 'createMilestoneProgression' - | 'updateMilestoneProgression' + | 'changeMilestoneProgression' | 'deleteMilestoneProgression'; payload: string | boolean | object | number | undefined; }