Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-10-27 11:02:16 +01:00
Code Issues Projects Releases Wiki Activity

fix: show draft badges for milestone progression changes (#10851)

Browse Source
This commit is contained in:
Fredrik Strand Oseberg 2025-10-23 13:19:48 +02:00 committed by GitHub
parent c5ac1ef81f
commit 32a950763b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/component/changeRequest/ChangeRequest/Changes/Change/MilestoneListRenderer.tsx
View File

@ -51,9 +51,14 @@ const MilestoneListRendererCore = ({
const hasPendingDelete = milestonesWithDeletedAutomation.has( const hasPendingDelete = milestonesWithDeletedAutomation.has(
milestone.id, milestone.id,
); );
const hasPendingModification = milestonesWithAutomation.has(
milestone.id,
);
const badge = hasPendingDelete ? ( const badge = hasPendingDelete ? (
<Badge color='error'>Deleted in draft</Badge> <Badge color='error'>Deleted in draft</Badge>
) : hasPendingModification ? (
<Badge color='warning'>Modified in draft</Badge>
) : undefined; ) : undefined;
const automationSection = const automationSection =

24
frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlan.tsx
View File

@ -17,6 +17,10 @@ import { useChangeRequestsEnabled } from 'hooks/useChangeRequestsEnabled';
import { useChangeRequestApi } from 'hooks/api/actions/useChangeRequestApi/useChangeRequestApi'; import { useChangeRequestApi } from 'hooks/api/actions/useChangeRequestApi/useChangeRequestApi';
import { usePendingChangeRequests } from 'hooks/api/getters/usePendingChangeRequests/usePendingChangeRequests'; import { usePendingChangeRequests } from 'hooks/api/getters/usePendingChangeRequests/usePendingChangeRequests';
import { ReleasePlanChangeRequestDialog } from './ChangeRequest/ReleasePlanChangeRequestDialog.tsx'; import { ReleasePlanChangeRequestDialog } from './ChangeRequest/ReleasePlanChangeRequestDialog.tsx';
import type {
IChangeRequestChangeMilestoneProgression,
IChangeRequestDeleteMilestoneProgression,
} from 'component/changeRequest/changeRequest.types';
import { usePlausibleTracker } from 'hooks/usePlausibleTracker'; import { usePlausibleTracker } from 'hooks/usePlausibleTracker';
import { Truncator } from 'component/common/Truncator/Truncator'; import { Truncator } from 'component/common/Truncator/Truncator';
import { useUiFlag } from 'hooks/useUiFlag'; import { useUiFlag } from 'hooks/useUiFlag';
@ -134,19 +138,17 @@ export const ReleasePlan = ({
); );
if (!featureInChangeRequest) continue; if (!featureInChangeRequest) continue;
// Look for update or delete progression changes // Look for change or delete progression changes
const progressionChange = featureInChangeRequest.changes.find( const progressionChange = featureInChangeRequest.changes.find(
(change: any) => (
(change.action === 'updateMilestoneProgression' && change,
(change.payload.sourceMilestoneId === ): change is
sourceMilestoneId || | IChangeRequestChangeMilestoneProgression
change.payload.sourceMilestone === | IChangeRequestDeleteMilestoneProgression =>
sourceMilestoneId)) || (change.action === 'changeMilestoneProgression' &&
change.payload.sourceMilestone === sourceMilestoneId) ||
(change.action === 'deleteMilestoneProgression' && (change.action === 'deleteMilestoneProgression' &&
(change.payload.sourceMilestoneId === change.payload.sourceMilestone === sourceMilestoneId),
sourceMilestoneId ||
change.payload.sourceMilestone ===
sourceMilestoneId)),
); );
if (progressionChange) { if (progressionChange) {

6
frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestoneItem/MilestoneAutomation.tsx
View File

@ -84,14 +84,14 @@ export const MilestoneAutomation = ({
const hasPendingCreate = const hasPendingCreate =
pendingProgressionChange?.action === 'createMilestoneProgression'; pendingProgressionChange?.action === 'createMilestoneProgression';
const hasPendingUpdate = const hasPendingChange =
pendingProgressionChange?.action === 'updateMilestoneProgression'; pendingProgressionChange?.action === 'changeMilestoneProgression';
const hasPendingDelete = const hasPendingDelete =
pendingProgressionChange?.action === 'deleteMilestoneProgression'; pendingProgressionChange?.action === 'deleteMilestoneProgression';
const badge = hasPendingDelete ? ( const badge = hasPendingDelete ? (
<Badge color='error'>Deleted in draft</Badge> <Badge color='error'>Deleted in draft</Badge>
) : hasPendingUpdate ? ( ) : hasPendingChange ? (
<Badge color='warning'>Modified in draft</Badge> <Badge color='warning'>Modified in draft</Badge>
) : undefined; ) : undefined;