From 8441bef88cbfc8fa87ff216088f4852b511910dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gr=C3=A9goire=20Aubert?= Date: Mon, 29 Jan 2018 17:55:12 +0100 Subject: [PATCH] SONAR-10319 Display Analysis Scope on rules detail page (#2995) * SONAR-10319 Display Analysis Scope on rules detail page * fix icons alignment --- .../src/main/js/api/quality-profiles.ts | 4 +- .../src/main/js/app/styles/init/misc.css | 5 +++ server/sonar-web/src/main/js/app/types.ts | 19 ++++++--- .../components/ActivationSeverityFacet.tsx | 1 + .../components/RuleDetailsMeta.tsx | 21 +++++++++- .../coding-rules/components/RuleListItem.tsx | 4 +- .../src/main/js/apps/coding-rules/styles.css | 26 ++++++------- .../icons-components/RuleScopeIcon.tsx | 39 +++++++++++++++++++ .../src/main/js/components/tags/TagsList.tsx | 3 +- .../__snapshots__/TagsList-test.tsx.snap | 4 +- .../main/js/components/ui/IssueTypeIcon.tsx | 13 ++++--- .../resources/org/sonar/l10n/core.properties | 5 +++ 12 files changed, 107 insertions(+), 37 deletions(-) create mode 100644 server/sonar-web/src/main/js/components/icons-components/RuleScopeIcon.tsx diff --git a/server/sonar-web/src/main/js/api/quality-profiles.ts b/server/sonar-web/src/main/js/api/quality-profiles.ts index 188651ddc31..736de049edb 100644 --- a/server/sonar-web/src/main/js/api/quality-profiles.ts +++ b/server/sonar-web/src/main/js/api/quality-profiles.ts @@ -249,11 +249,11 @@ export interface BulkActivateParameters { } export function bulkActivateRules(data: BulkActivateParameters) { - return postJSON('api/qualityprofiles/activate_rules', data); + return postJSON('/api/qualityprofiles/activate_rules', data); } export function bulkDeactivateRules(data: BulkActivateParameters) { - return postJSON('api/qualityprofiles/deactivate_rules', data); + return postJSON('/api/qualityprofiles/deactivate_rules', data); } export function activateRule(data: { diff --git a/server/sonar-web/src/main/js/app/styles/init/misc.css b/server/sonar-web/src/main/js/app/styles/init/misc.css index aa27be83099..72cadc3c21b 100644 --- a/server/sonar-web/src/main/js/app/styles/init/misc.css +++ b/server/sonar-web/src/main/js/app/styles/init/misc.css @@ -285,6 +285,11 @@ td.big-spacer-top { align-items: center; } +.display-inline-flex-center { + display: inline-flex !important; + align-items: center; +} + .rounded { border-radius: 2px; } diff --git a/server/sonar-web/src/main/js/app/types.ts b/server/sonar-web/src/main/js/app/types.ts index f0c37fbe7a3..0d7fb8b6fec 100644 --- a/server/sonar-web/src/main/js/app/types.ts +++ b/server/sonar-web/src/main/js/app/types.ts @@ -156,6 +156,14 @@ export interface CurrentUser { showOnboardingTutorial?: boolean; } +export interface Group { + default?: boolean; + description?: string; + id: number; + membersCount: number; + name: string; +} + export enum HomePageType { Project = 'PROJECT', Organization = 'ORGANIZATION', @@ -229,6 +237,7 @@ export interface RuleDetails extends Rule { remFnOverloaded?: boolean; remFnType?: string; repo: string; + scope?: RuleScope; templateKey?: string; } @@ -255,10 +264,8 @@ export enum RuleInheritance { Overridden = 'OVERRIDES' } -export interface Group { - default?: boolean; - description?: string; - id: number; - membersCount: number; - name: string; +export enum RuleScope { + Main = 'MAIN', + Test = 'TEST', + All = 'ALL' } diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationSeverityFacet.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationSeverityFacet.tsx index d9dcbf764cc..0faa11ff748 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationSeverityFacet.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationSeverityFacet.tsx @@ -38,6 +38,7 @@ export default class ActivationSeverityFacet extends React.PureComponent {...this.props} disabled={this.props.disabled} disabledHelper={translate('coding_rules.filters.active_severity.inactive')} + halfWidth={true} options={SEVERITIES} property="activationSeverities" renderName={this.renderName} diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsMeta.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsMeta.tsx index 3728d1e8c0e..88d81b5faca 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsMeta.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsMeta.tsx @@ -20,9 +20,10 @@ import * as React from 'react'; import { Link } from 'react-router'; import { Query } from '../query'; -import { RuleDetails } from '../../../app/types'; +import { RuleDetails, RuleScope } from '../../../app/types'; import { getRuleUrl } from '../../../helpers/urls'; import LinkIcon from '../../../components/icons-components/LinkIcon'; +import RuleScopeIcon from '../../../components/icons-components/RuleScopeIcon'; import SimilarRulesFilter from './SimilarRulesFilter'; import Tooltip from '../../../components/controls/Tooltip'; import { translate } from '../../../helpers/l10n'; @@ -72,7 +73,10 @@ export default class RuleDetailsMeta extends React.PureComponent { renderSeverity = () => (
  • - +
    • ); @@ -200,6 +204,18 @@ export default class RuleDetailsMeta extends React.PureComponent { ); }; + renderScope = () => { + const scope = this.props.ruleDetails.scope || RuleScope.Main; + return ( + +
  • + + {translate('coding_rules.scope', scope)} +
    • +     + ); + }; + render() { const { ruleDetails } = this.props; return ( @@ -223,6 +239,7 @@ export default class RuleDetailsMeta extends React.PureComponent { {this.renderType()} {this.renderSeverity()} {this.renderStatus()} + {this.renderScope()} {this.renderTags()} {this.renderCreationDate()} {this.renderRepository()} diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleListItem.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleListItem.tsx index e713523ac8f..20c045ba704 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleListItem.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleListItem.tsx @@ -183,7 +183,7 @@ export default class RuleListItem extends React.PureComponent { -
    +
    {rule.status !== 'READY' && ( {translate('rules.status', rule.status)} @@ -191,7 +191,7 @@ export default class RuleListItem extends React.PureComponent { )} {rule.langName} - + {translate('issue.type', rule.type)} 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 ceef209eeea..5647de8b17c 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 @@ -67,8 +67,10 @@ } .coding-rules-detail-properties { - margin: 10px 0; - font-size: 0; + display: flex; + flex-wrap: wrap; + align-items: center; + margin-top: var(--gridSize); } .coding-rules-detail-properties + .coding-rules-detail-properties { @@ -76,8 +78,10 @@ } .coding-rules-detail-property { - display: inline-block; - margin-right: 20px; + display: flex; + align-items: center; + margin-right: calc(2 * var(--gridSize)); + margin-bottom: var(--gridSize); font-size: var(--smallFontSize); } @@ -173,7 +177,7 @@ } .coding-rules-detail-quality-profile-severity i { - margin-top: 4px; + margin-top: 2px; } .coding-rules-detail-quality-profile-parameters, @@ -265,13 +269,13 @@ textarea.coding-rules-markdown-description { } .coding-rule-title { - line-height: 19.5px; + line-height: calc(2.5 * var(--gridSize)); font-size: var(--baseFontSize); } .coding-rule-meta { + padding: calc(0.25 * var(--gridSize)); padding-left: 30px; - line-height: 19.5px; font-size: var(--smallFontSize); } @@ -280,14 +284,6 @@ textarea.coding-rules-markdown-description { font-size: var(--smallFontSize); } -.coding-rule-meta .js-tag:after { - content: ','; -} - -.coding-rule-meta .js-tag:last-child:after { - content: ''; -} - .coding-rule-activation { width: 40px; line-height: 19.5px; diff --git a/server/sonar-web/src/main/js/components/icons-components/RuleScopeIcon.tsx b/server/sonar-web/src/main/js/components/icons-components/RuleScopeIcon.tsx new file mode 100644 index 00000000000..27dcdc277e7 --- /dev/null +++ b/server/sonar-web/src/main/js/components/icons-components/RuleScopeIcon.tsx @@ -0,0 +1,39 @@ +/* + * SonarQube + * Copyright (C) 2009-2018 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +import * as React from 'react'; +import { IconProps } from './types'; + +export default function RuleScopeIcon({ className, fill = 'currentColor', size = 16 }: IconProps) { + return ( + + + + ); +} diff --git a/server/sonar-web/src/main/js/components/tags/TagsList.tsx b/server/sonar-web/src/main/js/components/tags/TagsList.tsx index 9b7931c4722..eaf08bd4fb6 100644 --- a/server/sonar-web/src/main/js/components/tags/TagsList.tsx +++ b/server/sonar-web/src/main/js/components/tags/TagsList.tsx @@ -20,6 +20,7 @@ import * as React from 'react'; import * as classNames from 'classnames'; import './TagsList.css'; +import DropdownIcon from '../icons-components/DropdownIcon'; interface Props { allowUpdate?: boolean; @@ -32,7 +33,7 @@ export default function TagsList({ allowUpdate = false, className, tags }: Props {tags.join(', ')} - {allowUpdate && } + {allowUpdate && } ); } diff --git a/server/sonar-web/src/main/js/components/tags/__tests__/__snapshots__/TagsList-test.tsx.snap b/server/sonar-web/src/main/js/components/tags/__tests__/__snapshots__/TagsList-test.tsx.snap index d4305854263..3ea92ee6e20 100644 --- a/server/sonar-web/src/main/js/components/tags/__tests__/__snapshots__/TagsList-test.tsx.snap +++ b/server/sonar-web/src/main/js/components/tags/__tests__/__snapshots__/TagsList-test.tsx.snap @@ -13,9 +13,7 @@ exports[`should render with a caret on the right if update is allowed 1`] = ` > foo, bar - + `; diff --git a/server/sonar-web/src/main/js/components/ui/IssueTypeIcon.tsx b/server/sonar-web/src/main/js/components/ui/IssueTypeIcon.tsx index 38367963058..5cf34fe37e3 100644 --- a/server/sonar-web/src/main/js/components/ui/IssueTypeIcon.tsx +++ b/server/sonar-web/src/main/js/components/ui/IssueTypeIcon.tsx @@ -25,26 +25,27 @@ import CodeSmellIcon from '../icons-components/CodeSmellIcon'; interface Props { className?: string; query: string; + size?: number; } -export default function IssueTypeIcon(props: Props) { +export default function IssueTypeIcon({ className, query, size }: Props) { let icon; - switch (props.query.toLowerCase()) { + switch (query.toLowerCase()) { case 'bug': case 'bugs': case 'new_bugs': - icon = ; + icon = ; break; case 'vulnerability': case 'vulnerabilities': case 'new_vulnerabilities': - icon = ; + icon = ; break; case 'code_smell': case 'code_smells': case 'new_code_smells': - icon = ; + icon = ; break; } @@ -52,5 +53,5 @@ export default function IssueTypeIcon(props: Props) { return null; } - return props.className ? {icon} : icon; + return className ? {icon} : icon; } 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 5a2a3cf8981..f4e5b41e0eb 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -1302,6 +1302,11 @@ coding_rules.remediation_function.coeff=Coeff coding_rules.remediation_function.offset=Offset coding_rules.remediation_function.constant=Constant +coding_rules.scope.title=Analysis Scope +coding_rules.scope.MAIN=Main sources +coding_rules.scope.TEST=Test sources +coding_rules.scope.ALL=Main and Test sources + #------------------------------------------------------------------------------ # # EMAIL CONFIGURATION -- 2.39.5