From 0b2ab7f756488afd47438e59c611d7d0a2a4b536 Mon Sep 17 00:00:00 2001
From: Mathieu Suen <mathieu.suen@sonarsource.com>
Date: Tue, 25 Jan 2022 11:28:43 +0100
Subject: [PATCH] SONAR-15882 Improve message on measure page when project is
 not accessible

---
 .../sonar-web/src/main/js/apps/code/components/CodeApp.tsx  | 6 +++---
 .../__tests__/__snapshots__/CodeApp-test.tsx.snap           | 6 +++---
 .../src/main/resources/org/sonar/l10n/core.properties       | 5 ++++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/code/components/CodeApp.tsx b/server/sonar-web/src/main/js/apps/code/components/CodeApp.tsx
index a66a95fc915..c38bfe4a369 100644
--- a/server/sonar-web/src/main/js/apps/code/components/CodeApp.tsx
+++ b/server/sonar-web/src/main/js/apps/code/components/CodeApp.tsx
@@ -301,11 +301,11 @@ export class CodeApp extends React.Component<Props, State> {
         {!canBrowseAllChildProjects && isPortfolioLike(qualifier) && (
           <StyledAlert variant="warning" className="it__portfolio_warning">
             <AlertContent>
-              {translate('component_measures.not_all_measures_are_shown')}
+              {translate('code_viewer.not_all_measures_are_shown')}
               <HelpTooltip
                 className="spacer-left"
-                ariaLabel={translate('component_measures.not_all_measures_are_shown.help')}
-                overlay={translate('component_measures.not_all_measures_are_shown.help')}
+                ariaLabel={translate('code_viewer.not_all_measures_are_shown.help')}
+                overlay={translate('code_viewer.not_all_measures_are_shown.help')}
               />
             </AlertContent>
           </StyledAlert>
diff --git a/server/sonar-web/src/main/js/apps/code/components/__tests__/__snapshots__/CodeApp-test.tsx.snap b/server/sonar-web/src/main/js/apps/code/components/__tests__/__snapshots__/CodeApp-test.tsx.snap
index 0e98dd30dc6..f231725f00e 100644
--- a/server/sonar-web/src/main/js/apps/code/components/__tests__/__snapshots__/CodeApp-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/code/components/__tests__/__snapshots__/CodeApp-test.tsx.snap
@@ -180,11 +180,11 @@ exports[`should render a warning message when user does not have access to all p
     variant="warning"
   >
     <Styled(div)>
-      component_measures.not_all_measures_are_shown
+      code_viewer.not_all_measures_are_shown
       <HelpTooltip
-        ariaLabel="component_measures.not_all_measures_are_shown.help"
+        ariaLabel="code_viewer.not_all_measures_are_shown.help"
         className="spacer-left"
-        overlay="component_measures.not_all_measures_are_shown.help"
+        overlay="code_viewer.not_all_measures_are_shown.help"
       />
     </Styled(div)>
   </Styled(Alert)>
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 7b88aed98fe..d3e06b99b1c 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -1418,8 +1418,11 @@ code_viewer.no_source_code_displayed_due_to_empty_analysis.VW=No projects, appli
 code_viewer.no_source_code_displayed_due_to_empty_analysis.SVW=No projects, applications, or portfolios in this portfolio.
 code_viewer.no_source_code_displayed_due_to_security=Due to security settings, no source code can be displayed.
 code_viewer.no_source_code_displayed_due_to_source_removed=The file was removed, no source code can be displayed.
+code_viewer.not_all_measures_are_shown=Not all projects and applications are included
+code_viewer.not_all_measures_are_shown.help=You do not have access to all projects and/or applications.
 code_viewer.portfolio_code_toggle_disabled.help=New Code and Overall Code measures are not available when searching for projects or applications.
 
+
 #------------------------------------------------------------------------------
 #
 # CUSTOM MEASURES
@@ -3257,7 +3260,7 @@ component_measures.facet_category.overall_category.estimated=Estimated after mer
 component_measures.facet_category.tests_category=Tests
 component_measures.bubble_chart.zoom_level=Current zoom level. Scroll on the chart to zoom or unzoom, click here to reset.
 component_measures.not_all_measures_are_shown=Not all projects and applications are included
-component_measures.not_all_measures_are_shown.help=You do not have access to all projects and/or applications
+component_measures.not_all_measures_are_shown.help=You do not have access to all projects and/or applications. Measures are still computed based on all projects and applications.
 
 #------------------------------------------------------------------------------
 #
-- 
2.39.5