shpaq/sct-overseerr
1
0
Fork 0
mirror of https://github.com/sct/overseerr.git synced 2025-12-30 17:49:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): allow canceling from request list & hide edit button for own requests (#1401)

Browse Source 
* fix(ui): allow canceling from request list & hide edit button for own requests

* fix(ui): hide 'Cancel Request' button on request list for admins
This commit is contained in:
TheCatLady
2021-04-12 23:02:10 -04:00
committed by GitHub
parent b5ac2f5a2c
commit bed850dce9
4 changed files with 50 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/components/RequestModal/MovieRequestModal.tsx
View File

@@ -33,6 +33,7 @@ const messages = defineMessages({
errorediting: 'Something went wrong while editing the request.',
requestedited: 'Request for <strong>{title}</strong> edited successfully!',
requesterror: 'Something went wrong while submitting the request.',
pendingapproval: 'Your request is pending approval.',
});
interface RequestModalProps extends React.HTMLAttributes<HTMLDivElement> {
@@ -206,8 +207,7 @@ const MovieRequestModal: React.FC<RequestModalProps> = ({
};
const isOwner = activeRequest
? activeRequest.requestedBy.id === user?.id ||
hasPermission(Permission.MANAGE_REQUESTS)
? activeRequest.requestedBy.id === user?.id
: false;
if (activeRequest?.status === MediaRequestStatus.PENDING) {
@@ -222,27 +222,27 @@ const MovieRequestModal: React.FC<RequestModalProps> = ({
title: data?.title,
}
)}
onOk={() => updateRequest()}
onOk={() => (isOwner ? cancelRequest() : updateRequest())}
okDisabled={isUpdating}
okText={intl.formatMessage(globalMessages.edit)}
okButtonType="primary"
onSecondary={isOwner ? () => cancelRequest() : undefined}
secondaryDisabled={isUpdating}
secondaryText={
isUpdating
? intl.formatMessage(globalMessages.canceling)
: intl.formatMessage(messages.cancel)
okText={
isOwner
? isUpdating
? intl.formatMessage(globalMessages.canceling)
: intl.formatMessage(messages.cancel)
: intl.formatMessage(globalMessages.edit)
}
secondaryButtonType="danger"
okButtonType={isOwner ? 'danger' : 'primary'}
cancelText={intl.formatMessage(globalMessages.close)}
iconSvg={<DownloadIcon className="w-6 h-6" />}
>
{intl.formatMessage(
is4k ? messages.request4kfrom : messages.requestfrom,
{
username: activeRequest.requestedBy.displayName,
}
)}
{isOwner
? intl.formatMessage(messages.pendingapproval)
: intl.formatMessage(
is4k ? messages.request4kfrom : messages.requestfrom,
{
username: activeRequest.requestedBy.displayName,
}
)}
{(hasPermission(Permission.REQUEST_ADVANCED) ||
hasPermission(Permission.MANAGE_REQUESTS)) && (
<div className="mt-4">