diff options
| author | Wouter Admiraal <wouter.admiraal@sonarsource.com> | 2019-01-31 12:42:00 +0100 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2019-02-11 09:11:49 +0100 |
| commit | d225d0c37f88abb67eed6b48b3fca523ab846ee2 (patch) | |
| tree | 7b8d7d5635facb0a3c7a874a4668a635466cc8c9 /server/sonar-web/src/main/js | |
| parent | d37282d7d9136418f41b86654a9dca8cdb1f0414 (diff) | |
| download | sonarqube-d225d0c37f88abb67eed6b48b3fca523ab846ee2.tar.gz sonarqube-d225d0c37f88abb67eed6b48b3fca523ab846ee2.zip | |
SONAR-11678 Don't delete analysis if it's the baseline
Diffstat (limited to 'server/sonar-web/src/main/js')
| -rw-r--r-- | server/sonar-web/src/main/js/app/types.d.ts | 1 | ||||
| -rw-r--r-- | server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysis.tsx | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/server/sonar-web/src/main/js/app/types.d.ts b/server/sonar-web/src/main/js/app/types.d.ts index 40acb3e0b29..e51039b9405 100644 --- a/server/sonar-web/src/main/js/app/types.d.ts +++ b/server/sonar-web/src/main/js/app/types.d.ts @@ -52,6 +52,7 @@ declare namespace T { date: string; events: AnalysisEvent[]; key: string; + manualNewCodePeriodBaseline?: boolean; projectVersion?: string; } diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysis.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysis.tsx index 8ea22267d18..7b5d89e9625 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysis.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysis.tsx @@ -124,7 +124,8 @@ export default class ProjectActivityAnalysis extends React.PureComponent<Props, const canAddVersion = canAdmin && !hasVersion && this.props.canCreateVersion; const canAddEvent = canAdmin; - const canDeleteAnalyses = this.props.canDeleteAnalyses && !isFirst; + const canDeleteAnalyses = + this.props.canDeleteAnalyses && !isFirst && !analysis.manualNewCodePeriodBaseline; let tooltipContent = <TimeFormatter date={parsedDate} long={true} />; // If projectVersion AND codePeriodVersion are set, add the projectVersion |