From 9ccaa8efc2bb059a996fbb013c7f6f5ce5ac0f65 Mon Sep 17 00:00:00 2001
From: Patrick Knight <pknight@redhat.com>
Date: Tue, 21 Apr 2026 20:58:55 -0400
Subject: [PATCH 1/8] fix(scorecard): entity calculation health on aggregation
 and drill-down APIs

Signed-off-by: Patrick Knight <pknight@redhat.com>
---
 .../.changeset/rhidp-13128-entity-health.md   |   7 +
 workspaces/scorecard/app-config.yaml          |   3 +-
 .../app-legacy/e2e-tests/pages/CatalogPage.ts |  26 +-
 .../app-legacy/e2e-tests/pages/HomePage.ts    |  32 ++-
 .../e2e-tests/pages/ScorecardDrillDownPage.ts |  32 ++-
 .../app-legacy/e2e-tests/scorecard.test.ts    |  39 +--
 .../e2e-tests/utils/scorecardResponseUtils.ts |  23 ++
 .../e2e-tests/utils/translationUtils.ts       |  52 ++--
 .../scorecard-backend/docs/aggregation.md     |   6 +-
 .../scorecard-backend/docs/drill-down.md      |   6 +
 .../src/database/DatabaseMetricValues.test.ts |  48 ++++
 .../src/database/DatabaseMetricValues.ts      |  74 ++++--
 .../scorecard-backend/src/database/types.ts   |   7 +
 .../src/service/CatalogMetricService.test.ts  |  94 +++++++-
 .../src/service/CatalogMetricService.ts       |  77 +++++-
 .../src/service/mappers.test.ts               |  12 +
 .../scorecard-backend/src/service/mappers.ts  |   2 +
 .../src/service/router.test.ts                |  28 ++-
 .../src/utils/metricCalculationError.ts       |  28 +++
 .../plugins/scorecard-common/report.api.md    |  10 +
 .../scorecard-common/src/types/Metric.ts      |  15 ++
 .../scorecard-common/src/types/aggregation.ts |  10 +
 .../aggregatedScorecardEntitiesData.ts        |   5 +
 .../scorecard/__fixtures__/scorecardData.ts   |   2 +
 .../plugins/scorecard/report-alpha.api.md     |   2 +-
 .../src/api/ScorecardApiClient.test.ts        |   2 +
 .../ScorecardHomepageCard.tsx                 |   8 +-
 .../ScorecardHomepageCardComponent.tsx        | 226 ++++++++++++++++++
 .../__tests__/ScorecardHomepageCard.test.tsx  |  12 +-
 .../ScorecardHomepageSection.test.tsx         |   4 +
 .../EntitiesTable/EntitiesTable.tsx           |   7 +-
 .../EntitiesTable/EntitiesTableWrapper.tsx    |   9 +-
 .../__tests__/EntitiesTable.test.tsx          |  39 ++-
 .../__tests__/EntitiesTableWrapper.test.tsx   |  29 ++-
 .../__tests__/useAggregatedScorecard.test.tsx |   2 +
 .../plugins/scorecard/src/translations/de.ts  |   4 +
 .../plugins/scorecard/src/translations/es.ts  |   4 +
 .../plugins/scorecard/src/translations/fr.ts  |   4 +
 .../plugins/scorecard/src/translations/it.ts  |   4 +
 .../plugins/scorecard/src/translations/ja.ts  |   4 +
 .../plugins/scorecard/src/translations/ref.ts |   6 +-
 41 files changed, 861 insertions(+), 143 deletions(-)
 create mode 100644 workspaces/scorecard/.changeset/rhidp-13128-entity-health.md
 create mode 100644 workspaces/scorecard/plugins/scorecard-backend/src/utils/metricCalculationError.ts
 create mode 100644 workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx

diff --git a/workspaces/scorecard/.changeset/rhidp-13128-entity-health.md b/workspaces/scorecard/.changeset/rhidp-13128-entity-health.md
new file mode 100644
index 00000000000..180f26e102b
--- /dev/null
+++ b/workspaces/scorecard/.changeset/rhidp-13128-entity-health.md
@@ -0,0 +1,7 @@
+---
+'@red-hat-developer-hub/backstage-plugin-scorecard-common': patch
+'@red-hat-developer-hub/backstage-plugin-scorecard-backend': patch
+'@red-hat-developer-hub/backstage-plugin-scorecard': patch
+---
+
+Expose scorecard entity calculation health on drill-down and aggregation APIs, and align the drill-down warning plus homepage subheader with those counts.
diff --git a/workspaces/scorecard/app-config.yaml b/workspaces/scorecard/app-config.yaml
index c1c31480b5c..f3f72a01467 100644
--- a/workspaces/scorecard/app-config.yaml
+++ b/workspaces/scorecard/app-config.yaml
@@ -162,7 +162,8 @@ auth:
   # see https://backstage.io/docs/auth/ to learn about auth providers
   providers:
     # See https://backstage.io/docs/auth/guest/provider
-    guest: {}
+    guest:
+      userEntityRef: user:development/guest
 
 scaffolder:
   # see https://backstage.io/docs/features/software-templates/configuration for software template options
