feat(Picture): Add support for only and except setting

This allows to use only and except setting
on Picture ingredients like on File ingredients.

Signed-off-by: Thomas von Deyen <vondeyen@blish.cloud>

Author: tvdeyen

app/controllers/alchemy/admin/pictures_controller.rb

@@ -19,8 +19,8 @@ class PicturesController < Alchemy::Admin::ResourcesController
         @picture = Picture.find(params[:id])
       end
 
-      add_alchemy_filter :by_file_format, type: :select, options: ->(query) do
-        Alchemy::Picture.file_formats(query.result)
+      add_alchemy_filter :by_file_format, type: :select, options: ->(_q) do
+        Alchemy::Picture.file_formats
       end
       add_alchemy_filter :recent, type: :checkbox
       add_alchemy_filter :last_upload, type: :checkbox
@@ -183,12 +183,23 @@ def redirect_to_index
       end
 
       def search_filter_params
-        @_search_filter_params ||= params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:picture_ids]).permit(
-          *common_search_filter_includes + [
-            :size,
-            :form_field_id
-          ]
-        )
+        @_search_filter_params ||= begin
+          params[:q] ||= ActionController::Parameters.new
+          params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:picture_ids]).permit(
+            *common_search_filter_includes + [
+              :size,
+              :form_field_id
+            ]
+          )
+        end
+      end
+
+      def permitted_ransack_search_fields
+        super + [
+          {by_file_format: []},
+          :not_file_format,
+          {not_file_format: []}
+        ]
       end
 
       def picture_params

app/models/alchemy/ingredients/picture.rb

@@ -30,8 +30,10 @@ class Picture < Alchemy::Ingredient
       allow_settings %i[
         crop
         css_classes
+        except
         fixed_ratio
         linkable
+        only
         size
         sizes
         srcset

app/models/alchemy/picture.rb

@@ -80,10 +80,15 @@ def allowed_filetypes
     scope :named, ->(name) { where("#{table_name}.name LIKE ?", "%#{name}%") }
     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}) }
+
     scope :by_file_format, ->(file_format) do
       Alchemy.storage_adapter.by_file_format_scope(file_format)
     end
 
+    scope :not_file_format, ->(file_format) do
+      Alchemy.storage_adapter.not_file_format_scope(file_format)
+    end
+
     # Case insensitive Ransack searching and sorting for name attribute
     ransacker :name, type: :string do
       arel_table[:name].lower
@@ -125,7 +130,7 @@ def last_upload
       end
 
       def ransackable_scopes(_auth_object = nil)
-        [:by_file_format, :recent, :last_upload, :without_tag, :deletable]
+        [:by_file_format, :not_file_format, :recent, :last_upload, :without_tag, :deletable]
       end
 
       def file_formats(scope = all)

app/models/alchemy/storage_adapter.rb

@@ -7,6 +7,7 @@ class UnknownAdapterError < StandardError; end
     delegate(
       :attachment_url_class,
       :by_file_format_scope,
+      :not_file_format_scope,
       :by_file_type_scope,
       :not_file_type_scope,
       :file_extension,

app/models/alchemy/storage_adapter/active_storage.rb

@@ -84,6 +84,12 @@ def by_file_format_scope(file_format)
         Picture.with_attached_image_file.joins(:image_file_blob).where(active_storage_blobs: {content_type: file_format})
       end
 
+      # @param [String, Array<String>]
+      # @return [Alchemy::Picture::ActiveRecord_Relation]
+      def not_file_format_scope(file_format)
+        Picture.with_attached_image_file.joins(:image_file_blob).where.not(active_storage_blobs: {content_type: file_format})
+      end
+
       # @param [String, Array<String>]
       # @return [Alchemy::Atachment::ActiveRecord_Relation]
       def by_file_type_scope(file_type)

app/models/alchemy/storage_adapter/dragonfly.rb

@@ -109,6 +109,12 @@ def by_file_format_scope(file_format)
         Picture.where(image_file_format: file_format)
       end
 
+      # @param [String, Array<String>]
+      # @return [Alchemy::Picture::ActiveRecord_Relation]
+      def not_file_format_scope(file_format)
+        Picture.where.not(image_file_format: file_format)
+      end
+
       # @param [String, Array<String>]
       # @return [Alchemy::Attachment::ActiveRecord_Relation]
       def by_file_type_scope(file_type)

app/views/alchemy/ingredients/shared/_picture_tools.html.erb

@@ -22,7 +22,11 @@
 <%= content_tag "sl-tooltip", content: picture_editor.picture ? Alchemy.t(:swap_image) : Alchemy.t(:insert_image) do %>
   <%= link_to_dialog render_icon("image-add"),
     alchemy.admin_pictures_path(
-      form_field_id: picture_editor.form_field_id(:picture_id)
+      form_field_id: picture_editor.form_field_id(:picture_id),
+      q: {
+        by_file_format: Array(picture_editor.settings[:only]),
+        not_file_format: Array(picture_editor.settings[:except])
+      }
     ),
     {
       title: Alchemy.t(:choose_image),

spec/dummy/config/alchemy/elements.yml

@@ -6,6 +6,7 @@
       type: Picture
       settings:
         linkable: false
+        except: gif
 
 - name: headline
   ingredients:
@@ -123,6 +124,7 @@
       settings:
         size: 1200x480
         crop: true
+        only: [jpeg]
         css_classes:
           - "align-right"
           - "align-left"