Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-07-17 13:46:47 +02:00
Code Issues Projects Releases Wiki Activity

cancel changes (#2510)

Browse Source
This commit is contained in:
Mateusz Kwasniewski 2022-11-23 14:36:11 +01:00 committed by GitHub
parent f9726fdee9
commit 9fee0bb264
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestOverview.tsx
View File

@ -99,6 +99,23 @@ export const ChangeRequestOverview: FC = () => {
} }
}; };
const onCancelChanges = async () => {
try {
await changeState(projectId, Number(id), {
state: 'Cancelled',
});
refetchChangeRequest();
refetchChangeRequestOpen();
setToastData({
type: 'success',
title: 'Success',
text: 'Changes cancelled',
});
} catch (error: unknown) {
setToastApiError(formatUnknownError(error));
}
};
const isSelfReview = const isSelfReview =
changeRequest?.createdBy.id === user?.id && changeRequest?.createdBy.id === user?.id &&
changeRequest.state === 'In review' && changeRequest.state === 'In review' &&
@ -190,6 +207,23 @@ export const ChangeRequestOverview: FC = () => {
</PermissionButton> </PermissionButton>
} }
/> />
<ConditionallyRender
condition={
changeRequest.state !== 'Applied' &&
changeRequest.state !== 'Cancelled' &&
(changeRequest.createdBy.id === user?.id ||
isAdmin)
}
show={
<Button
sx={{ ml: 2 }}
variant="outlined"
onClick={onCancelChanges}
>
Cancel changes
</Button>
}
/>
</StyledButtonBox> </StyledButtonBox>
</StyledInnerContainer> </StyledInnerContainer>
</StyledPaper> </StyledPaper>

19
frontend/src/component/changeRequest/ChangeRequestOverview/ReviewButton/ReviewButton.tsx
View File

@ -54,22 +54,6 @@ export const ReviewButton = () => {
} }
}; };
const onReject = async () => {
try {
await changeState(projectId, Number(id), {
state: 'Cancelled',
});
refetchChangeRequest();
setToastData({
type: 'success',
title: 'Success',
text: 'Changes rejected',
});
} catch (error: unknown) {
setToastApiError(formatUnknownError(error));
}
};
const onToggle = () => { const onToggle = () => {
setOpen(prevOpen => !prevOpen); setOpen(prevOpen => !prevOpen);
}; };
@ -132,9 +116,6 @@ export const ReviewButton = () => {
<MenuItem onClick={onApprove}> <MenuItem onClick={onApprove}>
Approve changes Approve changes
</MenuItem> </MenuItem>
<MenuItem onClick={onReject}>
Reject changes
</MenuItem>
</MenuList> </MenuList>
</ClickAwayListener> </ClickAwayListener>
</Paper> </Paper>