Browse Source

SONAR-21471 Revert drop of type filter during reindexing from UI

tags/10.5.0.89998
stanislavh 2 months ago
parent
commit
dcf9f4f133

+ 1
- 1
server/sonar-web/src/main/js/apps/issues/__tests__/IssuesApp-Filtering-it.tsx View File

@@ -343,9 +343,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();

+ 35
- 27
server/sonar-web/src/main/js/apps/issues/sidebar/Sidebar.tsx View File

@@ -216,16 +216,20 @@ 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
@@ -396,24 +400,28 @@ export class SidebarClass extends React.PureComponent<Props> {
)}

{needIssueSync && (
<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>
<>
<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>
</>
)}
</>
);

Loading…
Cancel
Save