From c992c853f2efb2f7fcb72471af5f69feed99ba39 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Wed, 28 Mar 2018 13:13:06 +0200 Subject: [PATCH] SONAR-10381 Activity page of a file should not be accessible --- .../components/MeasureHeader.js | 24 ++++++++++--------- .../__tests__/MeasureHeader-test.js | 14 +++++++++++ 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureHeader.js b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureHeader.js index 9455760a908..1e247a65c21 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureHeader.js +++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureHeader.js @@ -46,6 +46,7 @@ import { isDiffMetric } from '../../../helpers/measures'; export default function MeasureHeader(props /*: Props*/) { const { branchLike, component, leakPeriod, measure, metric, secondaryMeasure } = props; const isDiff = isDiffMetric(metric.key); + const hasHistory = component.qualifier !== 'FIL' && component.qualifier !== 'UTS'; return (
@@ -70,17 +71,18 @@ export default function MeasureHeader(props /*: Props*/) { )} - {!isDiff && ( - - - - - - )} + {!isDiff && + hasHistory && ( + + + + + + )}
{leakPeriod != null && ( diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/MeasureHeader-test.js b/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/MeasureHeader-test.js index 8e177e736df..3d1130b7862 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/MeasureHeader-test.js +++ b/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/MeasureHeader-test.js @@ -90,6 +90,20 @@ it('should render with branch', () => { ).toMatchSnapshot(); }); +it('should not render link to activity page for files', () => { + expect( + shallow() + .find('IconHistory') + .exists() + ).toBeTruthy(); + + expect( + shallow() + .find('IconHistory') + .exists() + ).toBeFalsy(); +}); + it('should display secondary measure too', () => { const wrapper = shallow(); expect(wrapper.find('Connect(LanguageDistribution)')).toHaveLength(1); -- 2.39.5