Remove individual action partials and use conditional instead

Shopify · Jan 25, 2021 · 036c26c · 036c26c
1 parent f435701
commit 036c26c
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 44 deletions.
diff --git a/app/controllers/maintenance_tasks/tasks_controller.rb b/app/controllers/maintenance_tasks/tasks_controller.rb
@@ -19,7 +19,8 @@ def index
     # Shows running and completed instances of the Task.
     def show
       @task = TaskData.find(params.fetch(:id))
-      set_refresh if @task.last_run&.active?
+      @last_run = @task.last_run
+      set_refresh if @last_run&.active?
       @pagy, @previous_runs = pagy(@task.previous_runs)
     end
 

diff --git a/...nce_tasks/tasks/actions/_errored.html.erb → ...aintenance_tasks/tasks/_run_task.html.erb b/...nce_tasks/tasks/actions/_errored.html.erb → ...aintenance_tasks/tasks/_run_task.html.erb
@@ -1,6 +1,10 @@
 <%= form_with url: run_task_path(task), method: :put do |form| %>
-  <%= render 'maintenance_tasks/tasks/upload_csv', form: form if task.csv_task? %>
-
+  <% if task.csv_task? %>
+    <div class="block">
+      <%= form.label :csv_file %>
+      <%= form.file_field :csv_file %>
+    </div>
+  <% end %>
   <div class="block">
     <%= form.submit 'Run', class: "button is-success", disabled: task.deleted? %>
   </div>

diff --git a/app/views/maintenance_tasks/tasks/_upload_csv.html.erb b/app/views/maintenance_tasks/tasks/_upload_csv.html.erb
diff --git a/app/views/maintenance_tasks/tasks/actions/_cancelled.html.erb b/app/views/maintenance_tasks/tasks/actions/_cancelled.html.erb
diff --git a/app/views/maintenance_tasks/tasks/actions/_cancelling.html.erb b/app/views/maintenance_tasks/tasks/actions/_cancelling.html.erb
diff --git a/app/views/maintenance_tasks/tasks/actions/_enqueued.html.erb b/app/views/maintenance_tasks/tasks/actions/_enqueued.html.erb
diff --git a/app/views/maintenance_tasks/tasks/actions/_interrupted.html.erb b/app/views/maintenance_tasks/tasks/actions/_interrupted.html.erb
diff --git a/app/views/maintenance_tasks/tasks/actions/_new.html.erb b/app/views/maintenance_tasks/tasks/actions/_new.html.erb
diff --git a/app/views/maintenance_tasks/tasks/actions/_paused.html.erb b/app/views/maintenance_tasks/tasks/actions/_paused.html.erb
diff --git a/app/views/maintenance_tasks/tasks/actions/_pausing.html.erb b/app/views/maintenance_tasks/tasks/actions/_pausing.html.erb
diff --git a/app/views/maintenance_tasks/tasks/actions/_running.html.erb b/app/views/maintenance_tasks/tasks/actions/_running.html.erb
diff --git a/app/views/maintenance_tasks/tasks/actions/_succeeded.html.erb b/app/views/maintenance_tasks/tasks/actions/_succeeded.html.erb
diff --git a/app/views/maintenance_tasks/tasks/show.html.erb b/app/views/maintenance_tasks/tasks/show.html.erb
@@ -4,10 +4,26 @@
   <%= @task %> <%= status_tag(@task.status) %>
 </h1>
 
-<%= render 'maintenance_tasks/runs/info', run: @task.last_run, with_status: false if @task.last_run %>
+<%= render 'maintenance_tasks/runs/info', run: @last_run, with_status: false if @last_run %>
 
 <div class="buttons">
-  <%= render "maintenance_tasks/tasks/actions/#{@task.status}", task: @task %>
+  <% if @last_run.nil? || @last_run.completed? %>
+    <%= render 'maintenance_tasks/tasks/run_task', task: @task %>
+  <% elsif @last_run.cancelling? %>
+    <%= button_to 'Run', run_task_path(@task), method: :put, class: 'button is-success', disabled: true %>
+    <% if @last_run.stuck? %>
+      <%= button_to 'Cancel', cancel_task_run_path(@task, @last_run), method: :put, class: 'button is-danger', disabled: @task.deleted? %>
+    <% end %>
+  <% elsif @last_run.pausing? %>
+    <%= button_to 'Pausing', pause_task_run_path(@task, @last_run), method: :put, class: 'button is-warning', disabled: true %>
+    <%= button_to 'Cancel', cancel_task_run_path(@task, @last_run), method: :put, class: 'button is-danger' %>
+  <% elsif @last_run.paused? %>
+    <%= button_to 'Resume', run_task_path(@task), method: :put, class: 'button is-primary', disabled: @task.deleted? %>
+    <%= button_to 'Cancel', cancel_task_run_path(@task, @last_run), method: :put, class: 'button is-danger' %>
+  <% else %>
+    <%= button_to 'Pause', pause_task_run_path(@task, @last_run), method: :put, class: 'button is-warning', disabled: @task.deleted? %>
+    <%= button_to 'Cancel', cancel_task_run_path(@task, @last_run), method: :put, class: 'button is-danger' %>
+  <% end%>
 </div>
 
 <% if (code = @task.code) %>