SONAR-22148 Fixes cayc tour on branch overview

diff --git a/server/sonar-web/src/main/js/apps/overview/branches/BranchOverviewRenderer.tsx b/server/sonar-web/src/main/js/apps/overview/branches/BranchOverviewRenderer.tsx
index 6021e0ec732edb52634cf008dff27d5470145a31..02e6df25a0894c6271ef915f5f191660862a9ec4 100644 (file)
--- a/server/sonar-web/src/main/js/apps/overview/branches/BranchOverviewRenderer.tsx
+++ b/server/sonar-web/src/main/js/apps/overview/branches/BranchOverviewRenderer.tsx
@@ -199,7 +199,7 @@ export default function BranchOverviewRenderer(props: BranchOverviewRendererProp
               <div>
                 {branch && (
                   <>
-                    {currentUser.isLoggedIn && (
+                    {currentUser.isLoggedIn && hasNewCodeMeasures && (
                       <PromotedSection
                         content={translate('overview.promoted_section.content')}
                         dismissed={dismissedTour ?? false}
@@ -217,7 +217,9 @@ export default function BranchOverviewRenderer(props: BranchOverviewRendererProp
                       branch={branch}
                       component={component}
                       measures={measures}
-                      showTakeTheTourButton={dismissedTour && currentUser.isLoggedIn}
+                      showTakeTheTourButton={
+                        dismissedTour && currentUser.isLoggedIn && hasNewCodeMeasures
+                      }
                       startTour={startTourGuide}
                     />
                     <BasicSeparator />

diff --git a/server/sonar-web/src/main/js/apps/overview/branches/TabsPanel.tsx b/server/sonar-web/src/main/js/apps/overview/branches/TabsPanel.tsx
index c699725ca81e89fcc5503ec380eecaa15be5dad5..72b3839f8a2b4621bdd10c36a50eba102db38857 100644 (file)
--- a/server/sonar-web/src/main/js/apps/overview/branches/TabsPanel.tsx
+++ b/server/sonar-web/src/main/js/apps/overview/branches/TabsPanel.tsx
@@ -155,7 +155,10 @@ export function TabsPanel(props: React.PropsWithChildren<MeasuresPanelProps>) {
               value={isNewCode ? CodeScope.New : CodeScope.Overall}
             >
               {isNewCode && leakPeriod && (
-                <LightLabel className="sw-body-sm sw-flex sw-items-center sw-mr-6">
+                <LightLabel
+                  className="sw-body-sm sw-flex sw-items-center sw-mr-6 sw-pl-4"
+                  data-spotlight-id="cayc-promotion-2"
+                >
                   <span className="sw-mr-1">{translate('overview.new_code')}:</span>
                   <LeakPeriodInfo leakPeriod={leakPeriod} />
                 </LightLabel>

diff --git a/server/sonar-web/src/main/js/apps/overview/components/LastAnalysisLabel.tsx b/server/sonar-web/src/main/js/apps/overview/components/LastAnalysisLabel.tsx
index 22bd24d7b98bc7c3ece9cb0baaaf26300ee26839..5fcb961d0f3e30b4981613a15f22cd02ee405386 100644 (file)
--- a/server/sonar-web/src/main/js/apps/overview/components/LastAnalysisLabel.tsx
+++ b/server/sonar-web/src/main/js/apps/overview/components/LastAnalysisLabel.tsx
@@ -30,7 +30,7 @@ export default function LastAnalysisLabel({ analysisDate }: Readonly<Props>) {
   const intl = useIntl();
 
   return analysisDate ? (
-    <span className="sw-pl-4" data-spotlight-id="cayc-promotion-2">
+    <span>
       {intl.formatMessage(
         {
           id: 'overview.last_analysis_x',

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 824f1bf2c0b606614eb9da31e386cc207ebcf679..205669841b6c21dec15d393df8f3d77f5fdc4edd 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -110,6 +110,7 @@ got_it=Got it
 help=Help
 here=here
 hide=Hide
+ide=IDE
 inactive=Inactive
 info=Info
 issue=Issue
@@ -4090,7 +4091,7 @@ guiding.cayc_promotion.3.title=Green is clean
 guiding.cayc_promotion.3.content.1=Quality Gate Status tells you if your new code is clean or not. Keep it green as often as possible, and your project will always be production-ready.
 guiding.cayc_promotion.4.title=Clean at all levels
 guiding.cayc_promotion.4.content.1=With SonarLint, clean code as you write it in your {value}.
-guiding.cayc_promotion.4.content.2=When a feature is ready, analyze your {value} and make sure no issue is missed.
+guiding.cayc_promotion.4.content.2=When a feature is ready, analyze your {value} (commercial edition only) and make sure no issue is missed.
 guiding.cayc_promotion.4.content.3=Finally, rely on a thorough {value} analysis to ensure the new code is clean.
 guiding.replay_tour_button.1.title=Replay tour
 guiding.replay_tour_button.tour_completed.1.title=Tour complete!