SONAR-7446 Replace usage of facetMode 'debt' by 'effort' in Issues page

diff --git a/server/sonar-web/src/main/js/api/issues.js b/server/sonar-web/src/main/js/api/issues.js
index d4b6b4932bfa4df46ec526e157f8ae5325a15ea5..86ea25a9b30771ae8c5b64005ff33b02efbdd37d 100644 (file)
--- a/server/sonar-web/src/main/js/api/issues.js
+++ b/server/sonar-web/src/main/js/api/issues.js
@@ -56,7 +56,7 @@ export function getAssignees (query) {
 
 export function getIssuesCount (query) {
   const url = window.baseUrl + '/api/issues/search';
-  const data = _.extend({}, query, { ps: 1, facetMode: 'debt' });
+  const data = _.extend({}, query, { ps: 1, facetMode: 'effort' });
   return getJSON(url, data).then(r => {
     return { issues: r.total, debt: r.debtTotal };
   });

diff --git a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-mode-facet.hbs b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-mode-facet.hbs
index 6e8ec1de40f9266202ffa09c87152db4f4d8f070..bfbce223cf730655909c96ca15f4f51011ae4d07 100644 (file)
--- a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-mode-facet.hbs
+++ b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-mode-facet.hbs
@@ -6,9 +6,9 @@
       <label for="issues-page-mode-count">Issues</label>
     </li>
     <li>
-      <input type="radio" name="issues-page-mode" value="debt" id="issues-page-mode-debt"
-             {{#eq mode 'debt'}}checked{{/eq}}>
-      <label for="issues-page-mode-debt">Effort</label>
+      <input type="radio" name="issues-page-mode" value="effort" id="issues-page-mode-effort"
+             {{#eq mode 'effort'}}checked{{/eq}}>
+      <label for="issues-page-mode-effort">Effort</label>
     </li>
   </ul>
 </div>

diff --git a/server/sonar-web/src/main/js/apps/overview/main/code-smells.js b/server/sonar-web/src/main/js/apps/overview/main/code-smells.js
index d731a4c84d8b16b1ac76200487a8dd0a6560ad47..cc7cba652534e5902177a609a855c6d024d0f240 100644 (file)
--- a/server/sonar-web/src/main/js/apps/overview/main/code-smells.js
+++ b/server/sonar-web/src/main/js/apps/overview/main/code-smells.js
@@ -71,7 +71,7 @@ export const CodeSmells = React.createClass({
         <Measure label={getMetricName('new_effort')}>
           <IssuesLink
               component={this.props.component.key}
-              params={{ resolved: 'false', types: 'CODE_SMELL', facetMode: 'debt', sinceLeakPeriod: 'true' }}>
+              params={{ resolved: 'false', types: 'CODE_SMELL', facetMode: 'effort', sinceLeakPeriod: 'true' }}>
             <span
                 title={translateWithParameters('widget.as_calculated_on_x', formattedSnapshotDate)}
                 data-toggle="tooltip">
@@ -131,7 +131,7 @@ export const CodeSmells = React.createClass({
             <Measure label={getMetricName('effort')}>
               <IssuesLink
                   component={this.props.component.key}
-                  params={{ resolved: 'false', types: 'CODE_SMELL', facetMode: 'debt' }}>
+                  params={{ resolved: 'false', types: 'CODE_SMELL', facetMode: 'effort' }}>
                 <span
                     title={translateWithParameters('widget.as_calculated_on_x', formattedSnapshotDate)}
                     data-toggle="tooltip">

diff --git a/server/sonar-web/src/main/js/helpers/handlebars/formatFacetValue.js b/server/sonar-web/src/main/js/helpers/handlebars/formatFacetValue.js
index 366f77c6678975842d5b2c8e78c7abade70f9800..5764325afc416a68060a56b76abe4e4a3ad80828 100644 (file)
--- a/server/sonar-web/src/main/js/helpers/handlebars/formatFacetValue.js
+++ b/server/sonar-web/src/main/js/helpers/handlebars/formatFacetValue.js
@@ -20,7 +20,7 @@
 import { formatMeasure } from '../measures';
 
 module.exports = function (value, facetMode) {
-  const formatter = facetMode === 'debt' ? 'SHORT_WORK_DUR' : 'SHORT_INT';
+  const formatter = facetMode === 'effort' ? 'SHORT_WORK_DUR' : 'SHORT_INT';
   return formatMeasure(value, formatter);
 };
 

diff --git a/server/sonar-web/src/main/js/helpers/handlebars/issueFilterItemLink.js b/server/sonar-web/src/main/js/helpers/handlebars/issueFilterItemLink.js
index 92c18bcc5ca771c1097d89a3b894102b4a8f5aa7..10b926d86a2c1b4ecc1d1a4a8eb7788812796b90 100644 (file)
--- a/server/sonar-web/src/main/js/helpers/handlebars/issueFilterItemLink.js
+++ b/server/sonar-web/src/main/js/helpers/handlebars/issueFilterItemLink.js
@@ -32,8 +32,8 @@ module.exports = function (query, property, value, mode) {
   const criterion = {};
   criterion[property] = value;
   const r = _.extend({}, query, criterion);
-  if (mode === 'debt') {
-    r.facetMode = 'debt';
+  if (mode === 'effort') {
+    r.facetMode = 'effort';
   }
   if (r.componentKey != null) {
     return window.baseUrl + '/component_issues/index?id=' + encodeURIComponent(r.componentKey) +

diff --git a/server/sonar-web/src/main/js/helpers/handlebars/issueFilterTotalLink.js b/server/sonar-web/src/main/js/helpers/handlebars/issueFilterTotalLink.js
index c5212c6fcfb5f79db51dab37f0c6809469e4fe48..96e6863eefc6d316488ada10e28bb9641ce1f0a4 100644 (file)
--- a/server/sonar-web/src/main/js/helpers/handlebars/issueFilterTotalLink.js
+++ b/server/sonar-web/src/main/js/helpers/handlebars/issueFilterTotalLink.js
@@ -30,8 +30,8 @@ function getQuery (query, separator) {
 
 module.exports = function (query, mode) {
   const r = _.extend({}, query);
-  if (mode === 'debt') {
-    r.facetMode = 'debt';
+  if (mode === 'effort') {
+    r.facetMode = 'effort';
   }
   if (r.componentKey != null) {
     return window.baseUrl + '/component_issues/index?id=' + encodeURIComponent(r.componentKey) +

diff --git a/server/sonar-web/src/main/js/helpers/handlebars/issueFilterValue.js b/server/sonar-web/src/main/js/helpers/handlebars/issueFilterValue.js
index dc5ea72598ec9a7db493e75ecc3d92eb2b325026..9d1dbab3dc4072ff0c82de9b5ac038323f2a3570 100644 (file)
--- a/server/sonar-web/src/main/js/helpers/handlebars/issueFilterValue.js
+++ b/server/sonar-web/src/main/js/helpers/handlebars/issueFilterValue.js
@@ -20,6 +20,6 @@
 import { formatMeasure } from '../measures';
 
 module.exports = function (value, mode) {
-  const formatter = mode === 'debt' ? 'SHORT_WORK_DUR' : 'SHORT_INT';
+  const formatter = mode === 'effort' ? 'SHORT_WORK_DUR' : 'SHORT_INT';
   return formatMeasure(value, formatter);
 };

diff --git a/server/sonar-web/src/main/js/widgets/issue-filter/widget.js b/server/sonar-web/src/main/js/widgets/issue-filter/widget.js
index 64c5d09fbe4ddb237025fb83b1efed48f7c88562..da6b2f1ca774cd08d5a715dfec3bdd2aae918741 100644 (file)
--- a/server/sonar-web/src/main/js/widgets/issue-filter/widget.js
+++ b/server/sonar-web/src/main/js/widgets/issue-filter/widget.js
@@ -51,8 +51,8 @@ const defaultLink = function (item, property, query, index, items, mode) {
   const criterion = {};
   criterion[property] = item.val;
   const r = _.extend({}, query, criterion);
-  if (mode === 'debt') {
-    r.facetMode = 'debt';
+  if (mode === 'effort') {
+    r.facetMode = 'effort';
   }
   if (r.componentKey != null) {
     return window.baseUrl + '/component_issues/index?id=' + encodeURIComponent(r.componentKey) +
@@ -176,8 +176,8 @@ const byDistributionConf = {
         createdAfter: createdAfter.format('YYYY-MM-DD'),
         createdBefore: createdBefore.format('YYYY-MM-DD')
       });
-      if (mode === 'debt') {
-        r.facetMode = 'debt';
+      if (mode === 'effort') {
+        r.facetMode = 'effort';
       }
       if (r.componentKey != null) {
         return window.baseUrl + '/component_issues/index?id=' + encodeURIComponent(r.componentKey) +
@@ -306,7 +306,7 @@ export default Marionette.ItemView.extend({
           items,
           maxResultsReached: items.length >= FACET_LIMIT,
           maxResults: items.length,
-          total: facetMode === 'debt' ? r.debtTotal : r.total
+          total: facetMode === 'effort' ? r.debtTotal : r.total
         });
       }
     });