SONAR-10319 Display Analysis Scope on rules detail page (#2995)

* SONAR-10319 Display Analysis Scope on rules detail page * fix icons alignment
SonarSource · Feb 7, 2018 · 8441bef · 8441bef
1 parent 8b3584e
commit 8441bef
Show file tree

Hide file tree

Showing 12 changed files with 107 additions and 37 deletions.
diff --git 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
@@ -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
@@ -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
@@ -38,6 +38,7 @@ export default class ActivationSeverityFacet extends React.PureComponent<Props>
         {...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
@@ -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<Props, State> {
   renderSeverity = () => (
     <Tooltip overlay={translate('default_severity')}>
       <li className="coding-rules-detail-property" data-meta="severity">
-        <SeverityHelper severity={this.props.ruleDetails.severity} />
+        <SeverityHelper
+          className="display-inline-flex-center"
+          severity={this.props.ruleDetails.severity}
+        />
       </li>
     </Tooltip>
   );
@@ -200,6 +204,18 @@ export default class RuleDetailsMeta extends React.PureComponent<Props, State> {
     );
   };
 
+  renderScope = () => {
+    const scope = this.props.ruleDetails.scope || RuleScope.Main;
+    return (
+      <Tooltip overlay={translate('coding_rules.scope.title')}>
+        <li className="coding-rules-detail-property">
+          <RuleScopeIcon className="little-spacer-right" />
+          {translate('coding_rules.scope', scope)}
+        </li>
+      </Tooltip>
+    );
+  };
+
   render() {
     const { ruleDetails } = this.props;
     return (
@@ -223,6 +239,7 @@ export default class RuleDetailsMeta extends React.PureComponent<Props, State> {
           {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
@@ -183,15 +183,15 @@ export default class RuleListItem extends React.PureComponent<Props> {
               </td>
 
               <td className="coding-rule-table-meta-cell">
-                <div className="coding-rule-meta">
+                <div className="display-flex-center coding-rule-meta">
                   {rule.status !== 'READY' && (
                     <span className="spacer-left badge badge-normal-size badge-danger-light">
                       {translate('rules.status', rule.status)}
                     </span>
                   )}
                   <span className="spacer-left note">{rule.langName}</span>
                   <Tooltip overlay={translate('coding_rules.type.tooltip', rule.type)}>
-                    <span className="spacer-left note">
+                    <span className="display-inline-flex-center spacer-left note">
                       <IssueTypeIcon className="little-spacer-right" query={rule.type} />
                       {translate('issue.type', rule.type)}
                     </span>

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
@@ -67,17 +67,21 @@
 }
 
 .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 {
   margin-top: -10px;
 }
 
 .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
@@ -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 (
+    <svg
+      className={className}
+      width={size}
+      height={size}
+      viewBox="0 0 16 16"
+      version="1.1"
+      xmlnsXlink="http://www.w3.org/1999/xlink"
+      xmlSpace="preserve">
+      <path
+        style={{ fill }}
+        d="M8 3.071c2.724 0 4.929 2.204 4.929 4.929s-2.204 4.929-4.929 4.929c-2.724 0-4.929-2.204-4.929-4.929s2.204-4.929 4.929-4.929zM8 1.357c-3.669 0-6.643 2.974-6.643 6.643s2.974 6.643 6.643 6.643 6.643-2.974 6.643-6.643-2.974-6.643-6.643-6.643zM8 6.286c0.945 0 1.714 0.769 1.714 1.714s-0.769 1.714-1.714 1.714-1.714-0.769-1.714-1.714 0.769-1.714 1.714-1.714zM8 4.571c-1.893 0-3.429 1.535-3.429 3.429s1.535 3.429 3.429 3.429 3.429-1.535 3.429-3.429-1.535-3.429-3.429-3.429z"
+      />
+    </svg>
+  );
+}
diff --git 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
     <span className={classNames('tags-list', className)} title={tags.join(', ')}>
       <i className="icon-tags" />
       <span className="text-ellipsis">{tags.join(', ')}</span>
-      {allowUpdate && <i className="icon-dropdown" />}
+      {allowUpdate && <DropdownIcon />}
     </span>
   );
 }
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
@@ -13,9 +13,7 @@ exports[`should render with a caret on the right if update is allowed 1`] = `
   >
     foo, bar
   </span>
-  <i
-    className="icon-dropdown"
-  />
+  <DropdownIcon />
 </span>
 `;
 

diff --git a/server/sonar-web/src/main/js/components/ui/IssueTypeIcon.tsx b/server/sonar-web/src/main/js/components/ui/IssueTypeIcon.tsx
@@ -25,32 +25,33 @@ 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 = <BugIcon />;
+      icon = <BugIcon size={size} />;
       break;
     case 'vulnerability':
     case 'vulnerabilities':
     case 'new_vulnerabilities':
-      icon = <VulnerabilityIcon />;
+      icon = <VulnerabilityIcon size={size} />;
       break;
     case 'code_smell':
     case 'code_smells':
     case 'new_code_smells':
-      icon = <CodeSmellIcon />;
+      icon = <CodeSmellIcon size={size} />;
       break;
   }
 
   if (!icon) {
     return null;
   }
 
-  return props.className ? <span className={props.className}>{icon}</span> : icon;
+  return className ? <span className={className}>{icon}</span> : 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
@@ -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