From 63349576d2308c8a170a731945f7bb671094975c Mon Sep 17 00:00:00 2001
From: Belen Pruvost <belen.pruvost@sonarsource.com>
Date: Fri, 8 Apr 2022 17:07:50 +0200
Subject: [PATCH] SONAR-16254 - Explicit the content of the Last Analysis
 warning

---
 .../js/app/components/nav/component/ComponentNavWarnings.tsx  | 4 ++++
 .../src/main/js/app/components/nav/component/HeaderMeta.tsx   | 2 ++
 .../nav/component/__tests__/ComponentNavWarnings-test.tsx     | 1 +
 .../__snapshots__/ComponentNavWarnings-test.tsx.snap          | 1 +
 .../__tests__/__snapshots__/HeaderMeta-test.tsx.snap          | 4 ++++
 sonar-core/src/main/resources/org/sonar/l10n/core.properties  | 4 +++-
 6 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavWarnings.tsx b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavWarnings.tsx
index e7df51cae19..4d60b9080ae 100644
--- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavWarnings.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavWarnings.tsx
@@ -31,6 +31,7 @@ const AnalysisWarningsModal = lazyLoadComponent(
 
 interface Props {
   componentKey: string;
+  isBranch: boolean;
   onWarningDismiss: () => void;
   warnings: TaskWarning[];
 }
@@ -60,6 +61,9 @@ export default class ComponentNavWarnings extends React.PureComponent<Props, Sta
             defaultMessage={translate('component_navigation.last_analysis_had_warnings')}
             id="component_navigation.last_analysis_had_warnings"
             values={{
+              branchType: this.props.isBranch
+                ? translate('branches.branch')
+                : translate('branches.pr'),
               warnings: (
                 <a href="#" onClick={this.handleClick}>
                   <FormattedMessage
diff --git a/server/sonar-web/src/main/js/app/components/nav/component/HeaderMeta.tsx b/server/sonar-web/src/main/js/app/components/nav/component/HeaderMeta.tsx
index 1729155f1a0..3e78bec5863 100644
--- a/server/sonar-web/src/main/js/app/components/nav/component/HeaderMeta.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/component/HeaderMeta.tsx
@@ -45,6 +45,7 @@ export function HeaderMeta(props: HeaderMetaProps) {
   const { branchLike, component, currentUser, warnings } = props;
 
   const isABranch = isBranch(branchLike);
+
   const currentPage = getCurrentPage(component, branchLike);
   const displayVersion = component.version !== undefined && isABranch;
 
@@ -54,6 +55,7 @@ export function HeaderMeta(props: HeaderMetaProps) {
         {warnings.length > 0 && (
           <span className="header-meta-warnings">
             <ComponentNavWarnings
+              isBranch={isABranch}
               componentKey={component.key}
               onWarningDismiss={props.onWarningDismiss}
               warnings={warnings}
diff --git a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/ComponentNavWarnings-test.tsx b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/ComponentNavWarnings-test.tsx
index a1bfd0924ec..89333e8da46 100644
--- a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/ComponentNavWarnings-test.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/ComponentNavWarnings-test.tsx
@@ -26,6 +26,7 @@ it('should render', () => {
   const wrapper = shallow(
     <ComponentNavWarnings
       componentKey="foo"
+      isBranch={true}
       onWarningDismiss={jest.fn()}
       warnings={[mockTaskWarning({ message: 'warning 1' })]}
     />
diff --git a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavWarnings-test.tsx.snap b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavWarnings-test.tsx.snap
index f7893380d5b..4a4509f61f3 100644
--- a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavWarnings-test.tsx.snap
+++ b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavWarnings-test.tsx.snap
@@ -12,6 +12,7 @@ exports[`should render 1`] = `
       id="component_navigation.last_analysis_had_warnings"
       values={
         Object {
+          "branchType": "branches.branch",
           "warnings": <a
             href="#"
             onClick={[Function]}
diff --git a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/HeaderMeta-test.tsx.snap b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/HeaderMeta-test.tsx.snap
index 110542461d9..8069b500e19 100644
--- a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/HeaderMeta-test.tsx.snap
+++ b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/HeaderMeta-test.tsx.snap
@@ -10,6 +10,7 @@ exports[`should render correctly for a branch 1`] = `
     >
       <ComponentNavWarnings
         componentKey="my-project"
+        isBranch={true}
         onWarningDismiss={[MockFunction]}
         warnings={
           Array [
@@ -63,6 +64,7 @@ exports[`should render correctly for a main project branch 1`] = `
     >
       <ComponentNavWarnings
         componentKey="my-project"
+        isBranch={true}
         onWarningDismiss={[MockFunction]}
         warnings={
           Array [
@@ -116,6 +118,7 @@ exports[`should render correctly for a portfolio 1`] = `
     >
       <ComponentNavWarnings
         componentKey="foo"
+        isBranch={true}
         onWarningDismiss={[MockFunction]}
         warnings={
           Array [
@@ -156,6 +159,7 @@ exports[`should render correctly for a pull request 1`] = `
     >
       <ComponentNavWarnings
         componentKey="my-project"
+        isBranch={false}
         onWarningDismiss={[MockFunction]}
         warnings={
           Array [
diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index b6ce448d7b4..e814d4e44a5 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2886,7 +2886,7 @@ component_navigation.status.in_progress.admin.help=A background task is in progr
 component_navigation.status.in_progress_X.admin.help=The {type} is in progress.
 component_navigation.status.last_blocked_due_to_bad_license_X=Last analysis blocked due to an invalid license, which has since been corrected. Please reanalyze this {0}.
 
-component_navigation.last_analysis_had_warnings=Last analysis had {warnings}
+component_navigation.last_analysis_had_warnings=Last analysis of this {branchType} had {warnings}
 component_navigation.x_warnings={warningsCount} {warningsCount, plural, one {warning} other {warnings}}
 
 component_navigation.pr_deco.error_detected_X=We've detected an issue with your configuration. Your SonarQube instance won't be able to perform any pull request decoration. {action}
@@ -3941,7 +3941,9 @@ onboarding.tutorial.with.azure_pipelines.BranchAnalysis.branch_protection.link=d
 # BRANCHES
 #
 #------------------------------------------------------------------------------
+branches.branch=Branch
 branches.main_branch=Main Branch
+branches.pr=PR
 branches.see_the_pr=See the PR
 
 #------------------------------------------------------------------------------
-- 
2.39.5