backport of commit 41bae45

hashicorp · May 25, 2023 · f5c52fe · f5c52fe
1 parent 5410564
commit f5c52fe
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/.changelog/17319.txt b/.changelog/17319.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: fixed a handful of UX-related bugs during variable editing
+```
diff --git a/ui/app/components/variable-form.hbs b/ui/app/components/variable-form.hbs
@@ -143,6 +143,7 @@
             class="delete-row button is-danger is-inverted"
             type="button"
             {{on "click" (action this.deleteRow entry)}}
+            disabled={{eq this.keyValues.length 1}}
           >
             Delete
           </button>

diff --git a/ui/app/components/variable-form.js b/ui/app/components/variable-form.js
@@ -177,7 +177,10 @@ export default class VariableFormComponent extends Component {
   }
 
   @action appendRow() {
-    this.keyValues.pushObject(copy(EMPTY_KV));
+    // Clear our any entity errors
+    let newRow = copy(EMPTY_KV);
+    newRow.warnings = EmberObject.create();
+    this.keyValues.pushObject(newRow);
   }
 
   @action deleteRow(row) {

diff --git a/ui/app/components/variable-form/related-entities.hbs b/ui/app/components/variable-form/related-entities.hbs
@@ -9,7 +9,7 @@
     {{else if @job}}
     job <LinkTo @route="jobs.job" @model={{concat @job "@" @namespace}}>{{@job}} <FlightIcon @name="external-link" /></LinkTo>
     {{else}}
-    all nomad jobs
+    all nomad jobs in this namespace
     {{/if}}
 </span>
 </p>