Separate filter types methods for schemes and bulk uploads from logs

app/models/user.rb

@@ -219,12 +219,26 @@ class User < ApplicationRecord
 
   def logs_filters(specific_org: false)
     if (support? && !specific_org) || organisation.has_managing_agents? || organisation.has_stock_owners?
-      %w[years status needstypes assigned_to user uploaded_by managing_organisation owning_organisation uploading_organisation bulk_upload_id user_text_search owning_organisation_text_search managing_organisation_text_search]
+      %w[years status needstypes assigned_to user managing_organisation owning_organisation bulk_upload_id user_text_search owning_organisation_text_search managing_organisation_text_search]
     else
       %w[years status needstypes assigned_to user bulk_upload_id user_text_search]
     end
   end
 
+  def scheme_filters(specific_org: false)
+    if (support? && !specific_org) || organisation.has_managing_agents? || organisation.has_stock_owners?
+      %w[status owning_organisation owning_organisation_text_search]
+    else
+      %w[status]
+    end
+  end
+
+  def bulk_uploads_filters(specific_org: false)
+    return [] unless support? && !specific_org
+
+    %w[years uploaded_by uploading_organisation]
+  end
+
   delegate :name, to: :organisation, prefix: true
 
   def self.download_attributes

app/services/filter_manager.rb

@@ -131,7 +131,7 @@ class FilterManager
     end
 
     if filter_type.include?("schemes")
-      current_user.logs_filters(specific_org:).each do |filter|
+      current_user.scheme_filters(specific_org:).each do |filter|
         new_filters[filter] = params[filter] if params[filter].present?
       end
 
@@ -139,7 +139,7 @@ class FilterManager
     end
 
     if filter_type.include?("bulk_uploads")
-      current_user.logs_filters(specific_org:).each do |filter|
+      current_user.bulk_uploads_filters(specific_org:).each do |filter|
         new_filters[filter] = params[filter] if params[filter].present?
       end
       new_filters = new_filters.except("uploading_organisation") if params["uploading_organisation_select"] == "all"