1
0
mirror of https://github.com/Unleash/unleash.git synced 2025-10-27 11:02:16 +01:00

feat: release plan cr conflict (#10831)

This commit is contained in:
Mateusz Kwasniewski 2025-10-20 15:39:06 +02:00 committed by GitHub
parent ca4ec203c6
commit f37fde2a27
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -35,7 +35,8 @@ const DeleteReleasePlan: FC<{
actions?: ReactNode; actions?: ReactNode;
}> = ({ change, currentReleasePlan, changeRequestState, actions }) => { }> = ({ change, currentReleasePlan, changeRequestState, actions }) => {
const releasePlan = const releasePlan =
changeRequestState === 'Applied' && change.payload.snapshot (changeRequestState === 'Applied' || !currentReleasePlan) &&
change.payload.snapshot
? change.payload.snapshot ? change.payload.snapshot
: currentReleasePlan; : currentReleasePlan;
@ -62,7 +63,8 @@ const StartMilestone: FC<{
actions?: ReactNode; actions?: ReactNode;
}> = ({ change, currentReleasePlan, changeRequestState, actions }) => { }> = ({ change, currentReleasePlan, changeRequestState, actions }) => {
const releasePlan = const releasePlan =
changeRequestState === 'Applied' && change.payload.snapshot (changeRequestState === 'Applied' || !currentReleasePlan) &&
change.payload.snapshot
? change.payload.snapshot ? change.payload.snapshot
: currentReleasePlan; : currentReleasePlan;