Add some govuk-guix related jobs

And various other views and routes.

6 files changed, 83 insertions, 9 deletions

diff --git a/app/views/govuk_guix/revisions/index.html.erb b/app/views/govuk_guix/revisions/index.html.erb
new file mode 100644
index 0000000..54f9e4a
--- /dev/null
+++ b/app/views/govuk_guix/revisions/index.html.erb
@@ -0,0 +1,10 @@
+
+<% GovukGuix::Revision.all.each do |revision| %>
+
+  <div>
+
+    <%= revision.inspect %>
+
+  </div>
+
+<% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 5b90ace..35ea5ff 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,6 +1,5 @@
 <% content_for :head do %>
   <%= stylesheet_link_tag "application", :media => "all" %>
-  <%= javascript_include_tag "application" %>
   <%= csrf_meta_tag %>
   <%= yield :extra_headers %>
 <% end %>
diff --git a/app/views/mini_environments/new.html.erb b/app/views/mini_environments/new.html.erb
index 84d2316..7d3f2f2 100644
--- a/app/views/mini_environments/new.html.erb
+++ b/app/views/mini_environments/new.html.erb
@@ -1,8 +1,8 @@
 <div class="row">
   <div class="col-md-8">
-    <%= form_for @mini_environment,
-                 url: { action: "create" },
-                 html: { class: 'form-horizontal' } do |f| %>
+    <%= form_with(model: @mini_environment,
+                  url: { action: "create" },
+                  html: { class: 'form-horizontal' }) do |f| %>
 
       <div class="form-group">
         <%= f.label :name, class: 'col-sm-2 control-label' %>
@@ -10,6 +10,13 @@
           <%= f.text_field :name, class: 'form-control' %>
         </div>
       </div>
+
+      <div class="form-group">
+        <%= f.label :govuk_guix_revision_id, class: 'col-sm-2 control-label' %>
+        <div class="col-sm-10">
+          <%= f.collection_select :govuk_guix_revision_id, GovukGuix::Revision.all, :commit_hash, :commit_hash %>
+        </div>
+      </div>
       
       <div class="form-group">
         <div class="col-sm-offset-2 col-sm-10">
diff --git a/app/views/mini_environments/show.html.erb b/app/views/mini_environments/show.html.erb
index 0cc6bc6..a852e6c 100644
--- a/app/views/mini_environments/show.html.erb
+++ b/app/views/mini_environments/show.html.erb
@@ -1,5 +1,21 @@
 <h1>Name: <%= @mini_environment.name %></h1>
 
+<%= form_with(url: mini_environment_perform_action_path(@mini_environment),
+              local: true,
+              method: "post") do %>
+  <%= submit_tag('Start',
+                 disabled: !@mini_environment.start_command.present?,
+                 role: 'button',
+                 class: 'btn btn-lg btn-success')
+  %>
+
+  <%= submit_tag("Destroy",
+                 #disabled: !@mini_environment.start_command.present?,
+                 role: 'button',
+                 class: 'btn btn-lg btn-danger')
+  %>
+<% end %>
+
 <a href="https://signon.<%= @mini_environment.name.parameterize %>.aws.cbaines.net">View</a>
 
 <h2>Finished jobs</h2>
@@ -11,10 +27,48 @@
 
 <h2>Enqueued jobs</h2>
 
-<% @mini_environment.enqueued_terraform_jobs.each do |job| %>
-  <%= job['job_class'] %>
+<div class="panel-group"
+     id="accordion"
+     role="tablist"
+     aria-multiselectable="true">
+
+  <% @mini_environment.enqueued_terraform_jobs.each do |job| %>
 
-  <pre>
-    <%= job['last_error'] %>
-  </pre>
+    <div class="panel panel-default">
+      <div class="panel-heading" role="tab" id="headingOne">
+        <h4 class="panel-title">
+          <a role="button"
+             data-toggle="collapse"
+             data-parent="#accordion"
+             href="#collapseOne"
+             aria-expanded="true"
+             aria-controls="collapseOne">
+            <%= job['job_class'] %>
+          </a>
+          <span class="pull-right">
+            Retrying next in <%= distance_of_time_in_words_to_now(job['run_at'], include_seconds: true) %>
+          </span>
+        </h4>
+      </div>
+      <div id="collapseOne" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+        <div class="panel-body">
+          This job has failed <%= job['error_count'] %> times.
+
+          <div class="pull-right">
+            <%= form_with(url: retry_now_que_job_path(job['job_id'])) do %>
+              <%= submit_tag('Retry now', class: 'btn btn-default')
+              %>
+            <% end %>
+            <%= form_with(url: cancel_que_job_path(job['job_id'])) do %>
+              <%= submit_tag('Cancel', class: 'btn btn-default')
+              %>
+            <% end %>
+          </div>
+
+          <pre><%= job['last_error'] %></pre>
+        </div>
+      </div>
+    </div>
 <% end %>
+
+</div>
diff --git a/app/views/que_jobs/cancel.html.erb b/app/views/que_jobs/cancel.html.erb
new file mode 100644
index 0000000..5886237
--- /dev/null
+++ b/app/views/que_jobs/cancel.html.erb
@@ -0,0 +1,2 @@
+<h1>QueJobs#cancel</h1>
+<p>Find me in app/views/que_jobs/cancel.html.erb</p>
diff --git a/app/views/que_jobs/retry_now.html.erb b/app/views/que_jobs/retry_now.html.erb
new file mode 100644
index 0000000..1c8ecee
--- /dev/null
+++ b/app/views/que_jobs/retry_now.html.erb
@@ -0,0 +1,2 @@
+<h1>QueJobs#retry_now</h1>
+<p>Find me in app/views/que_jobs/retry_now.html.erb</p>