Merge pull request #3500 from AlchemyCMS/fix-attachments-filter

Fix filtering Attachments by only or except setting

Author: tvdeyen

app/assets/builds/alchemy/admin.css

@@ -4,7 +4,7 @@ module Alchemy
   module Admin
     module Resource
       class SelectFilter < ViewComponent::Base
-        attr_reader :name, :resource_name, :label, :include_blank, :options, :selected
+        attr_reader :name, :resource_name, :label, :include_blank, :options, :selected, :multiple
 
         erb_template <<~ERB
           <div class="filter-input">
@@ -14,17 +14,19 @@ class SelectFilter < ViewComponent::Base
               options_for_select(options, selected),
               include_blank: include_blank,
               form: "resource_search",
+              multiple: multiple,
               is: 'alchemy-select'
             ) %>
           </div>
         ERB
 
-        def initialize(name:, resource_name:, label:, include_blank:, options:, params:)
+        def initialize(name:, resource_name:, label:, include_blank:, options:, params:, multiple: false)
           @name = name
           @options = options
           @label = label
           @include_blank = include_blank
           @resource_name = resource_name
+          @multiple = multiple
           @selected = get_selected_value_from(params)
         end
 

app/assets/builds/alchemy/dark-theme.css

@@ -6,8 +6,17 @@ class AttachmentsController < ResourcesController
       include UploaderResponses
       include ArchiveOverlay
 
-      add_alchemy_filter :by_file_type, type: :select,
-        options: -> { Alchemy::Attachment.file_types(_1.result) }
+      add_alchemy_filter :by_file_type, type: :select, options: ->(_query, params) do
+        case params&.to_h
+        in {except:}
+          Attachment.file_types - Attachment.file_types(from_extensions: except)
+        in {only:}
+          Attachment.file_types(from_extensions: only)
+        else
+          Attachment.file_types
+        end
+      end
+
       add_alchemy_filter :recent, type: :checkbox
       add_alchemy_filter :last_upload, type: :checkbox
       add_alchemy_filter :without_tag, type: :checkbox
@@ -72,11 +81,37 @@ def default_sort_order
       end
 
       def search_filter_params
-        @_search_filter_params ||= params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:attachment]).permit(
-          *common_search_filter_includes + [
-            :form_field_id
-          ]
-        )
+        @_search_filter_params ||= begin
+          params[:q] ||= ActionController::Parameters.new
+
+          if params[:only].present?
+            params[:q][:by_file_type] ||= Array(params[:only]).map do |extension|
+              Marcel::MimeType.for(extension:)
+            end
+          end
+
+          if params[:except].present?
+            params[:q][:by_file_type] ||= Attachment.file_types - params[:except].map do |extension|
+              Marcel::MimeType.for(extension:)
+            end
+          end
+
+          params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:attachment]).permit(
+            *common_search_filter_includes + [
+              :form_field_id,
+              {only: []},
+              {except: []}
+            ]
+          )
+        end
+      end
+
+      def permitted_ransack_search_fields
+        super + [
+          {by_file_type: []},
+          :not_file_type,
+          {not_file_type: []}
+        ]
       end
 
       def handle_uploader_response(status:)

app/assets/builds/alchemy/light-theme.css

@@ -53,7 +53,7 @@ class Select extends HTMLSelectElement {
   }
 
   get allowClear() {
-    return this.dataset.hasOwnProperty("allowClear")
+    return this.dataset.hasOwnProperty("allowClear") || this.multiple
   }
 }
 

app/assets/builds/alchemy/theme.css

@@ -24,16 +24,25 @@ def input_component(params, query)
             name:,
             resource_name:,
             label: translated_name,
-            include_blank:,
-            options: get_options_for_select(query),
+            include_blank: include_blank(params),
+            options: get_options_for_select(query, params),
+            multiple: multiple?(params),
             params:
           )
         end
 
         private
 
-        def include_blank
-          Alchemy.t(:all, scope: [:filters, resource_name, name])
+        def multiple?(params)
+          params[:only].presence&.many? || params[:except].present?
+        end
+
+        def include_blank(params)
+          if params[:only].present? || params[:except].present?
+            false
+          else
+            Alchemy.t(:all, scope: [:filters, resource_name, name])
+          end
         end
 
         def options_to_proc(options)
@@ -44,8 +53,8 @@ def options_to_proc(options)
           end
         end
 
-        def get_options_for_select(query)
-          options_for_select = options.call(query)
+        def get_options_for_select(query, params = nil)
+          options_for_select = (options.arity == 1) ? options.call(query) : options.call(query, params)
           # The result of the query is an Array of Arrays, where the first element is the translated name and the second element is the value.
           # If the first element is an Array, we assume that the options are already translated.
           if options_for_select.first.is_a? Array

app/components/alchemy/admin/resource/select_filter.rb

@@ -29,10 +29,14 @@ class Attachment < BaseRecord
 
     stampable stamper_class_name: Alchemy.user_class_name
 
-    scope :by_file_type, ->(file_type) do
+    scope :by_file_type, ->(*file_type) do
       Alchemy.storage_adapter.by_file_type_scope(file_type)
     end
 
+    scope :not_file_type, ->(*file_type) do
+      Alchemy.storage_adapter.not_file_type_scope(file_type)
+    end
+
     scope :recent, -> { where("#{table_name}.created_at > ?", Time.current - 24.hours).order(:created_at) }
     scope :without_tag, -> { left_outer_joins(:taggings).where(gutentag_taggings: {id: nil}) }
 
@@ -70,7 +74,12 @@ def ransackable_associations(_auth_object = nil)
         Alchemy.storage_adapter.ransackable_associations(name)
       end
 
-      def file_types(scope = all)
+      def file_types(scope = all, from_extensions: nil)
+        if from_extensions.present?
+          scope = by_file_type(
+            Array(from_extensions).map { |extension| Marcel::MimeType.for(extension:) }
+          )
+        end
         Alchemy.storage_adapter.file_formats(name, scope:)
       end
 
@@ -79,7 +88,7 @@ def allowed_filetypes
       end
 
       def ransackable_scopes(_auth_object = nil)
-        %i[by_file_type recent last_upload without_tag deletable]
+        %i[by_file_type not_file_type recent last_upload without_tag deletable]
       end
     end
 

app/controllers/alchemy/admin/attachments_controller.rb

@@ -8,6 +8,7 @@ class UnknownAdapterError < StandardError; end
       :attachment_url_class,
       :by_file_format_scope,
       :by_file_type_scope,
+      :not_file_type_scope,
       :file_extension,
       :file_formats,
       :file_mime_type,