headmin 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c163e16eb068c93256e3a73a0ac3b58f569cc72c36da590f084ecb13873b8866
-  data.tar.gz: 9297b7bfd0194980aa843c45e59f9180349bc17e571cfe8f9c75678738de7def
+  metadata.gz: 7f5b560711076cca763871af2499728101e4f8d7a27a04f5c702671165e134d7
+  data.tar.gz: ed2d18ec0405786fd9b4f18984e750571062124828fc1102a662f78e0333c03e
 SHA512:
-  metadata.gz: b72bc6a71c864837e78619f8bfc7b0d455d4f57d108790f6d6619fbb3fe2acb882d2be87236b8a2d87204b55995fd4234c8617ee93be5a587b6eafa2616aaac4
-  data.tar.gz: 819ec0caa24dbfa82ac02dec7909d6c888550f87c71bf5eadae0b86b03a179c57b599c5a3af3b418e4435dfc569373a1b744ed5621380382bdf7cff4cb6d229d
+  metadata.gz: 8afa230d5e31dad3cbaa288fe46849672af9c4df118b4e9a9ed8024eea60da7d1089865b3678ee67860cfe88d34f67ba3a3db0c2b8ee1e37ebfbe515e2ae07fc
+  data.tar.gz: 106023130df278d025a608345e763aac87b6586736e511fd05866703876b296de9ae08d43ea5fd86d3f7cb75d378935e3aa86ff2d9f519d50434ee02e6453dc8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    headmin (0.5.3)
+    headmin (0.5.5)
       closure_tree (~> 7.4)
       inline_svg (~> 1.7)
       redcarpet (~> 3.5)
@@ -226,7 +226,7 @@ GEM
       actionpack (>= 5.0)
       railties (>= 5.0)
     rexml (3.2.5)
-    rouge (3.29.0)
+    rouge (3.30.0)
     route_translator (12.1.0)
       actionpack (>= 5.2, < 7.1)
       activesupport (>= 5.2, < 7.1)

data/app/assets/javascripts/headmin/controllers/media_controller.js

