fix: translate keys for frontend

Signed-off-by: Umberto Sgueglia <usgueglia@contractor.linuxfoundation.org>

Author: ulemons

backend/src/api/public/v1/ossprey/packageList.ts

@@ -5,6 +5,7 @@ import {
   computeHealthBand,
   getPackageStatusCounts,
   listPackagesForApi,
+  translateActivityContent,
 } from '@crowd/data-access-layer'
 
 import { getPackagesQx } from '@/db/packagesDb'
@@ -79,7 +80,7 @@ export async function packageListHandler(req: Request, res: Response): Promise<v
       lastActivity: r.lastActivityAt
         ? {
             type: r.lastActivityType,
-            content: r.lastActivityContent,
+            content: translateActivityContent(r.lastActivityContent ?? null, r.lastActivityType, r.lastActivityMetadata),
             at: r.lastActivityAt.toISOString(),
           }
         : null,

services/libs/data-access-layer/src/osspckgs/api.ts

@@ -126,6 +126,7 @@ export interface PackageListRow {
   latestReleaseAt: Date | null
   lastActivityType?: string | null
   lastActivityContent?: string | null
+  lastActivityMetadata?: Record<string, unknown> | null
   lastActivityAt?: Date | null
   stewards?: StewardEntry[]
   total: string
@@ -470,7 +471,7 @@ export async function listPackagesForApi(
     opts.includeLastActivity === true
       ? `
     LEFT JOIN LATERAL (
-      SELECT sa.activity_type, sa.content, sa.created_at
+      SELECT sa.activity_type, sa.content, sa.metadata, sa.created_at
       FROM stewardship_activity sa
       WHERE sa.stewardship_id = s.id
       ORDER BY sa.created_at DESC
@@ -502,7 +503,7 @@ export async function listPackagesForApi(
       pm_counts.cnt AS "maintainerCount",
       r_sc.scorecard_score AS "scorecardScore",
       p.latest_release_at AS "latestReleaseAt",
-      ${opts.includeLastActivity === true ? `last_act.activity_type AS "lastActivityType", last_act.content AS "lastActivityContent", last_act.created_at AS "lastActivityAt",` : ''}
+      ${opts.includeLastActivity === true ? `last_act.activity_type AS "lastActivityType", last_act.content AS "lastActivityContent", last_act.metadata AS "lastActivityMetadata", last_act.created_at AS "lastActivityAt",` : ''}
       ${opts.includeStewards === true ? "COALESCE(ss_agg.stewards, '[]'::json) AS stewards," : ''}
       COUNT(*) OVER() AS total
     FROM packages p

services/libs/data-access-layer/src/osspckgs/stewardships.ts

@@ -383,7 +383,7 @@ export async function listStewardshipActivity(
       actorUserId: row.actorUserId,
       actorType: row.actorType,
       activityType: row.activityType,
-      content: translateActivityContent(row.content),
+      content: translateActivityContent(row.content, row.activityType, row.metadata as Record<string, unknown> | null),
       metadata: row.metadata as Record<string, unknown> | null,
       stewardshipStatus: row.stewardshipStatus,
       createdAt: toIso(row.createdAt),
@@ -424,7 +424,7 @@ export async function listPackageHistory(
     actorUserId: r.actorUserId ? String(r.actorUserId) : null,
     actorType: String(r.actorType),
     activityType: String(r.activityType),
-    content: translateActivityContent(r.content ? String(r.content) : null),
+    content: translateActivityContent(r.content ? String(r.content) : null, String(r.activityType), r.metadata as Record<string, unknown> | null),
     metadata: r.metadata as Record<string, unknown> | null,
     createdAt: toIso(r.createdAt),
   }))
@@ -450,8 +450,16 @@ export const ESCALATION_RESOLUTION_PATH_LABELS: Record<EscalationResolutionPath,
   namespace_takeover: 'Namespace Takeover',
 }
 
-function translateActivityContent(content: string | null): string | null {
+export function translateActivityContent(
+  content: string | null,
+  activityType?: string | null,
+  metadata?: Record<string, unknown> | null,
+): string | null {
   if (!content) return content
+  if (activityType === 'escalation' && metadata?.resolutionPath) {
+    const label = ESCALATION_RESOLUTION_PATH_LABELS[metadata.resolutionPath as EscalationResolutionPath]
+    if (label) return `Escalated with resolution path: ${label}`
+  }
   return content.replace(/^(Escalated with resolution path: )(\S+)$/, (_, prefix, key) => {
     const label = ESCALATION_RESOLUTION_PATH_LABELS[key as EscalationResolutionPath]
     return label ? `${prefix}${label}` : content