diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/MilestoneListRenderer.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/MilestoneListRenderer.tsx index e11396e8fb..91492e374e 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/MilestoneListRenderer.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/MilestoneListRenderer.tsx @@ -51,9 +51,14 @@ const MilestoneListRendererCore = ({ const hasPendingDelete = milestonesWithDeletedAutomation.has( milestone.id, ); + const hasPendingModification = milestonesWithAutomation.has( + milestone.id, + ); const badge = hasPendingDelete ? ( Deleted in draft + ) : hasPendingModification ? ( + Modified in draft ) : undefined; const automationSection = diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlan.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlan.tsx index 83033d1ce9..2bd40ae149 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlan.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlan.tsx @@ -17,6 +17,10 @@ import { useChangeRequestsEnabled } from 'hooks/useChangeRequestsEnabled'; import { useChangeRequestApi } from 'hooks/api/actions/useChangeRequestApi/useChangeRequestApi'; import { usePendingChangeRequests } from 'hooks/api/getters/usePendingChangeRequests/usePendingChangeRequests'; import { ReleasePlanChangeRequestDialog } from './ChangeRequest/ReleasePlanChangeRequestDialog.tsx'; +import type { + IChangeRequestChangeMilestoneProgression, + IChangeRequestDeleteMilestoneProgression, +} from 'component/changeRequest/changeRequest.types'; import { usePlausibleTracker } from 'hooks/usePlausibleTracker'; import { Truncator } from 'component/common/Truncator/Truncator'; import { useUiFlag } from 'hooks/useUiFlag'; @@ -134,19 +138,17 @@ export const ReleasePlan = ({ ); if (!featureInChangeRequest) continue; - // Look for update or delete progression changes + // Look for change or delete progression changes const progressionChange = featureInChangeRequest.changes.find( - (change: any) => - (change.action === 'updateMilestoneProgression' && - (change.payload.sourceMilestoneId === - sourceMilestoneId || - change.payload.sourceMilestone === - sourceMilestoneId)) || + ( + change, + ): change is + | IChangeRequestChangeMilestoneProgression + | IChangeRequestDeleteMilestoneProgression => + (change.action === 'changeMilestoneProgression' && + change.payload.sourceMilestone === sourceMilestoneId) || (change.action === 'deleteMilestoneProgression' && - (change.payload.sourceMilestoneId === - sourceMilestoneId || - change.payload.sourceMilestone === - sourceMilestoneId)), + change.payload.sourceMilestone === sourceMilestoneId), ); if (progressionChange) { diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestoneItem/MilestoneAutomation.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestoneItem/MilestoneAutomation.tsx index 6ce8d1e9c3..4b2d520903 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestoneItem/MilestoneAutomation.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestoneItem/MilestoneAutomation.tsx @@ -84,14 +84,14 @@ export const MilestoneAutomation = ({ const hasPendingCreate = pendingProgressionChange?.action === 'createMilestoneProgression'; - const hasPendingUpdate = - pendingProgressionChange?.action === 'updateMilestoneProgression'; + const hasPendingChange = + pendingProgressionChange?.action === 'changeMilestoneProgression'; const hasPendingDelete = pendingProgressionChange?.action === 'deleteMilestoneProgression'; const badge = hasPendingDelete ? ( Deleted in draft - ) : hasPendingUpdate ? ( + ) : hasPendingChange ? ( Modified in draft ) : undefined;