Add separate step icons

cschleiden · cschleiden · commit c16483607d1c · 2023-01-30T14:41:19.000-08:00
diff --git a/src/treeViews/icons.ts b/src/treeViews/icons.ts
@@ -28,27 +28,64 @@ export function getIconForWorkflowRun({
     case "completed": {
       switch (conclusion) {
         case "success":
-          return getAbsoluteIconPath("conclusions/success.svg");
+          return getAbsoluteIconPath("workflowruns/wr_success.svg");
 
         case "failure":
-          return getAbsoluteIconPath("conclusions/failure.svg");
+          return getAbsoluteIconPath("workflowruns/wr_failure.svg");
 
         case "skipped":
+          return getAbsoluteIconPath("workflowruns/wr_skipped.svg");
+
         case "cancelled":
-          return getAbsoluteIconPath("conclusions/cancelled.svg");
+          return getAbsoluteIconPath("workflowruns/wr_cancelled.svg");
       }
+
       break;
     }
 
     case "queued":
-      return getAbsoluteIconPath("statuses/queued.svg");
+      return getAbsoluteIconPath("workflowruns/wr_queued.svg");
 
     case "waiting":
-      return getAbsoluteIconPath("statuses/waiting.svg");
+      return getAbsoluteIconPath("workflowruns/wr_waiting.svg");
+
+    case "inprogress":
+    case "in_progress":
+      return getAbsoluteIconPath("workflowruns/wr_inprogress.svg");
+  }
+
+  return "";
+}
+
+export function getIconForWorkflowStep({
+  status,
+  conclusion
+}: StatusAndConclusion): string | vscode.ThemeIcon | {light: string | vscode.Uri; dark: string | vscode.Uri} {
+  switch (status) {
+    case "completed": {
+      switch (conclusion) {
+        case "success":
+          return getAbsoluteIconPath("steps/step_success.svg");
+
+        case "failure":
+          return getAbsoluteIconPath("steps/step_failure.svg");
+
+        case "skipped":
+          return getAbsoluteIconPath("steps/step_skipped.svg");
+
+        case "cancelled":
+          return getAbsoluteIconPath("steps/step_cancelled.svg");
+      }
+
+      break;
+    }
+
+    case "queued":
+      return getAbsoluteIconPath("statuses/step_queued.svg");
 
     case "inprogress":
     case "in_progress":
-      return new vscode.ThemeIcon("sync~spin");
+      return getAbsoluteIconPath("steps/step_inprogress.svg");
   }
 
   return "";
diff --git a/src/treeViews/workflows/workflowStepNode.ts b/src/treeViews/workflows/workflowStepNode.ts
@@ -2,7 +2,7 @@ import * as vscode from "vscode";
 import {GitHubRepoContext} from "../../git/repository";
 import {WorkflowStep} from "../../model";
 import {WorkflowJob} from "../../store/WorkflowJob";
-import {getIconForWorkflowRun} from "../icons";
+import {getIconForWorkflowStep} from "../icons";
 
 export class WorkflowStepNode extends vscode.TreeItem {
   constructor(
@@ -23,6 +23,6 @@ export class WorkflowStepNode extends vscode.TreeItem {
       arguments: [this]
     };
 
-    this.iconPath = getIconForWorkflowRun(this.step);
+    this.iconPath = getIconForWorkflowStep(this.step);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import * as vscode from "vscode";`
`2`	`2`	`import {GitHubRepoContext} from "../../git/repository";`
`3`	`3`	`import {WorkflowStep} from "../../model";`
`4`	`4`	`import {WorkflowJob} from "../../store/WorkflowJob";`
`5`		`-import {getIconForWorkflowRun} from "../icons";`
	`5`	`+import {getIconForWorkflowStep} from "../icons";`
`6`	`6`
`7`	`7`	`export class WorkflowStepNode extends vscode.TreeItem {`
`8`	`8`	`constructor(`
`@@ -23,6 +23,6 @@ export class WorkflowStepNode extends vscode.TreeItem {`
`23`	`23`	`arguments: [this]`
`24`	`24`	`};`
`25`	`25`
`26`		`- this.iconPath = getIconForWorkflowRun(this.step);`
	`26`	`+ this.iconPath = getIconForWorkflowStep(this.step);`
`27`	`27`	`}`
`28`	`28`	`}`