Combine environment and repository secret nodes

Author: joshmgross

package.json

@@ -330,17 +330,17 @@
         },
         {
           "command": "github-actions.settings.secret.update",
-          "when": "viewItem == 'secret'",
+          "when": "viewItem == 'repo-secret'",
           "group": "inline@1"
         },
         {
           "command": "github-actions.settings.secret.copy",
-          "when": "viewItem == 'secret'",
+          "when": "viewItem == 'repo-secret'",
           "group": "context"
         },
         {
           "command": "github-actions.settings.secret.delete",
-          "when": "viewItem == 'secret'",
+          "when": "viewItem == 'repo-secret'",
           "group": "inline@2"
         },
         {

src/commands/secrets/copySecret.ts

@@ -1,15 +1,9 @@
 import * as vscode from "vscode";
-import {GitHubRepoContext} from "../../git/repository";
-import {EnvironmentSecret, RepoSecret} from "../../model";
-
-interface CopySecretCommandArgs {
-  gitHubRepoContext: GitHubRepoContext;
-  secret: RepoSecret | EnvironmentSecret;
-}
+import {SecretCommandArgs} from "../../treeViews/settings/secretNode";
 
 export function registerCopySecret(context: vscode.ExtensionContext) {
   context.subscriptions.push(
-    vscode.commands.registerCommand("github-actions.settings.secret.copy", async (args: CopySecretCommandArgs) => {
+    vscode.commands.registerCommand("github-actions.settings.secret.copy", async (args: SecretCommandArgs) => {
       const {secret} = args;
 
       await vscode.env.clipboard.writeText(secret.name);

src/commands/secrets/deleteSecret.ts

@@ -1,15 +1,9 @@
 import * as vscode from "vscode";
-import {GitHubRepoContext} from "../../git/repository";
-import {RepoSecret} from "../../model";
-
-interface DeleteSecretCommandArgs {
-  gitHubRepoContext: GitHubRepoContext;
-  secret: RepoSecret;
-}
+import {SecretCommandArgs} from "../../treeViews/settings/secretNode";
 
 export function registerDeleteSecret(context: vscode.ExtensionContext) {
   context.subscriptions.push(
-    vscode.commands.registerCommand("github-actions.settings.secret.delete", async (args: DeleteSecretCommandArgs) => {
+    vscode.commands.registerCommand("github-actions.settings.secret.delete", async (args: SecretCommandArgs) => {
       const gitHubContext = args.gitHubRepoContext;
       const secret = args.secret;
 

src/commands/secrets/updateSecret.ts

@@ -1,16 +1,11 @@
 import * as vscode from "vscode";
-import {GitHubRepoContext} from "../../git/repository";
 import {RepoSecret} from "../../model";
 import {encodeSecret} from "../../secrets";
-
-interface UpdateSecretCommandArgs {
-  gitHubRepoContext: GitHubRepoContext;
-  secret: RepoSecret;
-}
+import {SecretCommandArgs} from "../../treeViews/settings/secretNode";
 
 export function registerUpdateSecret(context: vscode.ExtensionContext) {
   context.subscriptions.push(
-    vscode.commands.registerCommand("github-actions.settings.secret.update", async (args: UpdateSecretCommandArgs) => {
+    vscode.commands.registerCommand("github-actions.settings.secret.update", async (args: SecretCommandArgs) => {
       const gitHubContext = args.gitHubRepoContext;
       const secret: RepoSecret = args.secret;
 

src/treeViews/settings/environmentSecretNode.ts

@@ -2,7 +2,7 @@ import * as vscode from "vscode";
 import {GitHubRepoContext} from "../../git/repository";
 import {Environment} from "../../model";
 import {EmptyNode} from "./emptyNode";
-import {EnvironmentSecretNode} from "./environmentSecretNode";
+import {SecretNode} from "./secretNode";
 
 export class EnvironmentSecretsNode extends vscode.TreeItem {
   constructor(public readonly gitHubRepoContext: GitHubRepoContext, public readonly environment: Environment) {
@@ -11,15 +11,15 @@ export class EnvironmentSecretsNode extends vscode.TreeItem {
     this.iconPath = new vscode.ThemeIcon("lock");
   }
 
-  async getSecrets(): Promise<(EnvironmentSecretNode | EmptyNode)[]> {
+  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 EnvironmentSecretNode(this.gitHubRepoContext, s))
+      response => response.data.map(s => new SecretNode(this.gitHubRepoContext, s, this.environment))
     );
 
     if (!secrets || secrets.length === 0) {

src/treeViews/settings/environmentSecretsNode.ts

@@ -1,6 +1,6 @@
 import * as vscode from "vscode";
 import {GitHubRepoContext} from "../../git/repository";
-import {RepoSecretNode} from "./repoSecretNode";
+import {SecretNode} from "./secretNode";
 
 export class RepoSecretsNode extends vscode.TreeItem {
   constructor(public readonly gitHubRepoContext: GitHubRepoContext) {
@@ -17,7 +17,7 @@ export class RepoSecretsNode extends vscode.TreeItem {
         repo: this.gitHubRepoContext.name,
         per_page: 100
       },
-      response => response.data.map(s => new RepoSecretNode(this.gitHubRepoContext, s))
+      response => response.data.map(s => new SecretNode(this.gitHubRepoContext, s))
     );
   }
 }

src/treeViews/settings/repoSecretNode.ts

@@ -0,0 +1,17 @@
+import * as vscode from "vscode";
+import {GitHubRepoContext} from "../../git/repository";
+import {Environment, EnvironmentSecret, RepoSecret} from "../../model";
+
+export type SecretCommandArgs = Pick<SecretNode, "gitHubRepoContext" | "secret" | "environment">;
+
+export class SecretNode extends vscode.TreeItem {
+  constructor(
+    public readonly gitHubRepoContext: GitHubRepoContext,
+    public readonly secret: RepoSecret | EnvironmentSecret,
+    public readonly environment?: Environment
+  ) {
+    super(secret.name);
+
+    this.contextValue = environment ? "env-secret" : "repo-secret";
+  }
+}

src/treeViews/settings/repoSecretsNode.ts

@@ -1,25 +1,22 @@
 import {EmptyNode} from "./emptyNode";
 import {EnvironmentNode} from "./environmentNode";
-import {EnvironmentSecretNode} from "./environmentSecretNode";
 import {EnvironmentSecretsNode} from "./environmentSecretsNode";
 import {EnvironmentsNode} from "./environmentsNode";
 import {VariableNode} from "./variableNode";
 import {EnvironmentVariablesNode} from "./environmentVariablesNode";
-import {RepoSecretNode} from "./repoSecretNode";
+import {SecretNode} from "./secretNode";
 import {SecretsNode} from "./secretsNode";
 import {SelfHostedRunnersNode} from "./selfHostedRunnersNode";
 import {VariablesNode} from "./variablesNode";
 
 export type SettingsExplorerNode =
   | SelfHostedRunnersNode
   | SecretsNode
-  | RepoSecretNode
+  | SecretNode
   | EnvironmentsNode
   | EnvironmentNode
-  | EnvironmentSecretNode
   | EnvironmentSecretsNode
   | VariableNode
   | VariablesNode
   | EnvironmentVariablesNode
-  | EnvironmentSecretNode
   | EmptyNode;