SONAR-22728 Update tooltips

diff --git a/server/sonar-web/src/main/js/app/components/metrics/RatingComponent.tsx b/server/sonar-web/src/main/js/app/components/metrics/RatingComponent.tsx
index 5029f84679ad9789171fa707027e7608c51e4a9f..b5c1c51651ed7f0d6e0dc9770580e8a54cb91164 100644 (file)
--- a/server/sonar-web/src/main/js/app/components/metrics/RatingComponent.tsx
+++ b/server/sonar-web/src/main/js/app/components/metrics/RatingComponent.tsx
@@ -37,7 +37,11 @@ interface Props {
   componentKey: string;
   forceMetric?: boolean;
   getLabel?: (rating: RatingEnum) => string;
-  getTooltip?: (rating: RatingEnum) => React.ReactNode;
+  getTooltip?: (
+    rating: RatingEnum,
+    value: string | undefined,
+    metricKey?: MetricKey,
+  ) => React.ReactNode;
   ratingMetric: MetricKey;
   size?: SizeType;
 }
@@ -114,9 +118,13 @@ export default function RatingComponent(props: Readonly<Props>) {
     <Spinner isLoading={isLoading}>
       {getTooltip ? (
         <>
-          <Tooltip content={getTooltip(rating)}>{badge}</Tooltip>
+          <Tooltip content={getTooltip(rating, value, measure?.metric as MetricKey)}>
+            {badge}
+          </Tooltip>
           {/* The badge is not interactive, so show the tooltip content for screen-readers only */}
-          <span className="sw-sr-only">{getTooltip(rating)}</span>
+          <span className="sw-sr-only">
+            {getTooltip(rating, value, measure?.metric as MetricKey)}
+          </span>
         </>
       ) : (
         badge

diff --git a/server/sonar-web/src/main/js/sonar-aligned/components/measure/Measure.tsx b/server/sonar-web/src/main/js/sonar-aligned/components/measure/Measure.tsx
index dc0f4c4b28db29f876ee9e4536eb1d4d771ec60e..798ea6cf5cd9a9a7c968fd84b2aaa8348d8f9824 100644 (file)
--- a/server/sonar-web/src/main/js/sonar-aligned/components/measure/Measure.tsx
+++ b/server/sonar-web/src/main/js/sonar-aligned/components/measure/Measure.tsx
@@ -59,8 +59,10 @@ export default function Measure({
   const classNameWithFont = classNames(className, fontClassName);
 
   const getTooltip = useCallback(
-    () => value !== undefined && <RatingTooltipContent metricKey={metricKey} value={value} />,
-    [metricKey, value],
+    (_: RatingEnum, value: string | undefined, metric?: MetricKey) =>
+      value !== undefined &&
+      metric !== undefined && <RatingTooltipContent metricKey={metric} value={value} />,
+    [],
   );
 
   const getLabel = useCallback(

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 c3caf43e39caef73fcd1d33518a4027095350da6..314b850b8fe3abf9d0fdc7e60b61bf1d33b3396b 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -3329,11 +3329,11 @@ metric.software_quality_releasability_rating.name=Releasability Rating
 metric.software_quality_reliability_rating.description=Reliability rating
 metric.software_quality_reliability_rating.name=Reliability Rating
 metric.software_quality_reliability_rating.extra_short_name=Rating
-metric.software_quality_reliability_rating.tooltip.A=Reliability rating is A when there are no bugs.
-metric.software_quality_reliability_rating.tooltip.B=Reliability rating is B when there is at least one minor bug.
-metric.software_quality_reliability_rating.tooltip.C=Reliability rating is C when there is at least one major bug.
-metric.software_quality_reliability_rating.tooltip.D=Reliability rating is D when there is at least one critical bug.
-metric.software_quality_reliability_rating.tooltip.E=Reliability rating is E when there is at least one blocker bug.
+metric.software_quality_reliability_rating.tooltip.A=Reliability rating is A when there are no reliability issues.
+metric.software_quality_reliability_rating.tooltip.B=Reliability rating is B when there is at least one low reliability issue.
+metric.software_quality_reliability_rating.tooltip.C=Reliability rating is C when there is at least one medium reliability issue.
+metric.software_quality_reliability_rating.tooltip.D=Reliability rating is D when there is at least one high reliability issue.
+metric.software_quality_reliability_rating.tooltip.E=Reliability rating is E when there is at least one high reliability issue.
 metric.reliability_remediation_effort.description=Reliability Remediation Effort
 metric.reliability_remediation_effort.name=Reliability Remediation Effort
 metric.reliability_remediation_effort.extra_short_name=Remediation Effort
@@ -3368,11 +3368,11 @@ metric.security_rating.tooltip.E=Security rating is E when there is at least one
 metric.software_quality_security_rating.description=Security rating
 metric.software_quality_security_rating.name=Security Rating
 metric.software_quality_security_rating.extra_short_name=Rating
-metric.software_quality_security_rating.tooltip.A=Security rating is A when there are no vulnerabilities.
-metric.software_quality_security_rating.tooltip.B=Security rating is B when there is at least one minor vulnerability.
-metric.software_quality_security_rating.tooltip.C=Security rating is C when there is at least one major vulnerability.
-metric.software_quality_security_rating.tooltip.D=Security rating is D when there is at least one critical vulnerability.
-metric.software_quality_security_rating.tooltip.E=Security rating is E when there is at least one blocker vulnerability.
+metric.software_quality_security_rating.tooltip.A=Security rating is A when there are no security issues.
+metric.software_quality_security_rating.tooltip.B=Security rating is B when there is at least one low security issue.
+metric.software_quality_security_rating.tooltip.C=Security rating is C when there is at least one medium security issue.
+metric.software_quality_security_rating.tooltip.D=Security rating is D when there is at least one high security issue.
+metric.software_quality_security_rating.tooltip.E=Security rating is E when there is at least one high security issue.
 metric.security_remediation_effort.description=Security remediation effort
 metric.security_remediation_effort.name=Security Remediation Effort
 metric.security_remediation_effort.extra_short_name=Remediation Effort
@@ -3390,8 +3390,8 @@ metric.security_review_rating.tooltip.B=Security Review rating is B when less th
 metric.security_review_rating.tooltip.C=Security Review rating is C when less than 70% of Security Hotspots are reviewed.
 metric.security_review_rating.tooltip.D=Security Review rating is D when less than 50% of Security Hotspots are reviewed.
 metric.security_review_rating.tooltip.E=Security Review rating is E when less than 30% of Security Hotspots are reviewed.
-metric.software_quality_security_review_rating.tooltip.A=Security Review rating is A when at least 80% of Security Hotspots are reviewed.
-metric.software_quality_security_review_rating.tooltip.B=Security Review rating is B when less than 80% of Security Hotspots are reviewed.
+metric.software_quality_security_review_rating.tooltip.A=Security Review rating is A when all Security Hotspots are reviewed.
+metric.software_quality_security_review_rating.tooltip.B=Security Review rating is B when less than 100% of Security Hotspots are reviewed.
 metric.software_quality_security_review_rating.tooltip.C=Security Review rating is C when less than 70% of Security Hotspots are reviewed.
 metric.software_quality_security_review_rating.tooltip.D=Security Review rating is D when less than 50% of Security Hotspots are reviewed.
 metric.software_quality_security_review_rating.tooltip.E=Security Review rating is E when less than 30% of Security Hotspots are reviewed.