diff --git a/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/CatalogPage.ts b/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/CatalogPage.ts
index d4471030217..64eab91d479 100644
--- a/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/CatalogPage.ts
+++ b/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/CatalogPage.ts
@@ -39,24 +39,22 @@ export class CatalogPage {
   async loginAndSetLocale(locale: string) {
     await this.page.goto('/');
     const enterButton = this.page.getByRole('button', { name: 'Enter' });
-    await expect(enterButton).toBeVisible();
+    await expect(enterButton).toBeVisible({ timeout: 30000 });
     await enterButton.click();
-    await expect(this.page.getByText('Welcome back!')).toBeVisible();
+    // Guest flow copy varies by Backstage / branding; wait for shell instead of "Welcome back!".
+    await expect(
+      this.page.getByRole('link', { name: 'Home' }).first(),
+    ).toBeVisible({
+      timeout: 30000,
+    });
     await this.switchToLocale(locale);
   }
 
-  async openCatalog() {
-    await this.page.goto('/catalog'); // Resolves the issue when "My Groups" sidebar covers the catalog toolbar
-    await this.page.getByTestId('user-picker-all').getByText('All').click();
-  }
-
-  async openComponent(componentName: string) {
-    const link = this.page.getByRole('link', { name: componentName });
-    await this.page
-      .getByRole('textbox', { name: 'Search' })
-      .fill(componentName);
-    await expect(link).toBeVisible({ timeout: 10000 });
-    await link.click();
+  /** Opens a Component in `default` by `metadata.name` (avoids catalog index / filter flakiness). */
+  async openComponent(name: string) {
+    await this.page.goto(
+      `/catalog/default/component/${encodeURIComponent(name)}`,
+    );
   }
 
   async switchToLocale(locale: string): Promise<void> {
diff --git a/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/HomePage.ts b/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/HomePage.ts
index 27c4ec68e65..a5dd1abe2be 100644
--- a/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/HomePage.ts
+++ b/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/HomePage.ts
@@ -18,8 +18,8 @@ import { Locator, Page, expect } from '@playwright/test';
 import { AGGREGATED_CARDS_WIDGET_TITLES } from '../constants/homepageWidgetTitles';
 import {
   ScorecardMessages,
-  getEntitiesLabel,
   getEntityCount,
+  getHomepageEntityCalculationHealthText,
   getLastUpdatedLabel,
 } from '../utils/translationUtils';
 
@@ -130,22 +130,18 @@ export class HomePage {
     await expect(this.page.getByText(label)).toBeVisible();
   }
 
-  async clickDrillDownLink() {
-    // CardSubheader renders the count as a Link (e.g. "10 entities"). The card
-    // description can also contain the word "entities" (see API metadata), so
-    // getByText(entitiesLabel) is ambiguous. MUI Tooltip also sets the link’s
-    // accessible name to the long tooltip, so getByRole('link', { name }) is
-    // locale‑fragile. Match only links whose *visible* text is "{{count}} <label>".
-    const entitiesLabel = getEntitiesLabel(this.translations);
-    await this.page
-      .getByRole('link')
-      .filter({
-        hasText: new RegExp(
-          String.raw`^\d+\s*${escapeRegex(entitiesLabel)}$`,
-          'i',
-        ),
-      })
-      .first()
-      .click();
+  /**
+   * Clicks the homepage KPI drill-down link (healthy/total subheader). Mock data uses 10/10.
+   */
+  async clickDrillDownLink(options?: { healthy?: string; total?: string }) {
+    const healthy = options?.healthy ?? '10';
+    const total = options?.total ?? '10';
+    const name = getHomepageEntityCalculationHealthText(
+      this.translations,
+      healthy,
+      total,
+    );
+    // Multiple homepage scorecards can share the same health string; target the first match.
+    await this.page.getByRole('link', { name }).first().click();
   }
 }
diff --git a/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/ScorecardDrillDownPage.ts b/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/ScorecardDrillDownPage.ts
index 9178d761518..571c1f2f13a 100644
--- a/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/ScorecardDrillDownPage.ts
+++ b/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/ScorecardDrillDownPage.ts
@@ -23,7 +23,6 @@ import {
   getEntitiesPageMissingPermission,
   getEntitiesPageNoDataFound,
   getEntitiesTableHeaderLabels,
-  getSomeEntitiesNotReportingTooltip,
 } from '../utils/translationUtils';
 
 type MetricId = 'github.open_prs' | 'jira.open_issues';
@@ -163,13 +162,16 @@ export class ScorecardDrillDownPage {
     await expect(this.page.locator('tbody')).toContainText(noDataText);
   }
 
-  /** Verifies the "some entities not reporting" icon tooltip on the drill-down card. */
-  async verifySomeEntitiesNotReportingTooltip() {
-    const icon = this.page.getByTestId('ReportProblemOutlinedIcon');
-    await expect(icon).toBeVisible();
-    await icon.hover();
-    const tooltipText = getSomeEntitiesNotReportingTooltip(this.translations);
-    await expect(this.page.getByRole('tooltip')).toContainText(tooltipText);
+  /**
+   * When mocks report no calculation failures, the drill-down must not show the
+   * calculation-warning icon next to the Entities heading.
+   */
+  async expectNoDrillDownCalculationErrorWarningIcon() {
+    const heading = this.page.getByRole('heading', {
+      level: 3,
+      name: this.translations.entitiesPage.entitiesTable.title,
+    });
+    await expect(heading.locator('svg.MuiSvgIcon-colorWarning')).toHaveCount(0);
   }
 
   async expectTableHeadersVisible() {
@@ -190,9 +192,21 @@ export class ScorecardDrillDownPage {
     }
   }
 
+  /**
+   * Asserts each entity row is present. Uses the catalog entity link `href`
+   * (…/component/&lt;slug&gt;) so it works when the UI shows `metadata.title`
+   * (e.g. "Red Hat Developer Hub") instead of `metadata.name` (slug).
+   */
   async expectEntityNamesVisible(entityNames: string[]) {
+    const entitiesTable = this.getEntitiesTable();
     for (const name of entityNames) {
-      await expect(this.page.getByText(name, { exact: true })).toBeVisible();
+      const slug = encodeURIComponent(name);
+      await expect(
+        entitiesTable
+          .locator('tbody')
+          .locator(`a[href*="/component/${slug}"]`)
+          .first(),
+      ).toBeVisible({ timeout: 15_000 });
     }
   }
 
diff --git a/workspaces/scorecard/packages/app-legacy/e2e-tests/scorecard.test.ts b/workspaces/scorecard/packages/app-legacy/e2e-tests/scorecard.test.ts
index 9427dfe88d3..1e186bb5baa 100644
--- a/workspaces/scorecard/packages/app-legacy/e2e-tests/scorecard.test.ts
+++ b/workspaces/scorecard/packages/app-legacy/e2e-tests/scorecard.test.ts
@@ -139,8 +139,7 @@ test.describe('Scorecard Plugin Tests', () => {
         notAllowedAggregationErrorBody,
         403,
       );
-      await catalogPage.openCatalog();
-      await catalogPage.openComponent('Red Hat Developer Hub');
+      await catalogPage.openComponent('red-hat-developer-hub');
       await page.getByText('Scorecard', { exact: true }).click();
 
       await expect(
@@ -163,8 +162,7 @@ test.describe('Scorecard Plugin Tests', () => {
         customScorecardResponse,
       );
 
-      await catalogPage.openCatalog();
-      await catalogPage.openComponent('Red Hat Developer Hub');
+      await catalogPage.openComponent('red-hat-developer-hub');
       await scorecardPage.openTab();
       await scorecardPage.verifyScorecardValues({
         [translations.metric['github.open_prs'].title]: '9',
@@ -187,8 +185,7 @@ test.describe('Scorecard Plugin Tests', () => {
         emptyScorecardResponse,
       );
 
-      await catalogPage.openCatalog();
-      await catalogPage.openComponent('Red Hat Developer Hub');
+      await catalogPage.openComponent('red-hat-developer-hub');
       await scorecardPage.openTab();
 
       await scorecardPage.expectEmptyState();
@@ -205,8 +202,7 @@ test.describe('Scorecard Plugin Tests', () => {
         unavailableMetricResponse,
       );
 
-      await catalogPage.openCatalog();
-      await catalogPage.openComponent('Red Hat Developer Hub');
+      await catalogPage.openComponent('red-hat-developer-hub');
       await scorecardPage.openTab();
 
       const jiraMetric = scorecardPage.scorecardMetrics[1];
@@ -240,8 +236,7 @@ test.describe('Scorecard Plugin Tests', () => {
         invalidThresholdResponse,
       );
 
-      await catalogPage.openCatalog();
-      await catalogPage.openComponent('Red Hat Developer Hub');
+      await catalogPage.openComponent('red-hat-developer-hub');
       await scorecardPage.openTab();
 
       const githubMetric = scorecardPage.scorecardMetrics[0];
@@ -417,11 +412,6 @@ test.describe('Scorecard Plugin Tests', () => {
         await addAggregatedScorecardWidgets(homePage);
         await page.reload();
 
-        const jiraEntityCount = getEntityCount(
-          translations,
-          currentLocale,
-          '10',
-        );
         const card = homePage.getCard(
           AGGREGATED_CARDS_METRIC_IDS.withDeprecatedMetricId,
         );
@@ -435,7 +425,6 @@ test.describe('Scorecard Plugin Tests', () => {
           getThresholdsSnapshot(translations, {
             drillDownMetricId:
               AGGREGATED_CARDS_METRIC_IDS.withDeprecatedMetricId,
-            entityCount: jiraEntityCount,
             cardTitle: metadata.title,
             cardDescription: metadata.description,
           }),
@@ -525,11 +514,6 @@ test.describe('Scorecard Plugin Tests', () => {
         await addAggregatedScorecardWidgets(homePage);
         await page.reload();
 
-        const githubEntityCount = getEntityCount(
-          translations,
-          currentLocale,
-          '10',
-        );
         const metadata =
           translations.metric[
             AGGREGATED_CARDS_METRIC_IDS.withDefaultAggregation
@@ -543,7 +527,6 @@ test.describe('Scorecard Plugin Tests', () => {
           getThresholdsSnapshot(translations, {
             drillDownMetricId:
               AGGREGATED_CARDS_METRIC_IDS.withDefaultAggregation,
-            entityCount: githubEntityCount,
             cardTitle: metadata.title,
             cardDescription: metadata.description,
           }),
@@ -647,11 +630,6 @@ test.describe('Scorecard Plugin Tests', () => {
         );
         await page.reload();
 
-        const githubEntityCount = getEntityCount(
-          translations,
-          currentLocale,
-          '10',
-        );
         const card = homePage.getCard(
           AGGREGATED_CARDS_METRIC_IDS.withGithubOpenPrs,
         );
@@ -663,7 +641,6 @@ test.describe('Scorecard Plugin Tests', () => {
               AGGREGATED_CARDS_METRIC_IDS.withDefaultAggregation,
             drillDownAggregationId:
               AGGREGATED_CARDS_METRIC_IDS.withGithubOpenPrs,
-            entityCount: githubEntityCount,
             cardTitle: githubAggregatedResponse.metadata.title,
             cardDescription: githubAggregatedResponse.metadata.description,
           }),
@@ -798,7 +775,7 @@ test.describe('Scorecard Plugin Tests', () => {
               cardDescription: githubAggregatedResponse.metadata.description,
             },
           );
-          await scorecardDrillDownPage.verifySomeEntitiesNotReportingTooltip();
+          await scorecardDrillDownPage.expectNoDrillDownCalculationErrorWarningIcon();
           await scorecardDrillDownPage.expectTableHeadersVisible();
           const rows5Label = getEntitiesTableFooterRowsLabel(translations, 5);
           await scorecardDrillDownPage.expectTableFooterSnapshot(
@@ -820,7 +797,7 @@ test.describe('Scorecard Plugin Tests', () => {
           // First page: only 5 entities (pageSize=5)
           await scorecardDrillDownPage.expectEntityNamesVisible([
             'all-scorecards-service',
-            'Red Hat Developer Hub',
+            'red-hat-developer-hub',
             'github-scorecard-only-service',
             'all-scorecards-service-different-owner',
             'backend-api',
@@ -915,7 +892,7 @@ test.describe('Scorecard Plugin Tests', () => {
               cardDescription: jiraAggregatedResponse.metadata.description,
             },
           );
-          await scorecardDrillDownPage.verifySomeEntitiesNotReportingTooltip();
+          await scorecardDrillDownPage.expectNoDrillDownCalculationErrorWarningIcon();
           await scorecardDrillDownPage.expectTableHeadersVisible();
           await scorecardDrillDownPage.expectEntityNamesVisible([
             'platform-api',
diff --git a/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/scorecardResponseUtils.ts b/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/scorecardResponseUtils.ts
index 80129b6deb3..3903b48c8f2 100644
--- a/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/scorecardResponseUtils.ts
+++ b/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/scorecardResponseUtils.ts
@@ -307,6 +307,8 @@ export const githubAggregatedResponse = {
     total: 10,
     timestamp: '2026-01-24T14:10:32.858Z',
     thresholds: DEFAULT_NUMBER_THRESHOLDS,
+    entitiesConsidered: 10,
+    calculationErrorCount: 0,
   },
 };
 
@@ -330,6 +332,8 @@ export const jiraAggregatedResponse = {
     total: 10,
     timestamp: '2026-01-24T14:10:32.776Z',
     thresholds: DEFAULT_NUMBER_THRESHOLDS,
+    entitiesConsidered: 10,
+    calculationErrorCount: 0,
   },
 };
 
@@ -353,6 +357,8 @@ export const emptyJiraAggregatedResponse = {
     ],
     timestamp: '2026-01-24T14:10:32.858Z',
     thresholds: DEFAULT_NUMBER_THRESHOLDS,
+    entitiesConsidered: 0,
+    calculationErrorCount: 0,
   },
 };
 
@@ -376,6 +382,8 @@ export const emptyGithubAggregatedResponse = {
     ],
     timestamp: '2026-01-24T14:10:32.858Z',
     thresholds: DEFAULT_NUMBER_THRESHOLDS,
+    entitiesConsidered: 0,
+    calculationErrorCount: 0,
   },
 };
 
@@ -497,6 +505,11 @@ export const githubEntitiesDrillDownResponse = {
     totalPages: 1,
     isCapped: false,
   },
+  entityHealth: {
+    totalEntities: 10,
+    calculationErrorCount: 0,
+    countsArePartial: false,
+  },
 };
 
 /** Mock response for GET .../api/scorecard/metrics/jira.open_issues/catalog/aggregations/entities (in sync with jiraAggregatedResponse) */
@@ -557,6 +570,11 @@ export const jiraEntitiesDrillDownResponse = {
     totalPages: 1,
     isCapped: false,
   },
+  entityHealth: {
+    totalEntities: 4,
+    calculationErrorCount: 0,
+    countsArePartial: false,
+  },
 };
 
 /** Mock response for Jira entities drill-down when aggregation has no data (empty list). */
@@ -576,6 +594,11 @@ export const jiraEntitiesDrillDownNoDataResponse = {
     totalPages: 0,
     isCapped: false,
   },
+  entityHealth: {
+    totalEntities: 0,
+    calculationErrorCount: 0,
+    countsArePartial: false,
+  },
 };
 
 export const fileCheckScorecardResponse = [
diff --git a/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/translationUtils.ts b/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/translationUtils.ts
index 7c34a9e48ea..41ff0c0f098 100644
--- a/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/translationUtils.ts
+++ b/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/translationUtils.ts
@@ -180,19 +180,6 @@ export function getEntitiesPageMissingPermission(
   );
 }
 
-/** Tooltip text for "some entities not reporting" icon on drill-down card (locale-aware). */
-export function getSomeEntitiesNotReportingTooltip(
-  translations: ScorecardMessages,
-): string {
-  const metric = (
-    translations as { metric?: { someEntitiesNotReportingValues?: string } }
-  ).metric;
-  return (
-    metric?.someEntitiesNotReportingValues ??
-    scorecardMessages.metric.someEntitiesNotReportingValues
-  );
-}
-
 /** Rows-per-page label (e.g. "5 rows", "5 lignes"). Used for dropdown and listbox options. */
 export function getEntitiesTableFooterRowsLabel(
   translations: ScorecardMessages,
@@ -306,20 +293,20 @@ export function getLastUpdatedLabel(
 }
 
 /**
- * Homepage KPI cards use aggregationIds (e.g. openPrsKpi); labels fall back to API/config
- * metadata in English, not `metric.github.open_prs` locale keys. Use ref copy for title
- * / description; keep localized errors, thresholds, and entity-count strings.
+ * Homepage KPI drill-down link text: healthy entities vs entities considered (RHIDP-13128).
  */
-function getSomeEntitiesNotReportingLabel(
+export function getHomepageEntityCalculationHealthText(
   translations: ScorecardMessages,
+  healthy: string,
+  total: string,
 ): string {
-  const metric = translations.metric as {
-    someEntitiesNotReportingValues?: string;
-  };
-  return (
-    metric.someEntitiesNotReportingValues ??
-    scorecardMessages.metric.someEntitiesNotReportingValues
-  );
+  const template =
+    (translations.metric as { homepageEntityCalculationHealth?: string })
+      .homepageEntityCalculationHealth ??
+    scorecardMessages.metric.homepageEntityCalculationHealth;
+  return template
+    .replace(/\{\{healthy\}\}/g, healthy)
+    .replace(/\{\{total\}\}/g, total);
 }
 
 /** Snapshot for the scorecard card on the drill-down page when permission is missing (no entity count in UI). */
@@ -357,7 +344,8 @@ export function getThresholdsSnapshot(
   options: {
     drillDownMetricId: 'jira.open_issues' | 'github.open_prs';
     drillDownAggregationId?: string;
-    entityCount: string;
+    /** Interpolation for `metric.homepageEntityCalculationHealth` (mock data uses 10/10). */
+    homepageCalculationHealth?: { healthy: string; total: string };
     cardTitle: string;
     cardDescription: string;
   },
@@ -365,18 +353,24 @@ export function getThresholdsSnapshot(
   const {
     drillDownMetricId,
     drillDownAggregationId,
-    entityCount,
     cardTitle,
     cardDescription,
   } = options;
   const aggregationSegment = drillDownAggregationId ?? drillDownMetricId;
-  const drillDownLinkName = getSomeEntitiesNotReportingLabel(translations);
+  const { healthy, total } = options.homepageCalculationHealth ?? {
+    healthy: '10',
+    total: '10',
+  };
+  const drillDownLinkText = getHomepageEntityCalculationHealthText(
+    translations,
+    healthy,
+    total,
+  );
   return `
         - article:
           - text: ${cardTitle}
-          - link "${drillDownLinkName}":
+          - link "${drillDownLinkText}":
             - /url: /scorecard/aggregations/${aggregationSegment}/metrics/${drillDownMetricId}
-            - text: ${entityCount}
           - button
           - separator
           - paragraph: ${cardDescription}
diff --git a/workspaces/scorecard/plugins/scorecard-backend/docs/aggregation.md b/workspaces/scorecard/plugins/scorecard-backend/docs/aggregation.md
index 41c094a1477..225f897844f 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/docs/aggregation.md
+++ b/workspaces/scorecard/plugins/scorecard-backend/docs/aggregation.md
@@ -64,9 +64,11 @@ Use this endpoint for all new integrations.
 - **`aggregationId`** may be a key under **`scorecard.aggregationKPIs`** in app-config (see the [backend README](../README.md#aggregation-kpis-homepage-and-get-aggregations)), which supplies **title**, **description**, **type**, **metricId**, and for **`type: average`** the **`options.statusScores`** map (threshold rule key → weight), with room for more **`options`** fields per type later.
 - If there is **no** `scorecard.aggregationKPIs.<aggregationId>` block, the backend still responds successfully: it treats **`aggregationId` as the `metricId`** and uses the default **statusGrouped** strategy (same as calling **`/aggregations/<metricId>`** with a metric id). A **warning** is logged on the server so missing KPI config is visible in operator logs. To get a custom **title**, **`average`** type, or other KPI options, you must add that block; a typo in the id falls through to this default and can look like “wrong” aggregation behavior in the UI, so check logs and app-config.
 
-The response shape includes **`id`**, **`status`**, **`metadata`** (title, description, type, aggregation type), and **`result`** (counts per threshold rule, total, thresholds). For **`average`**, **`result`** also includes **`averageScore`** (ratio in \[0, 1\]), **`averageWeightedSum`**, and **`averageMaxPossible`** (see backend README). The homepage card shows a donut gauge for this type instead of a multi-slice status pie.
+The response shape includes **`id`**, **`status`**, **`metadata`** (title, description, type, aggregation type), and **`result`** (counts per threshold rule, total, thresholds). The **`result`** object also includes **`entitiesConsidered`** (count of in-scope owned entities that have **at least one** latest `metric_values` row for this metric) and **`calculationErrorCount`** (how many of those latest rows are metric calculation failures: `error_message` set and `value` null), so the homepage ratio matches the population behind the drill-down table rather than the raw number of owned catalog refs. For **`average`**, **`result`** also includes **`averageScore`** (ratio in \[0, 1\]), **`averageWeightedSum`**, and **`averageMaxPossible`** (see backend README). The homepage card shows a donut gauge for this type instead of a multi-slice status pie.
 
-Backend routing uses a small **aggregation strategy registry**: each KPI **`type`** maps to a class that loads data (often via shared status-count reads) and builds **`AggregatedMetricResult`**. New types register another strategy without extending `if` chains in the HTTP router.
+**“Without calculation errors” on the homepage:** `healthy = entitiesConsidered - calculationErrorCount` counts only among entities that already have a latest stored row for this metric. Owned entities with **no** row yet are omitted from **`entitiesConsidered`** (same as omitting them from the drill-down list until data exists).
+
+**Partial totals:** The drill-down entities list can cap how many DB rows are considered and exposes **`entityHealth.countsArePartial`** when that cap applies. The aggregation path runs over the **full** list of owned catalog entity refs supplied to the query (there is no equivalent row cap), so **`entitiesConsidered`** / **`calculationErrorCount`** on **`GET /aggregations/:aggregationId`** are not marked partial in the same way.
 
 ### `GET /aggregations/:aggregationId/metadata`
 
diff --git a/workspaces/scorecard/plugins/scorecard-backend/docs/drill-down.md b/workspaces/scorecard/plugins/scorecard-backend/docs/drill-down.md
index 341673e28b7..d7d9fc14332 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/docs/drill-down.md
+++ b/workspaces/scorecard/plugins/scorecard-backend/docs/drill-down.md
@@ -71,6 +71,12 @@ Requires `scorecard.metric.read` permission. Additionally:
     pageSize: number;
     total: number;
     totalPages: number;
+    isCapped: boolean;
+  };
+  entityHealth: {
+    totalEntities: number; // Same as pagination.total for this response
+    calculationErrorCount: number; // Latest row is a metric calculation failure (error_message set, value null)
+    countsArePartial: boolean; // True when the DB fetch window was capped
   };
 }
 
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/database/DatabaseMetricValues.test.ts b/workspaces/scorecard/plugins/scorecard-backend/src/database/DatabaseMetricValues.test.ts
index a8c06128f6f..764fa021f31 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/database/DatabaseMetricValues.test.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/database/DatabaseMetricValues.test.ts
@@ -264,6 +264,8 @@ describe('DatabaseMetricValues', () => {
             critical: 1,
           }),
           max_timestamp: baseTimestamp,
+          calculation_error_count: 0,
+          latest_entity_count: 3,
         });
       },
     );
@@ -301,6 +303,8 @@ describe('DatabaseMetricValues', () => {
           total: 1,
           statusCounts: { success: 1 },
           max_timestamp: baseTimestamp,
+          calculation_error_count: 0,
+          latest_entity_count: 1,
         });
       },
     );
@@ -346,6 +350,8 @@ describe('DatabaseMetricValues', () => {
           total: 2,
           statusCounts: { error: 2 },
           max_timestamp: newerTime,
+          calculation_error_count: 0,
+          latest_entity_count: 2,
         });
       },
     );
@@ -389,6 +395,8 @@ describe('DatabaseMetricValues', () => {
           total: 1,
           statusCounts: { success: 1 },
           max_timestamp: baseTimestamp,
+          calculation_error_count: 1,
+          latest_entity_count: 3,
         });
       },
     );
@@ -443,6 +451,8 @@ describe('DatabaseMetricValues', () => {
             warning: 1,
           }),
           max_timestamp: time3,
+          calculation_error_count: 0,
+          latest_entity_count: 3,
         });
       },
     );
@@ -489,6 +499,44 @@ describe('DatabaseMetricValues', () => {
           statusCounts: { success: 1, warning: 2 },
           total: 3,
           max_timestamp: baseTimestamp,
+          calculation_error_count: 0,
+          latest_entity_count: 3,
+        });
+      },
+    );
+
+    it.each(databases.eachSupportedId())(
+      'should aggregate calculation errors when no successful values exist - %p',
+      async databaseId => {
+        const { client, db } = await createDatabase(databaseId);
+
+        await client('metric_values').insert([
+          createMetricValue({
+            entityRef: 'component:default/service1',
+            value: null,
+            status: null,
+            errorMessage: 'boom-a',
+          }),
+          createMetricValue({
+            entityRef: 'component:default/service2',
+            value: null,
+            status: null,
+            errorMessage: 'boom-b',
+          }),
+        ]);
+
+        const result = await db.readAggregatedMetricByEntityRefs(
+          ['component:default/service1', 'component:default/service2'],
+          'github.metric1',
+        );
+
+        expect(result).toEqual({
+          metric_id: 'github.metric1',
+          total: 0,
+          statusCounts: {},
+          max_timestamp: baseTimestamp,
+          calculation_error_count: 2,
+          latest_entity_count: 2,
         });
       },
     );
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/database/DatabaseMetricValues.ts b/workspaces/scorecard/plugins/scorecard-backend/src/database/DatabaseMetricValues.ts
index e999c9db1e1..07238280deb 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/database/DatabaseMetricValues.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/database/DatabaseMetricValues.ts
@@ -89,40 +89,79 @@ export class DatabaseMetricValues {
     catalog_entity_refs: string[],
     metric_id: string,
   ): Promise<DbAggregatedMetric | undefined> {
+    if (catalog_entity_refs.length === 0) {
+      return undefined;
+    }
+
     const latestIdsSubquery = this.dbClient(this.tableName)
       .max('id')
       .where('metric_id', metric_id)
       .whereIn('catalog_entity_ref', catalog_entity_refs)
       .groupBy('catalog_entity_ref');
 
-    const statusRows = await this.dbClient(this.tableName)
-      .select('status')
-      .count('* as count')
-      .max('timestamp as max_timestamp')
+    // One round-trip for latest-row count, calculation-error count, and max timestamp
+    // (same latest-id set as the status breakdown query below).
+    const statsRow = await this.dbClient(this.tableName)
       .whereIn('id', latestIdsSubquery)
-      .whereNotNull('status')
-      .whereNotNull('value')
-      .groupBy('status');
+      .select(
+        this.dbClient.raw('COUNT(*) as latest_row_count'),
+        this.dbClient.raw(
+          'SUM(CASE WHEN error_message IS NOT NULL AND value IS NULL THEN 1 ELSE 0 END) as calculation_error_count',
+        ),
+        this.dbClient.raw('MAX(timestamp) as max_timestamp'),
+      )
+      .first();
 
-    if (!statusRows || statusRows.length === 0) {
+    const latestRowCount = Number(
+      (statsRow as { latest_row_count?: string | number } | undefined)
+        ?.latest_row_count ?? 0,
+    );
+    if (latestRowCount === 0) {
       return undefined;
     }
 
+    const calculation_error_count = Number(
+      (statsRow as { calculation_error_count?: string | number } | undefined)
+        ?.calculation_error_count ?? 0,
+    );
+
     // Normalize types for cross-database compatibility
     // PostgreSQL returns COUNT/SUM as strings, SQLite returns numbers
     // PostgreSQL returns MAX(timestamp) as Date, SQLite returns number (milliseconds)
-    const normalizeTimestamp = (timestamp: any): Date => {
+    const normalizeTimestamp = (timestamp: unknown): Date => {
       if (timestamp instanceof Date) {
         return timestamp;
-      } else if (
-        typeof timestamp === 'number' ||
-        typeof timestamp === 'string'
-      ) {
+      }
+      if (typeof timestamp === 'number' || typeof timestamp === 'string') {
         return new Date(timestamp);
       }
       return new Date();
     };
 
+    const maxTimestampAllLatest = normalizeTimestamp(
+      (statsRow as { max_timestamp?: unknown })?.max_timestamp,
+    );
+
+    const statusRows = await this.dbClient(this.tableName)
+      .select('status')
+      .count('* as count')
+      .max('timestamp as max_timestamp')
+      .whereIn('id', latestIdsSubquery)
+      .whereNotNull('status')
+      .whereNotNull('value')
+      .groupBy('status');
+
+    if (!statusRows || statusRows.length === 0) {
+      return {
+        metric_id,
+        total: 0,
+        max_timestamp: maxTimestampAllLatest,
+        statusCounts: {},
+        calculation_error_count,
+        latest_entity_count: latestRowCount,
+      };
+    }
+
     let maxTimestamp = new Date(0);
     let total = 0;
     const statusCounts: Record<string, number> = {};
@@ -137,11 +176,18 @@ export class DatabaseMetricValues {
       total += count;
     }
 
+    const mergedMax =
+      maxTimestampAllLatest.getTime() >= maxTimestamp.getTime()
+        ? maxTimestampAllLatest
+        : maxTimestamp;
+
     return {
       metric_id,
       total,
-      max_timestamp: maxTimestamp,
+      max_timestamp: mergedMax,
       statusCounts,
+      calculation_error_count,
+      latest_entity_count: latestRowCount,
     };
   }
 
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/database/types.ts b/workspaces/scorecard/plugins/scorecard-backend/src/database/types.ts
index 0c6114fba3a..0acb8eda7df 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/database/types.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/database/types.ts
@@ -46,4 +46,11 @@ export type DbAggregatedMetric = {
   total: number;
   max_timestamp: Date;
   statusCounts: Record<string, number>;
+  /** Latest row per entity is a metric calculation failure (error_message set, value null). */
+  calculation_error_count: number;
+  /**
+   * How many of the requested `catalog_entity_refs` have at least one latest `metric_values` row
+   * for this metric (same cardinality the drill-down table is built from, modulo caps/filters).
+   */
+  latest_entity_count: number;
 };
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/service/CatalogMetricService.test.ts b/workspaces/scorecard/plugins/scorecard-backend/src/service/CatalogMetricService.test.ts
index 1ef24ffe3eb..0cd33b893e1 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/service/CatalogMetricService.test.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/service/CatalogMetricService.test.ts
@@ -37,6 +37,7 @@ import {
 import * as permissionUtils from '../permissions/permissionUtils';
 import {
   AggregatedMetric,
+  aggregationTypes,
   Metric,
 } from '@red-hat-developer-hub/backstage-plugin-scorecard-common';
 import * as thresholdUtils from '../utils/mergeEntityAndProviderThresholds';
@@ -77,6 +78,8 @@ const aggregatedMetric: DbAggregatedMetric = {
     success: 1,
     warning: 1,
   },
+  calculation_error_count: 0,
+  latest_entity_count: 2,
 };
 
 const metricsList = [
@@ -557,6 +560,8 @@ describe('CatalogMetricService', () => {
           },
           total: 2,
           timestamp: '2024-01-15T12:00:00.000Z',
+          entitiesConsidered: 2,
+          calculationErrorCount: 0,
         });
       });
 
@@ -576,6 +581,39 @@ describe('CatalogMetricService', () => {
         expect(toAggregatedMetricSpy).toHaveBeenCalledTimes(1);
         expect(toAggregatedMetricSpy).toHaveBeenCalledWith(aggregatedMetric);
       });
+
+      it('should throw when aggregation type is not supported', async () => {
+        await expect(
+          service.getAggregatedMetricByEntityRefs(
+            ['component:default/test-component'],
+            'github.important_metric',
+            'unknownAggregation',
+          ),
+        ).rejects.toThrow('Unsupported aggregation type: unknownAggregation');
+      });
+
+      it('should use latest_entity_count for entitiesConsidered when fewer owned refs have metric rows', async () => {
+        mockedDatabase.readAggregatedMetricByEntityRefs.mockResolvedValue({
+          ...aggregatedMetric,
+          latest_entity_count: 5,
+        });
+
+        const sparse = await service.getAggregatedMetricByEntityRefs(
+          [
+            'component:default/a',
+            'component:default/b',
+            'component:default/c',
+            'component:default/d',
+            'component:default/e',
+            'component:default/f',
+            'component:default/g',
+          ],
+          'github.important_metric',
+          aggregationTypes.statusGrouped,
+        );
+
+        expect(sparse.entitiesConsidered).toBe(5);
+      });
     });
 
     describe('when no entities are provided', () => {
@@ -593,6 +631,8 @@ describe('CatalogMetricService', () => {
           values: {},
           total: 0,
           timestamp: '2024-01-15T12:00:00.000Z',
+          entitiesConsidered: 0,
+          calculationErrorCount: 0,
         });
       });
 
@@ -604,7 +644,7 @@ describe('CatalogMetricService', () => {
 
       it('should call toAggregatedMetric to map aggregated metric to result', async () => {
         expect(toAggregatedMetricSpy).toHaveBeenCalledTimes(1);
-        expect(toAggregatedMetricSpy).toHaveBeenCalledWith();
+        expect(toAggregatedMetricSpy).toHaveBeenCalledWith(undefined);
       });
     });
   });
@@ -700,6 +740,11 @@ describe('CatalogMetricService', () => {
         totalPages: 1,
         isCapped: false,
       });
+      expect(result.entityHealth).toEqual({
+        totalEntities: 3,
+        calculationErrorCount: 0,
+        countsArePartial: false,
+      });
     });
 
     it('should enrich entities with catalog metadata', async () => {
@@ -1102,6 +1147,11 @@ describe('CatalogMetricService', () => {
       );
       expect(result.entities[0].entityRef).toBe('component:default/service-a');
       expect(result.entities[1].entityRef).toBe('component:staging/service-c');
+      expect(result.entityHealth).toEqual({
+        totalEntities: 2,
+        calculationErrorCount: 0,
+        countsArePartial: false,
+      });
     });
 
     it('should handle catalog API failures by logging an error and not returning information from the database', async () => {
@@ -1125,6 +1175,11 @@ describe('CatalogMetricService', () => {
 
       // When catalog is unavailable, do not bypass and instead log error
       expect(result.entities).toHaveLength(0);
+      expect(result.entityHealth).toEqual({
+        totalEntities: 0,
+        calculationErrorCount: 0,
+        countsArePartial: false,
+      });
     });
 
     it('should pass null to database for unscoped query (avoids catalog enumeration)', async () => {
@@ -1157,6 +1212,11 @@ describe('CatalogMetricService', () => {
       expect(result.entities.map(e => e.entityRef)).not.toContain(
         'component:default/service-b',
       );
+      expect(result.entityHealth).toEqual({
+        totalEntities: 2,
+        calculationErrorCount: 0,
+        countsArePartial: false,
+      });
     });
 
     it('should combine filters, sorting, and pagination', async () => {
@@ -1214,6 +1274,38 @@ describe('CatalogMetricService', () => {
         totalPages: 0,
         isCapped: false,
       });
+      expect(result.entityHealth).toEqual({
+        totalEntities: 0,
+        calculationErrorCount: 0,
+        countsArePartial: false,
+      });
+    });
+
+    it('should count metric calculation failures in entityHealth', async () => {
+      mockedDatabase.readEntityMetricsWithFilters.mockResolvedValue([
+        mockMetricRows[0],
+        {
+          ...mockMetricRows[1],
+          value: null,
+          error_message: 'Provider failed',
+          status: null,
+        },
+      ]);
+
+      const result = await service.getEntityMetricDetails(
+        'github.important_metric',
+        mockCredentials,
+        {
+          page: 1,
+          limit: 10,
+        },
+      );
+
+      expect(result.entityHealth).toEqual({
+        totalEntities: 2,
+        calculationErrorCount: 1,
+        countsArePartial: false,
+      });
     });
 
     it('should include metric metadata in response', async () => {
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/service/CatalogMetricService.ts b/workspaces/scorecard/plugins/scorecard-backend/src/service/CatalogMetricService.ts
index 26770af5eb7..b08bf7f3925 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/service/CatalogMetricService.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/service/CatalogMetricService.ts
@@ -19,6 +19,9 @@ import {
   ThresholdConfig,
   EntityMetricDetailResponse,
   EntityMetricDetail,
+  ScorecardEntityHealthSummary,
+  aggregationTypes,
+  AggregatedMetric,
 } from '@red-hat-developer-hub/backstage-plugin-scorecard-common';
 import type { Entity } from '@backstage/catalog-model';
 import { normalizeOwnerRef } from '../utils/normalizeOwnerRef';
@@ -38,6 +41,8 @@ import {
 import { CatalogService } from '@backstage/plugin-catalog-node';
 import { DatabaseMetricValues } from '../database/DatabaseMetricValues';
 import { mergeEntityAndProviderThresholds } from '../utils/mergeEntityAndProviderThresholds';
+import { isMetricCalculationError } from '../utils/metricCalculationError';
+import { AggregatedMetricMapper } from './mappers';
 import { DbMetricValue } from '../database/types';
 
 type CatalogMetricServiceOptions = {
@@ -49,6 +54,20 @@ type CatalogMetricServiceOptions = {
 };
 
 export class CatalogMetricService {
+  private static entityHealthSummary(
+    accessibleRows: DbMetricValue[],
+    countsArePartial: boolean,
+  ): ScorecardEntityHealthSummary {
+    const calculationErrorCount = accessibleRows.filter(row =>
+      isMetricCalculationError(row),
+    ).length;
+    return {
+      totalEntities: accessibleRows.length,
+      calculationErrorCount,
+      countsArePartial,
+    };
+  }
+
   private readonly logger: LoggerService;
 
   private readonly catalog: CatalogService;
@@ -122,7 +141,10 @@ export class CatalogMetricService {
           thresholdError = stringifyError(error);
         }
 
-        const isMetricCalcError = error_message !== null && value === null;
+        const isMetricCalcError = isMetricCalculationError({
+          value,
+          error_message,
+        });
 
         return {
           id: metric.id,
@@ -153,6 +175,49 @@ export class CatalogMetricService {
     );
   }
 
+  /**
+   * Get an aggregated metric by status grouped for multiple entities and a single metric ID.
+   *
+   * @param entityRefs - Array of entity references in format "kind:namespace/name"
+   * @param metricId - Metric ID to aggregate.
+   * @returns Aggregated metric by status grouped results
+   */
+  async getStatusGroupedAggregatedMetrics(
+    entityRefs: string[],
+    metricId: string,
+  ): Promise<AggregatedMetric> {
+    const aggregatedMetric =
+      await this.database.readAggregatedMetricByEntityRefs(
+        entityRefs,
+        metricId,
+      );
+
+    return AggregatedMetricMapper.toAggregatedMetric(aggregatedMetric);
+  }
+
+  /**
+   * Get an aggregated metric by aggregation type.
+   *
+   * @param entityRefs - Array of entity references in format "kind:namespace/name"
+   * @param metricId - Metric ID to aggregate.
+   * @param aggregationType - Aggregation type to use.
+   * @returns Aggregated metric by aggregation type results
+   */
+  async getAggregatedMetricByEntityRefs(
+    entityRefs: string[],
+    metricId: string,
+    aggregationType: string,
+  ): Promise<AggregatedMetric> {
+    if (entityRefs.length !== 0) {
+      if (aggregationType === aggregationTypes.statusGrouped) {
+        return this.getStatusGroupedAggregatedMetrics(entityRefs, metricId);
+      }
+      throw new Error(`Unsupported aggregation type: ${aggregationType}`);
+    }
+
+    return AggregatedMetricMapper.toAggregatedMetric(undefined);
+  }
+
   /**
    * Get detailed entity metrics for drill-down with filtering, sorting, and pagination.
    *
@@ -219,6 +284,7 @@ export class CatalogMetricService {
           totalPages: 0,
           isCapped: false,
         },
+        entityHealth: CatalogMetricService.entityHealthSummary([], false),
       };
     }
 
@@ -289,6 +355,7 @@ export class CatalogMetricService {
           totalPages: 0,
           isCapped: false,
         },
+        entityHealth: CatalogMetricService.entityHealthSummary([], false),
       };
     }
 
@@ -320,6 +387,10 @@ export class CatalogMetricService {
           totalPages: Math.ceil(totalFiltered / options.limit),
           isCapped,
         },
+        entityHealth: CatalogMetricService.entityHealthSummary(
+          accessibleRows,
+          isCapped,
+        ),
       };
     }
 
@@ -356,6 +427,10 @@ export class CatalogMetricService {
         totalPages: Math.ceil(totalFiltered / options.limit),
         isCapped,
       },
+      entityHealth: CatalogMetricService.entityHealthSummary(
+        accessibleRows,
+        isCapped,
+      ),
     };
   }
 }
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/service/mappers.test.ts b/workspaces/scorecard/plugins/scorecard-backend/src/service/mappers.test.ts
index 01e52a1b3f5..7020827e734 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/service/mappers.test.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/service/mappers.test.ts
@@ -43,6 +43,8 @@ describe('AggregatedMetricMapper', () => {
           warning: 3,
           error: 2,
         },
+        calculation_error_count: 1,
+        latest_entity_count: 12,
       };
 
       const result = AggregatedMetricMapper.toAggregatedMetric(dbMetric);
@@ -55,6 +57,8 @@ describe('AggregatedMetricMapper', () => {
         },
         total: 10,
         timestamp: '2024-01-15T10:00:00.000Z',
+        entitiesConsidered: 12,
+        calculationErrorCount: 1,
       });
     });
 
@@ -65,6 +69,8 @@ describe('AggregatedMetricMapper', () => {
         values: {},
         total: 0,
         timestamp: expect.any(String),
+        entitiesConsidered: 0,
+        calculationErrorCount: 0,
       });
     });
 
@@ -74,12 +80,16 @@ describe('AggregatedMetricMapper', () => {
         total: 0,
         max_timestamp: new Date('2024-01-15T10:00:00Z'),
         statusCounts: {},
+        calculation_error_count: 0,
+        latest_entity_count: 0,
       };
 
       const result = AggregatedMetricMapper.toAggregatedMetric(dbMetric);
 
       expect(result.values).toEqual({});
       expect(result.total).toBe(0);
+      expect(result.entitiesConsidered).toBe(0);
+      expect(result.calculationErrorCount).toBe(0);
     });
   });
 
@@ -140,6 +150,8 @@ describe('AggregatedMetricMapper', () => {
             { name: 'warning', count: 1, score: 0 },
             { name: 'error', count: 1, score: 0 },
           ],
+          entitiesConsidered: 7,
+          calculationErrorCount: 0,
           thresholds,
         },
         aggregationConfig,
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/service/mappers.ts b/workspaces/scorecard/plugins/scorecard-backend/src/service/mappers.ts
index f1bf3f9249a..921c65d61d4 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/service/mappers.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/service/mappers.ts
@@ -38,6 +38,8 @@ export class AggregatedMetricMapper {
       values: aggregatedMetric?.statusCounts ?? {},
       total,
       timestamp,
+      entitiesConsidered: aggregatedMetric?.latest_entity_count ?? 0,
+      calculationErrorCount: aggregatedMetric?.calculation_error_count ?? 0,
     };
   }
 
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/service/router.test.ts b/workspaces/scorecard/plugins/scorecard-backend/src/service/router.test.ts
index 7690502a277..6d6515cdffe 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/service/router.test.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/service/router.test.ts
@@ -504,6 +504,8 @@ describe('createRouter', () => {
       },
       total: 12,
       timestamp: '2025-01-01T10:30:00.000Z',
+      entitiesConsidered: 2,
+      calculationErrorCount: 0,
     };
 
     const mockAggregatedMetricResult: AggregatedMetricResult = {
@@ -531,6 +533,8 @@ describe('createRouter', () => {
             { key: 'success', expression: '<=20' },
           ],
         },
+        entitiesConsidered: 2,
+        calculationErrorCount: 0,
       },
     };
 
@@ -872,6 +876,8 @@ describe('createRouter', () => {
       values: { error: 1, warning: 2, success: 3 },
       total: 6,
       timestamp: '2025-01-01T10:30:00.000Z',
+      entitiesConsidered: 2,
+      calculationErrorCount: 0,
     };
 
     const mockAggregatedMetricResult: AggregatedMetricResult = {
@@ -899,6 +905,8 @@ describe('createRouter', () => {
             { key: 'success', expression: '<=20' },
           ],
         },
+        entitiesConsidered: 2,
+        calculationErrorCount: 0,
       },
     };
 
@@ -1412,6 +1420,12 @@ describe('createRouter', () => {
         pageSize: 10,
         total: 2,
         totalPages: 1,
+        isCapped: false,
+      },
+      entityHealth: {
+        totalEntities: 2,
+        calculationErrorCount: 0,
+        countsArePartial: false,
       },
     };
 
@@ -1684,10 +1698,20 @@ describe('createRouter', () => {
     it('should return empty entities array when no results', async () => {
       getEntityMetricDetailsSpy.mockResolvedValue({
         metricId: 'github.open_prs',
-        mockCredentials,
         metricMetadata: mockEntityMetricDetailResponse.metricMetadata,
         entities: [],
-        pagination: { page: 1, pageSize: 10, total: 0, totalPages: 0 },
+        pagination: {
+          page: 1,
+          pageSize: 10,
+          total: 0,
+          totalPages: 0,
+          isCapped: false,
+        },
+        entityHealth: {
+          totalEntities: 0,
+          calculationErrorCount: 0,
+          countsArePartial: false,
+        },
       });
 
       const response = await request(drillDownApp).get(
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/utils/metricCalculationError.ts b/workspaces/scorecard/plugins/scorecard-backend/src/utils/metricCalculationError.ts
new file mode 100644
index 00000000000..2a74aa876bc
--- /dev/null
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/utils/metricCalculationError.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { DbMetricValue } from '../database/types';
+
+/**
+ * True when the persisted latest row represents a provider-side calculation failure,
+ * aligned with `CatalogMetricService.getLatestEntityMetrics`.
+ */
+export function isMetricCalculationError(row: {
+  value: DbMetricValue['value'];
+  error_message: DbMetricValue['error_message'];
+}): boolean {
+  return row.error_message !== null && row.value === null;
+}
diff --git a/workspaces/scorecard/plugins/scorecard-common/report.api.md b/workspaces/scorecard/plugins/scorecard-common/report.api.md
index a4ceb81f0b6..213f62c1bd1 100644
--- a/workspaces/scorecard/plugins/scorecard-common/report.api.md
+++ b/workspaces/scorecard/plugins/scorecard-common/report.api.md
@@ -10,6 +10,8 @@ export type AggregatedMetric = {
   values: Record<string, number>;
   total: number;
   timestamp: string;
+  entitiesConsidered: number;
+  calculationErrorCount: number;
 };
 
 // @public (undocumented)
@@ -112,6 +114,7 @@ export type EntityMetricDetailResponse = {
     totalPages: number;
     isCapped: boolean;
   };
+  entityHealth: ScorecardEntityHealthSummary;
 };
 
 // @public (undocumented)
@@ -161,6 +164,13 @@ export const SCORECARD_THRESHOLD_RULE_COLOR_VALUES: (
   | 'error.main'
 )[];
 
+// @public
+export type ScorecardEntityHealthSummary = {
+  totalEntities: number;
+  calculationErrorCount: number;
+  countsArePartial: boolean;
+};
+
 // @public
 export type ScorecardMetricPermission = ResourcePermission<
   typeof RESOURCE_TYPE_SCORECARD_METRIC
diff --git a/workspaces/scorecard/plugins/scorecard-common/src/types/Metric.ts b/workspaces/scorecard/plugins/scorecard-common/src/types/Metric.ts
index 0d1735134e5..5032d137b6f 100644
--- a/workspaces/scorecard/plugins/scorecard-common/src/types/Metric.ts
+++ b/workspaces/scorecard/plugins/scorecard-common/src/types/Metric.ts
@@ -76,6 +76,20 @@ export type EntityMetricDetail = {
   status?: string | null;
 };
 
+/**
+ * Rollup for drill-down: counts over the same catalog-authorized rows as `EntityMetricDetailResponse.pagination`.
+ *
+ * @public
+ */
+export type ScorecardEntityHealthSummary = {
+  /** Same as `pagination.total`: entities the caller can read that matched the drill-down query window. */
+  totalEntities: number;
+  /** Latest stored row per entity is a metric **calculation** failure (`error_message` set and `value` null). */
+  calculationErrorCount: number;
+  /** True when the backend DB window was capped; totals may omit additional matching rows. */
+  countsArePartial: boolean;
+};
+
 /**
  * Paginated response for entity metrics drill-down
  * @public
@@ -95,4 +109,5 @@ export type EntityMetricDetailResponse = {
     totalPages: number;
     isCapped: boolean;
   };
+  entityHealth: ScorecardEntityHealthSummary;
 };
diff --git a/workspaces/scorecard/plugins/scorecard-common/src/types/aggregation.ts b/workspaces/scorecard/plugins/scorecard-common/src/types/aggregation.ts
index 7a35fb90ecb..df1f26a3dc9 100644
--- a/workspaces/scorecard/plugins/scorecard-common/src/types/aggregation.ts
+++ b/workspaces/scorecard/plugins/scorecard-common/src/types/aggregation.ts
@@ -42,6 +42,16 @@ export type AggregatedMetric = {
   values: Record<string, number>;
   total: number;
   timestamp: string;
+  /**
+   * Entities in aggregation scope that have at least one latest stored `metric_values` row for this metric
+   * (aligned with the drill-down list total when the same ownership filters apply).
+   */
+  entitiesConsidered: number;
+  /**
+   * How many of those entities have a latest stored row that is a metric **calculation** failure
+   * (`error_message` set and `value` null), distinct from threshold status counts in `values` / `total`.
+   */
+  calculationErrorCount: number;
 };
 
 /**
diff --git a/workspaces/scorecard/plugins/scorecard/__fixtures__/aggregatedScorecardEntitiesData.ts b/workspaces/scorecard/plugins/scorecard/__fixtures__/aggregatedScorecardEntitiesData.ts
index 21cda31eb70..675f8f8b298 100644
--- a/workspaces/scorecard/plugins/scorecard/__fixtures__/aggregatedScorecardEntitiesData.ts
+++ b/workspaces/scorecard/plugins/scorecard/__fixtures__/aggregatedScorecardEntitiesData.ts
@@ -134,5 +134,10 @@ export const mockAggregatedScorecardEntitiesData = (
       totalPages: 1,
       isCapped: false,
     },
+    entityHealth: {
+      totalEntities: 8,
+      calculationErrorCount: 0,
+      countsArePartial: false,
+    },
   };
 };
diff --git a/workspaces/scorecard/plugins/scorecard/__fixtures__/scorecardData.ts b/workspaces/scorecard/plugins/scorecard/__fixtures__/scorecardData.ts
index c5c3dcca0a1..1edcae32f63 100644
--- a/workspaces/scorecard/plugins/scorecard/__fixtures__/scorecardData.ts
+++ b/workspaces/scorecard/plugins/scorecard/__fixtures__/scorecardData.ts
@@ -154,6 +154,8 @@ export const mockAggregatedScorecardData = {
       total: 37,
       timestamp: '2024-01-15T10:30:00Z',
       thresholds: DEFAULT_NUMBER_THRESHOLDS,
+      entitiesConsidered: 37,
+      calculationErrorCount: 0,
     },
   } as AggregatedMetricResult,
   [aggregationTypes.average]: {
diff --git a/workspaces/scorecard/plugins/scorecard/report-alpha.api.md b/workspaces/scorecard/plugins/scorecard/report-alpha.api.md
index f43e5522b1f..c7f851d1c66 100644
--- a/workspaces/scorecard/plugins/scorecard/report-alpha.api.md
+++ b/workspaces/scorecard/plugins/scorecard/report-alpha.api.md
@@ -25,8 +25,8 @@ const _default: OverridableFrontendPlugin<
   {
     root: RouteRef<undefined>;
     drillDown: RouteRef<{
-      aggregationId: string;
       metricId: string;
+      aggregationId: string;
     }>;
   },
   {},
diff --git a/workspaces/scorecard/plugins/scorecard/src/api/ScorecardApiClient.test.ts b/workspaces/scorecard/plugins/scorecard/src/api/ScorecardApiClient.test.ts
index b25568dfb75..b647b7bb320 100644
--- a/workspaces/scorecard/plugins/scorecard/src/api/ScorecardApiClient.test.ts
+++ b/workspaces/scorecard/plugins/scorecard/src/api/ScorecardApiClient.test.ts
@@ -155,6 +155,8 @@ describe('ScorecardApiClient', () => {
         values: [{ name: 'success', count: 1 }],
         timestamp: '2025-01-01T00:00:00Z',
         thresholds: {},
+        entitiesConsidered: 1,
+        calculationErrorCount: 0,
       },
     };
 
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCard.tsx b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCard.tsx
index 3780aa6daf2..0603b179957 100644
--- a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCard.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCard.tsx
@@ -77,7 +77,13 @@ export const ScorecardHomepageCard = ({
     return null;
   }
 
-  if (data.result?.total === 0) {
+  const result = data.result;
+  const hasNoRenderableAggregation =
+    result.total === 0 &&
+    result.calculationErrorCount === 0 &&
+    result.entitiesConsidered === 0;
+
+  if (hasNoRenderableAggregation) {
     return (
       <EmptyStatePanel
         showSubheader={showSubheader}
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx
new file mode 100644
index 00000000000..fae356df5ae
--- /dev/null
+++ b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx
@@ -0,0 +1,226 @@
+/*
+ * Copyright Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { useState } from 'react';
+
+import { Link } from '@backstage/core-components';
+import type { AggregatedMetricResult } from '@red-hat-developer-hub/backstage-plugin-scorecard-common';
+
+import Box from '@mui/material/Box';
+import { useTheme } from '@mui/material/styles';
+import Tooltip from '@mui/material/Tooltip';
+import IconButton from '@mui/material/IconButton';
+import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
+
+import { CardWrapper } from '../Common/CardWrapper';
+import { CustomTooltip } from './CustomTooltip';
+import CustomLegend from './CustomLegend';
+import type { PieData } from '../types';
+import {
+  getThresholdRuleColor,
+  resolveStatusColor,
+  SCORECARD_ERROR_STATE_COLOR,
+  getLastUpdatedLabel,
+} from '../../utils';
+import { useTranslation } from '../../hooks/useTranslation';
+import { ResponsivePieChart } from './ResponsivePieChart';
+import { useLanguage } from '../../hooks/useLanguage';
+
+const InfoComponent = ({ timestamp }: { timestamp: string }) => {
+  const theme = useTheme();
+  const { t } = useTranslation();
+  const locale = useLanguage();
+
+  const lastUpdatedLabel = getLastUpdatedLabel(timestamp, locale);
+
+  return (
+    <Box sx={{ display: 'flex', alignItems: 'center', height: '100%', mr: 2 }}>
+      <Tooltip
+        title={
+          <Box sx={{ textAlign: 'center' }}>
+            {lastUpdatedLabel !== '--'
+              ? t('metric.lastUpdated', { timestamp: lastUpdatedLabel })
+              : t('metric.lastUpdatedNotAvailable')}
+          </Box>
+        }
+        placement="top"
+        arrow
+        componentsProps={{
+          tooltip: {
+            sx: {
+              display: 'flex',
+              justifyContent: 'center',
+              alignItems: 'center',
+              color: 'white',
+              fontSize: '0.875rem',
+              p: 1.5,
+            },
+          },
+        }}
+      >
+        <IconButton data-testid="scorecard-homepage-card-info">
+          <InfoOutlinedIcon
+            sx={{ color: theme.palette.text.secondary, fontSize: '1.75rem' }}
+          />
+        </IconButton>
+      </Tooltip>
+    </Box>
+  );
+};
+
+export const ScorecardHomepageCardComponent = ({
+  scorecard,
+  cardTitle,
+  description,
+  aggregationId,
+  showSubheader = true,
+  showInfo = true,
+  dataTestId,
+}: {
+  scorecard: AggregatedMetricResult;
+  cardTitle: string;
+  description: string;
+  aggregationId: string;
+  showSubheader?: boolean;
+  showInfo?: boolean;
+  dataTestId?: string;
+}) => {
+  const theme = useTheme();
+  const { t } = useTranslation();
+
+  const [activeIndex, setActiveIndex] = useState<number | null>(null);
+  const [tooltipPosition, setTooltipPosition] = useState<{
+    x: number;
+    y: number;
+  } | null>(null);
+
+  const pieData: PieData[] =
+    scorecard.result.values?.map(value => ({
+      name: value.name,
+      value: value.count,
+      color: resolveStatusColor(
+        theme,
+        getThresholdRuleColor(scorecard.result.thresholds.rules, value.name) ??
+          SCORECARD_ERROR_STATE_COLOR,
+      ),
+    })) ?? [];
+
+  const { entitiesConsidered, calculationErrorCount } = scorecard.result;
+  const healthyCount = Math.max(0, entitiesConsidered - calculationErrorCount);
+
+  const subheaderLink = (
+    <Link
+      to={`/scorecard/aggregations/${encodeURIComponent(
+        aggregationId,
+      )}/metrics/${encodeURIComponent(scorecard.id)}`}
+    >
+      {t('metric.homepageEntityCalculationHealth', {
+        healthy: String(healthyCount),
+        total: String(entitiesConsidered),
+      })}
+    </Link>
+  );
+
+  return (
+    <CardWrapper
+      title={cardTitle}
+      dataTestId={dataTestId}
+      {...(showSubheader
+        ? {
+            subheader:
+              calculationErrorCount > 0 ? (
+                <Tooltip
+                  enterDelay={800}
+                  title={t('metric.drillDownCalculationFailures')}
+                  arrow
+                  placement="right"
+                >
+                  {subheaderLink}
+                </Tooltip>
+              ) : (
+                subheaderLink
+              ),
+          }
+        : {})}
+      description={description}
+      {...(showInfo
+        ? {
+            info: <InfoComponent timestamp={scorecard.result.timestamp} />,
+          }
+        : {})}
+    >
+      <Box
+        width="100%"
+        minWidth={311}
+        minHeight={174}
+        height="100%"
+        data-chart-container
+        position="relative"
+        sx={{
+          display: 'flex',
+          justifyContent: 'center',
+          alignItems: 'center',
+          cursor: 'default',
+          '& .recharts-wrapper > svg': {
+            outline: 'none',
+          },
+        }}
+      >
+        <ResponsivePieChart
+          pieData={pieData}
+          legendContent={props => (
+            <CustomLegend
+              {...props}
+              activeIndex={activeIndex}
+              setActiveIndex={setActiveIndex}
+              setTooltipPosition={setTooltipPosition}
+              pieData={pieData}
+            />
+          )}
+          tooltipContent={({ active, payload }) =>
+            active && payload ? (
+              <CustomTooltip payload={payload} pieData={pieData} />
+            ) : null
+          }
+        />
+
+        {activeIndex !== null && tooltipPosition && (
+          <Box
+            sx={{
+              position: 'absolute',
+              left: `${tooltipPosition.x}px`,
+              top: `${tooltipPosition.y}px`,
+              transform: 'translate(-50%, -100%)',
+              zIndex: 1000,
+              pointerEvents: 'none',
+            }}
+          >
+            <CustomTooltip
+              payload={[
+                {
+                  name: pieData[activeIndex].name,
+                  value: pieData[activeIndex].value,
+                  payload: pieData[activeIndex],
+                },
+              ]}
+              pieData={pieData}
+            />
+          </Box>
+        )}
+      </Box>
+    </CardWrapper>
+  );
+};
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageCard.test.tsx b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageCard.test.tsx
index 644bd55838f..4da7f440b7a 100644
--- a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageCard.test.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageCard.test.tsx
@@ -115,6 +115,8 @@ jest.mock('../../../hooks/useTranslation', () => ({
   useTranslation: () => ({
     t: (key: string, options?: any) => {
       switch (key) {
+        case 'metric.homepageEntityCalculationHealth':
+          return `${options?.healthy} / ${options?.total} entities healthy`;
         case 'thresholds.entities':
           return `${options?.count} entities`;
         case 'thresholds.noEntities':
@@ -155,6 +157,8 @@ const mockScorecard: AggregatedMetricResult = {
     ],
     timestamp: '2024-01-01T00:00:00Z',
     thresholds: DEFAULT_NUMBER_THRESHOLDS,
+    entitiesConsidered: 37,
+    calculationErrorCount: 0,
   },
 };
 
@@ -218,7 +222,7 @@ describe('AggregatedMetricCard (homepage scorecard)', () => {
       'GitHub open PRs',
     );
     expect(screen.getByTestId('card-subheader')).toHaveTextContent(
-      '37 entities',
+      '37 / 37 entities healthy',
     );
     expect(screen.getByTestId('card-description')).toHaveTextContent(
       'Current count of open Pull Requests',
@@ -300,6 +304,8 @@ describe('AggregatedMetricCard (homepage scorecard)', () => {
         ...mockScorecard.result,
         values: [],
         total: 0,
+        entitiesConsidered: 0,
+        calculationErrorCount: 0,
       },
     };
 
@@ -314,7 +320,7 @@ describe('AggregatedMetricCard (homepage scorecard)', () => {
     );
 
     expect(screen.getByTestId('card-subheader')).toHaveTextContent(
-      '0 entities',
+      '0 / 0 entities healthy',
     );
     expect(screen.getByTestId('pie-data-length')).toHaveTextContent('0');
   });
@@ -341,6 +347,8 @@ describe('AggregatedMetricCard (homepage scorecard)', () => {
       result: {
         ...mockScorecard.result,
         values: [],
+        entitiesConsidered: 37,
+        calculationErrorCount: 0,
       },
     };
 
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageSection.test.tsx b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageSection.test.tsx
index 1513e1409e2..3a464d79334 100644
--- a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageSection.test.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageSection.test.tsx
@@ -101,6 +101,8 @@ const mockScorecard: AggregatedMetricResult = {
     values: [{ name: 'success', count: 8 }],
     timestamp: '2024-01-01T00:00:00Z',
     thresholds: DEFAULT_NUMBER_THRESHOLDS,
+    entitiesConsidered: 8,
+    calculationErrorCount: 0,
   },
 };
 
@@ -326,6 +328,8 @@ describe('ScorecardHomepageCard', () => {
           values: [],
           timestamp: '2024-01-01T00:00:00Z',
           thresholds: DEFAULT_NUMBER_THRESHOLDS,
+          entitiesConsidered: 0,
+          calculationErrorCount: 0,
         },
       },
       isLoading: false,
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/EntitiesTable.tsx b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/EntitiesTable.tsx
index ea0ecaf563d..359c0d006e1 100644
--- a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/EntitiesTable.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/EntitiesTable.tsx
@@ -130,13 +130,18 @@ export const EntitiesTable = ({
   const entities = aggregatedScorecardEntities?.entities ?? [];
 
   const total = aggregatedScorecardEntities?.pagination?.total ?? 0;
+  const calculationErrorCount =
+    aggregatedScorecardEntities?.entityHealth?.calculationErrorCount ?? 0;
   const entitiesTableTitle =
     total > 0
       ? t('entitiesPage.entitiesTable.titleWithCount', { count: total } as any)
       : t('entitiesPage.entitiesTable.title');
 
   return (
-    <EntitiesTableWrapper title={entitiesTableTitle} isError={!!entitiesError}>
+    <EntitiesTableWrapper
+      title={entitiesTableTitle}
+      showCalculationWarning={calculationErrorCount > 0}
+    >
       <Table sx={{ width: '100%', tableLayout: 'fixed' }}>
         <EntitiesTableHeader
           orderBy={orderBy}
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/EntitiesTableWrapper.tsx b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/EntitiesTableWrapper.tsx
index d44819df41f..ad263335bab 100644
--- a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/EntitiesTableWrapper.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/EntitiesTableWrapper.tsx
@@ -27,13 +27,14 @@ import { useTranslation } from '../../../hooks/useTranslation';
 interface EntitiesTableWrapperProps {
   children: ReactNode;
   title: string;
-  isError?: boolean;
+  /** When true, show a warning that at least one visible entity had a metric calculation failure. */
+  showCalculationWarning?: boolean;
 }
 
 export const EntitiesTableWrapper: FC<EntitiesTableWrapperProps> = ({
   children,
   title,
-  isError,
+  showCalculationWarning = false,
 }) => {
   const { t } = useTranslation();
 
@@ -55,9 +56,9 @@ export const EntitiesTableWrapper: FC<EntitiesTableWrapperProps> = ({
           }}
         >
           {title}
-          {!isError && (
+          {showCalculationWarning && (
             <Tooltip
-              title={t('metric.someEntitiesNotReportingValues')}
+              title={t('metric.drillDownCalculationFailures')}
               arrow
               placement="right"
               sx={{
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/__tests__/EntitiesTable.test.tsx b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/__tests__/EntitiesTable.test.tsx
index 5cf35589e2a..4533b50c255 100644
--- a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/__tests__/EntitiesTable.test.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/__tests__/EntitiesTable.test.tsx
@@ -121,6 +121,11 @@ const TestWrapper = ({ children }: { children: React.ReactNode }) => (
 describe('EntitiesTable', () => {
   const defaultAggregatedData = {
     metricMetadata: { title: 'Open PRs' },
+    entityHealth: {
+      totalEntities: 2,
+      calculationErrorCount: 0,
+      countsArePartial: false,
+    },
     entities: [
       {
         entityRef: 'component:default/service-a',
@@ -133,7 +138,13 @@ describe('EntitiesTable', () => {
         metricValue: 12,
       },
     ],
-    pagination: { total: 2 },
+    pagination: {
+      page: 1,
+      pageSize: 10,
+      total: 2,
+      totalPages: 1,
+      isCapped: false,
+    },
   };
 
   beforeEach(() => {
@@ -189,7 +200,18 @@ describe('EntitiesTable', () => {
       aggregatedScorecardEntities: {
         metricMetadata: {},
         entities: [],
-        pagination: { total: 0 },
+        pagination: {
+          page: 1,
+          pageSize: 10,
+          total: 0,
+          totalPages: 0,
+          isCapped: false,
+        },
+        entityHealth: {
+          totalEntities: 0,
+          calculationErrorCount: 0,
+          countsArePartial: false,
+        },
       },
       loadingData: false,
       error: undefined,
@@ -242,7 +264,18 @@ describe('EntitiesTable', () => {
       aggregatedScorecardEntities: {
         metricMetadata: {},
         entities: [],
-        pagination: { total: 0 },
+        pagination: {
+          page: 1,
+          pageSize: 10,
+          total: 0,
+          totalPages: 0,
+          isCapped: false,
+        },
+        entityHealth: {
+          totalEntities: 0,
+          calculationErrorCount: 0,
+          countsArePartial: false,
+        },
       },
       loadingData: false,
       error: undefined,
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/__tests__/EntitiesTableWrapper.test.tsx b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/__tests__/EntitiesTableWrapper.test.tsx
index 67fcfa86aa9..522c9594c7a 100644
--- a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/__tests__/EntitiesTableWrapper.test.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/__tests__/EntitiesTableWrapper.test.tsx
@@ -22,8 +22,8 @@ import { EntitiesTableWrapper } from '../EntitiesTableWrapper';
 jest.mock('../../../../hooks/useTranslation', () => ({
   useTranslation: () => ({
     t: (key: string) =>
-      key === 'metric.someEntitiesNotReportingValues'
-        ? 'Some entities are not reporting values'
+      key === 'metric.drillDownCalculationFailures'
+        ? 'Calculation failed for one or more entities'
         : key,
   }),
 }));
@@ -48,8 +48,8 @@ describe('EntitiesTableWrapper', () => {
     );
   });
 
-  it('should render warning icon with tooltip', () => {
-    render(
+  it('should not render calculation warning icon by default', () => {
+    const { container } = render(
       <TestWrapper>
         <EntitiesTableWrapper title="Entities">
           <span>Content</span>
@@ -57,12 +57,25 @@ describe('EntitiesTableWrapper', () => {
       </TestWrapper>,
     );
 
-    const icon = document.querySelector(
-      '[data-testid="ReportProblemOutlinedIcon"]',
+    expect(
+      container.querySelector('.MuiSvgIcon-colorWarning'),
+    ).not.toBeInTheDocument();
+  });
+
+  it('should render calculation warning icon when showCalculationWarning', () => {
+    const { container } = render(
+      <TestWrapper>
+        <EntitiesTableWrapper title="Entities" showCalculationWarning>
+          <span>Content</span>
+        </EntitiesTableWrapper>
+      </TestWrapper>,
     );
-    expect(icon).toBeInTheDocument();
+
+    expect(
+      container.querySelector('.MuiSvgIcon-colorWarning'),
+    ).toBeInTheDocument();
     expect(
-      screen.getByLabelText('Some entities are not reporting values'),
+      screen.getByLabelText('Calculation failed for one or more entities'),
     ).toBeInTheDocument();
   });
 });
diff --git a/workspaces/scorecard/plugins/scorecard/src/hooks/__tests__/useAggregatedScorecard.test.tsx b/workspaces/scorecard/plugins/scorecard/src/hooks/__tests__/useAggregatedScorecard.test.tsx
index 92b5ba8bf0d..987e8f297c0 100644
--- a/workspaces/scorecard/plugins/scorecard/src/hooks/__tests__/useAggregatedScorecard.test.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/hooks/__tests__/useAggregatedScorecard.test.tsx
@@ -57,6 +57,8 @@ describe('useAggregatedScorecard', () => {
       values: [{ name: 'success', count: 1 }],
       timestamp: '2025-01-01T00:00:00Z',
       thresholds: DEFAULT_NUMBER_THRESHOLDS,
+      entitiesConsidered: 1,
+      calculationErrorCount: 0,
     },
   };
 
diff --git a/workspaces/scorecard/plugins/scorecard/src/translations/de.ts b/workspaces/scorecard/plugins/scorecard/src/translations/de.ts
index b6c14cd0e07..f2cc6f62866 100644
--- a/workspaces/scorecard/plugins/scorecard/src/translations/de.ts
+++ b/workspaces/scorecard/plugins/scorecard/src/translations/de.ts
@@ -94,6 +94,10 @@ const scorecardTranslationDe = createTranslationMessages({
     'metric.averageLegendTooltipEntitiesEach_other':
       '{{count}} Elemente, je {{score}}',
     'metric.averageLegendTooltipRowTotal': 'Gesamtpunktzahl {{total}}',
+    'metric.drillDownCalculationFailures':
+      'Mindestens ein Element konnte diese Metrik nicht berechnen.',
+    'metric.homepageEntityCalculationHealth':
+      '{{healthy}} / {{total}} Elemente ohne Metrik-Berechnungsfehler',
 
     // Threshold translations
     'thresholds.success': 'Erfolg',
diff --git a/workspaces/scorecard/plugins/scorecard/src/translations/es.ts b/workspaces/scorecard/plugins/scorecard/src/translations/es.ts
index 2254dadee18..f63d6b1ea68 100644
--- a/workspaces/scorecard/plugins/scorecard/src/translations/es.ts
+++ b/workspaces/scorecard/plugins/scorecard/src/translations/es.ts
@@ -95,6 +95,10 @@ const scorecardTranslationEs = createTranslationMessages({
     'metric.averageLegendTooltipEntitiesEach_other':
       '{{count}} entidades, cada una {{score}}',
     'metric.averageLegendTooltipRowTotal': 'Puntuación total {{total}}',
+    'metric.drillDownCalculationFailures':
+      'Una o más entidades fallaron al calcular esta métrica.',
+    'metric.homepageEntityCalculationHealth':
+      '{{healthy}} / {{total}} entidades sin errores de cálculo de métrica',
 
     // Threshold translations
     'thresholds.success': 'Éxito',
diff --git a/workspaces/scorecard/plugins/scorecard/src/translations/fr.ts b/workspaces/scorecard/plugins/scorecard/src/translations/fr.ts
index f616bb4bddf..480d5cd184e 100644
--- a/workspaces/scorecard/plugins/scorecard/src/translations/fr.ts
+++ b/workspaces/scorecard/plugins/scorecard/src/translations/fr.ts
@@ -96,6 +96,10 @@ const scorecardTranslationFr = createTranslationMessages({
     'metric.averageLegendTooltipEntitiesEach_other':
       '{{count}} entités, chacune {{score}}',
     'metric.averageLegendTooltipRowTotal': 'Score total {{total}}',
+    'metric.drillDownCalculationFailures':
+      'Le calcul de cette métrique a échoué pour une ou plusieurs entités.',
+    'metric.homepageEntityCalculationHealth':
+      '{{healthy}} / {{total}} entités sans erreur de calcul de métrique',
 
     // Threshold translations
     'thresholds.success': 'Succès',
diff --git a/workspaces/scorecard/plugins/scorecard/src/translations/it.ts b/workspaces/scorecard/plugins/scorecard/src/translations/it.ts
index c1964006254..7c2dbc97754 100644
--- a/workspaces/scorecard/plugins/scorecard/src/translations/it.ts
+++ b/workspaces/scorecard/plugins/scorecard/src/translations/it.ts
@@ -96,6 +96,10 @@ const scorecardTranslationIt = createTranslationMessages({
     'metric.averageLegendTooltipEntitiesEach_other':
       '{{count}} entità, ciascuna {{score}}',
     'metric.averageLegendTooltipRowTotal': 'Punteggio totale {{total}}',
+    'metric.drillDownCalculationFailures':
+      'Il calcolo di questa metrica non è riuscito per una o più entità.',
+    'metric.homepageEntityCalculationHealth':
+      '{{healthy}} / {{total}} entità senza errori di calcolo della metrica',
 
     // Threshold translations
     'thresholds.success': 'Attività riuscita',
diff --git a/workspaces/scorecard/plugins/scorecard/src/translations/ja.ts b/workspaces/scorecard/plugins/scorecard/src/translations/ja.ts
index e8a5a5646ae..e8a83af8bcc 100644
--- a/workspaces/scorecard/plugins/scorecard/src/translations/ja.ts
+++ b/workspaces/scorecard/plugins/scorecard/src/translations/ja.ts
@@ -96,6 +96,10 @@ const scorecardTranslationJa = createTranslationMessages({
     'metric.averageLegendTooltipEntitiesEach_other':
       '{{count}} 件のエンティティー、各 {{score}}',
     'metric.averageLegendTooltipRowTotal': '合計スコア {{total}}',
+    'metric.drillDownCalculationFailures':
+      '1 件以上のエンティティーでこの指標の計算に失敗しました。',
+    'metric.homepageEntityCalculationHealth':
+      '指標の計算エラーがないエンティティー {{healthy}} / {{total}}',
 
     // Threshold translations
     'thresholds.success': '成功',
diff --git a/workspaces/scorecard/plugins/scorecard/src/translations/ref.ts b/workspaces/scorecard/plugins/scorecard/src/translations/ref.ts
index 0ba90459ccf..f70d26131d6 100644
--- a/workspaces/scorecard/plugins/scorecard/src/translations/ref.ts
+++ b/workspaces/scorecard/plugins/scorecard/src/translations/ref.ts
@@ -105,6 +105,10 @@ export const scorecardMessages = {
     averageLegendTooltipEntitiesEach_other:
       '{{count}} entities, each {{score}}',
     averageLegendTooltipRowTotal: 'Total score {{total}}',
+    drillDownCalculationFailures:
+      'One or more entities failed while calculating this metric.',
+    homepageEntityCalculationHealth:
+      '{{healthy}} / {{total}} entities without metric calculation errors',
   },
 
   // Threshold translations
@@ -148,7 +152,7 @@ export const scorecardMessages = {
       },
     },
   },
-};
+} as const;
 
 /**
  * Translation reference for scorecard plugin

From 5ee0cbd12dc94c0b457510cf0b71f9deaa57f457 Mon Sep 17 00:00:00 2001
From: Patrick Knight <pknight@redhat.com>
Date: Thu, 23 Apr 2026 09:07:48 -0400
Subject: [PATCH 2/8] fix(scorecard): update generated reports

Signed-off-by: Patrick Knight <pknight@redhat.com>
---
 workspaces/scorecard/plugins/scorecard/report-alpha.api.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workspaces/scorecard/plugins/scorecard/report-alpha.api.md b/workspaces/scorecard/plugins/scorecard/report-alpha.api.md
index c7f851d1c66..f43e5522b1f 100644
--- a/workspaces/scorecard/plugins/scorecard/report-alpha.api.md
+++ b/workspaces/scorecard/plugins/scorecard/report-alpha.api.md
@@ -25,8 +25,8 @@ const _default: OverridableFrontendPlugin<
   {
     root: RouteRef<undefined>;
     drillDown: RouteRef<{
-      metricId: string;
       aggregationId: string;
+      metricId: string;
     }>;
   },
   {},

From 2014966d08a13eb8425f00a72a053043dc4b8a37 Mon Sep 17 00:00:00 2001
From: Patrick Knight <pknight@redhat.com>
Date: Thu, 23 Apr 2026 10:26:29 -0400
Subject: [PATCH 3/8] fix(scorecard): QODO review suggestions and sonarqube
 fixes

Signed-off-by: Patrick Knight <pknight@redhat.com>
---
 .../e2e-tests/utils/translationUtils.ts       |  4 +-
 .../src/service/CatalogMetricService.test.ts  |  2 +-
 .../src/service/CatalogMetricService.ts       |  2 +-
 .../src/api/ScorecardApiClient.test.ts        | 52 +++++++++++++++++
 .../plugins/scorecard/src/api/index.ts        | 56 ++++++++++++++++++-
 .../ScorecardHomepageCard.tsx                 | 15 ++++-
 .../ScorecardHomepageCardComponent.tsx        | 17 +++++-
 7 files changed, 138 insertions(+), 10 deletions(-)

diff --git a/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/translationUtils.ts b/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/translationUtils.ts
index 41ff0c0f098..f3c759e5775 100644
--- a/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/translationUtils.ts
+++ b/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/translationUtils.ts
@@ -305,8 +305,8 @@ export function getHomepageEntityCalculationHealthText(
       .homepageEntityCalculationHealth ??
     scorecardMessages.metric.homepageEntityCalculationHealth;
   return template
-    .replace(/\{\{healthy\}\}/g, healthy)
-    .replace(/\{\{total\}\}/g, total);
+    .replaceAll('{{healthy}}', healthy)
+    .replaceAll('{{total}}', total);
 }
 
 /** Snapshot for the scorecard card on the drill-down page when permission is missing (no entity count in UI). */
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/service/CatalogMetricService.test.ts b/workspaces/scorecard/plugins/scorecard-backend/src/service/CatalogMetricService.test.ts
index 0cd33b893e1..897227d059f 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/service/CatalogMetricService.test.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/service/CatalogMetricService.test.ts
@@ -644,7 +644,7 @@ describe('CatalogMetricService', () => {
 
       it('should call toAggregatedMetric to map aggregated metric to result', async () => {
         expect(toAggregatedMetricSpy).toHaveBeenCalledTimes(1);
-        expect(toAggregatedMetricSpy).toHaveBeenCalledWith(undefined);
+        expect(toAggregatedMetricSpy).toHaveBeenCalledWith();
       });
     });
   });
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/service/CatalogMetricService.ts b/workspaces/scorecard/plugins/scorecard-backend/src/service/CatalogMetricService.ts
index b08bf7f3925..df8e265d003 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/service/CatalogMetricService.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/service/CatalogMetricService.ts
@@ -215,7 +215,7 @@ export class CatalogMetricService {
       throw new Error(`Unsupported aggregation type: ${aggregationType}`);
     }
 
-    return AggregatedMetricMapper.toAggregatedMetric(undefined);
+    return AggregatedMetricMapper.toAggregatedMetric();
   }
 
   /**
diff --git a/workspaces/scorecard/plugins/scorecard/src/api/ScorecardApiClient.test.ts b/workspaces/scorecard/plugins/scorecard/src/api/ScorecardApiClient.test.ts
index b647b7bb320..caea4906d08 100644
--- a/workspaces/scorecard/plugins/scorecard/src/api/ScorecardApiClient.test.ts
+++ b/workspaces/scorecard/plugins/scorecard/src/api/ScorecardApiClient.test.ts
@@ -202,6 +202,58 @@ describe('ScorecardApiClient', () => {
         TypeError,
       );
     });
+
+    it('should throw TypeError when result is null', async () => {
+      fetchApi.fetch.mockResolvedValue({
+        ok: true,
+        json: async () => ({
+          ...validAggregated,
+          result: null,
+        }),
+      });
+
+      await expect(client.getAggregatedScorecard('myKpi')).rejects.toThrow(
+        'result must be a non-null object',
+      );
+    });
+
+    it('should default missing numeric result fields to 0', async () => {
+      fetchApi.fetch.mockResolvedValue({
+        ok: true,
+        json: async () => ({
+          ...validAggregated,
+          result: {
+            total: 2,
+            values: [{ name: 'success', count: 2 }],
+            timestamp: '2025-01-01T00:00:00Z',
+            thresholds: {},
+          },
+        }),
+      });
+
+      const out = await client.getAggregatedScorecard('myKpi');
+
+      expect(out.result.entitiesConsidered).toBe(0);
+      expect(out.result.calculationErrorCount).toBe(0);
+      expect(out.result.total).toBe(2);
+    });
+
+    it('should throw TypeError when a normalized numeric field is non-finite', async () => {
+      fetchApi.fetch.mockResolvedValue({
+        ok: true,
+        json: async () => ({
+          ...validAggregated,
+          result: {
+            ...validAggregated.result,
+            entitiesConsidered: Number.NaN,
+          },
+        }),
+      });
+
+      await expect(client.getAggregatedScorecard('myKpi')).rejects.toThrow(
+        'entitiesConsidered must be a finite number',
+      );
+    });
   });
 
   describe('getAggregationMetadata', () => {
diff --git a/workspaces/scorecard/plugins/scorecard/src/api/index.ts b/workspaces/scorecard/plugins/scorecard/src/api/index.ts
index 3145cbeee40..023ed4a0425 100644
--- a/workspaces/scorecard/plugins/scorecard/src/api/index.ts
+++ b/workspaces/scorecard/plugins/scorecard/src/api/index.ts
@@ -142,7 +142,61 @@ export class ScorecardApiClient implements ScorecardApi {
         );
       }
 
-      return data;
+      const resultRaw = data.result;
+      if (
+        resultRaw === null ||
+        typeof resultRaw !== 'object' ||
+        Array.isArray(resultRaw)
+      ) {
+        throw new TypeError(
+          'Invalid response format from aggregated scorecard API: result must be a non-null object',
+        );
+      }
+
+      const requireFiniteNumber = (value: unknown, fieldName: string) => {
+        const n = Number(value ?? 0);
+        if (!Number.isFinite(n)) {
+          throw new TypeError(
+            `Invalid aggregated scorecard API response: ${fieldName} must be a finite number`,
+          );
+        }
+        return n;
+      };
+
+      const resultRecord = resultRaw as Record<string, unknown>;
+      const timestampValue = resultRecord.timestamp;
+      let timestamp: string;
+      if (typeof timestampValue === 'string') {
+        timestamp = timestampValue;
+      } else if (
+        typeof timestampValue === 'number' &&
+        Number.isFinite(timestampValue)
+      ) {
+        timestamp = String(timestampValue);
+      } else if (typeof timestampValue === 'bigint') {
+        timestamp = timestampValue.toString();
+      } else if (timestampValue instanceof Date) {
+        timestamp = timestampValue.toISOString();
+      } else {
+        timestamp = '';
+      }
+
+      return {
+        ...data,
+        result: {
+          ...resultRecord,
+          total: requireFiniteNumber(resultRecord.total, 'total'),
+          entitiesConsidered: requireFiniteNumber(
+            resultRecord.entitiesConsidered,
+            'entitiesConsidered',
+          ),
+          calculationErrorCount: requireFiniteNumber(
+            resultRecord.calculationErrorCount,
+            'calculationErrorCount',
+          ),
+          timestamp,
+        },
+      } as AggregatedMetricResult;
     } catch (error) {
       if (error instanceof Error) {
         throw error;
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCard.tsx b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCard.tsx
index 0603b179957..8fe2eaf0089 100644
--- a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCard.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCard.tsx
@@ -24,6 +24,12 @@ import { Metric } from '@red-hat-developer-hub/backstage-plugin-scorecard-common
 import { useMetricDisplayLabels } from '../../hooks/useMetricDisplayLabels';
 import { CardLoading } from '../Common/CardLoading';
 
+/** Coerces unknown/missing values to a finite number for safe UI math (NaN → 0). */
+function toSafeFiniteNumber(value: unknown): number {
+  const n = Number(value ?? 0);
+  return Number.isFinite(n) ? n : 0;
+}
+
 export const ScorecardHomepageCard = ({
   metricId,
   aggregationId,
@@ -78,10 +84,13 @@ export const ScorecardHomepageCard = ({
   }
 
   const result = data.result;
+  const total = toSafeFiniteNumber(result.total);
+  const calculationErrorCount = toSafeFiniteNumber(
+    result.calculationErrorCount,
+  );
+  const entitiesConsidered = toSafeFiniteNumber(result.entitiesConsidered);
   const hasNoRenderableAggregation =
-    result.total === 0 &&
-    result.calculationErrorCount === 0 &&
-    result.entitiesConsidered === 0;
+    total === 0 && calculationErrorCount === 0 && entitiesConsidered === 0;
 
   if (hasNoRenderableAggregation) {
     return (
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx
index fae356df5ae..6231d6078d9 100644
--- a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx
@@ -39,6 +39,12 @@ import { useTranslation } from '../../hooks/useTranslation';
 import { ResponsivePieChart } from './ResponsivePieChart';
 import { useLanguage } from '../../hooks/useLanguage';
 
+/** Coerces unknown/missing values to a finite number for safe UI math (NaN → 0). */
+function toSafeFiniteNumber(value: unknown): number {
+  const n = Number(value ?? 0);
+  return Number.isFinite(n) ? n : 0;
+}
+
 const InfoComponent = ({ timestamp }: { timestamp: string }) => {
   const theme = useTheme();
   const { t } = useTranslation();
@@ -118,7 +124,12 @@ export const ScorecardHomepageCardComponent = ({
       ),
     })) ?? [];
 
-  const { entitiesConsidered, calculationErrorCount } = scorecard.result;
+  const entitiesConsidered = toSafeFiniteNumber(
+    scorecard.result.entitiesConsidered,
+  );
+  const calculationErrorCount = toSafeFiniteNumber(
+    scorecard.result.calculationErrorCount,
+  );
   const healthyCount = Math.max(0, entitiesConsidered - calculationErrorCount);
 
   const subheaderLink = (
@@ -158,7 +169,9 @@ export const ScorecardHomepageCardComponent = ({
       description={description}
       {...(showInfo
         ? {
-            info: <InfoComponent timestamp={scorecard.result.timestamp} />,
+            info: (
+              <InfoComponent timestamp={scorecard.result.timestamp ?? ''} />
+            ),
           }
         : {})}
     >

From c966b180812806a941883fb586dea6c92b1d1c64 Mon Sep 17 00:00:00 2001
From: Patrick Knight <pknight@redhat.com>
Date: Mon, 27 Apr 2026 09:58:02 -0400
Subject: [PATCH 4/8] fix(scorecard): align homepage entity-health UX with
 Figma and error semantics

Signed-off-by: Patrick Knight <pknight@redhat.com>
---
 .../e2e-tests/utils/translationUtils.ts       | 25 ++++++--
 .../src/database/DatabaseMetricValues.test.ts | 41 ++++++++++++
 .../src/database/DatabaseMetricValues.ts      |  9 ++-
 .../ScorecardHomepageCardComponent.tsx        | 48 +++++++++-----
 .../__tests__/ScorecardHomepageCard.test.tsx  | 63 +++++++++++++++++--
 .../EntitiesTable/EntitiesTableWrapper.tsx    |  2 +-
 .../__tests__/EntitiesTableWrapper.test.tsx   |  8 ++-
 .../plugins/scorecard/src/translations/de.ts  |  1 +
 .../plugins/scorecard/src/translations/es.ts  |  1 +
 .../plugins/scorecard/src/translations/fr.ts  |  1 +
 .../plugins/scorecard/src/translations/it.ts  |  1 +
 .../plugins/scorecard/src/translations/ja.ts  |  1 +
 .../plugins/scorecard/src/translations/ref.ts |  1 +
 13 files changed, 171 insertions(+), 31 deletions(-)

diff --git a/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/translationUtils.ts b/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/translationUtils.ts
index f3c759e5775..d9d1aa7d699 100644
--- a/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/translationUtils.ts
+++ b/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/translationUtils.ts
@@ -293,17 +293,34 @@ export function getLastUpdatedLabel(
 }
 
 /**
- * Homepage KPI drill-down link text: healthy entities vs entities considered (RHIDP-13128).
+ * Homepage KPI drill-down link text:
+ * - with calculation errors: healthy/total ratio
+ * - without calculation errors: plain entity count
  */
 export function getHomepageEntityCalculationHealthText(
   translations: ScorecardMessages,
   healthy: string,
   total: string,
 ): string {
+  if (healthy === total) {
+    const count = Number(total);
+    const entitiesTemplate =
+      count === 1
+        ? translations.thresholds.entities_one
+        : translations.thresholds.entities_other;
+    return entitiesTemplate.replaceAll('{{count}}', String(count));
+  }
+
   const template =
-    (translations.metric as { homepageEntityCalculationHealth?: string })
-      .homepageEntityCalculationHealth ??
+    (
+      translations.metric as {
+        homepageEntityHealthRatio?: string;
+        homepageEntityCalculationHealth?: string;
+      }
+    ).homepageEntityHealthRatio ??
+    scorecardMessages.metric.homepageEntityHealthRatio ??
     scorecardMessages.metric.homepageEntityCalculationHealth;
+
   return template
     .replaceAll('{{healthy}}', healthy)
     .replaceAll('{{total}}', total);
@@ -344,7 +361,7 @@ export function getThresholdsSnapshot(
   options: {
     drillDownMetricId: 'jira.open_issues' | 'github.open_prs';
     drillDownAggregationId?: string;
-    /** Interpolation for `metric.homepageEntityCalculationHealth` (mock data uses 10/10). */
+    /** Interpolation for homepage subheader (mock data uses 10/10). */
     homepageCalculationHealth?: { healthy: string; total: string };
     cardTitle: string;
     cardDescription: string;
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/database/DatabaseMetricValues.test.ts b/workspaces/scorecard/plugins/scorecard-backend/src/database/DatabaseMetricValues.test.ts
index 764fa021f31..d1452f46ee5 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/database/DatabaseMetricValues.test.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/database/DatabaseMetricValues.test.ts
@@ -541,6 +541,47 @@ describe('DatabaseMetricValues', () => {
       },
     );
 
+    it.each(databases.eachSupportedId())(
+      'should treat JSON null metric values as calculation errors - %p',
+      async databaseId => {
+        const { client, db } = await createDatabase(databaseId);
+
+        await client('metric_values').insert([
+          {
+            catalog_entity_ref: 'component:default/service1',
+            metric_id: 'github.metric1',
+            // Simulates a JSON literal null (not SQL NULL), seen in production DB rows.
+            value: 'null',
+            timestamp: baseTimestamp,
+            error_message: 'boom-a',
+            status: 'null',
+          },
+          {
+            catalog_entity_ref: 'component:default/service2',
+            metric_id: 'github.metric1',
+            value: 4,
+            timestamp: baseTimestamp,
+            error_message: null,
+            status: 'warning',
+          },
+        ]);
+
+        const result = await db.readAggregatedMetricByEntityRefs(
+          ['component:default/service1', 'component:default/service2'],
+          'github.metric1',
+        );
+
+        expect(result).toEqual({
+          metric_id: 'github.metric1',
+          total: 1,
+          statusCounts: { warning: 1 },
+          max_timestamp: baseTimestamp,
+          calculation_error_count: 1,
+          latest_entity_count: 2,
+        });
+      },
+    );
+
     it.each(databases.eachSupportedId())(
       'should return undefined when no matching entities - %p',
       async databaseId => {
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/database/DatabaseMetricValues.ts b/workspaces/scorecard/plugins/scorecard-backend/src/database/DatabaseMetricValues.ts
index 07238280deb..63550a76af8 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/database/DatabaseMetricValues.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/database/DatabaseMetricValues.ts
@@ -99,6 +99,11 @@ export class DatabaseMetricValues {
       .whereIn('catalog_entity_ref', catalog_entity_refs)
       .groupBy('catalog_entity_ref');
 
+    // `value` is a JSON column. Depending on database/driver, a "missing" metric value can
+    // arrive either as SQL NULL or as JSON literal null (`CAST(value AS TEXT) = 'null'`).
+    const metricValueIsMissingExpr =
+      "(value IS NULL OR CAST(value AS TEXT) = 'null')";
+
     // One round-trip for latest-row count, calculation-error count, and max timestamp
     // (same latest-id set as the status breakdown query below).
     const statsRow = await this.dbClient(this.tableName)
@@ -106,7 +111,7 @@ export class DatabaseMetricValues {
       .select(
         this.dbClient.raw('COUNT(*) as latest_row_count'),
         this.dbClient.raw(
-          'SUM(CASE WHEN error_message IS NOT NULL AND value IS NULL THEN 1 ELSE 0 END) as calculation_error_count',
+          `SUM(CASE WHEN error_message IS NOT NULL AND ${metricValueIsMissingExpr} THEN 1 ELSE 0 END) as calculation_error_count`,
         ),
         this.dbClient.raw('MAX(timestamp) as max_timestamp'),
       )
@@ -148,7 +153,7 @@ export class DatabaseMetricValues {
       .max('timestamp as max_timestamp')
       .whereIn('id', latestIdsSubquery)
       .whereNotNull('status')
-      .whereNotNull('value')
+      .whereRaw(`NOT ${metricValueIsMissingExpr}`)
       .groupBy('status');
 
     if (!statusRows || statusRows.length === 0) {
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx
index 6231d6078d9..2d5a07cb841 100644
--- a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx
@@ -127,10 +127,26 @@ export const ScorecardHomepageCardComponent = ({
   const entitiesConsidered = toSafeFiniteNumber(
     scorecard.result.entitiesConsidered,
   );
-  const calculationErrorCount = toSafeFiniteNumber(
+  const rawCalculationErrorCount = toSafeFiniteNumber(
     scorecard.result.calculationErrorCount,
   );
+
+  const total = toSafeFiniteNumber(scorecard.result.total);
+  // Defensive fallback: older/inconsistent payloads may miss calc-error counts even
+  // when entitiesConsidered includes rows without a status bucket.
+  const inferredCalculationErrorCount = Math.max(0, entitiesConsidered - total);
+  const calculationErrorCount = Math.max(
+    rawCalculationErrorCount,
+    inferredCalculationErrorCount,
+  );
   const healthyCount = Math.max(0, entitiesConsidered - calculationErrorCount);
+  const hasCalculationErrors = calculationErrorCount > 0;
+  const subheaderLabel = hasCalculationErrors
+    ? t('metric.homepageEntityHealthRatio', {
+        healthy: String(healthyCount),
+        total: String(entitiesConsidered),
+      })
+    : t('thresholds.entities', { count: entitiesConsidered });
 
   const subheaderLink = (
     <Link
@@ -138,10 +154,7 @@ export const ScorecardHomepageCardComponent = ({
         aggregationId,
       )}/metrics/${encodeURIComponent(scorecard.id)}`}
     >
-      {t('metric.homepageEntityCalculationHealth', {
-        healthy: String(healthyCount),
-        total: String(entitiesConsidered),
-      })}
+      {subheaderLabel}
     </Link>
   );
 
@@ -151,19 +164,20 @@ export const ScorecardHomepageCardComponent = ({
       dataTestId={dataTestId}
       {...(showSubheader
         ? {
-            subheader:
-              calculationErrorCount > 0 ? (
-                <Tooltip
-                  enterDelay={800}
-                  title={t('metric.drillDownCalculationFailures')}
-                  arrow
-                  placement="right"
-                >
+            subheader: hasCalculationErrors ? (
+              <Tooltip
+                enterDelay={800}
+                title={t('metric.someEntitiesNotReportingValues')}
+                arrow
+                placement="right"
+              >
+                <Box sx={{ display: 'inline-flex', alignItems: 'center' }}>
                   {subheaderLink}
-                </Tooltip>
-              ) : (
-                subheaderLink
-              ),
+                </Box>
+              </Tooltip>
+            ) : (
+              subheaderLink
+            ),
           }
         : {})}
       description={description}
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageCard.test.tsx b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageCard.test.tsx
index 4da7f440b7a..68411f2dd86 100644
--- a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageCard.test.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageCard.test.tsx
@@ -115,10 +115,12 @@ jest.mock('../../../hooks/useTranslation', () => ({
   useTranslation: () => ({
     t: (key: string, options?: any) => {
       switch (key) {
-        case 'metric.homepageEntityCalculationHealth':
-          return `${options?.healthy} / ${options?.total} entities healthy`;
+        case 'metric.homepageEntityHealthRatio':
+          return `${options?.healthy}/${options?.total} entities`;
         case 'thresholds.entities':
           return `${options?.count} entities`;
+        case 'metric.someEntitiesNotReportingValues':
+          return 'Some entities are not reporting values related to this metric.';
         case 'thresholds.noEntities':
           return `No entities in ${options?.category} state`;
         case 'thresholds.Test':
@@ -222,13 +224,66 @@ describe('AggregatedMetricCard (homepage scorecard)', () => {
       'GitHub open PRs',
     );
     expect(screen.getByTestId('card-subheader')).toHaveTextContent(
-      '37 / 37 entities healthy',
+      '37 entities',
     );
     expect(screen.getByTestId('card-description')).toHaveTextContent(
       'Current count of open Pull Requests',
     );
   });
 
+  it('should render ratio and warning affordance when calculation errors exist', () => {
+    const scorecardWithCalculationErrors: AggregatedMetricResult = {
+      ...mockScorecard,
+      result: {
+        ...mockScorecard.result,
+        entitiesConsidered: 45,
+        calculationErrorCount: 8,
+      },
+    };
+
+    render(
+      <ScorecardHomepageCardComponent
+        scorecard={scorecardWithCalculationErrors}
+        aggregationId={scorecardWithCalculationErrors.id}
+        cardTitle="GitHub open PRs"
+        description="desc"
+      />,
+      { wrapper: TestWrapper },
+    );
+
+    expect(screen.getByTestId('card-subheader')).toHaveTextContent(
+      '37/45 entities',
+    );
+    expect(screen.queryByTestId('scorecard-homepage-card-warning')).toBeNull();
+  });
+
+  it('should infer ratio and warning from entitiesConsidered minus total when calculationErrorCount is missing', () => {
+    const scorecardWithImplicitCalculationErrors: AggregatedMetricResult = {
+      ...mockScorecard,
+      result: {
+        ...mockScorecard.result,
+        total: 4,
+        entitiesConsidered: 5,
+        calculationErrorCount: 0,
+      },
+    };
+
+    render(
+      <ScorecardHomepageCardComponent
+        scorecard={scorecardWithImplicitCalculationErrors}
+        aggregationId={scorecardWithImplicitCalculationErrors.id}
+        cardTitle="GitHub open PRs"
+        description="desc"
+      />,
+      { wrapper: TestWrapper },
+    );
+
+    expect(screen.getByTestId('card-subheader')).toHaveTextContent(
+      '4/5 entities',
+    );
+    expect(screen.queryByTestId('scorecard-homepage-card-warning')).toBeNull();
+  });
+
   it('should render ResponsivePieChart', () => {
     render(
       <AggregatedMetricCard
@@ -320,7 +375,7 @@ describe('AggregatedMetricCard (homepage scorecard)', () => {
     );
 
     expect(screen.getByTestId('card-subheader')).toHaveTextContent(
-      '0 / 0 entities healthy',
+      '0 entities',
     );
     expect(screen.getByTestId('pie-data-length')).toHaveTextContent('0');
   });
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/EntitiesTableWrapper.tsx b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/EntitiesTableWrapper.tsx
index ad263335bab..f1007301be0 100644
--- a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/EntitiesTableWrapper.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/EntitiesTableWrapper.tsx
@@ -58,7 +58,7 @@ export const EntitiesTableWrapper: FC<EntitiesTableWrapperProps> = ({
           {title}
           {showCalculationWarning && (
             <Tooltip
-              title={t('metric.drillDownCalculationFailures')}
+              title={t('metric.someEntitiesNotReportingValues')}
               arrow
               placement="right"
               sx={{
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/__tests__/EntitiesTableWrapper.test.tsx b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/__tests__/EntitiesTableWrapper.test.tsx
index 522c9594c7a..1592c0ad882 100644
--- a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/__tests__/EntitiesTableWrapper.test.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardPage/EntitiesTable/__tests__/EntitiesTableWrapper.test.tsx
@@ -22,8 +22,8 @@ import { EntitiesTableWrapper } from '../EntitiesTableWrapper';
 jest.mock('../../../../hooks/useTranslation', () => ({
   useTranslation: () => ({
     t: (key: string) =>
-      key === 'metric.drillDownCalculationFailures'
-        ? 'Calculation failed for one or more entities'
+      key === 'metric.someEntitiesNotReportingValues'
+        ? 'Some entities are not reporting values related to this metric.'
         : key,
   }),
 }));
@@ -75,7 +75,9 @@ describe('EntitiesTableWrapper', () => {
       container.querySelector('.MuiSvgIcon-colorWarning'),
     ).toBeInTheDocument();
     expect(
-      screen.getByLabelText('Calculation failed for one or more entities'),
+      screen.getByLabelText(
+        'Some entities are not reporting values related to this metric.',
+      ),
     ).toBeInTheDocument();
   });
 });
diff --git a/workspaces/scorecard/plugins/scorecard/src/translations/de.ts b/workspaces/scorecard/plugins/scorecard/src/translations/de.ts
index f2cc6f62866..0a9814e6562 100644
--- a/workspaces/scorecard/plugins/scorecard/src/translations/de.ts
+++ b/workspaces/scorecard/plugins/scorecard/src/translations/de.ts
@@ -96,6 +96,7 @@ const scorecardTranslationDe = createTranslationMessages({
     'metric.averageLegendTooltipRowTotal': 'Gesamtpunktzahl {{total}}',
     'metric.drillDownCalculationFailures':
       'Mindestens ein Element konnte diese Metrik nicht berechnen.',
+    'metric.homepageEntityHealthRatio': '{{healthy}}/{{total}} Elemente',
     'metric.homepageEntityCalculationHealth':
       '{{healthy}} / {{total}} Elemente ohne Metrik-Berechnungsfehler',
 
diff --git a/workspaces/scorecard/plugins/scorecard/src/translations/es.ts b/workspaces/scorecard/plugins/scorecard/src/translations/es.ts
index f63d6b1ea68..4172e1db0ee 100644
--- a/workspaces/scorecard/plugins/scorecard/src/translations/es.ts
+++ b/workspaces/scorecard/plugins/scorecard/src/translations/es.ts
@@ -97,6 +97,7 @@ const scorecardTranslationEs = createTranslationMessages({
     'metric.averageLegendTooltipRowTotal': 'Puntuación total {{total}}',
     'metric.drillDownCalculationFailures':
       'Una o más entidades fallaron al calcular esta métrica.',
+    'metric.homepageEntityHealthRatio': '{{healthy}}/{{total}} entidades',
     'metric.homepageEntityCalculationHealth':
       '{{healthy}} / {{total}} entidades sin errores de cálculo de métrica',
 
diff --git a/workspaces/scorecard/plugins/scorecard/src/translations/fr.ts b/workspaces/scorecard/plugins/scorecard/src/translations/fr.ts
index 480d5cd184e..f87ac8434b3 100644
--- a/workspaces/scorecard/plugins/scorecard/src/translations/fr.ts
+++ b/workspaces/scorecard/plugins/scorecard/src/translations/fr.ts
@@ -98,6 +98,7 @@ const scorecardTranslationFr = createTranslationMessages({
     'metric.averageLegendTooltipRowTotal': 'Score total {{total}}',
     'metric.drillDownCalculationFailures':
       'Le calcul de cette métrique a échoué pour une ou plusieurs entités.',
+    'metric.homepageEntityHealthRatio': '{{healthy}}/{{total}} entités',
     'metric.homepageEntityCalculationHealth':
       '{{healthy}} / {{total}} entités sans erreur de calcul de métrique',
 
diff --git a/workspaces/scorecard/plugins/scorecard/src/translations/it.ts b/workspaces/scorecard/plugins/scorecard/src/translations/it.ts
index 7c2dbc97754..5793a9c9131 100644
--- a/workspaces/scorecard/plugins/scorecard/src/translations/it.ts
+++ b/workspaces/scorecard/plugins/scorecard/src/translations/it.ts
@@ -98,6 +98,7 @@ const scorecardTranslationIt = createTranslationMessages({
     'metric.averageLegendTooltipRowTotal': 'Punteggio totale {{total}}',
     'metric.drillDownCalculationFailures':
       'Il calcolo di questa metrica non è riuscito per una o più entità.',
+    'metric.homepageEntityHealthRatio': '{{healthy}}/{{total}} entità',
     'metric.homepageEntityCalculationHealth':
       '{{healthy}} / {{total}} entità senza errori di calcolo della metrica',
 
diff --git a/workspaces/scorecard/plugins/scorecard/src/translations/ja.ts b/workspaces/scorecard/plugins/scorecard/src/translations/ja.ts
index e8a83af8bcc..4fb7b964de6 100644
--- a/workspaces/scorecard/plugins/scorecard/src/translations/ja.ts
+++ b/workspaces/scorecard/plugins/scorecard/src/translations/ja.ts
@@ -98,6 +98,7 @@ const scorecardTranslationJa = createTranslationMessages({
     'metric.averageLegendTooltipRowTotal': '合計スコア {{total}}',
     'metric.drillDownCalculationFailures':
       '1 件以上のエンティティーでこの指標の計算に失敗しました。',
+    'metric.homepageEntityHealthRatio': '{{healthy}}/{{total}} エンティティー',
     'metric.homepageEntityCalculationHealth':
       '指標の計算エラーがないエンティティー {{healthy}} / {{total}}',
 
diff --git a/workspaces/scorecard/plugins/scorecard/src/translations/ref.ts b/workspaces/scorecard/plugins/scorecard/src/translations/ref.ts
index f70d26131d6..83179913bdd 100644
--- a/workspaces/scorecard/plugins/scorecard/src/translations/ref.ts
+++ b/workspaces/scorecard/plugins/scorecard/src/translations/ref.ts
@@ -107,6 +107,7 @@ export const scorecardMessages = {
     averageLegendTooltipRowTotal: 'Total score {{total}}',
     drillDownCalculationFailures:
       'One or more entities failed while calculating this metric.',
+    homepageEntityHealthRatio: '{{healthy}}/{{total}} entities',
     homepageEntityCalculationHealth:
       '{{healthy}} / {{total}} entities without metric calculation errors',
   },

From 1a28aadb194e8a17f98633d52545d9afca8aa137 Mon Sep 17 00:00:00 2001
From: Patrick Knight <pknight@redhat.com>
Date: Mon, 27 Apr 2026 10:34:49 -0400
Subject: [PATCH 5/8] fix(scorecard): fix generated reports

Signed-off-by: Patrick Knight <pknight@redhat.com>
---
 workspaces/scorecard/plugins/scorecard/report-alpha.api.md    | 3 +++
 workspaces/scorecard/plugins/scorecard/report.api.md          | 3 +++
 .../ScorecardHomepageCardComponent.tsx                        | 4 ++--
 .../scorecard/plugins/scorecard/src/translations/ref.ts       | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/workspaces/scorecard/plugins/scorecard/report-alpha.api.md b/workspaces/scorecard/plugins/scorecard/report-alpha.api.md
index f43e5522b1f..eeb29c82d52 100644
--- a/workspaces/scorecard/plugins/scorecard/report-alpha.api.md
+++ b/workspaces/scorecard/plugins/scorecard/report-alpha.api.md
@@ -179,6 +179,9 @@ export const scorecardTranslationRef: TranslationRef<
     readonly 'metric.averageLegendTooltipEntitiesEach_one': string;
     readonly 'metric.averageLegendTooltipEntitiesEach_other': string;
     readonly 'metric.averageLegendTooltipRowTotal': string;
+    readonly 'metric.drillDownCalculationFailures': string;
+    readonly 'metric.homepageEntityHealthRatio': string;
+    readonly 'metric.homepageEntityCalculationHealth': string;
     readonly 'thresholds.success': string;
     readonly 'thresholds.warning': string;
     readonly 'thresholds.error': string;
diff --git a/workspaces/scorecard/plugins/scorecard/report.api.md b/workspaces/scorecard/plugins/scorecard/report.api.md
index f9900d8e694..3a8e8569d3c 100644
--- a/workspaces/scorecard/plugins/scorecard/report.api.md
+++ b/workspaces/scorecard/plugins/scorecard/report.api.md
@@ -79,6 +79,9 @@ export const scorecardTranslationRef: TranslationRef<
     readonly 'metric.averageLegendTooltipEntitiesEach_one': string;
     readonly 'metric.averageLegendTooltipEntitiesEach_other': string;
     readonly 'metric.averageLegendTooltipRowTotal': string;
+    readonly 'metric.drillDownCalculationFailures': string;
+    readonly 'metric.homepageEntityHealthRatio': string;
+    readonly 'metric.homepageEntityCalculationHealth': string;
     readonly 'thresholds.success': string;
     readonly 'thresholds.warning': string;
     readonly 'thresholds.error': string;
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx
index 2d5a07cb841..7e54adab249 100644
--- a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx
@@ -58,7 +58,7 @@ const InfoComponent = ({ timestamp }: { timestamp: string }) => {
         title={
           <Box sx={{ textAlign: 'center' }}>
             {lastUpdatedLabel !== '--'
-              ? t('metric.lastUpdated', { timestamp: lastUpdatedLabel })
+              ? t('metric.lastUpdated' as any, { timestamp: lastUpdatedLabel })
               : t('metric.lastUpdatedNotAvailable')}
           </Box>
         }
@@ -142,7 +142,7 @@ export const ScorecardHomepageCardComponent = ({
   const healthyCount = Math.max(0, entitiesConsidered - calculationErrorCount);
   const hasCalculationErrors = calculationErrorCount > 0;
   const subheaderLabel = hasCalculationErrors
-    ? t('metric.homepageEntityHealthRatio', {
+    ? t('metric.homepageEntityHealthRatio' as any, {
         healthy: String(healthyCount),
         total: String(entitiesConsidered),
       })
diff --git a/workspaces/scorecard/plugins/scorecard/src/translations/ref.ts b/workspaces/scorecard/plugins/scorecard/src/translations/ref.ts
index 83179913bdd..58b9b221909 100644
--- a/workspaces/scorecard/plugins/scorecard/src/translations/ref.ts
+++ b/workspaces/scorecard/plugins/scorecard/src/translations/ref.ts
@@ -153,7 +153,7 @@ export const scorecardMessages = {
       },
     },
   },
-} as const;
+};
 
 /**
  * Translation reference for scorecard plugin

From 4ef888923ffa34262cef33fe466e29964dbb5c9f Mon Sep 17 00:00:00 2001
From: Patrick Knight <pknight@redhat.com>
Date: Mon, 27 Apr 2026 11:04:06 -0400
Subject: [PATCH 6/8] fix(scorecard): fix issues with e2e tests

Signed-off-by: Patrick Knight <pknight@redhat.com>
---
 .../app-legacy/e2e-tests/pages/CatalogPage.ts   | 17 ++++++++++++-----
 .../app-legacy/e2e-tests/scorecard.test.ts      | 16 +++++++++++-----
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/CatalogPage.ts b/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/CatalogPage.ts
index 64eab91d479..a4d153531e6 100644
--- a/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/CatalogPage.ts
+++ b/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/CatalogPage.ts
@@ -50,11 +50,18 @@ export class CatalogPage {
     await this.switchToLocale(locale);
   }
 
-  /** Opens a Component in `default` by `metadata.name` (avoids catalog index / filter flakiness). */
-  async openComponent(name: string) {
-    await this.page.goto(
-      `/catalog/default/component/${encodeURIComponent(name)}`,
-    );
+  async openCatalog() {
+    await this.page.goto('/catalog'); // Resolves the issue when "My Groups" sidebar covers the catalog toolbar
+    await this.page.getByTestId('user-picker-all').getByText('All').click();
+  }
+
+  async openComponent(componentName: string) {
+    const link = this.page.getByRole('link', { name: componentName });
+    await this.page
+      .getByRole('textbox', { name: 'Search' })
+      .fill(componentName);
+    await expect(link).toBeVisible({ timeout: 10000 });
+    await link.click();
   }
 
   async switchToLocale(locale: string): Promise<void> {
diff --git a/workspaces/scorecard/packages/app-legacy/e2e-tests/scorecard.test.ts b/workspaces/scorecard/packages/app-legacy/e2e-tests/scorecard.test.ts
index 1e186bb5baa..5babc18c525 100644
--- a/workspaces/scorecard/packages/app-legacy/e2e-tests/scorecard.test.ts
+++ b/workspaces/scorecard/packages/app-legacy/e2e-tests/scorecard.test.ts
@@ -139,7 +139,9 @@ test.describe('Scorecard Plugin Tests', () => {
         notAllowedAggregationErrorBody,
         403,
       );
-      await catalogPage.openComponent('red-hat-developer-hub');
+
+      await catalogPage.openCatalog();
+      await catalogPage.openComponent('Red Hat Developer Hub');
       await page.getByText('Scorecard', { exact: true }).click();
 
       await expect(
@@ -162,7 +164,8 @@ test.describe('Scorecard Plugin Tests', () => {
         customScorecardResponse,
       );
 
-      await catalogPage.openComponent('red-hat-developer-hub');
+      await catalogPage.openCatalog();
+      await catalogPage.openComponent('Red Hat Developer Hub');
       await scorecardPage.openTab();
       await scorecardPage.verifyScorecardValues({
         [translations.metric['github.open_prs'].title]: '9',
@@ -185,7 +188,8 @@ test.describe('Scorecard Plugin Tests', () => {
         emptyScorecardResponse,
       );
 
-      await catalogPage.openComponent('red-hat-developer-hub');
+      await catalogPage.openCatalog();
+      await catalogPage.openComponent('Red Hat Developer Hub');
       await scorecardPage.openTab();
 
       await scorecardPage.expectEmptyState();
@@ -202,7 +206,8 @@ test.describe('Scorecard Plugin Tests', () => {
         unavailableMetricResponse,
       );
 
-      await catalogPage.openComponent('red-hat-developer-hub');
+      await catalogPage.openCatalog();
+      await catalogPage.openComponent('Red Hat Developer Hub');
       await scorecardPage.openTab();
 
       const jiraMetric = scorecardPage.scorecardMetrics[1];
@@ -236,7 +241,8 @@ test.describe('Scorecard Plugin Tests', () => {
         invalidThresholdResponse,
       );
 
-      await catalogPage.openComponent('red-hat-developer-hub');
+      await catalogPage.openCatalog();
+      await catalogPage.openComponent('Red Hat Developer Hub');
       await scorecardPage.openTab();
 
       const githubMetric = scorecardPage.scorecardMetrics[0];

From 9fb7bb64e31eeae82f839bc0178bf64ea3634aa4 Mon Sep 17 00:00:00 2001
From: Patrick Knight <pknight@redhat.com>
Date: Tue, 28 Apr 2026 09:29:44 -0400
Subject: [PATCH 7/8] fix(scorecard): some updates after rebase

Signed-off-by: Patrick Knight <pknight@redhat.com>
---
 .../AggregatedMetricLoader.test.ts            |   2 +
 .../aggregations/AggregationsService.test.ts  |   4 +
 .../statusGroupedAggregationStrategy.test.ts  |   2 +
 .../src/service/router.test.ts                |   6 +
 .../ScorecardHomepageCardComponent.tsx        | 253 ------------------
 .../__tests__/ScorecardHomepageCard.test.tsx  |   4 +-
 6 files changed, 16 insertions(+), 255 deletions(-)
 delete mode 100644 workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx

diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/AggregatedMetricLoader.test.ts b/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/AggregatedMetricLoader.test.ts
index 3aa7eb42c27..71976ac2dea 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/AggregatedMetricLoader.test.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/AggregatedMetricLoader.test.ts
@@ -42,6 +42,8 @@ describe('AggregatedMetricLoader', () => {
       total: 3,
       max_timestamp: new Date('2025-01-01T10:30:00.000Z'),
       statusCounts: { success: 3 },
+      calculation_error_count: 1,
+      latest_entity_count: 1,
     };
 
     const readAggregatedMetricByEntityRefs = jest.fn().mockResolvedValue(row);
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/AggregationsService.test.ts b/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/AggregationsService.test.ts
index 3ef1bd98a52..af5e31e5d04 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/AggregationsService.test.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/AggregationsService.test.ts
@@ -59,6 +59,8 @@ describe('AggregationsService', () => {
       total: 3,
       max_timestamp: new Date('2025-01-01T10:00:00.000Z'),
       statusCounts: { error: 1, warning: 1, success: 1 },
+      calculation_error_count: 1,
+      latest_entity_count: 1,
     };
     const readAggregatedMetricByEntityRefs = jest.fn().mockResolvedValue(dbRow);
 
@@ -95,6 +97,8 @@ describe('AggregationsService', () => {
       total: 3,
       max_timestamp: new Date('2025-01-01T10:00:00.000Z'),
       statusCounts: { error: 1, warning: 1, success: 1 },
+      calculation_error_count: 1,
+      latest_entity_count: 1,
     };
     const readAggregatedMetricByEntityRefs = jest.fn().mockResolvedValue(dbRow);
 
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/statusGroupedAggregationStrategy.test.ts b/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/statusGroupedAggregationStrategy.test.ts
index 2a82238db9f..8f7c52adf4a 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/statusGroupedAggregationStrategy.test.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/statusGroupedAggregationStrategy.test.ts
@@ -67,6 +67,8 @@ describe('StatusGroupedAggregationStrategy', () => {
           timestamp: '2025-01-01T10:30:00.000Z',
           values: [{ count: 2, name: 'success' }],
           thresholds,
+          entitiesConsidered: 9,
+          calculationErrorCount: 0,
         },
       });
 
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/service/router.test.ts b/workspaces/scorecard/plugins/scorecard-backend/src/service/router.test.ts
index 6d6515cdffe..d5322370dfb 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/service/router.test.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/service/router.test.ts
@@ -547,6 +547,8 @@ describe('createRouter', () => {
         warning: 4,
         success: 5,
       },
+      calculation_error_count: 1,
+      latest_entity_count: 1,
     };
 
     let mockCatalog: ReturnType<typeof catalogServiceMock.mock>;
@@ -739,6 +741,8 @@ describe('createRouter', () => {
               count: 0,
             })),
             thresholds,
+            entitiesConsidered: 9,
+            calculationErrorCount: 0,
           },
           {
             id: 'github.open_prs',
@@ -919,6 +923,8 @@ describe('createRouter', () => {
         warning: 2,
         success: 3,
       },
+      calculation_error_count: 1,
+      latest_entity_count: 1,
     };
 
     let metricRegistry: MetricProvidersRegistry;
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx
deleted file mode 100644
index 7e54adab249..00000000000
--- a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/ScorecardHomepageCardComponent.tsx
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Copyright Red Hat, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { useState } from 'react';
-
-import { Link } from '@backstage/core-components';
-import type { AggregatedMetricResult } from '@red-hat-developer-hub/backstage-plugin-scorecard-common';
-
-import Box from '@mui/material/Box';
-import { useTheme } from '@mui/material/styles';
-import Tooltip from '@mui/material/Tooltip';
-import IconButton from '@mui/material/IconButton';
-import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
-
-import { CardWrapper } from '../Common/CardWrapper';
-import { CustomTooltip } from './CustomTooltip';
-import CustomLegend from './CustomLegend';
-import type { PieData } from '../types';
-import {
-  getThresholdRuleColor,
-  resolveStatusColor,
-  SCORECARD_ERROR_STATE_COLOR,
-  getLastUpdatedLabel,
-} from '../../utils';
-import { useTranslation } from '../../hooks/useTranslation';
-import { ResponsivePieChart } from './ResponsivePieChart';
-import { useLanguage } from '../../hooks/useLanguage';
-
-/** Coerces unknown/missing values to a finite number for safe UI math (NaN → 0). */
-function toSafeFiniteNumber(value: unknown): number {
-  const n = Number(value ?? 0);
-  return Number.isFinite(n) ? n : 0;
-}
-
-const InfoComponent = ({ timestamp }: { timestamp: string }) => {
-  const theme = useTheme();
-  const { t } = useTranslation();
-  const locale = useLanguage();
-
-  const lastUpdatedLabel = getLastUpdatedLabel(timestamp, locale);
-
-  return (
-    <Box sx={{ display: 'flex', alignItems: 'center', height: '100%', mr: 2 }}>
-      <Tooltip
-        title={
-          <Box sx={{ textAlign: 'center' }}>
-            {lastUpdatedLabel !== '--'
-              ? t('metric.lastUpdated' as any, { timestamp: lastUpdatedLabel })
-              : t('metric.lastUpdatedNotAvailable')}
-          </Box>
-        }
-        placement="top"
-        arrow
-        componentsProps={{
-          tooltip: {
-            sx: {
-              display: 'flex',
-              justifyContent: 'center',
-              alignItems: 'center',
-              color: 'white',
-              fontSize: '0.875rem',
-              p: 1.5,
-            },
-          },
-        }}
-      >
-        <IconButton data-testid="scorecard-homepage-card-info">
-          <InfoOutlinedIcon
-            sx={{ color: theme.palette.text.secondary, fontSize: '1.75rem' }}
-          />
-        </IconButton>
-      </Tooltip>
-    </Box>
-  );
-};
-
-export const ScorecardHomepageCardComponent = ({
-  scorecard,
-  cardTitle,
-  description,
-  aggregationId,
-  showSubheader = true,
-  showInfo = true,
-  dataTestId,
-}: {
-  scorecard: AggregatedMetricResult;
-  cardTitle: string;
-  description: string;
-  aggregationId: string;
-  showSubheader?: boolean;
-  showInfo?: boolean;
-  dataTestId?: string;
-}) => {
-  const theme = useTheme();
-  const { t } = useTranslation();
-
-  const [activeIndex, setActiveIndex] = useState<number | null>(null);
-  const [tooltipPosition, setTooltipPosition] = useState<{
-    x: number;
-    y: number;
-  } | null>(null);
-
-  const pieData: PieData[] =
-    scorecard.result.values?.map(value => ({
-      name: value.name,
-      value: value.count,
-      color: resolveStatusColor(
-        theme,
-        getThresholdRuleColor(scorecard.result.thresholds.rules, value.name) ??
-          SCORECARD_ERROR_STATE_COLOR,
-      ),
-    })) ?? [];
-
-  const entitiesConsidered = toSafeFiniteNumber(
-    scorecard.result.entitiesConsidered,
-  );
-  const rawCalculationErrorCount = toSafeFiniteNumber(
-    scorecard.result.calculationErrorCount,
-  );
-
-  const total = toSafeFiniteNumber(scorecard.result.total);
-  // Defensive fallback: older/inconsistent payloads may miss calc-error counts even
-  // when entitiesConsidered includes rows without a status bucket.
-  const inferredCalculationErrorCount = Math.max(0, entitiesConsidered - total);
-  const calculationErrorCount = Math.max(
-    rawCalculationErrorCount,
-    inferredCalculationErrorCount,
-  );
-  const healthyCount = Math.max(0, entitiesConsidered - calculationErrorCount);
-  const hasCalculationErrors = calculationErrorCount > 0;
-  const subheaderLabel = hasCalculationErrors
-    ? t('metric.homepageEntityHealthRatio' as any, {
-        healthy: String(healthyCount),
-        total: String(entitiesConsidered),
-      })
-    : t('thresholds.entities', { count: entitiesConsidered });
-
-  const subheaderLink = (
-    <Link
-      to={`/scorecard/aggregations/${encodeURIComponent(
-        aggregationId,
-      )}/metrics/${encodeURIComponent(scorecard.id)}`}
-    >
-      {subheaderLabel}
-    </Link>
-  );
-
-  return (
-    <CardWrapper
-      title={cardTitle}
-      dataTestId={dataTestId}
-      {...(showSubheader
-        ? {
-            subheader: hasCalculationErrors ? (
-              <Tooltip
-                enterDelay={800}
-                title={t('metric.someEntitiesNotReportingValues')}
-                arrow
-                placement="right"
-              >
-                <Box sx={{ display: 'inline-flex', alignItems: 'center' }}>
-                  {subheaderLink}
-                </Box>
-              </Tooltip>
-            ) : (
-              subheaderLink
-            ),
-          }
-        : {})}
-      description={description}
-      {...(showInfo
-        ? {
-            info: (
-              <InfoComponent timestamp={scorecard.result.timestamp ?? ''} />
-            ),
-          }
-        : {})}
-    >
-      <Box
-        width="100%"
-        minWidth={311}
-        minHeight={174}
-        height="100%"
-        data-chart-container
-        position="relative"
-        sx={{
-          display: 'flex',
-          justifyContent: 'center',
-          alignItems: 'center',
-          cursor: 'default',
-          '& .recharts-wrapper > svg': {
-            outline: 'none',
-          },
-        }}
-      >
-        <ResponsivePieChart
-          pieData={pieData}
-          legendContent={props => (
-            <CustomLegend
-              {...props}
-              activeIndex={activeIndex}
-              setActiveIndex={setActiveIndex}
-              setTooltipPosition={setTooltipPosition}
-              pieData={pieData}
-            />
-          )}
-          tooltipContent={({ active, payload }) =>
-            active && payload ? (
-              <CustomTooltip payload={payload} pieData={pieData} />
-            ) : null
-          }
-        />
-
-        {activeIndex !== null && tooltipPosition && (
-          <Box
-            sx={{
-              position: 'absolute',
-              left: `${tooltipPosition.x}px`,
-              top: `${tooltipPosition.y}px`,
-              transform: 'translate(-50%, -100%)',
-              zIndex: 1000,
-              pointerEvents: 'none',
-            }}
-          >
-            <CustomTooltip
-              payload={[
-                {
-                  name: pieData[activeIndex].name,
-                  value: pieData[activeIndex].value,
-                  payload: pieData[activeIndex],
-                },
-              ]}
-              pieData={pieData}
-            />
-          </Box>
-        )}
-      </Box>
-    </CardWrapper>
-  );
-};
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageCard.test.tsx b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageCard.test.tsx
index 68411f2dd86..2771eace322 100644
--- a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageCard.test.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageCard.test.tsx
@@ -242,7 +242,7 @@ describe('AggregatedMetricCard (homepage scorecard)', () => {
     };
 
     render(
-      <ScorecardHomepageCardComponent
+      <AggregatedMetricCard
         scorecard={scorecardWithCalculationErrors}
         aggregationId={scorecardWithCalculationErrors.id}
         cardTitle="GitHub open PRs"
@@ -269,7 +269,7 @@ describe('AggregatedMetricCard (homepage scorecard)', () => {
     };
 
     render(
-      <ScorecardHomepageCardComponent
+      <AggregatedMetricCard
         scorecard={scorecardWithImplicitCalculationErrors}
         aggregationId={scorecardWithImplicitCalculationErrors.id}
         cardTitle="GitHub open PRs"

From db857a979ff38371d7e7e47d3fe21b3d38856940 Mon Sep 17 00:00:00 2001
From: Patrick Knight <pknight@redhat.com>
Date: Tue, 28 Apr 2026 10:35:48 -0400
Subject: [PATCH 8/8] fix(scorecard): some more fixes after the rebase

Signed-off-by: Patrick Knight <pknight@redhat.com>
---
 .../e2e-tests/pages/ScorecardDrillDownPage.ts | 12 +++-
 .../app-legacy/e2e-tests/scorecard.test.ts    |  3 +-
 .../e2e-tests/utils/translationUtils.ts       | 13 +++++
 .../strategies/AverageAggregationStrategy.ts  |  2 +
 .../StatusGroupedAggregationStrategy.ts       |  2 +
 .../averageAggregationStrategy.test.ts        | 12 ++++
 .../statusGroupedAggregationStrategy.test.ts  |  6 ++
 .../src/service/mappers.test.ts               |  4 +-
 .../AverageCard/AverageCardComponent.tsx      |  2 +
 .../StatusGroupedCardComponent.tsx            |  2 +
 .../components/CardSubheader.tsx              | 57 ++++++++++++++-----
 .../__tests__/ScorecardHomepageCard.test.tsx  |  2 +-
 12 files changed, 98 insertions(+), 19 deletions(-)

diff --git a/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/ScorecardDrillDownPage.ts b/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/ScorecardDrillDownPage.ts
index 571c1f2f13a..76a64e4ed32 100644
--- a/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/ScorecardDrillDownPage.ts
+++ b/workspaces/scorecard/packages/app-legacy/e2e-tests/pages/ScorecardDrillDownPage.ts
@@ -23,6 +23,7 @@ import {
   getEntitiesPageMissingPermission,
   getEntitiesPageNoDataFound,
   getEntitiesTableHeaderLabels,
+  getSomeEntitiesNotReportingTooltip,
 } from '../utils/translationUtils';
 
 type MetricId = 'github.open_prs' | 'jira.open_issues';
@@ -174,6 +175,15 @@ export class ScorecardDrillDownPage {
     await expect(heading.locator('svg.MuiSvgIcon-colorWarning')).toHaveCount(0);
   }
 
+  /** Verifies the "some entities not reporting" icon tooltip on the drill-down card. */
+  async verifySomeEntitiesNotReportingTooltip() {
+    const icon = this.page.getByTestId('ReportProblemOutlinedIcon');
+    await expect(icon).toBeVisible();
+    await icon.hover();
+    const tooltipText = getSomeEntitiesNotReportingTooltip(this.translations);
+    await expect(this.page.getByRole('tooltip')).toContainText(tooltipText);
+  }
+
   async expectTableHeadersVisible() {
     const tableHeaders = getEntitiesTableHeaderLabels(this.translations);
     const headerNames = [
@@ -204,7 +214,7 @@ export class ScorecardDrillDownPage {
       await expect(
         entitiesTable
           .locator('tbody')
-          .locator(`a[href*="/component/${slug}"]`)
+          .locator(`a[href*="/catalog/default/component/${slug}"]`)
           .first(),
       ).toBeVisible({ timeout: 15_000 });
     }
diff --git a/workspaces/scorecard/packages/app-legacy/e2e-tests/scorecard.test.ts b/workspaces/scorecard/packages/app-legacy/e2e-tests/scorecard.test.ts
index 5babc18c525..ae15f1a0e45 100644
--- a/workspaces/scorecard/packages/app-legacy/e2e-tests/scorecard.test.ts
+++ b/workspaces/scorecard/packages/app-legacy/e2e-tests/scorecard.test.ts
@@ -1094,11 +1094,10 @@ test.describe('Scorecard Plugin Tests', () => {
           },
         );
         await expectAverageCardCenterPercent(drillCard, '50%');
-        await scorecardDrillDownPage.verifySomeEntitiesNotReportingTooltip();
         await scorecardDrillDownPage.expectTableHeadersVisible();
         await scorecardDrillDownPage.expectEntityNamesVisible([
           'all-scorecards-service',
-          'Red Hat Developer Hub',
+          'red-hat-developer-hub',
           'github-scorecard-only-service',
           'all-scorecards-service-different-owner',
           'backend-api',
diff --git a/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/translationUtils.ts b/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/translationUtils.ts
index d9d1aa7d699..10d05598a6e 100644
--- a/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/translationUtils.ts
+++ b/workspaces/scorecard/packages/app-legacy/e2e-tests/utils/translationUtils.ts
@@ -180,6 +180,19 @@ export function getEntitiesPageMissingPermission(
   );
 }
 
+/** Tooltip text for "some entities not reporting" icon on drill-down card (locale-aware). */
+export function getSomeEntitiesNotReportingTooltip(
+  translations: ScorecardMessages,
+): string {
+  const metric = (
+    translations as { metric?: { someEntitiesNotReportingValues?: string } }
+  ).metric;
+  return (
+    metric?.someEntitiesNotReportingValues ??
+    scorecardMessages.metric.someEntitiesNotReportingValues
+  );
+}
+
 /** Rows-per-page label (e.g. "5 rows", "5 lignes"). Used for dropdown and listbox options. */
 export function getEntitiesTableFooterRowsLabel(
   translations: ScorecardMessages,
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/AverageAggregationStrategy.ts b/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/AverageAggregationStrategy.ts
index c2131b2855a..3d2362dd00e 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/AverageAggregationStrategy.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/AverageAggregationStrategy.ts
@@ -95,6 +95,8 @@ export class AverageAggregationStrategy implements AggregationStrategy {
     const result = {
       total: aggregatedMetric.total,
       timestamp: aggregatedMetric.timestamp,
+      entitiesConsidered: aggregatedMetric.entitiesConsidered,
+      calculationErrorCount: aggregatedMetric.calculationErrorCount,
       values: thresholds.rules.map(rule => ({
         name: rule.key,
         count: aggregatedMetric.values[rule.key] ?? 0,
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/StatusGroupedAggregationStrategy.ts b/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/StatusGroupedAggregationStrategy.ts
index c34f98eca69..3c31da2f198 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/StatusGroupedAggregationStrategy.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/StatusGroupedAggregationStrategy.ts
@@ -40,6 +40,8 @@ export class StatusGroupedAggregationStrategy implements AggregationStrategy {
     const result = {
       total: aggregatedMetric.total,
       timestamp: aggregatedMetric.timestamp,
+      entitiesConsidered: aggregatedMetric.entitiesConsidered,
+      calculationErrorCount: aggregatedMetric.calculationErrorCount,
       values: thresholds.rules.map(rule => ({
         name: rule.key,
         count: aggregatedMetric.values[rule.key] ?? 0,
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/averageAggregationStrategy.test.ts b/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/averageAggregationStrategy.test.ts
index 43cd50bb9c7..7dda045de84 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/averageAggregationStrategy.test.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/averageAggregationStrategy.test.ts
@@ -45,6 +45,8 @@ describe('AverageAggregationStrategy', () => {
       values: { error: 1, warning: 1, success: 1 },
       total: 3,
       timestamp: '2025-01-01T10:30:00.000Z',
+      entitiesConsidered: 5,
+      calculationErrorCount: 2,
     });
 
     const loader = {
@@ -73,6 +75,8 @@ describe('AverageAggregationStrategy', () => {
     expect(out.result).toEqual(
       expect.objectContaining({
         total: 3,
+        entitiesConsidered: 5,
+        calculationErrorCount: 2,
         averageWeightedSum: 150,
         averageMaxPossible: 300,
         averageScore: 0.5,
@@ -88,6 +92,8 @@ describe('AverageAggregationStrategy', () => {
       values: { error: 1, warning: 1, success: 1 },
       total: 3,
       timestamp: '2025-01-01T10:30:00.000Z',
+      entitiesConsidered: 3,
+      calculationErrorCount: 0,
     });
 
     const loader = {
@@ -129,6 +135,8 @@ describe('AverageAggregationStrategy', () => {
         values: { success: 1 },
         total: 1,
         timestamp: '2025-01-01T10:30:00.000Z',
+        entitiesConsidered: 1,
+        calculationErrorCount: 0,
       }),
     } as unknown as AggregatedMetricLoader;
 
@@ -154,6 +162,8 @@ describe('AverageAggregationStrategy', () => {
       values: { error: 0, warning: 0, success: 1, orphan: 2 },
       total: 3,
       timestamp: '2025-01-01T10:30:00.000Z',
+      entitiesConsidered: 4,
+      calculationErrorCount: 1,
     });
 
     const loader = {
@@ -183,6 +193,8 @@ describe('AverageAggregationStrategy', () => {
     expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('orphan'));
     expect(out.result).toEqual(
       expect.objectContaining({
+        entitiesConsidered: 4,
+        calculationErrorCount: 1,
         averageWeightedSum: 100,
         averageMaxPossible: 300,
         averageScore: 0.333,
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/statusGroupedAggregationStrategy.test.ts b/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/statusGroupedAggregationStrategy.test.ts
index 8f7c52adf4a..d60eb3a83f7 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/statusGroupedAggregationStrategy.test.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/service/aggregations/strategies/statusGroupedAggregationStrategy.test.ts
@@ -45,6 +45,8 @@ describe('StatusGroupedAggregationStrategy', () => {
       values: { success: 2 },
       total: 2,
       timestamp: '2025-01-01T10:30:00.000Z',
+      entitiesConsidered: 9,
+      calculationErrorCount: 2,
     });
 
     const loader = {
@@ -94,6 +96,8 @@ describe('StatusGroupedAggregationStrategy', () => {
       metric,
       expect.objectContaining({
         total: 2,
+        entitiesConsidered: 9,
+        calculationErrorCount: 2,
         values: expect.arrayContaining([
           expect.objectContaining({ name: 'error', count: 0 }),
           expect.objectContaining({ name: 'warning', count: 0 }),
@@ -124,6 +128,8 @@ describe('StatusGroupedAggregationStrategy', () => {
     });
 
     expect(result.result.total).toBe(0);
+    expect(result.result.entitiesConsidered).toBe(0);
+    expect(result.result.calculationErrorCount).toBe(0);
     expect(
       result.result.values.map(v => ({ name: v.name, count: v.count })),
     ).toEqual([
diff --git a/workspaces/scorecard/plugins/scorecard-backend/src/service/mappers.test.ts b/workspaces/scorecard/plugins/scorecard-backend/src/service/mappers.test.ts
index 7020827e734..9fa2281bae6 100644
--- a/workspaces/scorecard/plugins/scorecard-backend/src/service/mappers.test.ts
+++ b/workspaces/scorecard/plugins/scorecard-backend/src/service/mappers.test.ts
@@ -150,8 +150,8 @@ describe('AggregatedMetricMapper', () => {
             { name: 'warning', count: 1, score: 0 },
             { name: 'error', count: 1, score: 0 },
           ],
-          entitiesConsidered: 7,
           calculationErrorCount: 0,
+          entitiesConsidered: 3,
           thresholds,
         },
         aggregationConfig,
@@ -175,6 +175,8 @@ describe('AggregatedMetricMapper', () => {
             { name: 'warning', count: 1, score: 0 },
             { name: 'error', count: 1, score: 0 },
           ],
+          calculationErrorCount: 0,
+          entitiesConsidered: 3,
           thresholds,
         },
       });
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/AggregatedMetricCards/AverageCard/AverageCardComponent.tsx b/workspaces/scorecard/plugins/scorecard/src/components/AggregatedMetricCards/AverageCard/AverageCardComponent.tsx
index ebf6e96505f..eb36e012898 100644
--- a/workspaces/scorecard/plugins/scorecard/src/components/AggregatedMetricCards/AverageCard/AverageCardComponent.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/components/AggregatedMetricCards/AverageCard/AverageCardComponent.tsx
@@ -115,6 +115,8 @@ export const AverageCardComponent = ({
       aggregationId={aggregationId}
       scorecardId={scorecard.id}
       entitiesCount={scorecard.result.total}
+      entitiesConsidered={scorecard.result.entitiesConsidered}
+      calculationErrorCount={scorecard.result.calculationErrorCount}
     />
   ) : null;
 
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/AggregatedMetricCards/StatusGroupedCard/StatusGroupedCardComponent.tsx b/workspaces/scorecard/plugins/scorecard/src/components/AggregatedMetricCards/StatusGroupedCard/StatusGroupedCardComponent.tsx
index 8b386b5e7cf..06e31b12396 100644
--- a/workspaces/scorecard/plugins/scorecard/src/components/AggregatedMetricCards/StatusGroupedCard/StatusGroupedCardComponent.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/components/AggregatedMetricCards/StatusGroupedCard/StatusGroupedCardComponent.tsx
@@ -67,6 +67,8 @@ export const StatusGroupedCardComponent = ({
       aggregationId={aggregationId}
       scorecardId={scorecardId}
       entitiesCount={result.total}
+      entitiesConsidered={result.entitiesConsidered}
+      calculationErrorCount={result.calculationErrorCount}
     />
   ) : null;
 
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/AggregatedMetricCards/components/CardSubheader.tsx b/workspaces/scorecard/plugins/scorecard/src/components/AggregatedMetricCards/components/CardSubheader.tsx
index 76298b97593..c2aa246a15c 100644
--- a/workspaces/scorecard/plugins/scorecard/src/components/AggregatedMetricCards/components/CardSubheader.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/components/AggregatedMetricCards/components/CardSubheader.tsx
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import Box from '@mui/material/Box';
 import Tooltip from '@mui/material/Tooltip';
 import { Link } from '@backstage/core-components';
 import { useTranslation } from '../../../hooks/useTranslation';
@@ -22,29 +23,57 @@ type CardSubheaderProps = {
   aggregationId: string;
   scorecardId: string;
   entitiesCount: number;
+  entitiesConsidered?: number;
+  calculationErrorCount?: number;
 };
 
 export const CardSubheader = ({
   aggregationId,
   scorecardId,
   entitiesCount,
+  entitiesConsidered = entitiesCount,
+  calculationErrorCount = 0,
 }: CardSubheaderProps) => {
   const { t } = useTranslation();
+  const totalEntities = Math.max(0, entitiesConsidered);
+  const inferredErrorCount = Math.max(0, totalEntities - entitiesCount);
+  const effectiveErrorCount = Math.max(
+    calculationErrorCount,
+    inferredErrorCount,
+  );
+  const hasCalculationErrors = effectiveErrorCount > 0;
+  const healthyEntitiesCount = Math.max(0, totalEntities - effectiveErrorCount);
+  const ratioTemplate = t('metric.homepageEntityHealthRatio');
+  const entitiesLabel = hasCalculationErrors
+    ? ratioTemplate
+        .replace('{{healthy}}', String(healthyEntitiesCount))
+        .replace('{{total}}', String(totalEntities))
+    : t('thresholds.entities', { count: entitiesCount });
 
-  return (
-    <Tooltip
-      enterDelay={1500}
-      title={t('metric.someEntitiesNotReportingValues')}
-      arrow
-      placement="right"
+  const linkNode = (
+    <Link
+      to={`/scorecard/aggregations/${encodeURIComponent(
+        aggregationId,
+      )}/metrics/${encodeURIComponent(scorecardId)}`}
     >
-      <Link
-        to={`/scorecard/aggregations/${encodeURIComponent(
-          aggregationId,
-        )}/metrics/${encodeURIComponent(scorecardId)}`}
-      >
-        {t('thresholds.entities', { count: entitiesCount })}
-      </Link>
-    </Tooltip>
+      {entitiesLabel}
+    </Link>
+  );
+
+  return (
+    <Box sx={{ display: 'inline-flex', alignItems: 'center' }}>
+      {hasCalculationErrors ? (
+        <Tooltip
+          enterDelay={1500}
+          title={t('metric.someEntitiesNotReportingValues')}
+          arrow
+          placement="right"
+        >
+          {linkNode}
+        </Tooltip>
+      ) : (
+        linkNode
+      )}
+    </Box>
   );
 };
diff --git a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageCard.test.tsx b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageCard.test.tsx
index 2771eace322..7dc804ef7db 100644
--- a/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageCard.test.tsx
+++ b/workspaces/scorecard/plugins/scorecard/src/components/ScorecardHomepageSection/__tests__/ScorecardHomepageCard.test.tsx
@@ -116,7 +116,7 @@ jest.mock('../../../hooks/useTranslation', () => ({
     t: (key: string, options?: any) => {
       switch (key) {
         case 'metric.homepageEntityHealthRatio':
-          return `${options?.healthy}/${options?.total} entities`;
+          return '{{healthy}}/{{total}} entities';
         case 'thresholds.entities':
           return `${options?.count} entities`;
         case 'metric.someEntitiesNotReportingValues':