From 4b10923c40d03bf25fff9cb1bcd92ae15db567ce Mon Sep 17 00:00:00 2001 From: Kevin Silva Date: Tue, 10 Jan 2023 14:41:42 +0100 Subject: [PATCH] SONAR-17845 [1096026, 1099611] Multiple links have the same programmatic link text but different destinations --- .../components/SimilarRulesFilter.tsx | 97 ++++++++++--------- .../__tests__/SimilarRulesFilter-test.tsx | 2 +- .../SimilarRulesFilter-test.tsx.snap | 65 ++++++------- .../src/main/js/apps/coding-rules/styles.css | 16 ++- .../resources/org/sonar/l10n/core.properties | 4 + 5 files changed, 103 insertions(+), 81 deletions(-) diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/SimilarRulesFilter.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/SimilarRulesFilter.tsx index 0c3f8e462ea..73fc930e32f 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/SimilarRulesFilter.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/SimilarRulesFilter.tsx @@ -17,14 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +import classNames from 'classnames'; import * as React from 'react'; +import { Button, ButtonPlain } from '../../../components/controls/buttons'; import Dropdown from '../../../components/controls/Dropdown'; import DropdownIcon from '../../../components/icons/DropdownIcon'; import FilterIcon from '../../../components/icons/FilterIcon'; import IssueTypeIcon from '../../../components/icons/IssueTypeIcon'; import TagsIcon from '../../../components/icons/TagsIcon'; import SeverityHelper from '../../../components/shared/SeverityHelper'; -import { translate } from '../../../helpers/l10n'; +import { translate, translateWithParameters } from '../../../helpers/l10n'; import { Rule } from '../../../types/types'; import { Query } from '../query'; @@ -34,32 +36,23 @@ interface Props { } export default class SimilarRulesFilter extends React.PureComponent { - handleLanguageClick = (event: React.SyntheticEvent) => { - event.preventDefault(); - event.currentTarget.blur(); + handleLanguageClick = () => { if (this.props.rule.lang) { this.props.onFilterChange({ languages: [this.props.rule.lang] }); } }; - handleTypeClick = (event: React.SyntheticEvent) => { - event.preventDefault(); - event.currentTarget.blur(); + handleTypeClick = () => { this.props.onFilterChange({ types: [this.props.rule.type] }); }; - handleSeverityClick = (event: React.SyntheticEvent) => { - event.preventDefault(); - event.currentTarget.blur(); + handleSeverityClick = () => { if (this.props.rule.severity) { this.props.onFilterChange({ severities: [this.props.rule.severity] }); } }; - handleTagClick = (event: React.SyntheticEvent) => { - event.preventDefault(); - event.currentTarget.blur(); - const { tag } = event.currentTarget.dataset; + handleTagClick = (tag: string) => { if (tag) { this.props.onFilterChange({ tags: [tag] }); } @@ -75,70 +68,82 @@ export default class SimilarRulesFilter extends React.PureComponent { className="display-inline-block" overlay={ <> -

+

{translate('coding_rules.filter_similar_rules')} -

-
    -
  • - - {rule.langName} - -
    • - + + } > - - + ); } diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/SimilarRulesFilter-test.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/SimilarRulesFilter-test.tsx index e93d5ac58d0..41629801e7f 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/SimilarRulesFilter-test.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/SimilarRulesFilter-test.tsx @@ -62,6 +62,6 @@ function mountRenderAction(actionName: string, props: Partial ); return mount(wrapper.find('Dropdown').prop('overlay')) - .find(`a[data-test="coding-rules__similar-${actionName}"]`) + .find(`button[data-test="coding-rules__similar-${actionName}"]`) .first(); } diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/__snapshots__/SimilarRulesFilter-test.tsx.snap b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/__snapshots__/SimilarRulesFilter-test.tsx.snap index 2585ebc6e1d..63f445a90aa 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/__snapshots__/SimilarRulesFilter-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/__snapshots__/SimilarRulesFilter-test.tsx.snap @@ -5,30 +5,27 @@ exports[`should render correctly 1`] = ` className="display-inline-block" overlay={ -

    coding_rules.filter_similar_rules -

    +     } > - - + `; diff --git a/server/sonar-web/src/main/js/apps/coding-rules/styles.css b/server/sonar-web/src/main/js/apps/coding-rules/styles.css index 969fcb856de..f7cab25e4cb 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/styles.css +++ b/server/sonar-web/src/main/js/apps/coding-rules/styles.css @@ -17,6 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + .coding-rules-extended-view .coding-rules-list { display: none; } @@ -25,6 +26,19 @@ display: block; } +.coding-rules-similar-tag-divider { + margin-top: 6px; + border-top: 1px solid var(--barBorderColor); +} + +.coding-rules-filter-title { + padding: var(--gridSize); + font-size: 12px; + color: var(--neutral600); + white-space: nowrap; + line-height: unset; +} + /* * Detail */ @@ -234,7 +248,7 @@ } .coding-rule-table td { - vertical-align: top; + vertical-align: middle; } .coding-rule-table + .coding-rule-table { diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index 74aa32dccf8..b4f051af2a0 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -1958,6 +1958,10 @@ coding_rules.type.tooltip.VULNERABILITY=Vulnerability Detection Rule coding_rules.type.tooltip.SECURITY_HOTSPOT=Security Hotspot Detection Rule coding_rules.update_custom_rule=Update Custom Rule coding_rules.filter_similar_rules=Filter Similar Rules +coding_rules.filter_by_language=Filter by {0} language +coding_rules.filter_by_type=Filter by {0} type +coding_rules.filter_by_severity=Filter by {0} severity +coding_rules.filter_by_tag=Filter by {0} tag coding_rules.filters.activation=Activation coding_rules.filters.activation.active=Active -- 2.39.5