diff --git a/app/controllers/mission_control/jobs/discards_controller.rb b/app/controllers/mission_control/jobs/discards_controller.rb index b37f90b9..3207ed01 100644 --- a/app/controllers/mission_control/jobs/discards_controller.rb +++ b/app/controllers/mission_control/jobs/discards_controller.rb @@ -12,7 +12,11 @@ def jobs_relation end def redirect_location - status = @job.status.presence_in(supported_job_statuses) || :failed - application_jobs_url(@application, status, **jobs_filter_param) + if @job.pending? + application_queue_path(@application, @job.queue_name) + else + status = @job.status.presence_in(supported_job_statuses) || :failed + application_jobs_url(@application, status, **jobs_filter_param) + end end end diff --git a/app/views/mission_control/jobs/jobs/_title.html.erb b/app/views/mission_control/jobs/jobs/_title.html.erb index 349c4d26..43612ebd 100644 --- a/app/views/mission_control/jobs/jobs/_title.html.erb +++ b/app/views/mission_control/jobs/jobs/_title.html.erb @@ -5,6 +5,9 @@
<%= job.status %>
+ <% if job.pending? %> + <%= render "mission_control/jobs/jobs/pending/actions", job: job %> + <% end %> <% if job.failed? %> <%= render "mission_control/jobs/jobs/failed/actions", job: job %> <% end %> diff --git a/app/views/mission_control/jobs/jobs/pending/_actions.html.erb b/app/views/mission_control/jobs/jobs/pending/_actions.html.erb new file mode 100644 index 00000000..c5626d3b --- /dev/null +++ b/app/views/mission_control/jobs/jobs/pending/_actions.html.erb @@ -0,0 +1,4 @@ +
+ <%= button_to "Discard", application_job_discard_path(@application, job.job_id, params: jobs_filter_param), class: "button is-danger is-light mr-0", + form: { data: { turbo_confirm: "This will delete the job and can't be undone. Are you sure?" } } %> +