From 5adcb3760de68b3a80a5a1432a93428d25792f67 Mon Sep 17 00:00:00 2001 From: Pascal Mugnier Date: Mon, 4 Jun 2018 11:55:27 +0200 Subject: [PATCH] SONAR-10686 Hide Coverage and Duplications in Code tab of PR / SLB --- .../src/main/js/apps/code/components/Component.tsx | 12 +++++++----- .../src/main/js/apps/code/components/Components.tsx | 6 +++++- .../js/apps/code/components/ComponentsHeader.tsx | 10 +++++++--- 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 { } = 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 { { 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 { {columns.map(column => ( - +
- + {baseComponent && (