feat: Enhance workflow identification by using workflowPath as a fallback in usage report components

Author: austenstone

src/app/components/usage/actions/charts/chart-line-usage-daily/chart-line-usage-daily.component.ts

@@ -72,7 +72,7 @@ export class ChartLineUsageDailyComponent implements OnChanges {
         let name = 'Total';
         let timeKey = 'total';
         if (this.timeType === 'run') {
-          timeKey = `${line.workflowName || 'Unknown'}${line.date}${index}`;
+          timeKey = `${line.workflowName || line.workflowPath || 'Unknown'}${line.date}${index}`;
         } else if (this.timeType === 'daily') {
           timeKey = line.date.toISOString().split('T')[0];
         } else if (this.timeType === 'weekly') {
@@ -93,7 +93,7 @@ export class ChartLineUsageDailyComponent implements OnChanges {
         } else if (this.chartType === 'repo') {
           name = line.repositoryName;
         } else if (this.chartType === 'workflow') {
-          name = line.workflowName || 'Unknown Workflow';
+          name = line.workflowName || line.workflowPath || 'Unknown Workflow';
         } else if (this.chartType === 'total') {
           name = 'total';
         }

src/app/components/usage/actions/table-workflow-usage/table-workflow-usage.component.ts

@@ -76,7 +76,7 @@ export class TableWorkflowUsageComponent implements OnChanges, AfterViewInit {
     usageItems = this.data.reduce((acc, line) => {
       const item = acc.find(a => {
         if (this.tableType === 'workflow') {
-          return a.workflow === (line.workflowName || 'Unknown Workflow')
+          return a.workflow === (line.workflowName || line.workflowPath || 'Unknown Workflow')
         } else if (this.tableType === 'repo') {
           return a.repo === line.repositoryName;
         } else if (this.tableType === 'sku') {
@@ -129,7 +129,7 @@ export class TableWorkflowUsageComponent implements OnChanges, AfterViewInit {
         item.runs++;
       } else {
         acc.push({
-          workflow: line.workflowName || 'Unknown Workflow',
+          workflow: line.workflowName || line.workflowPath || 'Unknown Workflow',
           repo: line.repositoryName,
           total: line.quantity,
           cost: line.quantity * line.pricePerUnit,

src/app/usage-report.service.ts

@@ -171,8 +171,9 @@ export class UsageReportService {
       if (!this.repositories.includes(line.repositoryName)) {
         this.repositories.push(line.repositoryName);
       }
-      if (line.workflowName && !this.workflows.includes(line.workflowName)) {
-        this.workflows.push(line.workflowName);
+      const workflow = line.workflowName || line.workflowPath;
+      if (workflow && !this.workflows.includes(workflow)) {
+        this.workflows.push(workflow);
       }
       if (!this.skus.includes(line.sku)) {
         this.skus.push(line.sku);
@@ -201,7 +202,7 @@ export class UsageReportService {
       filtered = filtered.filter(line => line.sku === this.filters.sku);
     }
     if (this.filters.workflow) {
-      filtered = filtered.filter(line => line.workflowName && line.workflowName === this.filters.workflow);
+      filtered = filtered.filter(line => (line.workflowName || line.workflowPath) === this.filters.workflow);
     }
     if (this.filters.startDate && this.filters.endDate) {
       filtered = filtered.filter(line => {
@@ -225,8 +226,8 @@ export class UsageReportService {
   getWorkflowsFiltered(): Observable<string[]> {
     return this.getUsageFilteredByProduct('actions').pipe(
       map(lines => lines
-        .map(line => line.workflowName)
-        .filter((workflow): workflow is string => workflow !== undefined)
+        .map(line => line.workflowName || line.workflowPath)
+        .filter((workflow): workflow is string => workflow !== undefined && workflow !== '')
         .filter((workflow, index, self) => self.indexOf(workflow) === index)
       ),
     )