External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 02:50:02 -03:30
Code Issues Packages Projects Releases Wiki Activity

Combine approve/deny modals into one modal

Browse Source
This commit is contained in:
mabashian 2020-11-13 10:10:40 -05:00
parent a9c3484387
commit aba14bfb8c
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalList.jsx
View File

@ -129,11 +129,6 @@ function WorkflowApprovalsList({ i18n }) {
setSelected([]);
};
const {
error: approveError,
dismissError: dismissApproveError,
} = useDismissableError(approveApprovalError);
const {
error: denyApprovalError,
isLoading: isDenyLoading,
@ -153,9 +148,9 @@ function WorkflowApprovalsList({ i18n }) {
};
const {
error: denyError,
dismissError: dismissDenyError,
} = useDismissableError(denyApprovalError);
error: actionError,
dismissError: dismissActionError,
} = useDismissableError(approveApprovalError || denyApprovalError);
return (
<>
@ -248,26 +243,17 @@ function WorkflowApprovalsList({ i18n }) {
<ErrorDetail error={deletionError} />
</AlertModal>
)}
{approveError && (
{actionError && (
<AlertModal
isOpen={approveError}
isOpen={actionError}
variant="error"
title={i18n._(t`Error!`)}
onClose={dismissApproveError}
onClose={dismissActionError}
>
{i18n._(t`Failed to approve one or more workflow approval.`)}
<ErrorDetail error={approveError} />
</AlertModal>
)}
{denyError && (
<AlertModal
isOpen={denyError}
variant="error"
title={i18n._(t`Error!`)}
onClose={dismissDenyError}
>
{i18n._(t`Failed to deny one or more workflow approval.`)}
<ErrorDetail error={denyError} />
{approveApprovalError
? i18n._(t`Failed to approve one or more workflow approval.`)
: i18n._(t`Failed to deny one or more workflow approval.`)}
<ErrorDetail error={actionError} />
</AlertModal>
)}
</>