aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src/main/js/apps
diff options
context:
space:
mode:
authorPascal Mugnier <pascal.mugnier@sonarsource.com>2018-06-04 11:55:27 +0200
committerSonarTech <sonartech@sonarsource.com>2018-06-06 20:20:51 +0200
commit5adcb3760de68b3a80a5a1432a93428d25792f67 (patch)
tree44caaefc123b4385ab63e09ce9330afbd588d632 /server/sonar-web/src/main/js/apps
parentc3e2a74873f94a7c2ccdbc808d2cf9a45d8cfef8 (diff)
downloadsonarqube-5adcb3760de68b3a80a5a1432a93428d25792f67.tar.gz
sonarqube-5adcb3760de68b3a80a5a1432a93428d25792f67.zip
SONAR-10686 Hide Coverage and Duplications in Code tab of PR / SLB
Diffstat (limited to 'server/sonar-web/src/main/js/apps')
-rw-r--r--server/sonar-web/src/main/js/apps/code/components/Component.tsx12
-rw-r--r--server/sonar-web/src/main/js/apps/code/components/Components.tsx6
-rw-r--r--server/sonar-web/src/main/js/apps/code/components/ComponentsHeader.tsx10
3 files changed, 19 insertions, 9 deletions
diff --git a/server/sonar-web/src/main/js/apps/code/components/Component.tsx b/server/sonar-web/src/main/js/apps/code/components/Component.tsx
index df873439506..c12248a826a 100644
--- a/server/sonar-web/src/main/js/apps/code/components/Component.tsx
+++ b/server/sonar-web/src/main/js/apps/code/components/Component.tsx
@@ -25,6 +25,7 @@ import ComponentLink from './ComponentLink';
import ComponentPin from './ComponentPin';
import { Component as IComponent } from '../types';
import { BranchLike } from '../../../app/types';
+import { isShortLivingBranch, isPullRequest } from '../../../helpers/branches';
const TOP_OFFSET = 200;
const BOTTOM_OFFSET = 10;
@@ -83,6 +84,7 @@ export default class Component extends React.PureComponent<Props> {
} = this.props;
const isPortfolio = ['VW', 'SVW'].includes(rootComponent.qualifier);
const isApplication = rootComponent.qualifier === 'APP';
+ const hideCoverageAndDuplicates = isShortLivingBranch(branchLike) || isPullRequest(branchLike);
let componentAction = null;
@@ -111,8 +113,8 @@ export default class Component extends React.PureComponent<Props> {
{ metric: 'bugs', type: 'SHORT_INT' },
{ metric: 'vulnerabilities', type: 'SHORT_INT' },
{ metric: 'code_smells', type: 'SHORT_INT' },
- { metric: 'coverage', type: 'PERCENT' },
- { metric: 'duplicated_lines_density', type: 'PERCENT' }
+ !hideCoverageAndDuplicates && { metric: 'coverage', type: 'PERCENT' },
+ !hideCoverageAndDuplicates && { metric: 'duplicated_lines_density', type: 'PERCENT' }
].filter(Boolean) as Array<{ metric: string; type: string }>);
return (
@@ -123,15 +125,15 @@ export default class Component extends React.PureComponent<Props> {
<td className="code-name-cell">
<ComponentName
branchLike={branchLike}
+ canBrowse={canBrowse}
component={component}
- rootComponent={rootComponent}
previous={previous}
- canBrowse={canBrowse}
+ rootComponent={rootComponent}
/>
</td>
{columns.map(column => (
- <td key={column.metric} className="thin nowrap text-right">
+ <td className="thin nowrap text-right" key={column.metric}>
<div className="code-components-cell">
<ComponentMeasure
component={component}
diff --git a/server/sonar-web/src/main/js/apps/code/components/Components.tsx b/server/sonar-web/src/main/js/apps/code/components/Components.tsx
index 98d3b569e71..59b017c40b6 100644
--- a/server/sonar-web/src/main/js/apps/code/components/Components.tsx
+++ b/server/sonar-web/src/main/js/apps/code/components/Components.tsx
@@ -36,7 +36,11 @@ export default function Components(props: Props) {
const { baseComponent, branchLike, components, rootComponent, selected } = props;
return (
<table className="data zebra">
- <ComponentsHeader baseComponent={baseComponent} rootComponent={rootComponent} />
+ <ComponentsHeader
+ baseComponent={baseComponent}
+ branchLike={branchLike}
+ rootComponent={rootComponent}
+ />
{baseComponent && (
<tbody>
<Component
diff --git a/server/sonar-web/src/main/js/apps/code/components/ComponentsHeader.tsx b/server/sonar-web/src/main/js/apps/code/components/ComponentsHeader.tsx
index 125c7e005be..6bb54c900be 100644
--- a/server/sonar-web/src/main/js/apps/code/components/ComponentsHeader.tsx
+++ b/server/sonar-web/src/main/js/apps/code/components/ComponentsHeader.tsx
@@ -20,15 +20,19 @@
import * as React from 'react';
import { translate } from '../../../helpers/l10n';
import { Component } from '../types';
+import { isShortLivingBranch, isPullRequest } from '../../../helpers/branches';
+import { BranchLike } from '../../../app/types';
interface Props {
+ branchLike?: BranchLike;
baseComponent?: Component;
rootComponent: Component;
}
-export default function ComponentsHeader({ baseComponent, rootComponent }: Props) {
+export default function ComponentsHeader({ baseComponent, branchLike, rootComponent }: Props) {
const isPortfolio = rootComponent.qualifier === 'VW' || rootComponent.qualifier === 'SVW';
const isApplication = rootComponent.qualifier === 'APP';
+ const hideCoverageAndDuplicates = isShortLivingBranch(branchLike) || isPullRequest(branchLike);
const columns = isPortfolio
? [
@@ -44,8 +48,8 @@ export default function ComponentsHeader({ baseComponent, rootComponent }: Props
translate('metric', 'bugs', 'name'),
translate('metric', 'vulnerabilities', 'name'),
translate('metric', 'code_smells', 'name'),
- translate('metric', 'coverage', 'name'),
- translate('metric', 'duplicated_lines_density', 'short_name')
+ !hideCoverageAndDuplicates && translate('metric', 'coverage', 'name'),
+ !hideCoverageAndDuplicates && translate('metric', 'duplicated_lines_density', 'short_name')
].filter(Boolean) as string[]);
return (