diff options
4 files changed, 15 insertions, 2 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssueFilterWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssueFilterWidget.java index f0106c1236c..17f017ee293 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssueFilterWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssueFilterWidget.java @@ -32,7 +32,7 @@ import static org.sonar.api.web.WidgetScope.GLOBAL; @WidgetProperties({ @WidgetProperty(key = IssueFilterWidget.FILTER_PROPERTY, type = WidgetPropertyType.ISSUE_FILTER, optional = false), @WidgetProperty(key = IssueFilterWidget.DISTRIBUTION_AXIS_PROPERTY, type = WidgetPropertyType.SINGLE_SELECT_LIST, defaultValue = "severities", - options = {"severities", "resolutions", "statuses", "rules", "tags", "projectUuids", "assignees", "reporters", + options = {"types", "severities", "resolutions", "statuses", "rules", "tags", "projectUuids", "assignees", "reporters", "authors", "languages", "actionPlans", "createdAt"}), @WidgetProperty(key = IssueFilterWidget.DISPLAY_FILTER_DESCRIPTION, type = WidgetPropertyType.BOOLEAN, defaultValue = "false"), @WidgetProperty(key = IssueFilterWidget.DISPLAY_MODE, type = WidgetPropertyType.SINGLE_SELECT_LIST, defaultValue = "count", options = {"count", "debt"}) diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ProjectIssueFilterWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ProjectIssueFilterWidget.java index 7809f0433fd..e87b8673bdd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ProjectIssueFilterWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ProjectIssueFilterWidget.java @@ -32,7 +32,7 @@ import static org.sonar.api.web.WidgetScope.PROJECT; @WidgetProperties({ @WidgetProperty(key = ProjectIssueFilterWidget.FILTER_PROPERTY, type = WidgetPropertyType.ISSUE_FILTER, optional = false), @WidgetProperty(key = ProjectIssueFilterWidget.DISTRIBUTION_AXIS_PROPERTY, type = WidgetPropertyType.SINGLE_SELECT_LIST, defaultValue = "severities", - options = {"severities", "resolutions", "statuses", "rules", "tags", "assignees", "reporters", "authors", + options = {"types", "severities", "resolutions", "statuses", "rules", "tags", "assignees", "reporters", "authors", "languages", "actionPlans", "createdAt"}), @WidgetProperty(key = ProjectIssueFilterWidget.DISPLAY_FILTER_DESCRIPTION, type = WidgetPropertyType.BOOLEAN, defaultValue = "false"), @WidgetProperty(key = ProjectIssueFilterWidget.DISPLAY_MODE, type = WidgetPropertyType.SINGLE_SELECT_LIST, defaultValue = "count", options = {"count", "debt"}) 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 1e371ed4122..83627414b1b 100644 --- a/server/sonar-web/src/main/js/widgets/issue-filter/widget.js +++ b/server/sonar-web/src/main/js/widgets/issue-filter/widget.js @@ -30,6 +30,8 @@ import ResolutionsTemplate from './templates/widget-issue-filter-resolutions.hbs import SeveritiesTemplate from './templates/widget-issue-filter-severities.hbs'; import StatusesTemplate from './templates/widget-issue-filter-statuses.hbs'; +import { translate } from '../../helpers/l10n'; + const FACET_LIMIT = 15; @@ -63,6 +65,15 @@ const defaultLink = function (item, property, query, index, items, mode) { }; const byDistributionConf = { + 'types': { + comparator (item) { + const order = ['BUG', 'VULNERABILITY', 'CODE_SMELL']; + return order.indexOf(item.val); + }, + label (item) { + return translate('issue.type', item.val); + } + }, 'severities': { template: SeveritiesTemplate, comparator (item) { 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 92fca4a5c39..8fb828e6c23 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -1353,6 +1353,7 @@ widget.issue_filter.property.displayFilterDescription.name=Display Filter Descri widget.issue_filter.property.displayMode.name=Display Mode widget.issue_filter.unknown_filter_warning=This widget is configured to display an issue filter that doesn't exist anymore. widget.issue_filter.insufficient_privileges_warning=Widget cannot be displayed: insufficient privileges. +widget.issue_filter.property.distributionAxis.option.types.name=By Type widget.issue_filter.property.distributionAxis.option.severities.name=By Severity widget.issue_filter.property.distributionAxis.option.projectUuids.name=By Project widget.issue_filter.property.distributionAxis.option.statuses.name=By Status @@ -1376,6 +1377,7 @@ widget.project_issue_filter.property.displayFilterDescription.name=Display Filte widget.project_issue_filter.property.displayMode.name=Display Mode widget.project_issue_filter.unknown_filter_warning=This widget is configured to display an issue filter that doesn't exist anymore. widget.project_issue_filter.insufficient_privileges_warning=Widget cannot be displayed: insufficient privileges. +widget.project_issue_filter.property.distributionAxis.option.types.name=By Type widget.project_issue_filter.property.distributionAxis.option.severities.name=By Severity widget.project_issue_filter.property.distributionAxis.option.statuses.name=By Status widget.project_issue_filter.property.distributionAxis.option.createdAt.name=By Creation Date |