@@ -3,7 +3,7 @@ import Sortable from 'sortablejs'
 
 export default class extends Controller {
   static get targets () {
-    return ['item', 'template', 'thumbnails', 'modalButton', 'placeholder', 'validationInput', 'count', 'editButton']
+    return ['item', 'template', 'thumbnails', 'modalButton', 'placeholder', 'count', 'editButton']
   }
 
   connect () {
@@ -17,8 +17,6 @@ export default class extends Controller {
     if (this.hasSorting()) {
       this.initSortable()
     }
-
-    this.validate()
   }
 
   // Actions
@@ -83,42 +81,6 @@ export default class extends Controller {
 
     // Toggle placeholder
     this.togglePlaceholder()
-
-    // Validate
-    this.validate()
-  }
-
-  validate () {
-    this.clearValidation()
-    if (this.element.dataset.required === '0') return
-    this.validateMinimum()
-    this.validateMaximum()
-  }
-
-  clearValidation () {
-    this.validationInputTarget.setCustomValidity('')
-  }
-
-  validateMinimum () {
-    const count = this.activeItems().length
-    if (count < this.minActiveItems()) {
-      this.validationInputTarget.setCustomValidity(this.validationInputTarget.dataset.minMessage)
-    }
-  }
-
-  validateMaximum () {
-    const count = this.activeItems().length
-    if (count > this.maxActiveItems()) {
-      this.validationInputTarget.setCustomValidity(this.validationInputTarget.dataset.maxMessage)
-    }
-  }
-
-  minActiveItems () {
-    return parseInt(this.element.dataset.min, 10) || 0
-  }
-
-  maxActiveItems () {
-    return parseInt(this.element.dataset.max, 10) || Infinity
   }
 
   resetPositions () {

data/app/assets/javascripts/headmin/controllers/repeater_controller.js

@@ -80,8 +80,8 @@ export default class extends Controller {
       row.remove()
     } else {
       // Existing records are hidden and flagged for deletion
-      row.querySelector("input[name*='_destroy']").value = 1
-      row.style.display = 'none'
+      this.flagRowForDeletion(row)
+      row.remove()
     }
 
     this.resetIndices()
@@ -89,6 +89,18 @@ export default class extends Controller {
     this.toggleEmpty()
   }
 
+  flagRowForDeletion (row) {
+    const destroyInput = row.querySelector('input[name*=\'_destroy\']')
+    const idInput = row.querySelector('input[name*=\'[id]\']')
+
+    // Update _destroy value
+    destroyInput.value = 1
+
+    // Move away from row
+    this.listTarget.parentNode.appendChild(destroyInput)
+    this.listTarget.parentNode.appendChild(idInput)
+  }
+
   getTemplate (name) {
     return this.templateTargets.filter((template) => {
       return template.dataset.templateName === name
@@ -107,7 +119,7 @@ export default class extends Controller {
   visibleRows () {
     const rows = this.rowTargets
     return rows.filter((row) => {
-      return row.querySelector("input[name*='_destroy']").value !== '1'
+      return row.querySelector('input[name*=\'_destroy\']').value !== '1'
     })
   }
 
@@ -121,7 +133,7 @@ export default class extends Controller {
 
   resetPositions () {
     this.visibleRows().forEach((row, index) => {
-      const positionInput = row.querySelector("input[name*='position']")
+      const positionInput = row.querySelector('input[name*=\'position\']')
       if (positionInput) {
         positionInput.value = index
       }

data/app/assets/javascripts/headmin.js

@@ -10096,7 +10096,7 @@ var hello_controller_default = class extends Controller {
 // app/assets/javascripts/headmin/controllers/media_controller.js
 var media_controller_default = class extends Controller {
   static get targets() {
-    return ["item", "template", "thumbnails", "modalButton", "placeholder", "validationInput", "count", "editButton"];
+    return ["item", "template", "thumbnails", "modalButton", "placeholder", "count", "editButton"];
   }
   connect() {
     document.addEventListener("mediaSelectionSubmitted", (event) => {
@@ -10107,7 +10107,6 @@ var media_controller_default = class extends Controller {
     if (this.hasSorting()) {
       this.initSortable();
     }
-    this.validate();
   }
   destroy(event) {
     const item = event.currentTarget.closest("[data-media-target='item']");
@@ -10148,35 +10147,6 @@ var media_controller_default = class extends Controller {
     this.resetPositions();
     this.syncIds();
     this.togglePlaceholder();
-    this.validate();
-  }
-  validate() {
-    this.clearValidation();
-    if (this.element.dataset.required === "0")
-      return;
-    this.validateMinimum();
-    this.validateMaximum();
-  }
-  clearValidation() {
-    this.validationInputTarget.setCustomValidity("");
-  }
-  validateMinimum() {
-    const count = this.activeItems().length;
-    if (count < this.minActiveItems()) {
-      this.validationInputTarget.setCustomValidity(this.validationInputTarget.dataset.minMessage);
-    }
-  }
-  validateMaximum() {
-    const count = this.activeItems().length;
-    if (count > this.maxActiveItems()) {
-      this.validationInputTarget.setCustomValidity(this.validationInputTarget.dataset.maxMessage);
-    }
-  }
-  minActiveItems() {
-    return parseInt(this.element.dataset.min, 10) || 0;
-  }
-  maxActiveItems() {
-    return parseInt(this.element.dataset.max, 10) || Infinity;
   }
   resetPositions() {
     this.activeItems().forEach((item, index2) => {
@@ -15559,13 +15529,20 @@ var repeater_controller_default = class extends Controller {
     if (row.dataset.newRecord === "true") {
       row.remove();
     } else {
-      row.querySelector("input[name*='_destroy']").value = 1;
-      row.style.display = "none";
+      this.flagRowForDeletion(row);
+      row.remove();
     }
     this.resetIndices();
     this.resetPositions();
     this.toggleEmpty();
   }
+  flagRowForDeletion(row) {
+    const destroyInput = row.querySelector("input[name*='_destroy']");
+    const idInput = row.querySelector("input[name*='[id]']");
+    destroyInput.value = 1;
+    this.listTarget.parentNode.appendChild(destroyInput);
+    this.listTarget.parentNode.appendChild(idInput);
+  }
   getTemplate(name) {
     return this.templateTargets.filter((template) => {
       return template.dataset.templateName === name;

data/app/controllers/concerns/headmin/pagination.rb

@@ -2,7 +2,11 @@ module Headmin
   module Pagination
     def paginate(collection)
       @records_filtered = collection.count
-      collection.page(page).per(per_page)
+      if collection.is_a?(Array)
+        Kaminari.paginate_array(collection).page(page).per(per_page)
+      else
+        collection.page(page).per(per_page)
+      end
     end
 
     def page

data/app/controllers/headmin/media_controller.rb

@@ -4,12 +4,12 @@ class Headmin::MediaController < HeadminController
   def index
     @blobs =
       ActiveStorage::Blob
-        .left_outer_joins(:attachments)
-        .where.not(active_storage_attachments: {record_type: "ActiveStorage::VariantRecord"}) # Not a variant
-        .or(ActiveStorage::Blob.where(active_storage_attachments: {id: nil})) # Or an orphan
+        .not_attached_to_variant
+        .by_mimetypes_string(media_params[:mimetype])
         .order(created_at: :desc)
         .group(:id)
         .all
+    @mimetypes = media_params[:mimetype]
   end
 
   def create
@@ -42,6 +42,11 @@ class Headmin::MediaController < HeadminController
 
   def media_params
     params.permit(
+      :min,
+      :max,
+      :name,
+      :mimetype,
+      ids: [],
       files: []
     )
   end

data/app/models/concerns/headmin/blob.rb

@@ -0,0 +1,36 @@
+module Headmin
+  module Blob
+    extend ActiveSupport::Concern
+
+    included do
+      class << self
+        def not_attached_to_variant
+          left_outer_joins(:attachments)
+            .where.not(active_storage_attachments: {record_type: "ActiveStorage::VariantRecord"})
+            .or(is_orphan)
+        end
+
+        def is_orphan
+          left_outer_joins(:attachments)
+            .where(active_storage_attachments: {id: nil})
+        end
+
+        def by_mimetypes_string(mimetype_string)
+          by_mimetypes(mimetype_string.split(","))
+        end
+
+        def by_mimetypes(mimetypes = [])
+          results = self
+
+          mimetypes.map.with_index do |mimetype, index|
+            content_type = mimetype.tr("*", "%")
+            query = where(arel_table[:content_type].matches(content_type))
+            results = index == 0 ? query : results.or(query)
+          end
+
+          results
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/headmin/field.rb

@@ -4,7 +4,7 @@ module Headmin
 
     included do
       # Configuration
-      has_closure_tree order: "position", numeric_order: true
+      has_closure_tree order: "position", numeric_order: true, dependent: :destroy
 
       # Associations
       belongs_to :fieldable, polymorphic: true, optional: true, touch: true

data/app/models/concerns/headmin/fieldable.rb

@@ -28,7 +28,10 @@ module Headmin
       private
 
       def parse_fields
-        hash_tree = fields.includes(default_include_tables | include_tables).hash_tree
+        hash_tree = {}
+        fields.roots.includes(default_include_tables | include_tables).each do |field|
+          field.hash_tree.map { |key, value| hash_tree[key] = value }
+        end
         parse_hash_tree(hash_tree)
       end
 

data/app/models/headmin/filter/association_view.rb

@@ -1,6 +1,6 @@
 module Headmin
   module Filter
-    class AssociationView < ViewModel
+    class AssociationView < FilterView
       def base_options
         keys = %i[name label form]
         options = to_h.slice(*keys)

data/app/models/headmin/filter/base.rb

@@ -21,12 +21,13 @@ module Headmin
       }
 
       # Methods
-      def initialize(attribute, params)
-        @raw_value = params[attribute]
-        @attribute = attribute
+      def initialize(attribute, params, association: nil)
+        @attribute = association ? "#{association}_#{attribute}".to_sym : attribute
+        @raw_value = params[@attribute]
+        @association = association
         @instructions = []
 
-        if params.key?(attribute)
+        if params.key?(@attribute)
           parse(@raw_value)
         end
       end
@@ -61,7 +62,8 @@ module Headmin
           query = build_query(query, collection, instruction)
         end
 
-        collection.where(query)
+        collection = collection.joins(@association) if @association
+        collection.distinct.where(query)
       end
 
       def cast_value(value)
@@ -74,6 +76,30 @@ module Headmin
         value
       end
 
+      def build_query(query, collection, instruction)
+        query_operator = convert_to_query_operator(instruction[:operator])
+        query_value = convert_to_query_value(instruction[:value], instruction[:operator])
+
+        query_operator, query_value = process_null_operators(query_operator, query_value)
+
+        model = collection.is_a?(Class) ? collection : collection.model
+
+        if @association
+          # Association attributes are passed through as {association}_{attribute}, so we need to transform this into {attribute}
+          new_attribute = attribute.to_s.gsub("#{@association}_", "").to_sym
+          new_model = model.reflect_on_association(@association)
+
+          # In case the association cannot be found, raise a well defined error
+          raise UnknownAssociation if new_model.nil?
+
+          new_query = new_model.klass.arel_table[new_attribute].send(query_operator, query_value)
+        else
+          new_query = model.arel_table[attribute].send(query_operator, query_value)
+        end
+
+        query ? query.send(instruction[:conditional], new_query) : new_query
+      end
+
       private
 
       def parse(string)
@@ -139,18 +165,6 @@ module Headmin
         process_value(string, operator)
       end
 
-      def build_query(query, collection, instruction)
-        query_operator = convert_to_query_operator(instruction[:operator])
-        query_value = convert_to_query_value(instruction[:value], instruction[:operator])
-
-        query_operator, query_value = process_null_operators(query_operator, query_value)
-
-        model = collection.is_a?(Class) ? collection : collection.model
-        new_query = model.arel_table[attribute].send(query_operator, query_value)
-
-        query ? query.send(instruction[:conditional], new_query) : new_query
-      end
-
       def process_null_operators(operator, value)
         # In case of null operators (is_null and is_not_null), we have to intercept the operator and value values
         # and transform them to the correct operator (eq or not_eq) and value (nil)
@@ -237,5 +251,8 @@ module Headmin
 
     class NotImplementedMethodError < StandardError
     end
+
+    class UnknownAssociation < StandardError
+    end
   end
 end

data/app/models/headmin/filter/boolean_view.rb

@@ -1,6 +1,6 @@
 module Headmin
   module Filter
-    class BooleanView < ViewModel
+    class BooleanView < FilterView
       def base_options
         keys = %i[name label form]
         options = to_h.slice(*keys)
@@ -28,10 +28,6 @@ module Headmin
         @name || attribute
       end
 
-      def label
-        @label || I18n.t("attributes.#{attribute}", default: name.to_s)
-      end
-
       def default_base_options
         {
           label: label,

data/app/models/headmin/filter/date_view.rb

@@ -1,6 +1,6 @@
 module Headmin
   module Filter
-    class DateView < ViewModel
+    class DateView < FilterView
       def base_options
         keys = %i[name label form]
         options = to_h.slice(*keys)
@@ -23,10 +23,6 @@ module Headmin
         @name || attribute
       end
 
-      def label
-        @label || I18n.t("attributes.#{attribute}", default: name.to_s)
-      end
-
       def default_base_options
         {
           label: label,

data/app/models/headmin/filter/field.rb

@@ -0,0 +1,55 @@
+module Headmin
+  module Filter
+    class Field < Headmin::Filter::Base
+      OPERATORS = %w[eq not_eq matches does_not_match]
+
+      def initialize(attribute, params, association: nil)
+        @attribute = association ? "#{association}_#{attribute}".to_sym : attribute
+        @attribute = "field_#{attribute}".to_sym
+        @raw_value = params[@attribute]
+        @association = association
+        @instructions = []
+
+        if params.key?(@attribute)
+          parse(@raw_value)
+        end
+      end
+
+      def cast_value(value)
+        value
+      end
+
+      def display_value(value)
+        value.downcase
+      end
+
+      def query(collection)
+        return collection unless @instructions.any?
+
+        query = nil
+
+        @instructions.each do |instruction|
+          query = build_query(query, collection, instruction)
+        end
+
+        collection = collection.joins(:fields)
+        collection.where(query)
+      end
+
+      def build_query(query, collection, instruction)
+        query_operator = convert_to_query_operator(instruction[:operator])
+        query_value = convert_to_query_value(instruction[:value], instruction[:operator])
+
+        query_operator, query_value = process_null_operators(query_operator, query_value)
+
+        model = collection.is_a?(Class) ? collection : collection.model
+
+        new_attribute = attribute.to_s.gsub("field_", "").to_sym
+        fields_model = model.reflect_on_association(:fields).klass
+        new_query = fields_model.arel_table[:name].matches(new_attribute).and(fields_model.arel_table[:value].send(query_operator, query_value))
+
+        query ? query.send(instruction[:conditional], new_query) : new_query
+      end
+    end
+  end
+end

data/app/models/headmin/filter/field_view.rb

@@ -0,0 +1,50 @@
+module Headmin
+  module Filter
+    class FieldView < FilterView
+      def base_options
+        keys = %i[name label form]
+        options = to_h.slice(*keys)
+        default_base_options.merge(options)
+      end
+
+      def input_options
+        keys = %i[form]
+        options = to_h.slice(*keys)
+        default_input_options.merge(options)
+      end
+
+      private
+
+      def id
+        "#{name}_value"
+      end
+
+      def name
+        "field_#{@name}".to_sym || attribute
+      end
+
+      def default_base_options
+        {
+          label: label,
+          name: "field_#{attribute}".to_sym,
+          filter: Headmin::Filter::Field.new(attribute.to_s.to_sym, @params),
+          allowed_operators: Headmin::Filter::Field::OPERATORS - %w[in not_in]
+        }
+      end
+
+      def default_input_options
+        {
+          label: false,
+          wrapper: false,
+          id: id,
+          name: nil,
+          data: {
+            action: "change->filter#updateHiddenValue",
+            filter_target: "value",
+            filter_row_target: "original"
+          }
+        }
+      end
+    end
+  end
+end

data/app/models/headmin/filter/filter_view.rb

@@ -0,0 +1,25 @@
+module Headmin
+  module Filter
+    class FilterView < ViewModel
+      def attribute
+        @association ? "#{@association}_#{@attribute}".to_sym : @attribute
+      end
+
+      def label
+        @label || I18n.t("attributes.#{attribute}", default: @association ? "#{association_model.model_name.human(count: 1)} - #{association_model.human_attribute_name(@attribute)}" : name.to_s)
+      end
+
+      def reflection
+        if @association
+          form.object.class.reflect_on_association(@association)
+        end
+      end
+
+      def association_model
+        if @association
+          reflection.klass
+        end
+      end
+    end
+  end
+end

data/app/models/headmin/filter/number_view.rb

@@ -1,6 +1,6 @@
 module Headmin
   module Filter
-    class NumberView < ViewModel
+    class NumberView < FilterView
       def base_options
         keys = %i[name label form]
         options = to_h.slice(*keys)
@@ -23,10 +23,6 @@ module Headmin
         @name || attribute
       end
 
-      def label
-        @label || I18n.t("attributes.#{attribute}", default: name.to_s)
-      end
-
       def default_base_options
         {
           label: label,

data/app/models/headmin/filter/options_view.rb

@@ -1,6 +1,6 @@
 module Headmin
   module Filter
-    class OptionsView < ViewModel
+    class OptionsView < FilterView
       def base_options
         keys = %i[name label form]
         options = to_h.slice(*keys)
@@ -27,10 +27,6 @@ module Headmin
         @name || attribute
       end
 
-      def label
-        @label || I18n.t("attributes.#{attribute}", default: name.to_s)
-      end
-
       def default_base_options
         {
           label: label,

data/app/models/headmin/filter/text_view.rb

@@ -1,6 +1,6 @@
 module Headmin
   module Filter
-    class TextView < ViewModel
+    class TextView < FilterView
       def base_options
         keys = %i[name label form]
         options = to_h.slice(*keys)
@@ -23,10 +23,6 @@ module Headmin
         @name || attribute
       end
 
-      def label
-        @label || I18n.t("attributes.#{attribute}", default: name.to_s)
-      end
-
       def default_base_options
         {
           label: label,

data/app/models/headmin/filters.rb

@@ -13,15 +13,30 @@ module Headmin
       @param_types = param_types
     end
 
-    def parse(attribute, type)
+    def parse(attribute, type, association: nil)
       class_name = "Headmin::Filter::#{type.to_s.classify}".constantize
-      class_name.new(attribute, @params)
+      class_name.new(attribute, @params, association: association)
     end
 
     def query(collection)
       @param_types.each do |attribute, type|
-        filter = parse(attribute, type)
-        collection = filter.query(collection)
+        if type.is_a? Hash
+          # We are given attribute filters of an association
+          association = attribute
+
+          # By default, we offer a filter of type association
+          association_filter = Headmin::Filter::Association.new(attribute, @params, association: nil)
+          collection = association_filter.query(collection)
+
+          # Query all the passed attribute filters for this association
+          type.each do |new_attribute, new_type|
+            filter = parse(new_attribute, new_type, association: association)
+            collection = filter.query(collection)
+          end
+        else
+          filter = parse(attribute, type)
+          collection = filter.query(collection)
+        end
       end
       collection
     end

data/app/models/headmin/form/media_item_view.rb

@@ -31,6 +31,10 @@ module Headmin
         attachment.blob&.filename&.to_s
       end
 
+      def content_type
+        attachment.blob&.content_type
+      end
+
       def size
         number_to_human_size(attachment.blob&.byte_size || 0)
       end

data/app/models/headmin/form/media_view.rb

@@ -23,6 +23,7 @@ module Headmin
             min: min,
             max: max,
             sort: sort,
+            accept: accept,
             required: required.nil? ? 0 : required
           }
         }).deep_merge(@wrapper || {})
@@ -45,7 +46,8 @@ module Headmin
           form: form,
           attribute: attribute,
           min: min,
-          max: max
+          max: max,
+          accept: accept
         }
       end
 
@@ -117,6 +119,8 @@ module Headmin
         end
       end
 
+      attr_reader :accept
+
       def required
         @required ? 1 : nil
       end

data/app/views/headmin/_filters.html.erb

@@ -16,7 +16,7 @@
   action = local_assigns.has_key?(:url) ? url : request.path
 
   begin
-    model = controller_name.singularize.capitalize.constantize
+    model = controller_name.classify.constantize
   rescue
     raise "Cannot find class!"
   end

data/app/views/headmin/filters/_field.html.erb

@@ -0,0 +1,23 @@
+<%
+  # headmin/filters/field
+  #
+  # ==== Required parameters
+  # * +form+ - Form object
+  # * +attribute+ - Name of the attribute to be filtered
+  #
+  # ==== Optional parameters
+  # * +label+ - Display label
+  # * +name+ - Name of the filter parameter
+  #
+  # ==== Examples
+  #   Basic version
+  #   <%= render "headmin/filters", url: admin_orders_path do |form| %#>
+  #     <%= render "headmin/filters/field", form: form, attribute: :title %#>
+  #   <% end  %#>
+
+  text = Headmin::Filter::FieldView.new(local_assigns.merge(params: params))
+%>
+
+<%= render "headmin/filters/base", text.base_options do |value| %>
+  <%= render "headmin/forms/text", text.input_options.merge({value: value}) %>
+<% end %>

data/app/views/headmin/forms/_media.html.erb

@@ -31,16 +31,14 @@
 <%= render "headmin/forms/wrapper", media.wrapper_options do %>
   <%= render "headmin/forms/label", media.label_options if media.prepend_label? %>
   <div class="h-form-file-thumbnails" data-media-target="thumbnails">
-    <%= render "headmin/forms/media/validation", media.custom_validation_options %>
-
     <!-- Render previews for attachments -->
     <%= form.fields_for(media.nested_attribute, media.association_object) do |ff| %>
-      <%= render "headmin/forms/media/item", media.item_options.merge(form: ff, url: headmin_media_url(name: media.name, ids: media.blob_ids, min: media.min, max: media.max)) %>
+      <%= render "headmin/forms/media/item", media.item_options.merge(form: ff, url: headmin_media_url(name: media.name, ids: media.blob_ids, min: media.min, max: media.max, mimetype: media.accept)) %>
     <% end %>
 
     <!-- Placeholder -->
     <div class="<%= "d-none" if media.attachments.any? %>" data-media-target="placeholder">
-      <a href="<%= headmin_media_url(name: media.name, ids: media.blob_ids, min: media.min, max: media.max) %>" data-turbo-frame="remote_modal" data-media-target="modalButton">
+      <a href="<%= headmin_media_url(name: media.name, ids: media.blob_ids, min: media.min, max: media.max, mimetype: media.accept) %>" data-turbo-frame="remote_modal" data-media-target="modalButton">
         <%= render "headmin/thumbnail", media.thumbnail_options %>
       </a>
     </div>
@@ -50,7 +48,7 @@
   <% association_object = ActiveStorage::Attachment.new %>
   <template data-media-target="template" data-template-id-regex="<%= association_object.object_id %>">
     <%= form.fields_for(media.nested_attribute, ActiveStorage::Attachment.new, child_index: association_object.object_id) do |ff| %>
-      <%= render "headmin/forms/media/item", media.item_options.merge(form: ff, url: headmin_media_url(name: media.name, ids: media.blob_ids, min: media.min, max: media.max)) %>
+      <%= render "headmin/forms/media/item", media.item_options.merge(form: ff, url: headmin_media_url(name: media.name, ids: media.blob_ids, min: media.min, max: media.max, mimetype: media.accept)) %>
     <% end %>
   </template>
 

data/app/views/headmin/media/_modal.html.erb

@@ -22,7 +22,7 @@
           <%= form.label :files, class: "btn h-btn-outline-light" do %>
             <%= bootstrap_icon("upload") %>
             <%= t(".upload") %>
-            <%= form.file_field :files, class: "d-none", multiple: true, data: {action: "change->media-modal#submitForm"} %>
+            <%= form.file_field :files, accept: mimetypes, class: "d-none", multiple: true, data: {action: "change->media-modal#submitForm"} %>
           <% end %>
         <% end %>
         <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"><%= t(".close") %></button>

data/app/views/headmin/media/index.html.erb

@@ -1,3 +1,3 @@
 <%= turbo_frame_tag "remote_modal" do %>
-  <%= render "headmin/media/modal", blobs: @blobs, name: params[:name], min: params[:min], max: params[:max] %>
+  <%= render "headmin/media/modal", blobs: @blobs, mimetypes: @mimetypes, name: params[:name], min: params[:min], max: params[:max] %>
 <% end %>

data/config/initializers/extend_active_storage_blob.rb

@@ -0,0 +1,3 @@
+Rails.configuration.to_prepare do
+  ActiveStorage::Blob.include Headmin::Blob
+end

data/config/locales/headmin/forms/en.yml

@@ -18,14 +18,6 @@ en:
           remove:
             title: Delete
             confirm: Are you sure you want to delete this?
-      media:
-        validation:
-          min:
-            one: "Please select at least 1 item"
-            other: "Please select at least %{count} items"
-          max:
-            one: "Please limit your selection to maximum 1 item"
-            other: "Please limit your selection to maximum %{count} items"
       select:
         blank: Make a choice
       repeater:

data/config/locales/headmin/forms/nl.yml

@@ -17,14 +17,6 @@ nl:
           remove:
             title: Verwijderen
             confirm: Ben je zeker dat je dit wil verwijderen?
-      media:
-        validation:
-          min:
-            one: "Gelieve minstens 1 item te selecteren"
-            other: "Gelieve minstens %{count} items te selecteren"
-          max:
-            one: "Gelieve maximum 1 item te selecteren"
-            other: "Gelieve maximum %{count} items te selecteren"
       select:
         blank: Maak een keuze
       repeater:

data/lib/headmin/version.rb

@@ -1,3 +1,3 @@
 module Headmin
-  VERSION = "0.5.4"
+  VERSION = "0.5.6"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "headmin",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "Admin component library",
   "module": "app/assets/javascripts/headmin.js",
   "main": "app/assets/javascripts/headmin.js",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: headmin
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - Jef Vlamings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: closure_tree
@@ -244,6 +244,7 @@ files:
 - app/helpers/headmin/form_helper.rb
 - app/helpers/headmin/notification_helper.rb
 - app/helpers/headmin/request_helper.rb
+- app/models/concerns/headmin/blob.rb
 - app/models/concerns/headmin/block.rb
 - app/models/concerns/headmin/blockable.rb
 - app/models/concerns/headmin/field.rb
@@ -268,6 +269,9 @@ files:
 - app/models/headmin/filter/conditional_view.rb
 - app/models/headmin/filter/date.rb
 - app/models/headmin/filter/date_view.rb
+- app/models/headmin/filter/field.rb
+- app/models/headmin/filter/field_view.rb
+- app/models/headmin/filter/filter_view.rb
 - app/models/headmin/filter/flatpickr_view.rb
 - app/models/headmin/filter/menu_item_view.rb
 - app/models/headmin/filter/money.rb
@@ -336,6 +340,7 @@ files:
 - app/views/headmin/filters/_base.html.erb
 - app/views/headmin/filters/_boolean.html.erb
 - app/views/headmin/filters/_date.html.erb
+- app/views/headmin/filters/_field.html.erb
 - app/views/headmin/filters/_flatpickr.html.erb
 - app/views/headmin/filters/_number.html.erb
 - app/views/headmin/filters/_options.html.erb
@@ -389,7 +394,6 @@ files:
 - app/views/headmin/forms/fields/_list.html.erb
 - app/views/headmin/forms/fields/_text.html.erb
 - app/views/headmin/forms/media/_item.html.erb
-- app/views/headmin/forms/media/_validation.html.erb
 - app/views/headmin/forms/repeater/_row.html.erb
 - app/views/headmin/heading/_title.html.erb
 - app/views/headmin/layout/_body.html.erb
@@ -462,6 +466,7 @@ files:
 - bin/setup
 - config/importmap.rb
 - config/initializers/customize_input_error.rb
+- config/initializers/extend_active_storage_blob.rb
 - config/locales/activerecord/en.yml
 - config/locales/activerecord/nl.yml
 - config/locales/defaults/en.yml

data/app/views/headmin/forms/media/_validation.html.erb

@@ -1,10 +0,0 @@
-<!-- Custom validation field -->
-<%= form.text_field :"validation_#{attribute}",
-  name: nil,
-  value: nil,
-  class: "h-form-media-validation",
-  data: {
-    "media-target": "validationInput",
-    "min-message": t(".min", count: min),
-    "max-message": t(".max", count: max),
-  } %>