diff options
author | stanislavh <stanislav.honcharov@sonarsource.com> | 2024-02-15 11:11:20 +0100 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2024-02-15 20:02:34 +0000 |
commit | 9a1d70adca457f84a6f7da5561328c8d85b1a7bb (patch) | |
tree | fdc0be688be1cafaece0789bdaf76837379021f6 /server/sonar-web | |
parent | eb184b2376f69c49a6feec11a67231887a2dbbfe (diff) | |
download | sonarqube-9a1d70adca457f84a6f7da5561328c8d85b1a7bb.tar.gz sonarqube-9a1d70adca457f84a6f7da5561328c8d85b1a7bb.zip |
SONAR-21471 Drop type from allowed filters during reindexing
Diffstat (limited to 'server/sonar-web')
-rw-r--r-- | server/sonar-web/src/main/js/apps/issues/__tests__/IssuesApp-Filtering-it.tsx | 2 | ||||
-rw-r--r-- | server/sonar-web/src/main/js/apps/issues/sidebar/Sidebar.tsx | 63 |
2 files changed, 28 insertions, 37 deletions
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 ca713dc904d..35501cdd50e 100644 --- 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 1a464436c81..7c7d9598f3e 100644 --- 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> )} </> ); |