From 250a7bbfa887e54a78958729eea5df81eeee61d3 Mon Sep 17 00:00:00 2001
From: Greg Hoin <ghoin@hashicorp.com>
Date: Mon, 9 Aug 2021 17:43:29 +0200
Subject: [PATCH] Add Variable deletion

---
 .../project-config-variables/list-item.ts           |  2 +-
 ui/app/components/project-config-variables/list.ts  | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ui/app/components/project-config-variables/list-item.ts b/ui/app/components/project-config-variables/list-item.ts
index 01c7fe73ac0..b8f1504e76f 100644
--- a/ui/app/components/project-config-variables/list-item.ts
+++ b/ui/app/components/project-config-variables/list-item.ts
@@ -45,7 +45,7 @@ export default class ProjectConfigVariablesListItemComponent extends Component<V
 
   @action
   async deleteVariable(variable) {
-    // await this.args.deleteVariable(variable);
+    await this.args.deleteVariable(variable);
   }
 
   @action
diff --git a/ui/app/components/project-config-variables/list.ts b/ui/app/components/project-config-variables/list.ts
index 127d1656850..ad242b0c7e5 100644
--- a/ui/app/components/project-config-variables/list.ts
+++ b/ui/app/components/project-config-variables/list.ts
@@ -2,6 +2,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { ConfigSetRequest, ConfigGetRequest, ConfigVar, Project, Ref } from 'waypoint-pb';
+import { Empty } from 'google-protobuf/google/protobuf/empty_pb';
 import { inject as service } from '@ember/service';
 import ApiService from 'waypoint/services/api';
 
@@ -28,6 +29,11 @@ export default class ProjectConfigVariablesListComponent extends Component<Proje
     this.isCreating = false;
   }
 
+  @action
+  async deleteVariable(variable) {
+    await this.saveVariableSettings(variable, undefined, true);
+  }
+
   @action
   addVariable() {
     this.isCreating = true;
@@ -40,7 +46,8 @@ export default class ProjectConfigVariablesListComponent extends Component<Proje
   @action
   async saveVariableSettings(
     variable: ConfigVar.AsObject,
-    initialVariable?: ConfigVar.AsObject
+    initialVariable?: ConfigVar.AsObject,
+    deleteVariable?: boolean
   ): Promise<any | void> {
     let req = new ConfigSetRequest();
 
@@ -61,6 +68,10 @@ export default class ProjectConfigVariablesListComponent extends Component<Proje
       newVar.setInternal(variable.internal);
     }
 
+    if (deleteVariable) {
+      newVar.setUnset(new Empty());
+    }
+
     req.setVariablesList([newVar]);
     try {
       await this.api.client.setConfig(req, this.api.WithMeta());