Include filter params in Retry/Discard redirects and links

Only those, not all params, which include controller, actions, etc.

Author: rosa

app/controllers/concerns/mission_control/jobs/job_filters.rb

@@ -4,7 +4,7 @@ module MissionControl::Jobs::JobFilters
   included do
     before_action :set_filters
 
-    helper_method :active_filters?
+    helper_method :active_filters?, :jobs_filter_param
   end
 
   private
@@ -20,6 +20,14 @@ def active_filters?
       @job_filters.any?
     end
 
+    def jobs_filter_param
+      if @job_filters&.any?
+        { filter: @job_filters }
+      else
+        {}
+      end
+    end
+
     def finished_at_range_params
       range_start, range_end = params.dig(:filter, :finished_at_start), params.dig(:filter, :finished_at_end)
       if range_start || range_end

app/controllers/mission_control/jobs/application_controller.rb

@@ -12,6 +12,7 @@ class MissionControl::Jobs::ApplicationController < MissionControl::Jobs.base_co
   include MissionControl::Jobs::BasicAuthentication
   include MissionControl::Jobs::ApplicationScoped, MissionControl::Jobs::NotFoundRedirections
   include MissionControl::Jobs::AdapterFeatures
+  include MissionControl::Jobs::JobFilters
 
   around_action :set_current_locale
 

app/controllers/mission_control/jobs/discards_controller.rb

@@ -13,6 +13,6 @@ def jobs_relation
 
     def redirect_location
       status = @job.status.presence_in(supported_job_statuses) || :failed
-      application_jobs_url(@application, status)
+      application_jobs_url(@application, status, **jobs_filter_param)
     end
 end

app/controllers/mission_control/jobs/jobs_controller.rb

@@ -1,5 +1,5 @@
 class MissionControl::Jobs::JobsController < MissionControl::Jobs::ApplicationController
-  include MissionControl::Jobs::JobScoped, MissionControl::Jobs::JobFilters
+  include MissionControl::Jobs::JobScoped
 
   skip_before_action :set_job, only: :index
 

app/controllers/mission_control/jobs/retries_controller.rb

@@ -3,7 +3,7 @@ class MissionControl::Jobs::RetriesController < MissionControl::Jobs::Applicatio
 
   def create
     @job.retry
-    redirect_to application_jobs_url(@application, :failed), notice: "Retried job with id #{@job.job_id}"
+    redirect_to application_jobs_url(@application, :failed, **jobs_filter_param), notice: "Retried job with id #{@job.job_id}"
   end
 
   private

app/helpers/mission_control/jobs/navigation_helper.rb

@@ -37,14 +37,6 @@ def selected_server?(server)
     MissionControl::Jobs::Current.server.name == server.name
   end
 
-  def jobs_filter_param
-    if @job_filters&.any?
-      { filter: @job_filters }
-    else
-      {}
-    end
-  end
-
   def jobs_count_with_status(status)
     count = ActiveJob.jobs.with_status(status).count
     if count.infinite?

app/views/mission_control/jobs/jobs/failed/_actions.html.erb

@@ -1,5 +1,5 @@
 <div class="buttons is-right">
-  <%= button_to "Discard", application_job_discard_path(@application, job.job_id, params: params.permit!), class: "button is-danger is-light mr-0",
+  <%= 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?" } } %>
-  <%= button_to "Retry", application_job_retry_path(@application, job.job_id, params: params.permit!), class: "button is-warning is-light mr-0" %>
+  <%= button_to "Retry", application_job_retry_path(@application, job.job_id, params: jobs_filter_param), class: "button is-warning is-light mr-0" %>
 </div>