External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-11 06:29:31 -02: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
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([]); setSelected([]);
}; };
const {
error: approveError,
dismissError: dismissApproveError,
} = useDismissableError(approveApprovalError);
const { const {
error: denyApprovalError, error: denyApprovalError,
isLoading: isDenyLoading, isLoading: isDenyLoading,
@@ -153,9 +148,9 @@ function WorkflowApprovalsList({ i18n }) {
}; };
const { const {
error: denyError, error: actionError,
dismissError: dismissDenyError, dismissError: dismissActionError,
} = useDismissableError(denyApprovalError); } = useDismissableError(approveApprovalError || denyApprovalError);
return ( return (
<> <>
@@ -248,26 +243,17 @@ function WorkflowApprovalsList({ i18n }) {
<ErrorDetail error={deletionError} /> <ErrorDetail error={deletionError} />
</AlertModal> </AlertModal>
)} )}
{approveError && ( {actionError && (
<AlertModal <AlertModal
isOpen={approveError} isOpen={actionError}
variant="error" variant="error"
title={i18n._(t`Error!`)} title={i18n._(t`Error!`)}
onClose={dismissApproveError} onClose={dismissActionError}
> >
{i18n._(t`Failed to approve one or more workflow approval.`)} {approveApprovalError
<ErrorDetail error={approveError} /> ? i18n._(t`Failed to approve one or more workflow approval.`)
</AlertModal> : i18n._(t`Failed to deny one or more workflow approval.`)}
)} <ErrorDetail error={actionError} />
{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} />
</AlertModal> </AlertModal>
)} )}
</> </>