Merge branch 'main' into cschleiden/user-agent

Author: cschleiden

src/treeViews/settings/environmentSecretsNode.ts

@@ -12,15 +12,20 @@ export class EnvironmentSecretsNode extends vscode.TreeItem {
   }
 
   async getSecrets(): Promise<(SecretNode | EmptyNode)[]> {
-    const secrets = await this.gitHubRepoContext.client.paginate(
-      this.gitHubRepoContext.client.actions.listEnvironmentSecrets,
-      {
-        repository_id: this.gitHubRepoContext.id,
-        environment_name: this.environment.name,
-        per_page: 100
-      },
-      response => response.data.map(s => new SecretNode(this.gitHubRepoContext, s, this.environment))
-    );
+    let secrets: SecretNode[] = [];
+    try {
+      secrets = await this.gitHubRepoContext.client.paginate(
+        this.gitHubRepoContext.client.actions.listEnvironmentSecrets,
+        {
+          repository_id: this.gitHubRepoContext.id,
+          environment_name: this.environment.name,
+          per_page: 100
+        },
+        response => response.data.map(s => new SecretNode(this.gitHubRepoContext, s, this.environment))
+      );
+    } catch (e) {
+      await vscode.window.showErrorMessage((e as Error).message);
+    }
 
     if (!secrets || secrets.length === 0) {
       return [new EmptyNode("No environment secrets defined")];

src/treeViews/settings/environmentVariablesNode.ts

@@ -16,15 +16,20 @@ export class EnvironmentVariablesNode extends vscode.TreeItem {
   }
 
   async getVariables(): Promise<(VariableNode | EmptyNode)[]> {
-    const variables = await this.gitHubRepoContext.client.paginate(
-      this.gitHubRepoContext.client.actions.listEnvironmentVariables,
-      {
-        repository_id: this.gitHubRepoContext.id,
-        environment_name: this.environment.name,
-        per_page: 100
-      },
-      response => response.data.map(v => new VariableNode(this.gitHubRepoContext, v, this.environment))
-    );
+    let variables: VariableNode[] = [];
+    try {
+      variables = await this.gitHubRepoContext.client.paginate(
+        this.gitHubRepoContext.client.actions.listEnvironmentVariables,
+        {
+          repository_id: this.gitHubRepoContext.id,
+          environment_name: this.environment.name,
+          per_page: 100
+        },
+        response => response.data.map(v => new VariableNode(this.gitHubRepoContext, v, this.environment))
+      );
+    } catch (e) {
+      await vscode.window.showErrorMessage((e as Error).message);
+    }
 
     if (!variables || variables.length === 0) {
       return [new EmptyNode("No environment variables defined")];

src/treeViews/settings/repoSecretsNode.ts

@@ -1,5 +1,6 @@
 import * as vscode from "vscode";
 import {GitHubRepoContext} from "../../git/repository";
+import {EmptyNode} from "./emptyNode";
 import {SecretNode} from "./secretNode";
 
 export class RepoSecretsNode extends vscode.TreeItem {
@@ -10,14 +11,25 @@ export class RepoSecretsNode extends vscode.TreeItem {
   }
 
   async getSecrets(): Promise<vscode.TreeItem[]> {
-    return await this.gitHubRepoContext.client.paginate(
-      this.gitHubRepoContext.client.actions.listRepoSecrets,
-      {
-        owner: this.gitHubRepoContext.owner,
-        repo: this.gitHubRepoContext.name,
-        per_page: 100
-      },
-      response => response.data.map(s => new SecretNode(this.gitHubRepoContext, s))
-    );
+    let secrets: SecretNode[] = [];
+    try {
+      secrets = await this.gitHubRepoContext.client.paginate(
+        this.gitHubRepoContext.client.actions.listRepoSecrets,
+        {
+          owner: this.gitHubRepoContext.owner,
+          repo: this.gitHubRepoContext.name,
+          per_page: 100
+        },
+        response => response.data.map(s => new SecretNode(this.gitHubRepoContext, s))
+      );
+    } catch (e) {
+      await vscode.window.showErrorMessage((e as Error).message);
+    }
+
+    if (!secrets || secrets.length === 0) {
+      return [new EmptyNode("No repository secrets defined")];
+    }
+
+    return secrets;
   }
 }

src/treeViews/settings/repoVariablesNode.ts

@@ -1,5 +1,6 @@
 import * as vscode from "vscode";
 import {GitHubRepoContext} from "../../git/repository";
+import {EmptyNode} from "./emptyNode";
 import {VariableNode} from "./variableNode";
 
 export type RepoVariablesCommandArgs = Pick<RepoVariablesNode, "gitHubRepoContext">;
@@ -12,14 +13,25 @@ export class RepoVariablesNode extends vscode.TreeItem {
   }
 
   async getVariables(): Promise<vscode.TreeItem[]> {
-    return await this.gitHubRepoContext.client.paginate(
-      this.gitHubRepoContext.client.actions.listRepoVariables,
-      {
-        owner: this.gitHubRepoContext.owner,
-        repo: this.gitHubRepoContext.name,
-        per_page: 100
-      },
-      response => response.data.map(s => new VariableNode(this.gitHubRepoContext, s))
-    );
+    let variables: VariableNode[] = [];
+    try {
+      variables = await this.gitHubRepoContext.client.paginate(
+        this.gitHubRepoContext.client.actions.listRepoVariables,
+        {
+          owner: this.gitHubRepoContext.owner,
+          repo: this.gitHubRepoContext.name,
+          per_page: 100
+        },
+        response => response.data.map(s => new VariableNode(this.gitHubRepoContext, s))
+      );
+    } catch (e) {
+      await vscode.window.showErrorMessage((e as Error).message);
+    }
+
+    if (!variables || variables.length === 0) {
+      return [new EmptyNode("No repository variables defined")];
+    }
+
+    return variables;
   }
 }