SONAR-21471 Drop type from allowed filters during reindexing

diff --git a/server/sonar-web/src/main/js/apps/issues/__tests__/IssuesApp-Filtering-it.tsx b/server/sonar-web/src/main/js/apps/issues/__tests__/IssuesApp-Filtering-it.tsx
index ca713dc904d39086e093a4c68cc13665da5c1dca..35501cdd50ee06e9269b7ec77d8eae71c19315aa 100644 (file)
--- a/server/sonar-web/src/main/js/apps/issues/__tests__/IssuesApp-Filtering-it.tsx
+++ b/server/sonar-web/src/main/js/apps/issues/__tests__/IssuesApp-Filtering-it.tsx
@@ -338,9 +338,9 @@ describe('issues app when reindexing', () => {
 
     // Enabled facets
     expect(ui.inNewCodeFilter.get()).toBeInTheDocument();
-    expect(ui.typeFacet.get()).toBeInTheDocument();
 
     // Disabled facets
+    expect(ui.typeFacet.query()).not.toBeInTheDocument();
     expect(ui.cleanCodeAttributeCategoryFacet.query()).not.toBeInTheDocument();
     expect(ui.softwareQualityFacet.query()).not.toBeInTheDocument();
     expect(ui.assigneeFacet.query()).not.toBeInTheDocument();

diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/Sidebar.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/Sidebar.tsx
index 1a464436c81db8b87281be7a05cce60ec0b96ba5..7c7d9598f3e42c6ac1de00358ac3ebe6a3c52498 100644 (file)
--- a/server/sonar-web/src/main/js/apps/issues/sidebar/Sidebar.tsx
+++ b/server/sonar-web/src/main/js/apps/issues/sidebar/Sidebar.tsx
@@ -216,21 +216,16 @@ export class SidebarClass extends React.PureComponent<Props> {
             />
 
             <BasicSeparator className="sw-my-4" />
-          </>
-        )}
-
-        <TypeFacet
-          fetching={this.props.loadingFacets.types === true}
-          needIssueSync={needIssueSync}
-          onChange={this.props.onFilterChange}
-          onToggle={this.props.onFacetToggle}
-          open={!!openFacets.types}
-          stats={facets.types}
-          types={query.types}
-        />
+            <TypeFacet
+              fetching={this.props.loadingFacets.types === true}
+              needIssueSync={needIssueSync}
+              onChange={this.props.onFilterChange}
+              onToggle={this.props.onFacetToggle}
+              open={!!openFacets.types}
+              stats={facets.types}
+              types={query.types}
+            />
 
-        {!needIssueSync && (
-          <>
             <BasicSeparator className="sw-my-4" />
 
             <ScopeFacet
@@ -401,28 +396,24 @@ export class SidebarClass extends React.PureComponent<Props> {
         )}
 
         {needIssueSync && (
-          <>
-            <BasicSeparator className="sw-my-4" />
-
-            <FlagMessage className="sw-my-6" variant="info">
-              <div>
-                {translate('indexation.page_unavailable.description')}
-                <span className="sw-ml-1">
-                  <FormattedMessage
-                    defaultMessage={translate('indexation.filters_unavailable')}
-                    id="indexation.filters_unavailable"
-                    values={{
-                      link: (
-                        <Link to="https://docs.sonarsource.com/sonarqube/latest/instance-administration/reindexing/">
-                          {translate('learn_more')}
-                        </Link>
-                      ),
-                    }}
-                  />
-                </span>
-              </div>
-            </FlagMessage>
-          </>
+          <FlagMessage className="sw-my-6" variant="info">
+            <div>
+              {translate('indexation.page_unavailable.description')}
+              <span className="sw-ml-1">
+                <FormattedMessage
+                  defaultMessage={translate('indexation.filters_unavailable')}
+                  id="indexation.filters_unavailable"
+                  values={{
+                    link: (
+                      <Link to="https://docs.sonarsource.com/sonarqube/latest/instance-administration/reindexing/">
+                        {translate('learn_more')}
+                      </Link>
+                    ),
+                  }}
+                />
+              </span>
+            </div>
+          </FlagMessage>
         )}
       </>
     );