SONAR-10561 Fix error message after deleting a quality gate

2 files changed, 7 insertions, 4 deletions

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/CopyQualityGateForm.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/CopyQualityGateForm.tsx
index 2c0609e5f66..7583b76de78 100644
--- a/server/sonar-web/src/main/js/apps/quality-gates/components/CopyQualityGateForm.tsx
+++ b/server/sonar-web/src/main/js/apps/quality-gates/components/CopyQualityGateForm.tsx
@@ -21,7 +21,7 @@ import * as React from 'react';
 import * as PropTypes from 'prop-types';
 import { copyQualityGate, QualityGate } from '../../../api/quality-gates';
 import Modal from '../../../components/controls/Modal';
-import { Button, ResetButtonLink } from '../../../components/ui/buttons';
+import { ResetButtonLink, SubmitButton } from '../../../components/ui/buttons';
 import { translate } from '../../../helpers/l10n';
 import { getQualityGateUrl } from '../../../helpers/urls';
 
@@ -116,9 +116,9 @@ export default class CopyQualityGateForm extends React.PureComponent<Props, Stat
           </div>
           <div className="modal-foot">
             {loading && <i className="spinner spacer-right" />}
-            <Button className="js-confirm" disabled={submitDisabled}>
+            <SubmitButton className="js-confirm" disabled={submitDisabled}>
               {translate('copy')}
-            </Button>
+            </SubmitButton>
             <ResetButtonLink className="js-modal-close" onClick={this.props.onClose}>
               {translate('cancel')}
             </ResetButtonLink>
diff --git a/server/sonar-web/src/main/js/apps/quality-gates/store/rootReducer.js b/server/sonar-web/src/main/js/apps/quality-gates/store/rootReducer.js
index b7032b18bc1..c9c4814bf8f 100644
--- a/server/sonar-web/src/main/js/apps/quality-gates/store/rootReducer.js
+++ b/server/sonar-web/src/main/js/apps/quality-gates/store/rootReducer.js
@@ -43,7 +43,10 @@ export default function rootReducer(state = initialState, action = {}) {
     case DELETE:
       return {
         ...state,
-        qualityGates: state.qualityGates.filter(candidate => candidate.id !== action.qualityGate.id)
+        qualityGates: state.qualityGates.filter(
+          candidate => candidate.id !== action.qualityGate.id
+        ),
+        qualityGate: state.qualityGate.id === action.qualityGate.id ? undefined : state.qualityGate
       };
     case SHOW:
       return {