From: Grégoire Aubert <gregoire.aubert@sonarsource.com>
Date: Tue, 7 Mar 2017 09:25:36 +0000 (+0100)
Subject: SONAR-8876 Rename language facet to languages
X-Git-Tag: 6.4-RC1~799
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F1751%2Fhead;p=sonarqube.git

SONAR-8876 Rename language facet to languages
---

diff --git a/server/sonar-web/src/main/js/apps/projects/filters/LanguageFilter.js b/server/sonar-web/src/main/js/apps/projects/filters/LanguageFilter.js
index 0e3d5e51706..549d50eb6ac 100644
--- a/server/sonar-web/src/main/js/apps/projects/filters/LanguageFilter.js
+++ b/server/sonar-web/src/main/js/apps/projects/filters/LanguageFilter.js
@@ -30,6 +30,8 @@ export default class LanguageFilter extends React.Component {
     organization: React.PropTypes.object
   }
 
+  property = 'languages';
+
   renderOption = option => {
     return (
       <LanguageFilterOption languageKey={option}/>
@@ -42,7 +44,7 @@ export default class LanguageFilter extends React.Component {
 
   renderFooter = () => (
     <LanguageFilterFooter
-        property="language"
+        property={this.property}
         query={this.props.query}
         isFavorite={this.props.isFavorite}
         organization={this.props.organization}/>
@@ -53,7 +55,7 @@ export default class LanguageFilter extends React.Component {
   render () {
     return (
       <FilterContainer
-          property="language"
+          property={this.property}
           getOptions={facet => facet ? this.getSortedOptions(facet) : []}
           renderName={() => 'Languages'}
           renderOption={this.renderOption}
diff --git a/server/sonar-web/src/main/js/apps/projects/store/actions.js b/server/sonar-web/src/main/js/apps/projects/store/actions.js
index 237df655e0f..b609227c95f 100644
--- a/server/sonar-web/src/main/js/apps/projects/store/actions.js
+++ b/server/sonar-web/src/main/js/apps/projects/store/actions.js
@@ -54,7 +54,7 @@ const FACETS = [
   'duplicated_lines_density',
   'ncloc',
   'alert_status',
-  'language'
+  'languages'
 ];
 
 const onFail = dispatch => error => {
diff --git a/server/sonar-web/src/main/js/apps/projects/store/utils.js b/server/sonar-web/src/main/js/apps/projects/store/utils.js
index 4d6ef3dc157..e2cd838941b 100644
--- a/server/sonar-web/src/main/js/apps/projects/store/utils.js
+++ b/server/sonar-web/src/main/js/apps/projects/store/utils.js
@@ -54,7 +54,7 @@ export const parseUrlQuery = urlQuery => ({
   'coverage': getAsNumericRating(urlQuery['coverage']),
   'duplications': getAsNumericRating(urlQuery['duplications']),
   'size': getAsNumericRating(urlQuery['size']),
-  'language': getAsArray(urlQuery['language'], getAsString),
+  'languages': getAsArray(urlQuery['languages'], getAsString),
   'search': getAsString(urlQuery['search'])
 });
 
@@ -152,11 +152,12 @@ export const convertToFilter = (query, isFavorite) => {
     conditions.push(convertIssuesRating('sqale_rating', query['maintainability']));
   }
 
-  if (query['language'] != null) {
-    if (!Array.isArray(query['language']) || query['language'].length < 2) {
-      conditions.push('language = ' + query['language']);
+  const { languages } = query;
+  if (languages != null) {
+    if (!Array.isArray(languages) || languages.length < 2) {
+      conditions.push('languages = ' + languages);
     } else {
-      conditions.push(`language IN (${query['language'].join(', ')})`);
+      conditions.push(`languages IN (${languages.join(', ')})`);
     }
   }
 
@@ -176,7 +177,7 @@ export const mapMetricToProperty = metricKey => {
     'duplicated_lines_density': 'duplications',
     'ncloc': 'size',
     'alert_status': 'gate',
-    'language': 'language'
+    'languages': 'languages'
   };
   return map[metricKey];
 };