import ReliabilityFilter from '../filters/ReliabilityFilter';
import SecurityFilter from '../filters/SecurityFilter';
import MaintainabilityFilter from '../filters/MaintainabilityFilter';
+import LanguageFilter from '../filters/LanguageFilter';
import { translate } from '../../../helpers/l10n';
export default class PageSidebar extends React.Component {
query={this.props.query}
isFavorite={this.props.isFavorite}
organization={this.props.organization}/>
+ <LanguageFilter
+ query={this.props.query}
+ isFavorite={this.props.isFavorite}
+ organization={this.props.organization}/>
</div>
);
}
return (
<FilterContainer
property="coverage"
- options={[1, 2, 3, 4, 5]}
+ getOptions={() => [1, 2, 3, 4, 5]}
renderName={() => 'Coverage'}
renderOption={this.renderOption}
getFacetValueForOption={this.getFacetValueForOption}
return (
<FilterContainer
property="duplications"
- options={[1, 2, 3, 4, 5]}
+ getOptions={() => [1, 2, 3, 4, 5]}
renderName={() => 'Duplications'}
renderOption={this.renderOption}
getFacetValueForOption={this.getFacetValueForOption}
import classNames from 'classnames';
import { Link } from 'react-router';
import { formatMeasure } from '../../../helpers/measures';
+import { translate } from '../../../helpers/l10n';
export default class Filter extends React.Component {
static propTypes = {
value: React.PropTypes.any,
property: React.PropTypes.string.isRequired,
- options: React.PropTypes.array.isRequired,
+ getOptions: React.PropTypes.func.isRequired,
maxFacetValue: React.PropTypes.number,
optionClassName: React.PropTypes.string,
halfWidth: false
};
+ isSelected (option) {
+ const { value } = this.props;
+ return Array.isArray(value) ? value.includes(option) : option === value;
+ }
+
+ getPath (option) {
+ const { property, value } = this.props;
+ let urlOption;
+
+ if (Array.isArray(value)) {
+ if (this.isSelected(option)) {
+ urlOption = value.length > 1 ? value.filter(val => val !== option).join(',') : null;
+ } else {
+ urlOption = value.concat(option).join(',');
+ }
+ } else {
+ urlOption = this.isSelected(option) ? null : option;
+ }
+ return this.props.getFilterUrl({ [property]: urlOption });
+ }
+
renderHeader () {
return (
<div className="search-navigator-facet-header projects-facet-header">
}
renderOption (option) {
- const { property, value, facet, getFacetValueForOption } = this.props;
+ const { facet, getFacetValueForOption } = this.props;
const className = classNames('facet', 'search-navigator-facet', 'projects-facet', {
- 'active': option === value,
+ 'active': this.isSelected(option),
'search-navigator-facet-half': this.props.halfWidth
}, this.props.optionClassName);
- const path = option === value ?
- this.props.getFilterUrl({ [property]: null }) :
- this.props.getFilterUrl({ [property]: option });
+ const path = this.getPath(option);
const facetValue = (facet && getFacetValueForOption) ? getFacetValueForOption(facet, option) : null;
return (
<Link key={option} className={className} to={path} data-key={option}>
<span className="facet-name">
- {this.props.renderOption(option, option === value)}
+ {this.props.renderOption(option, this.isSelected(option))}
</span>
{facetValue != null && (
<span className="facet-stat">
}
renderOptions () {
- return (
+ const options = this.props.getOptions(this.props.facet);
+ if (options && options.length > 0) {
+ return (
<div className="search-navigator-facet-list">
- {this.props.options.map(option => this.renderOption(option))}
+ {options.map(option => this.renderOption(option))}
</div>
- );
+ );
+ } else {
+ return (
+ <div className="search-navigator-facet-empty">
+ {translate('no_results')}
+ </div>
+ );
+ }
}
render () {
return (
<FilterContainer
property={this.props.property}
- options={[1, 2, 3, 4, 5]}
+ getOptions={() => [1, 2, 3, 4, 5]}
renderName={() => this.props.name}
renderOption={this.renderOption}
getFacetValueForOption={this.getFacetValueForOption}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2017 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+import React from 'react';
+import sortBy from 'lodash/sortBy';
+import FilterContainer from './FilterContainer';
+import LanguageFilterOption from './LanguageFilterOption';
+
+export default class LanguageFilter extends React.Component {
+ static propTypes = {
+ query: React.PropTypes.object.isRequired,
+ isFavorite: React.PropTypes.bool,
+ organization: React.PropTypes.object
+ }
+
+ renderOption = option => {
+ return (
+ <LanguageFilterOption languageKey={option}/>
+ );
+ };
+
+ getSortedOptions (facet) {
+ return sortBy(Object.keys(facet), [option => -facet[option]]);
+ }
+
+ getFacetValueForOption = (facet, option) => facet[option];
+
+ render () {
+ return (
+ <FilterContainer
+ property="language"
+ getOptions={facet => facet ? this.getSortedOptions(facet) : []}
+ renderName={() => 'Languages'}
+ renderOption={this.renderOption}
+ getFacetValueForOption={this.getFacetValueForOption}
+ query={this.props.query}
+ isFavorite={this.props.isFavorite}
+ organization={this.props.organization}/>
+ );
+ }
+}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2017 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+import { connect } from 'react-redux';
+import React from 'react';
+import { translate } from '../../../helpers/l10n';
+import { getLanguageByKey } from '../../../store/rootReducer';
+
+class LanguageFilterOption extends React.Component {
+ static propTypes = {
+ languageKey: React.PropTypes.string.isRequired,
+ language: React.PropTypes.object
+ }
+
+ render () {
+ const languageName = this.props.language ? this.props.language.name : this.props.languageKey;
+ return (
+ <span>{this.props.languageKey !== '<null>' ? languageName : translate('unknown')}</span>
+ );
+ }
+}
+
+const mapStateToProps = (state, ownProps) => ({
+ language: getLanguageByKey(state, ownProps.languageKey)
+});
+
+export default connect(mapStateToProps)(LanguageFilterOption);
return (
<FilterContainer
property="gate"
- options={['OK', 'WARN', 'ERROR']}
+ getOptions={() => ['OK', 'WARN', 'ERROR']}
renderName={() => 'Quality Gate'}
renderOption={this.renderOption}
getFacetValueForOption={this.getFacetValueForOption}
return (
<FilterContainer
property="size"
- options={[1, 2, 3, 4, 5]}
+ getOptions={() => [1, 2, 3, 4, 5]}
renderName={() => 'Size'}
renderOption={this.renderOption}
getFacetValueForOption={this.getFacetValueForOption}
'coverage',
'duplicated_lines_density',
'ncloc',
- 'alert_status'
+ 'alert_status',
+ 'language'
];
const onFail = dispatch => error => {
'maintainability',
'coverage',
'duplications',
- 'size'
+ 'size',
+ 'language'
];
const REVERSED_FACETS = [
return null;
};
+const getAsString = value => {
+ if (!value) {
+ return null;
+ }
+ return value;
+};
+
+const getAsArray = (values, elementGetter) => {
+ if (!values) {
+ return null;
+ }
+ return values.split(',').map(elementGetter);
+};
+
export const parseUrlQuery = urlQuery => ({
'gate': getAsLevel(urlQuery['gate']),
'reliability': getAsNumericRating(urlQuery['reliability']),
'maintainability': getAsNumericRating(urlQuery['maintainability']),
'coverage': getAsNumericRating(urlQuery['coverage']),
'duplications': getAsNumericRating(urlQuery['duplications']),
- 'size': getAsNumericRating(urlQuery['size'])
+ 'size': getAsNumericRating(urlQuery['size']),
+ 'language': getAsArray(urlQuery['language'], getAsString)
});
const convertIssuesRating = (metric, rating) => {
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']);
+ } else {
+ conditions.push(`language IN (${query['language'].join(', ')})`);
+ }
+ }
+
return conditions.join(' and ');
};
'coverage': 'coverage',
'duplicated_lines_density': 'duplications',
'ncloc': 'size',
- 'alert_status': 'gate'
+ 'alert_status': 'gate',
+ 'language': 'language'
};
return map[metricKey];
};
export const getLanguages = state => (
state
);
+
+export const getLanguageByKey = (state, key) => (
+ state[key]
+);
fromGlobalMessages.getGlobalMessages(state.globalMessages)
);
-export const getLanguages = (state, key) => (
- fromLanguages.getLanguages(state.languages, key)
+export const getLanguages = state => (
+ fromLanguages.getLanguages(state.languages)
+);
+
+export const getLanguageByKey = (state, key) => (
+ fromLanguages.getLanguageByKey(state.languages, key)
);
export const getCurrentUser = state => (
background-color: transparent;
.search-navigator-facet-list,
+ .search-navigator-facet-empty,
.search-navigator-facet-container {
display: none;
}
font-size: 0;
}
+.search-navigator-facet-empty {
+ margin: 0 0 0 0;
+ padding: 0 10px 10px;
+ color: @baseFontColor;
+ font-size: @smallFontSize;
+ white-space: nowrap;
+}
+
.search-navigator-facet-list-align-right {
.facet-name {
projects / sonarqube.git / commitdiff