From b540193bb7f1b813771c22d81fe5ebdb6c34c2c9 Mon Sep 17 00:00:00 2001
From: Wouter Admiraal <wouter.admiraal@sonarsource.com>
Date: Tue, 22 Dec 2020 15:37:26 +0100
Subject: [PATCH] SONAR-12407 Do not disable facets with 0 results

---
 .../src/main/js/apps/coding-rules/components/Facet.tsx      | 1 -
 .../src/main/js/apps/issues/sidebar/ResolutionFacet.tsx     | 1 -
 .../src/main/js/apps/issues/sidebar/ScopeFacet.tsx          | 1 -
 .../src/main/js/apps/issues/sidebar/SeverityFacet.tsx       | 1 -
 .../src/main/js/apps/issues/sidebar/StatusFacet.tsx         | 1 -
 .../sonar-web/src/main/js/apps/issues/sidebar/TypeFacet.tsx | 1 -
 .../__tests__/__snapshots__/ScopeFacet-test.tsx.snap        | 2 +-
 .../__tests__/__snapshots__/StatusFacet-test.tsx.snap       | 4 ++--
 .../sidebar/__tests__/__snapshots__/TypeFacet-test.tsx.snap | 2 +-
 .../src/main/js/components/facet/ListStyleFacet.tsx         | 6 ------
 10 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/Facet.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/Facet.tsx
index f5f9dbd741f..2b37791cb47 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/components/Facet.tsx
+++ b/server/sonar-web/src/main/js/apps/coding-rules/components/Facet.tsx
@@ -81,7 +81,6 @@ export default class Facet extends React.PureComponent<Props> {
     return (
       <FacetItem
         active={active}
-        disabled={stat === 0 && !active}
         halfWidth={this.props.halfWidth}
         key={value}
         name={renderName(value)}
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 6bae4439cf1..c531b5067d0 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
@@ -95,7 +95,6 @@ export default class ResolutionFacet extends React.PureComponent<Props> {
     return (
       <FacetItem
         active={active}
-        disabled={stat === 0 && !active}
         halfWidth={true}
         key={resolution}
         name={this.getFacetItemName(resolution)}
diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/ScopeFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/ScopeFacet.tsx
index 301a3c266df..0cc9c879f0b 100644
--- a/server/sonar-web/src/main/js/apps/issues/sidebar/ScopeFacet.tsx
+++ b/server/sonar-web/src/main/js/apps/issues/sidebar/ScopeFacet.tsx
@@ -63,7 +63,6 @@ export default function ScopeFacet(props: ScopeFacetProps) {
               return (
                 <FacetItem
                   active={active}
-                  disabled={stat === 0 && !active}
                   key={scope}
                   name={
                     <span className="display-flex-center">
diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/SeverityFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/SeverityFacet.tsx
index 15e7530a135..0092ee39e0a 100644
--- a/server/sonar-web/src/main/js/apps/issues/sidebar/SeverityFacet.tsx
+++ b/server/sonar-web/src/main/js/apps/issues/sidebar/SeverityFacet.tsx
@@ -80,7 +80,6 @@ export default class SeverityFacet extends React.PureComponent<Props> {
     return (
       <FacetItem
         active={active}
-        disabled={stat === 0 && !active}
         halfWidth={true}
         key={severity}
         name={<SeverityHelper severity={severity} />}
diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/StatusFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/StatusFacet.tsx
index 1f6d66bb610..6ff6c004b18 100644
--- a/server/sonar-web/src/main/js/apps/issues/sidebar/StatusFacet.tsx
+++ b/server/sonar-web/src/main/js/apps/issues/sidebar/StatusFacet.tsx
@@ -78,7 +78,6 @@ export default class StatusFacet extends React.PureComponent<Props> {
     return (
       <FacetItem
         active={active}
-        disabled={stat === 0 && !active}
         halfWidth={true}
         key={status}
         name={<StatusHelper resolution={undefined} status={status} />}
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 f7513f5879f..81326fc2b63 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
@@ -83,7 +83,6 @@ export default class TypeFacet extends React.PureComponent<Props> {
     return (
       <FacetItem
         active={active}
-        disabled={stat === 0 && !active}
         key={type}
         name={
           <span className="display-flex-center">
diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/__snapshots__/ScopeFacet-test.tsx.snap b/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/__snapshots__/ScopeFacet-test.tsx.snap
index ca871a44fa6..dab4fe20f21 100644
--- a/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/__snapshots__/ScopeFacet-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/__snapshots__/ScopeFacet-test.tsx.snap
@@ -97,7 +97,7 @@ exports[`should render correctly: disabled facet 1`] = `
   <FacetItemsList>
     <FacetItem
       active={false}
-      disabled={true}
+      disabled={false}
       halfWidth={false}
       key="MAIN"
       loading={false}
diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/__snapshots__/StatusFacet-test.tsx.snap b/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/__snapshots__/StatusFacet-test.tsx.snap
index 8a01c4c8a2a..3b51ae596a6 100644
--- a/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/__snapshots__/StatusFacet-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/__snapshots__/StatusFacet-test.tsx.snap
@@ -47,7 +47,7 @@ exports[`should render correctly 1`] = `
     />
     <FacetItem
       active={false}
-      disabled={true}
+      disabled={false}
       halfWidth={true}
       key="REOPENED"
       loading={false}
@@ -63,7 +63,7 @@ exports[`should render correctly 1`] = `
     />
     <FacetItem
       active={false}
-      disabled={true}
+      disabled={false}
       halfWidth={true}
       key="RESOLVED"
       loading={false}
diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/__snapshots__/TypeFacet-test.tsx.snap b/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/__snapshots__/TypeFacet-test.tsx.snap
index 534929cfa43..c71e13dc2cd 100644
--- a/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/__snapshots__/TypeFacet-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/__snapshots__/TypeFacet-test.tsx.snap
@@ -20,7 +20,7 @@ exports[`should render open by default 1`] = `
   <FacetItemsList>
     <FacetItem
       active={false}
-      disabled={true}
+      disabled={false}
       halfWidth={false}
       key="BUG"
       loading={false}
diff --git a/server/sonar-web/src/main/js/components/facet/ListStyleFacet.tsx b/server/sonar-web/src/main/js/components/facet/ListStyleFacet.tsx
index 70ab5b12cbb..76c0d7b0736 100644
--- a/server/sonar-web/src/main/js/components/facet/ListStyleFacet.tsx
+++ b/server/sonar-web/src/main/js/components/facet/ListStyleFacet.tsx
@@ -314,10 +314,6 @@ export default class ListStyleFacet<S> extends React.Component<Props<S>, State<S
   }
 
   renderSearch() {
-    if (!this.props.stats || !Object.keys(this.props.stats).length) {
-      return null;
-    }
-
     return (
       <SearchBox
         autoFocus={this.state.autoFocus}
@@ -370,11 +366,9 @@ export default class ListStyleFacet<S> extends React.Component<Props<S>, State<S
     const key = this.props.getSearchResultKey(result);
     const active = this.props.values.includes(key);
     const stat = this.getStat(key) || this.state.searchResultsCounts[key];
-    const disabled = !active && stat === 0;
     return (
       <FacetItem
         active={active}
-        disabled={disabled}
         key={key}
         name={this.props.renderSearchResult(result, this.state.query)}
         onClick={this.handleItemClick}
-- 
2.39.5