headmin 0.5.3 → 0.5.5

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("field_#{attribute}".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/flatpickr_view.rb

@@ -40,6 +40,7 @@ module Headmin
         {
           label: false,
           wrapper: false,
+          name: nil,
           id: id,
           data: {
             action: "change->filter#updateHiddenValue",

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,
@@ -41,6 +37,7 @@ module Headmin
           label: false,
           wrapper: false,
           id: id,
+          name: nil,
           data: {
             action: "change->filter#updateHiddenValue",
             filter_target: "value",

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

@@ -22,7 +22,9 @@ module Headmin
           matches: "≈ #{I18n.t("headmin.filters.operators.matches")}",
           does_not_match: "≉ #{I18n.t("headmin.filters.operators.does_not_match")}",
           is_null: "○ #{I18n.t("headmin.filters.operators.is_null")}",
-          is_not_null: "● #{I18n.t("headmin.filters.operators.is_not_null")}"
+          is_not_null: "● #{I18n.t("headmin.filters.operators.is_not_null")}",
+          in: "∋ #{I18n.t("headmin.filters.operators.in")}",
+          not_in: "∌ #{I18n.t("headmin.filters.operators.not_in")}"
         }
       end
     end

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,
@@ -46,6 +42,7 @@ module Headmin
           label: false,
           wrapper: false,
           id: id,
+          name: nil,
           data: {
             action: "change->filter#updateHiddenValue",
             filter_target: "value",

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,
@@ -41,6 +37,7 @@ module Headmin
           label: false,
           wrapper: false,
           id: id,
+          name: nil,
           data: {
             action: "change->filter#updateHiddenValue",
             filter_target: "value",

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/association_view.rb

@@ -0,0 +1,102 @@
+module Headmin
+  module Form
+    class AssociationView < ViewModel
+      include Headmin::Form::Hintable
+      include Headmin::Form::InputGroupable
+      include Headmin::Form::Labelable
+      include Headmin::Form::Listable
+      include Headmin::Form::Placeholderable
+      include Headmin::Form::Validatable
+      include Headmin::Form::Wrappable
+
+      def input_options
+        keys = attributes - %i[append attribute collection float form input_group include_blank label prepend validate selected tags wrapper]
+        options = to_h.slice(*keys)
+        def_input_options = default_input_options
+        def_input_options = def_input_options.deep_merge(options)
+        def_input_options = def_input_options.merge({multiple: true}) if collection?
+        def_input_options
+      end
+
+      def input_group_options
+        default_input_group_options
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
+      end
+
+      def wrapper_options
+        default_wrapper_options.deep_merge({
+          class: ["mb-3", ("form-floating" if float)]
+        }).deep_merge(@wrapper || {})
+      end
+
+      def select_options
+        keys = %i[include_blank selected]
+        options = to_h.slice(*keys)
+        default_options.deep_merge(options)
+      end
+
+      def attribute_with_id
+        attribute_with_id = collection? ? "#{association_foreign_key}s" : foreign_key
+
+        if attribute_with_id.nil?
+          raise(AssociationDoesNotExistError, "Association attribute that was passed does not exist.")
+        else
+          attribute_with_id
+        end
+      end
+
+      def collection
+        association_class.all.map { |item| [item.to_s, item.id] }
+      end
+
+      private
+
+      def association_foreign_key
+        reflection.association_foreign_key
+      end
+
+      def foreign_key
+        reflection.foreign_key
+      end
+
+      def reflection
+        form.object.class.reflect_on_association(attribute)
+      end
+
+      def association_class
+        reflection.klass
+      end
+
+      def collection?
+        reflection.collection?
+      end
+
+      def default_options
+        {
+          selected: form.object&.send(attribute_with_id)
+        }
+      end
+
+      def default_input_options
+        {
+          aria: {describedby: validation_id},
+          class: [form_control_class, validation_class],
+          data: {
+            tags: tags,
+            controller: "select"
+          },
+          multiple: tags,
+          placeholder: placeholder
+        }
+      end
+
+      def form_control_class
+        plaintext ? "form-control-plaintext" : "form-select"
+      end
+
+      class AssociationDoesNotExistError < StandardError
+      end
+    end
+  end
+end

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

@@ -21,7 +21,10 @@ module Headmin
         {
           attribute: "blocks",
           label: false,
-          templates: names
+          templates: names,
+          row: {
+            class: "repeater-row list-group-item pt-3"
+          }
         }
       end
     end

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

@@ -55,14 +55,6 @@ module Headmin
         attached.is_a?(ActiveStorage::Attached::Many) ? :"#{attribute}_attachments" : :"#{attribute}_attachment"
       end
 
-      def thumbnail_width
-        100
-      end
-
-      def thumbnail_height
-        100
-      end
-
       def dropzone_options
         if dropzone
           {

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

@@ -18,8 +18,9 @@ module Headmin
       def default_data
         {
           controller: "flatpickr",
+
           flatpickr: {
-            defaultDate: form.object&.send(attribute)&.strftime("%d/%m/%Y")
+            defaultDate: attribute.nil? ? Date.today : form.object&.send(attribute)&.strftime("%d/%m/%Y")
           }
         }
       end

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

@@ -0,0 +1,39 @@
+module Headmin
+  module Form
+    class MediaItemView < ViewModel
+      include Rails.application.routes.url_helpers
+
+      def thumbnail_options
+        options = {
+          file: attachment
+        }
+
+        # Don't pass width or height if it was not defined
+        options = options.merge(width: width) if is_defined?(:width)
+        options = options.merge(height: height) if is_defined?(:height)
+
+        options
+      end
+
+      def attachment
+        form.object
+      end
+
+      def position_value
+        attachment.new_record? ? nil : attachment.position
+      end
+
+      def id
+        attachment.blob ? attachment.blob.id : "$1"
+      end
+
+      def filename
+        attachment.blob&.filename&.to_s
+      end
+
+      def size
+        number_to_human_size(attachment.blob&.byte_size || 0)
+      end
+    end
+  end
+end

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

@@ -19,7 +19,7 @@ module Headmin
           class: ["mb-3", ("form-floating" if float)],
           data: {
             controller: "media",
-            name: "#{attribute}_#{object_id}",
+            name: name,
             min: min,
             max: max,
             sort: sort,
@@ -28,6 +28,18 @@ module Headmin
         }).deep_merge(@wrapper || {})
       end
 
+      def item_options
+        options = {
+          sort: sort
+        }
+
+        # Don't pass width or height if it was not defined
+        options = options.merge(width: width) if is_defined?(:width)
+        options = options.merge(height: height) if is_defined?(:height)
+
+        options
+      end
+
       def custom_validation_options
         {
           form: form,
@@ -37,6 +49,18 @@ module Headmin
         }
       end
 
+      def thumbnail_options
+        options = {
+          icon: "plus"
+        }
+
+        # Don't pass width or height if it was not defined
+        options = options.merge(width: width) unless is_defined?(:width)
+        options = options.merge(height: height) unless is_defined?(:height)
+
+        options
+      end
+
       def association_object
         if attached.is_a?(ActiveStorage::Attached::Many)
           result = form.object.send(nested_attribute)
@@ -101,8 +125,8 @@ module Headmin
         attachments.map { |attachment| attachment.blob_id }
       end
 
-      def media_modal_url
-        headmin_media_url(name: "#{attribute}_#{object_id}", ids: blob_ids, min: min, max: max)
+      def name
+        "#{attribute}_#{object_id}"
       end
 
       def sort

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

@@ -36,8 +36,9 @@ module Headmin
       private
 
       def default_options
+        selected = attribute.nil? ? nil : form.object&.send(attribute)
         {
-          selected: form.object&.send(attribute)
+          selected: selected
         }
       end
 

data/app/models/headmin/thumbnail_view.rb

@@ -1,41 +1,62 @@
 module Headmin
-  class ThumbnailView
-    def initialize(local_assigns)
-      @local_assigns = local_assigns
-    end
-
+  class ThumbnailView < ViewModel
     def class_names
-      class_names = [@local_assigns[:class]]
+      class_names = [@class]
       class_names << "img-thumbnail h-thumbnail"
       class_names.join(" ")
     end
 
     def width
-      @local_assigns[:width] || 150
+      if is_defined?(:width)
+        @width
+      else
+        @width || 100
+      end
     end
 
     def height
-      @local_assigns[:height] || 150
+      if is_defined?(:height)
+        @height
+      else
+        @height || 100
+      end
     end
 
-    def src
-      @local_assigns[:src]
+    def blob
+      file.is_a?(ActiveStorage::Blob) ? file : file&.blob
     end
 
-    def icon
-      @local_assigns[:icon]
+    def mime_type
+      blob&.content_type
     end
 
-    def mime_type
-      if src
-        stripped_path = URI.parse(src).path
-        extension = File.extname(stripped_path)
-        Rack::Mime.mime_type(extension)
+    def variant_options
+      if width.nil? || height.nil?
+        default_variant_options.merge({
+          resize_to_fit: [width, height]
+        })
+      else
+        default_variant_options.merge({
+          resize_to_fill: [width, height, crop: :attention]
+        })
       end
     end
 
-    def image?
-      mime_type&.match?(/^image/)
+    def default_variant_options
+      {
+        saver: {
+          quality: 80
+        }
+      }
+    end
+
+    # Is it possible to create a ActiveStorage::Variant?
+    def variable?
+      blob&.variable?
+    end
+
+    def icon?
+      is_defined?(:icon)
     end
 
     # https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types

data/app/models/view_model.rb

@@ -40,6 +40,10 @@ class ViewModel
 
   private
 
+  def is_defined?(attribute)
+    attributes.include?(attribute.to_sym)
+  end
+
   def value_for(attribute)
     reserved_methods.include?(attribute) ? instance_variable_get("@#{attribute}") : send(attribute)
   end

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

@@ -14,10 +14,15 @@
   #   <%= render "headmin/filters", url: admin_polls_path %#>
 
   action = local_assigns.has_key?(:url) ? url : request.path
-%>
 
-<%= form_with url: action, method: :get, data: {controller: "filters", filters_target: "form"} do |form| %>
+  begin
+    model = controller_name.classify.constantize
+  rescue
+    raise "Cannot find class!"
+  end
+%>
 
+<%= form_with model: model.new, url: action, method: :get, data: {controller: "filters", filters_target: "form"} do |form| %>
   <%# Perform yield in order to capture content blocks, pass form so we can use headmin form inputs %>
   <%= yield(form) %>
 

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

@@ -1,11 +1,35 @@
-<% thumbnail = Headmin::ThumbnailView.new(local_assigns) %>
+<%
+  # headmin/thumbnail
+  #
+  # ==== Required parameters
+  # * +file+ - Name of the attribute of the form model
+  #
+  # ==== Optional parameters
+  # * +width+ - Width of the thumbnail. Set to nil to fill according to the original aspect ratio
+  # * +height+ - Height of the thumbnail. Set to nil to fill according to the original aspect ratio
+  # * +icon+ - Force icon to be shown instead of a thumbnail
+  #
+  # ==== References
+  # https://headmin.dev/docs/thumbnail
+  #
+  # ==== Examples
+  #   Basic version
+  #   <%= render "headmin/thumbnail", file: file %#>
+  #
+  #   Custom size (200px x 100px)
+  #   <%= render "headmin/thumbnail", file: file, width: 200, height: 100 %#>
+  #
+  #   Custom (bootstrap) icon
+  #   <%= render "headmin/thumbnail", file: file, icon: "file-earmark-excel" %#>
+  thumbnail = Headmin::ThumbnailView.new(local_assigns)
+%>
 
-<div class="<%= thumbnail.class_names %>" style="width: <%= thumbnail.width %>px; height: <%= thumbnail.height %>px;">
-  <% if thumbnail.image? %>
-    <div class="h-thumbnail-bg" style="background-image: url('<%= thumbnail.src %>');"></div>
-  <% else %>
-    <div class="h-thumbnail-bg">
+<div class="<%= thumbnail.class_names %>">
+  <div class="h-thumbnail-bg" style="min-width: <%= thumbnail.width || 100 %>px; min-height: <%= thumbnail.height || 100 %>px;">
+    <% if thumbnail.variable? && !thumbnail.icon? %>
+      <%= image_tag(thumbnail.file.variant(thumbnail.variant_options)) %>
+    <% else %>
       <%= bootstrap_icon(thumbnail.icon_name, class: "h-thumbnail-icon") %>
-    </div>
-  <% end %>
+    <% end %>
+  </div>
 </div>