Fix self-hosted runners display

cschleiden · cschleiden · commit 9d8da2119327 · 2020-04-10T20:01:58.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to the "vscode-github-actions" extension will be documented
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 
+## [v0.2.0]
+- Bugfix for displaying self-hosted runners
+
 ## [v0.1.16]
 - Bugfix: "Trigger workflow" shows up for workflows using the object notation to define the `on` events
 - Feature: If `repository_dispatch` is filtered to specific types, the trigger workflow run will be pre-populated with those.
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/cschleiden/vscode-github-actions"
   },
   "description": "See GitHub Actions workflows and runs for github.com hosted repositories in VS Code",
-  "version": "0.1.16",
+  "version": "0.2.0",
   "engines": {
     "vscode": "^1.41.0"
   },
diff --git a/src/extension.ts b/src/extension.ts
@@ -94,7 +94,9 @@ export function activate(context: vscode.ExtensionContext) {
           }
         );
 
-        if (selection != custom_type) {
+        if (selection === undefined) {
+          return;
+        } else if (selection != custom_type) {
           event_type = selection;
         }
       }
diff --git a/src/treeViews/settings.ts b/src/treeViews/settings.ts
@@ -1,12 +1,12 @@
+import { ActionsListSecretsForRepoResponseItem } from "@octokit/rest";
 import * as vscode from "vscode";
-import { getGitHubProtocol } from "../git/repository";
-import { getPAT } from "../auth/pat";
 import { getClient } from "../api/api";
-import { Secret, SelfHostedRunner } from "../model";
+import { getPAT } from "../auth/pat";
 import { Protocol } from "../external/protocol";
-import Octokit = require("@octokit/rest");
-import { ActionsListSecretsForRepoResponseItem } from "@octokit/rest";
+import { getGitHubProtocol } from "../git/repository";
+import { Secret, SelfHostedRunner } from "../model";
 import { getAbsoluteIconPath } from "./icons";
+import Octokit = require("@octokit/rest");
 
 class SelfHostedRunnersNode extends vscode.TreeItem {
   constructor(public readonly repo: Protocol, public readonly client: Octokit) {
@@ -101,29 +101,32 @@ export class SettingsTreeProvider
       // Root
       return [
         new SelfHostedRunnersNode(repo, client),
-        new SecretsNode(repo, client)
+        new SecretsNode(repo, client),
       ];
     }
 
     if (element instanceof SecretsNode) {
       const result = await client.actions.listSecretsForRepo({
         owner: repo.owner,
-        repo: repo.repositoryName
+        repo: repo.repositoryName,
       });
       // Work around bad typings/docs
       const data = (result.data as any) as ActionsListSecretsForRepoResponseItem;
       const secrets = data.secrets;
-      return secrets.map(s => new SecretNode(repo, s, client));
+      return secrets.map((s) => new SecretNode(repo, s, client));
     }
 
     if (element instanceof SelfHostedRunnersNode) {
       const result = await client.actions.listSelfHostedRunnersForRepo({
         owner: repo.owner,
-        repo: repo.repositoryName
+        repo: repo.repositoryName,
       });
-      const data = (result.data as any) as Octokit.ActionsListSelfHostedRunnersForRepoResponseItemItem[];
 
-      return data.map(r => new SelfHostedRunnerNode(repo, r, client));
+      result.data;
+
+      // Work around typing issues with the consumed octokit version
+      const data: any[] = (result.data as any).runners || [];
+      return data.map((r) => new SelfHostedRunnerNode(repo, r, client));
     }
 
     return [];

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,9 @@ export function activate(context: vscode.ExtensionContext) {`
`94`	`94`	`}`
`95`	`95`	`);`
`96`	`96`
`97`		`- if (selection != custom_type) {`
	`97`	`+ if (selection === undefined) {`
	`98`	`+ return;`
	`99`	`+ } else if (selection != custom_type) {`
`98`	`100`	`event_type = selection;`
`99`	`101`	`}`
`100`	`102`	`}`