SONAR-9962 Remove the "unset as default" action on Quality Gates

diff --git a/server/sonar-web/src/main/js/api/quality-gates.ts b/server/sonar-web/src/main/js/api/quality-gates.ts
index b7eb009e7f126c417f8bc5592f6c1d5050ea5e32..10bc60cea6c3456751a6ef47ba9ae83c0003a394 100644 (file)
--- a/server/sonar-web/src/main/js/api/quality-gates.ts
+++ b/server/sonar-web/src/main/js/api/quality-gates.ts
@@ -74,10 +74,6 @@ export function setQualityGateAsDefault(id: string): Promise<void | Response> {
   return post('/api/qualitygates/set_as_default', { id }).catch(throwGlobalError);
 }
 
-export function unsetQualityGateAsDefault(id: string): Promise<void | Response> {
-  return post('/api/qualitygates/unset_default', { id }).catch(throwGlobalError);
-}
-
 export function createCondition(gateId: string, condition: RequestData): Promise<any> {
   return postJSON('/api/qualitygates/create_condition', { ...condition, gateId });
 }

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/Details.js b/server/sonar-web/src/main/js/apps/quality-gates/components/Details.js
index 97249bf6532db766c88de2a2d98caec66111b042..2d3a5ad3beb195bed0886fcb281daec969b88182 100644 (file)
--- a/server/sonar-web/src/main/js/apps/quality-gates/components/Details.js
+++ b/server/sonar-web/src/main/js/apps/quality-gates/components/Details.js
@@ -20,11 +20,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
-import {
-  fetchQualityGate,
-  setQualityGateAsDefault,
-  unsetQualityGateAsDefault
-} from '../../../api/quality-gates';
+import { fetchQualityGate, setQualityGateAsDefault } from '../../../api/quality-gates';
 import DetailsHeader from './DetailsHeader';
 import DetailsContent from './DetailsContent';
 import RenameView from '../views/rename-view';
@@ -77,11 +73,9 @@ export default class Details extends React.PureComponent {
   };
 
   handleSetAsDefaultClick = () => {
-    const { qualityGate, onSetAsDefault, onUnsetAsDefault } = this.props;
-    if (qualityGate.isDefault) {
-      unsetQualityGateAsDefault(qualityGate.id).then(() => onUnsetAsDefault(qualityGate));
-    } else {
-      setQualityGateAsDefault(qualityGate.id).then(() => onSetAsDefault(qualityGate));
+    const { qualityGate, onSetAsDefault } = this.props;
+    if (!qualityGate.isDefault) {
+      setQualityGateAsDefault(qualityGate.id).then(() => onSetAsDefault(qualityGate), () => {});
     }
   };
 

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/DetailsHeader.js b/server/sonar-web/src/main/js/apps/quality-gates/components/DetailsHeader.js
index dc878e83e39ba47816d65ab01eb2ddbfdddbe66f..2ac134c52751c9f106a37869576fa0f92c6653bd 100644 (file)
--- a/server/sonar-web/src/main/js/apps/quality-gates/components/DetailsHeader.js
+++ b/server/sonar-web/src/main/js/apps/quality-gates/components/DetailsHeader.js
@@ -73,9 +73,7 @@ export default class DetailsHeader extends React.PureComponent {
                   className="little-spacer-left"
                   id="quality-gate-toggle-default"
                   onClick={this.handleSetAsDefaultClick}>
-                  {qualityGate.isDefault
-                    ? translate('unset_as_default')
-                    : translate('set_as_default')}
+                  {translate('set_as_default')}
                 </button>
               )}
               {actions.edit && (

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/containers/DetailsContainer.js b/server/sonar-web/src/main/js/apps/quality-gates/containers/DetailsContainer.js
index c5eddfe37f9638d13f7046d8ec8d89b55b7ccc43..5ac0a656b9dc0df289ee12e9965c650420bd04eb 100644 (file)
--- a/server/sonar-web/src/main/js/apps/quality-gates/containers/DetailsContainer.js
+++ b/server/sonar-web/src/main/js/apps/quality-gates/containers/DetailsContainer.js
@@ -24,7 +24,6 @@ import {
   renameQualityGate,
   copyQualityGate,
   setQualityGateAsDefault,
-  unsetQualityGateAsDefault,
   addCondition,
   deleteCondition,
   saveCondition
@@ -44,7 +43,6 @@ const mapDispatchToProps = dispatch => ({
   onRename: (qualityGate, newName) => dispatch(renameQualityGate(qualityGate, newName)),
   onCopy: qualityGate => dispatch(copyQualityGate(qualityGate)),
   onSetAsDefault: qualityGate => dispatch(setQualityGateAsDefault(qualityGate)),
-  onUnsetAsDefault: qualityGate => dispatch(unsetQualityGateAsDefault(qualityGate)),
   onAddCondition: metric => dispatch(addCondition(metric)),
   onSaveCondition: (oldCondition, newCondition) =>
     dispatch(saveCondition(oldCondition, newCondition)),

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/store/actions.js b/server/sonar-web/src/main/js/apps/quality-gates/store/actions.js
index 0dcea3223d1f4cd9a37560ea3a54da2dec686025..ad94c833969baf66d8f02fd8de57ef639b1024fb 100644 (file)
--- a/server/sonar-web/src/main/js/apps/quality-gates/store/actions.js
+++ b/server/sonar-web/src/main/js/apps/quality-gates/store/actions.js
@@ -74,14 +74,6 @@ export function setQualityGateAsDefault(qualityGate) {
   };
 }
 
-export const UNSET_AS_DEFAULT = 'qualityGates/UNSET_AS_DEFAULT';
-export function unsetQualityGateAsDefault(qualityGate) {
-  return {
-    type: UNSET_AS_DEFAULT,
-    qualityGate
-  };
-}
-
 export const ADD_CONDITION = 'qualityGates/ADD_CONDITION';
 export function addCondition(metric) {
   return {

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 05fc9df3e653e39168740d6941adc1935e7ca4cb..56078fc6518a4c89a41561fc6a7b71395cc4fe91 100644 (file)
--- 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
@@ -25,7 +25,6 @@ import {
   RENAME,
   COPY,
   SET_AS_DEFAULT,
-  UNSET_AS_DEFAULT,
   ADD_CONDITION,
   DELETE_CONDITION,
   SAVE_CONDITION
@@ -75,16 +74,6 @@ export default function rootReducer(state = initialState, action = {}) {
           isDefault: state.qualityGate.id === action.qualityGate.id
         }
       };
-    case UNSET_AS_DEFAULT:
-      return {
-        ...state,
-        qualityGates: state.qualityGates.map(candidate => {
-          return candidate.id === action.qualityGate.id
-            ? { ...candidate, isDefault: false }
-            : candidate;
-        }),
-        qualityGate: { ...state.qualityGate, isDefault: false }
-      };
     case ADD_CONDITION:
       return {
         ...state,

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index ddcfa8d7041de83508a26ab059da1365440981b8..921ae0999d58f74c2b5f4d379b10e33e51d55e65 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -218,7 +218,6 @@ no_results_search.2=Try to change filters to get some results.
 no_results_search.favorites.2=Would you like to search among {url} projects?
 page_extension_failed=Page extension failed.
 set_as_default=Set as Default
-unset_as_default=Unset as Default
 short_number_suffix.g=G
 short_number_suffix.k=k
 short_number_suffix.m=M