Merge branch '263723-add-stats-to-group-coverage-tooltip' into 'master'

Add project count and coverage count to tooltip

See merge request gitlab-org/gitlab!73215

ee/app/assets/javascripts/analytics/repository_analytics/components/test_coverage_summary.vue

@@ -55,7 +55,12 @@ export default {
         this.groupCoverageChartData = [
           {
             name: this.$options.i18n.graphName,
-            data: groupCoverage.map((coverage) => [coverage.date, coverage.averageCoverage]),
+            data: groupCoverage.map((coverage) => [
+              coverage.date,
+              coverage.averageCoverage,
+              coverage.projectCount,
+              coverage.coverageCount,
+            ]),
           },
         ];
       },
@@ -137,8 +142,12 @@ export default {
   },
   methods: {
     formatTooltipText(params) {
+      const [, averageCoverage, projectCount, coverageCount] = params.seriesData?.[0]?.data;
+
       this.tooltipTitle = formatDate(params.value, 'mmm dd');
-      this.coveragePercentage = formatPercent(params.seriesData?.[0]?.data?.[1], 2);
+      this.tooltipAverageCoverage = formatPercent(averageCoverage, 2);
+      this.tooltipProjectCount = projectCount;
+      this.tooltipCoverageCount = coverageCount;
     },
   },
   i18n: {
@@ -147,7 +156,11 @@ export default {
     yAxisName: __('Coverage'),
     xAxisName: __('Date'),
     graphName: s__('RepositoriesAnalytics|Average coverage'),
-    graphTooltipMessage: __('Code Coverage: %{coveragePercentage}'),
+    graphTooltip: {
+      averageCoverage: s__('RepositoriesAnalytics|Code Coverage: %{averageCoverage}'),
+      projectCount: s__('RepositoriesAnalytics|Projects with Coverage: %{projectCount}'),
+      coverageCount: s__('RepositoriesAnalytics|Jobs with Coverage: %{coverageCount}'),
+    },
     metrics: {
       projectCountLabel: s__('RepositoriesAnalytics|Projects with Coverage'),
       averageCoverageLabel: s__('RepositoriesAnalytics|Average Coverage by Job'),
@@ -207,10 +220,16 @@ export default {
           {{ tooltipTitle }}
         </template>
         <template #tooltip-content>
-          <gl-sprintf :message="$options.i18n.graphTooltipMessage">
-            <template #coveragePercentage>
-              {{ coveragePercentage }}
-            </template>
+          <gl-sprintf :message="$options.i18n.graphTooltip.averageCoverage">
+            <template #averageCoverage> {{ tooltipAverageCoverage }}</template>
+          </gl-sprintf>
+          <br />
+          <gl-sprintf :message="$options.i18n.graphTooltip.projectCount">
+            <template #projectCount> {{ tooltipProjectCount }} </template>
+          </gl-sprintf>
+          <br />
+          <gl-sprintf :message="$options.i18n.graphTooltip.coverageCount">
+            <template #coverageCount> {{ tooltipCoverageCount }} </template>
           </gl-sprintf>
         </template>
       </gl-area-chart>

locale/gitlab.pot

@@ -8216,9 +8216,6 @@ msgstr ""
 msgid "Code"
 msgstr ""
 
-msgid "Code Coverage: %{coveragePercentage}"
-msgstr ""
-
 msgid "Code Coverage: %{coveragePercentage}%{percentSymbol}"
 msgstr ""
 
@@ -29005,6 +29002,9 @@ msgstr ""
 msgid "RepositoriesAnalytics|Average test coverage last 30 days"
 msgstr ""
 
+msgid "RepositoriesAnalytics|Code Coverage: %{averageCoverage}"
+msgstr ""
+
 msgid "RepositoriesAnalytics|Coverage"
 msgstr ""
 
@@ -29026,6 +29026,9 @@ msgstr ""
 msgid "RepositoriesAnalytics|Jobs with Coverage"
 msgstr ""
 
+msgid "RepositoriesAnalytics|Jobs with Coverage: %{coverageCount}"
+msgstr ""
+
 msgid "RepositoriesAnalytics|Last Update"
 msgstr ""
 
@@ -29044,6 +29047,9 @@ msgstr ""
 msgid "RepositoriesAnalytics|Projects with Coverage"
 msgstr ""
 
+msgid "RepositoriesAnalytics|Projects with Coverage: %{projectCount}"
+msgstr ""
+
 msgid "RepositoriesAnalytics|Test Code Coverage"
 msgstr ""