From 6d5fe56fa1a01b30326676a3bcaf23348e647e64 Mon Sep 17 00:00:00 2001
From: Phil Renaud <phil.renaud@hashicorp.com>
Date: Wed, 2 Nov 2022 10:34:10 -0400
Subject: [PATCH] Job spec upload (#14747)

* Job spec upload by click or drag

* pseudo-restrict formats

* Changelog

* Tweak to job spec upload to be above editor layer

* Within the job-editor again tho

* Beginning testcase cleanup

* Test progression

* refact: update codemirror fillin logic

Co-authored-by: Jai Bhagat <jaybhagat841@gmail.com>
---
 .changelog/14747.txt                          |  3 ++
 ui/app/components/job-editor.js               | 11 +++++-
 ui/app/styles/components/codemirror.scss      | 22 +++++++++++
 ui/app/templates/components/job-editor.hbs    | 31 ++++++---------
 .../integration/components/job-editor-test.js | 38 ++-----------------
 ui/tests/pages/components/job-editor.js       |  7 ----
 6 files changed, 50 insertions(+), 62 deletions(-)
 create mode 100644 .changelog/14747.txt

diff --git a/.changelog/14747.txt b/.changelog/14747.txt
new file mode 100644
index 000000000..bcc0207d3
--- /dev/null
+++ b/.changelog/14747.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: allow users to upload files by click or drag in the web ui
+```
diff --git a/ui/app/components/job-editor.js b/ui/app/components/job-editor.js
index c2944e4a2..1690c7830 100644
--- a/ui/app/components/job-editor.js
+++ b/ui/app/components/job-editor.js
@@ -49,7 +49,6 @@ export default class JobEditor extends Component {
   planOutput = null;
 
   @localStorageProperty('nomadMessageJobPlan', true) showPlanMessage;
-  @localStorageProperty('nomadMessageJobEditor', true) showEditorMessage;
 
   @computed('planOutput')
   get stage() {
@@ -117,4 +116,14 @@ export default class JobEditor extends Component {
       window.scrollTo(0, 0);
     }
   }
+
+  @action uploadJobSpec(event) {
+    const reader = new FileReader();
+    reader.onload = () => {
+      this.updateCode(reader.result);
+    };
+
+    const [file] = event.target.files;
+    reader.readAsText(file);
+  }
 }
diff --git a/ui/app/styles/components/codemirror.scss b/ui/app/styles/components/codemirror.scss
index 81c08356e..3c158074b 100644
--- a/ui/app/styles/components/codemirror.scss
+++ b/ui/app/styles/components/codemirror.scss
@@ -129,3 +129,25 @@ $dark-bright: lighten($dark, 15%);
     background-color: $dark-2;
   }
 }
+
+header.run-job-header {
+  display: grid;
+  grid-template-columns: 1fr auto;
+  margin-bottom: 2rem;
+  gap: 0 1rem;
+  & > h1 {
+    grid-column: -1 / 1;
+  }
+
+  .job-spec-upload {
+    .button {
+      cursor: pointer;
+    }
+    input {
+      width: 100%;
+      height: 100%;
+      position: absolute;
+      display: none;
+    }
+  }
+}
diff --git a/ui/app/templates/components/job-editor.hbs b/ui/app/templates/components/job-editor.hbs
index 50d3ea47b..7404deb67 100644
--- a/ui/app/templates/components/job-editor.hbs
+++ b/ui/app/templates/components/job-editor.hbs
@@ -18,26 +18,16 @@
 {{/if}}
 
 {{#if (eq this.stage "editor")}}
-  {{#if (and this.showEditorMessage (eq this.context "new"))}}
-    <div class="notification is-info">
-      <div class="columns">
-        <div class="column">
-          <h3 class="title is-4" data-test-editor-help-title>Run a Job</h3>
-          <p data-test-editor-help-message>Paste or author HCL or JSON to submit
-            to your cluster. A plan will be requested before the job is
-            submitted.</p>
-        </div>
-        <div class="column is-centered is-minimum">
-          <button
-            class="button is-info"
-            onclick={{toggle-action "showEditorMessage" this}}
-            data-test-editor-help-dismiss
-            type="button"
-          >Okay</button>
-        </div>
-      </div>
-    </div>
-  {{/if}}
+
+  <header class="run-job-header">
+    <h1 class="title is-3">Run a job</h1>
+    <p>Paste or author HCL or JSON to submit to your cluster. A plan will be requested before the job is submitted. You can also attach a job spec by uploading a job file or dragging &amp; dropping a file to the editor.</p>
+    <label class="job-spec-upload">
+      <input type="file" onchange={{action this.uploadJobSpec}} accept=".hcl,.json,.nomad" />
+      <span class="button">Upload a job spec file</span>
+    </label>
+  </header>
+
   <div class="boxed-section">
     <div class="boxed-section-head">
       Job Definition
@@ -63,6 +53,7 @@
       />
     </div>
   </div>
+
   <div class="content is-associative">
     <button
       class="button is-primary {{if this.plan.isRunning 'is-loading'}}"
diff --git a/ui/tests/integration/components/job-editor-test.js b/ui/tests/integration/components/job-editor-test.js
index 05c121ff4..36fe8f1ce 100644
--- a/ui/tests/integration/components/job-editor-test.js
+++ b/ui/tests/integration/components/job-editor-test.js
@@ -105,59 +105,29 @@ module('Integration | Component | job-editor', function (hooks) {
   };
 
   const planJob = async (spec) => {
-    await Editor.editor.fillIn(spec);
+    const cm = getCodeMirrorInstance(['data-test-editor']);
+    cm.setValue(spec);
     await Editor.plan();
   };
 
   test('the default state is an editor with an explanation popup', async function (assert) {
-    assert.expect(3);
+    assert.expect(2);
 
     const job = await this.store.createRecord('job');
 
     await renderNewJob(this, job);
-    assert.ok(
-      Editor.editorHelp.isPresent,
-      'Editor explanation popup is present'
-    );
     assert.ok(Editor.editor.isPresent, 'Editor is present');
 
     await componentA11yAudit(this.element, assert);
   });
 
-  test('the explanation popup can be dismissed', async function (assert) {
-    const job = await this.store.createRecord('job');
-
-    await renderNewJob(this, job);
-    await Editor.editorHelp.dismiss();
-    assert.notOk(
-      Editor.editorHelp.isPresent,
-      'Editor explanation popup is gone'
-    );
-    assert.equal(
-      window.localStorage.nomadMessageJobEditor,
-      'false',
-      'Dismissal is persisted in localStorage'
-    );
-  });
-
-  test('the explanation popup is not shown once the dismissal state is set in localStorage', async function (assert) {
-    window.localStorage.nomadMessageJobEditor = 'false';
-
-    const job = await this.store.createRecord('job');
-
-    await renderNewJob(this, job);
-    assert.notOk(
-      Editor.editorHelp.isPresent,
-      'Editor explanation popup is gone'
-    );
-  });
-
   test('submitting a json job skips the parse endpoint', async function (assert) {
     const spec = jsonJob();
     const job = await this.store.createRecord('job');
 
     await renderNewJob(this, job);
     await planJob(spec);
+    console.log('wait');
     const requests = this.server.pretender.handledRequests.mapBy('url');
     assert.notOk(
       requests.includes('/v1/jobs/parse'),
diff --git a/ui/tests/pages/components/job-editor.js b/ui/tests/pages/components/job-editor.js
index 387cd95a1..908334042 100644
--- a/ui/tests/pages/components/job-editor.js
+++ b/ui/tests/pages/components/job-editor.js
@@ -28,13 +28,6 @@ export default () => ({
     dismiss: clickable('[data-test-plan-help-dismiss]'),
   },
 
-  editorHelp: {
-    isPresent: isPresent('[data-test-editor-help-title]'),
-    title: text('[data-test-editor-help-title]'),
-    message: text('[data-test-editor-help-message]'),
-    dismiss: clickable('[data-test-editor-help-dismiss]'),
-  },
-
   editor: {
     isPresent: isPresent('[data-test-editor]'),
     contents: code('[data-test-editor]'),