Add Variable deletion

hashicorp · Aug 9, 2021 · 250a7bb · 250a7bb
1 parent efa0846
commit 250a7bb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git 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
@@ -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());