Merge pull request #2316 from posit-dev/dotnomad/remove-secret-cmd

Add ability to remove a Secret name in the UI
posit-dev · Sep 26, 2024 · 4209d39 · 4209d39
2 parents b081f49 + 9631a4e
commit 4209d39
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 0 deletions.
diff --git a/extensions/vscode/package.json b/extensions/vscode/package.json
@@ -58,6 +58,12 @@
         "icon": "$(refresh)",
         "category": "Posit Publisher"
       },
+      {
+        "command": "posit.publisher.homeView.removeSecret",
+        "title": "Remove Secret from Configuration",
+        "icon": "$(trash)",
+        "category": "Posit Publisher"
+      },
       {
         "command": "posit.publisher.files.refresh",
         "title": "Refresh Deployment Files",
@@ -247,6 +253,10 @@
           "command": "posit.publisher.homeView.refreshCredentials",
           "when": "posit.publish.state == 'initialized'"
         },
+        {
+          "command": "posit.publisher.homeView.removeSecret",
+          "when": "false"
+        },
         {
           "command": "posit.publisher.files.refresh",
           "when": "posit.publish.state == 'initialized'"
@@ -346,6 +356,10 @@
         {
           "command": "posit.publisher.homeView.deleteCredential",
           "when": "webviewId == 'posit.publisher.homeView' && webviewSection == 'credentials-tree-item'"
+        },
+        {
+          "command": "posit.publisher.homeView.removeSecret",
+          "when": "webviewId == 'posit.publisher.homeView' && webviewSection == 'secrets-tree-item'"
         }
       ]
     },

diff --git a/extensions/vscode/src/constants.ts b/extensions/vscode/src/constants.ts
@@ -73,6 +73,7 @@ const homeViewCommands = {
   AddCredential: "posit.publisher.homeView.addCredential",
   DeleteCredential: "posit.publisher.homeView.deleteCredential",
   RefreshCredentials: "posit.publisher.homeView.refreshCredentials",
+  RemoveSecret: "posit.publisher.homeView.removeSecret",
   EditCurrentConfiguration: "posit.publisher.homeView.edit.Configuration",
   // Added automatically by VSCode with view registration
   Focus: "posit.publisher.homeView.focus",

diff --git a/extensions/vscode/src/views/homeView.ts b/extensions/vscode/src/views/homeView.ts
@@ -936,6 +936,30 @@ export class HomeViewProvider implements WebviewViewProvider, Disposable {
     }
   }
 
+  public removeSecret = async (context: { name: string }) => {
+    const activeConfig = await this.state.getSelectedConfiguration();
+    if (activeConfig === undefined) {
+      console.error("homeView::removeSecret: No active configuration.");
+      return;
+    }
+
+    try {
+      await showProgress("Removing Secret", Views.HomeView, async () => {
+        const api = await useApi();
+        await api.secrets.remove(
+          activeConfig.configurationName,
+          context.name,
+          activeConfig.projectDir,
+        );
+      });
+    } catch (error: unknown) {
+      const summary = getSummaryStringFromError("removeSecret", error);
+      window.showInformationMessage(
+        `Failed to remove secret from configuration. ${summary}`,
+      );
+    }
+  };
+
   private async showNewCredential() {
     return await commands.executeCommand(Commands.HomeView.AddCredential);
   }
@@ -1789,6 +1813,13 @@ export class HomeViewProvider implements WebviewViewProvider, Disposable {
       }),
     );
 
+    this.context.subscriptions.push(
+      commands.registerCommand(
+        Commands.HomeView.RemoveSecret,
+        this.removeSecret,
+      ),
+    );
+
     this.context.subscriptions.push(
       commands.registerCommand(Commands.HomeView.RefreshCredentials, () =>
         useBus().trigger("refreshCredentials", undefined),

diff --git a/extensions/vscode/webviews/homeView/src/components/views/secrets/Secret.vue b/extensions/vscode/webviews/homeView/src/components/views/secrets/Secret.vue
@@ -6,6 +6,7 @@
     :list-style="secretValue || isEditing ? 'default' : 'deemphasized'"
     :tooltip="tooltip"
     align-icon-with-twisty
+    :data-vscode-context="vscodeContext"
   >
     <template #description>
       <SidebarInput
@@ -91,4 +92,12 @@ const actions = computed<ActionButton[]>(() => {
 
   return result;
 });
+
+const vscodeContext = computed(() => {
+  return JSON.stringify({
+    name: props.name,
+    webviewSection: "secrets-tree-item",
+    preventDefaultContextMenuItems: true,
+  });
+});
 </script>