From e5d4ef578a9cab0d6ee6049e8207ab2e988f8eda Mon Sep 17 00:00:00 2001
From: Stas Vilchik <stas.vilchik@sonarsource.com>
Date: Fri, 6 Jul 2018 12:34:21 +0200
Subject: SONAR-10992 Make bugs, vulnerabilities and code smells default
 selection (#488)

---
 .../src/main/js/apps/issues/sidebar/ResolutionFacet.tsx     |  1 +
 .../sonar-web/src/main/js/apps/issues/sidebar/TypeFacet.tsx | 13 ++++++++++++-
 .../sonar-web/src/main/js/components/facet/FacetHeader.tsx  |  3 ++-
 3 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'server')

diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/ResolutionFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/ResolutionFacet.tsx
index e909d06372c..1a6163d9124 100644
--- a/server/sonar-web/src/main/js/apps/issues/sidebar/ResolutionFacet.tsx
+++ b/server/sonar-web/src/main/js/apps/issues/sidebar/ResolutionFacet.tsx
@@ -116,6 +116,7 @@ export default class ResolutionFacet extends React.PureComponent<Props> {
     return (
       <FacetBox property={this.property}>
         <FacetHeader
+          clearLabel="reset_verb"
           name={translate('issues.facet', this.property)}
           onClear={this.handleClear}
           onClick={this.handleHeaderClick}
diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/TypeFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/TypeFacet.tsx
index 0cb0497549d..62900a529a3 100644
--- a/server/sonar-web/src/main/js/apps/issues/sidebar/TypeFacet.tsx
+++ b/server/sonar-web/src/main/js/apps/issues/sidebar/TypeFacet.tsx
@@ -70,8 +70,18 @@ export default class TypeFacet extends React.PureComponent<Props> {
     return stats ? stats[type] : undefined;
   }
 
+  isFacetItemActive(type: string) {
+    const { types } = this.props;
+    return (
+      // type is selected explicitly
+      types.includes(type) ||
+      // bugs, vulnerabilities and code smells are selected implicitly by default
+      (types.length === 0 && ['BUG', 'VULNERABILITY', 'CODE_SMELL'].includes(type))
+    );
+  }
+
   renderItem = (type: string) => {
-    const active = this.props.types.includes(type);
+    const active = this.isFacetItemActive(type);
     const stat = this.getStat(type);
 
     return (
@@ -100,6 +110,7 @@ export default class TypeFacet extends React.PureComponent<Props> {
     return (
       <FacetBox property={this.property}>
         <FacetHeader
+          clearLabel="reset_verb"
           name={translate('issues.facet', this.property)}
           onClear={this.handleClear}
           onClick={this.handleHeaderClick}
diff --git a/server/sonar-web/src/main/js/components/facet/FacetHeader.tsx b/server/sonar-web/src/main/js/components/facet/FacetHeader.tsx
index f4544cf5028..0c496278381 100644
--- a/server/sonar-web/src/main/js/components/facet/FacetHeader.tsx
+++ b/server/sonar-web/src/main/js/components/facet/FacetHeader.tsx
@@ -25,6 +25,7 @@ import { translate, translateWithParameters } from '../../helpers/l10n';
 
 interface Props {
   children?: React.ReactNode;
+  clearLabel?: string;
   helper?: string;
   name: React.ReactNode;
   onClear?: () => void;
@@ -94,7 +95,7 @@ export default class FacetHeader extends React.PureComponent<Props> {
           <Button
             className="search-navigator-facet-header-button button-small button-red"
             onClick={this.props.onClear}>
-            {translate('clear')}
+            {translate(this.props.clearLabel || 'clear')}
           </Button>
         )}
       </div>
-- 
cgit v1.2.3