headmin 0.5.0 → 0.5.3

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

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

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

@@ -17,10 +17,19 @@ module Headmin
         @fields_hash = hash
       end
 
+      def include_tables
+        []
+      end
+
+      def default_include_tables
+        [files_attachments: :blob]
+      end
+
       private
 
       def parse_fields
-        fields.where(parent: nil).order(position: :asc).map { |field| parse_hash_tree(field.hash_tree) }.reduce({}, :merge)
+        hash_tree = fields.includes(default_include_tables | include_tables).hash_tree
+        parse_hash_tree(hash_tree)
       end
 
       def build_fields
@@ -95,10 +104,11 @@ module Headmin
           name: name,
           field_type: "file",
           value: nil,
-          files: [ActiveStorage::Blob.create_and_upload!(
-            io: file,
-            filename: File.basename(file.path)
-          )]
+          files_attachments_attributes: [
+            {
+              blob: ActiveStorage::Blob.create_and_upload!(io: file, filename: File.basename(file.path))
+            }
+          ]
         )
       end
 
@@ -108,11 +118,10 @@ module Headmin
           name: name,
           field_type: "files",
           value: nil,
-          files: files.map { |file|
-            ActiveStorage::Blob.create_and_upload!(
-              io: file,
-              filename: File.basename(file.path)
-            )
+          files_attachments_attributes: files.map { |file|
+            {
+              blob: ActiveStorage::Blob.create_and_upload!(io: file, filename: File.basename(file.path))
+            }
           }
         )
       end

data/app/models/concerns/headmin/form/hintable.rb

@@ -8,9 +8,14 @@ module Headmin
           hint.present?
         end
 
+        def maxlength?
+          maxlength.present?
+        end
+
         def hint_options
           {
-            content: hint
+            content: hint,
+            maxlength: maxlength
           }
         end
       end

data/app/models/headmin/blocks_view.rb

@@ -9,7 +9,7 @@ module Headmin
     end
 
     def prefixes
-      paths + ["website/blocks", "blocks", ""]
+      paths + ["website/blocks", "blocks"]
     end
   end
 end

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

@@ -3,16 +3,64 @@ module Headmin
     class Date < Headmin::Filter::Base
       OPERATORS = %w[eq not_eq gt gteq lt lteq between not_between in not_in is_null is_not_null]
 
+      QUERY_OPERATOR_CONVERT_TO = {
+        between: %w[eq],
+        not_between: %w[not_eq]
+      }
+
+      OPERATORS_CONVERT_TO = {
+        convert_to_range: %w[between not_between],
+        convert_to_array: %w[in not_in],
+        convert_to_value: %w[matches does_not_match is_null is_not_null starts_with ends_with],
+        convert_to_datetime_equals: %w[eq not_eq],
+        convert_to_datetime_begin: %w[lt gteq],
+        convert_to_datetime_end: %w[gt lteq]
+      }
+
       def cast_value(value)
         value.present? ? value.to_date : ::Date.current
       rescue
         raise TypeError, "The value that was passed to this filter is not a date"
       end
 
+      def values
+        @instructions.map { |instruction| output_value(instruction) }.compact
+      end
+
+      def output_value(instruction)
+        if %w[eq not_eq].include?(instruction[:operator])
+          instruction[:value].last.to_date
+        elsif %w[lt lteq gt gteq].include?(instruction[:operator])
+          instruction[:value].to_date
+        else
+          instruction[:value]
+        end
+      end
+
+      def convert_to_datetime_equals(value)
+        casted_date = cast_value(value)
+
+        (casted_date - 1.day).end_of_day..casted_date.end_of_day
+      end
+
+      def convert_to_datetime_begin(value)
+        casted_date = cast_value(value)
+        casted_date.beginning_of_day
+      end
+
+      def convert_to_datetime_end(value)
+        casted_date = cast_value(value)
+        casted_date.end_of_day
+      end
+
       def display_value(value)
         # This uses the default date format of headmin.
         # Can be overwritten by setting default date format of the application.
-        I18n.l(value)
+        if value.class.to_s == "Range"
+          I18n.l(value.last.to_date)
+        else
+          I18n.l(value.to_date)
+        end
       end
     end
   end

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

@@ -0,0 +1,48 @@
+module Headmin
+  module Form
+    class ColorView < ViewModel
+      include Headmin::Form::Hintable
+      include Headmin::Form::Labelable
+      include Headmin::Form::Validatable
+      include Headmin::Form::Wrappable
+
+      def input_options
+        keys = attributes - %i[attribute form label validate wrapper]
+        options = to_h.slice(*keys)
+        default_input_options.deep_merge(options)
+      end
+
+      def label_options
+        {
+          class: ["form-label"],
+          attribute: attribute,
+          form: form,
+          required: required,
+          text: label
+        }
+      end
+
+      def value
+        @form.object&.send(@attribute) || "#000000"
+      end
+
+      def wrapper_options
+        default_wrapper_options.deep_merge(
+          {
+          }
+        ).deep_merge(@wrapper || {})
+      end
+
+      private
+
+      def default_input_options
+        {
+          aria: {describedby: validation_id},
+          class: ["form-control form-control-color", validation_class],
+          placeholder: placeholder,
+          title: value
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,113 @@
+module Headmin
+  module Form
+    class MediaView < ViewModel
+      include Rails.application.routes.url_helpers
+      include Headmin::Form::Hintable
+      include Headmin::Form::Labelable
+      include Headmin::Form::Placeholderable
+      include Headmin::Form::Validatable
+      include Headmin::Form::Wrappable
+
+      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)],
+          data: {
+            controller: "media",
+            name: "#{attribute}_#{object_id}",
+            min: min,
+            max: max,
+            sort: sort,
+            required: required.nil? ? 0 : required
+          }
+        }).deep_merge(@wrapper || {})
+      end
+
+      def custom_validation_options
+        {
+          form: form,
+          attribute: attribute,
+          min: min,
+          max: max
+        }
+      end
+
+      def association_object
+        if attached.is_a?(ActiveStorage::Attached::Many)
+          result = form.object.send(nested_attribute)
+          result = result.order(position: :asc) if sort
+          result
+        else
+          form.object.send(nested_attribute)
+        end
+      end
+
+      def attachments
+        if attached.is_a?(ActiveStorage::Attached::Many)
+          result = form.object.send(nested_attribute)
+          result = result.order(position: :asc) if sort
+          result.to_a.compact
+        else
+          [form.object.send(nested_attribute)].compact
+        end
+      end
+
+      def attached
+        form.object.send(attribute)
+      end
+
+      def build_nested_attribute
+        if attached.is_a?(ActiveStorage::Attached::Many)
+          form.object.send(nested_attribute).build
+        else
+          form.object.send("build_#{nested_attribute}")
+        end
+      end
+
+      def nested_attribute
+        if attached.is_a?(ActiveStorage::Attached::Many)
+          :"#{attribute}_attachments"
+        else
+          :"#{attribute}_attachment"
+        end
+      end
+
+      def min
+        if @required
+          @min.to_i < 1 ? 1 : @min.to_i
+        else
+          @min.to_i < 1 ? 0 : @min.to_i
+        end
+      end
+
+      def max
+        if attached.is_a?(ActiveStorage::Attached::Many)
+          @max
+        else
+          1
+        end
+      end
+
+      def required
+        @required ? 1 : nil
+      end
+
+      def blob_ids
+        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)
+      end
+
+      def sort
+        @sort == true
+      end
+    end
+  end
+end

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

@@ -22,7 +22,8 @@ module Headmin
 
       def wrapper_options
         default_wrapper_options.deep_merge({
-          class: ["mb-3", ("form-floating" if float)]
+          class: ["mb-3", ("form-floating" if float)],
+          data: {controller: :textarea}
         }).deep_merge(@wrapper || {})
       end
 
@@ -32,6 +33,10 @@ module Headmin
         {
           aria: {describedby: validation_id},
           class: [form_control_class, validation_class],
+          data: {
+            textarea_target: :textarea,
+            action: "input->textarea#update"
+          },
           placeholder: placeholder
         }
       end

data/app/views/examples/admin.html.erb

@@ -6,15 +6,15 @@
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
 
-  <%= stylesheet_pack_tag 'admin', media: 'all', 'data-turbo-track': 'reload' %>
-  <%= javascript_pack_tag 'admin', 'data-turbo-track': 'reload' %>
+  <%= stylesheet_pack_tag "admin", media: "all", "data-turbo-track": "reload" %>
+  <%= javascript_pack_tag "admin", "data-turbo-track": "reload" %>
 </head>
 
 <body>
 <%= render "headmin/layout/main" do %>
-  <%= render "headmin/layout/sidebar", logo: inline_svg_tag('logo.svg') do %>
+  <%= render "headmin/layout/sidebar", logo: inline_svg_tag("logo.svg") do %>
     <%= render "headmin/layout/sidebar/menu" do %>
-      <%= render "headmin/layout/sidebar/menu/item", name: t('.dashboard'), link: admin_root_path, icon: 'speedometer' %>
+      <%= render "headmin/layout/sidebar/menu/item", name: t(".dashboard"), link: admin_root_path, icon: "speedometer" %>
       <div class="d-block d-md-none">
         <%= render "headmin/layout/sidebar/menu/locale" do end %>
         <%= render "headmin/layout/sidebar/menu/account" do end %>
@@ -30,10 +30,10 @@
       <%= render "headmin/notifications" %>
       <%= yield %>
     <% end %>
-    <%= render "headmin/layout/footer", class: 'text-secondary' do %>
-      <%= bootstrap_icon('question-circle') %>
-      <a class="text-secondary" href="mailto:info@insiting.com" title="<%= t('.help') %>">
-        <%= t('.help') %>
+    <%= render "headmin/layout/footer", class: "text-secondary" do %>
+      <%= bootstrap_icon("question-circle") %>
+      <a class="text-secondary" href="mailto:info@insiting.com" title="<%= t(".help") %>">
+        <%= t(".help") %>
       </a>
     <% end %>
   <% end %>

data/app/views/examples/auth.html.erb

@@ -5,8 +5,8 @@
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
-  <%= stylesheet_pack_tag 'admin', media: 'all', 'data-turbolinks-track': 'reload' %>
-  <%= javascript_pack_tag 'admin', 'data-turbolinks-track': 'reload' %>
+  <%= stylesheet_pack_tag "admin", media: "all", "data-turbolinks-track": "reload" %>
+  <%= javascript_pack_tag "admin", "data-turbolinks-track": "reload" %>
 </head>
 <body class="bg-light w-100 vh-100">
 

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

@@ -15,7 +15,7 @@
   #   <%= render "headmin/blocks", blockable: @page, paths: %w(website/pages/blocks) %#>
 
   blocks = Headmin::BlocksView.new(local_assigns)
-  @lookup_context.prefixes = @lookup_context.prefixes + blocks.prefixes
+  @lookup_context.prefixes = blocks.prefixes + @lookup_context.prefixes
 %>
 
 <% if blockable && blockable.respond_to?(:blocks) %>

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

@@ -14,11 +14,11 @@
     <% breadcrumb_count = breadcrumbs.count %>
     <% breadcrumbs.each_with_index do |breadcrumb, index| %>
       <% last = (index == breadcrumb_count - 1) %>
-      <li class="breadcrumb-item text-muted" aria-current="<%= last ? 'page' : nil %>">
+      <li class="breadcrumb-item text-muted" aria-current="<%= last ? "page" : nil %>">
         <% if last %>
           <%= breadcrumb.name %>
         <% else %>
-          <%= link_to_unless_current(breadcrumb.name, breadcrumb.path, class: 'text-muted text-decoration-none') %>
+          <%= link_to_unless_current(breadcrumb.name, breadcrumb.path, class: "text-muted text-decoration-none") %>
         <% end %>
       </li>
     <% end %>

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

@@ -10,7 +10,7 @@
   #     Your content
   #   <% end %#>
 
-  class_names = local_assigns.has_key?(:class) ? local_assigns[:class] : 'btn-group'
+  class_names = local_assigns.has_key?(:class) ? local_assigns[:class] : "btn-group"
 %>
 
 <div class="dropdown <%= class_names %>">

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

@@ -7,7 +7,7 @@
   # ==== Examples
   #   Basic version
   #   <%= render "headmin/filters" do %#>
-  #     <%= render "headmin/filters/select", name: 'color', options: ['red', 'green', 'blue']  %#>
+  #     <%= render "headmin/filters/select", name: "color", options: ["red", "green", "blue"]  %#>
   #   <% end %#>
   #
   #   With custom URL
@@ -22,7 +22,7 @@
   <%= yield(form) %>
 
   <!-- Default parameters (e.g. sorting, pagination) -->
-  <% default_params.except('page').each do |name, value| %>
+  <% default_params.except("page").each do |name, value| %>
     <%= form.hidden_field name.to_sym, value: value %>
   <% end %>
 
@@ -44,8 +44,8 @@
         <% if content_for?(:filters_menu) %>
           <div class="btn-group">
             <button type="button" class="btn h-btn-outline-light dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-              <%= bootstrap_icon('funnel') %>
-              <%= t('.button') %>
+              <%= bootstrap_icon("funnel") %>
+              <%= t(".button") %>
             </button>
             <ul class="dropdown-menu">
               <%= content_for :filters_menu %>
@@ -53,7 +53,7 @@
                 <hr class="dropdown-divider">
               </li>
               <li>
-                <a class="dropdown-item text-danger" href="#" data-action="click->filters#removeAll"><%= t('.remove_all') %></a>
+                <a class="dropdown-item text-danger" href="#" data-action="click->filters#removeAll"><%= t(".remove_all") %></a>
               </li>
             </ul>
           </div>

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

@@ -12,7 +12,7 @@
 <div class="d-flex flex-row-reverse flex-md-row align-items-center justify-content-between justify-content-md-end my-1">
   <% content_for :collection_total_count, collection.total_count.to_s unless content_for?(:collection_total_count) %>
   <div class="ms-2 me-md-2 text-secondary flex-grow-1 flex-shrink-0">
-    <%= t('.items', count: content_for(:collection_total_count).to_i) %>
+    <%= t(".items", count: content_for(:collection_total_count).to_i) %>
   </div>
-  <%= paginate collection, views_prefix: 'headmin/pagination' %>
+  <%= paginate collection, views_prefix: "headmin/pagination" %>
 </div>

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

@@ -8,7 +8,7 @@
   #   To trigger this popup create an element with a data attribute like this
   #
   #   <button data-popup-id="popupId">open Popup</button>
-  #   <%= render "headmin/popup", id: 'popupId' do %#>
+  #   <%= render "headmin/popup", id: "popupId" do %#>
   #     popup Content
   #   <% end %#>
   #
@@ -16,14 +16,14 @@
   #   "data-popup-pass-thru" attribute.
   #
   #   <button data-popup-id="popupId" data-popup-pass-thru="#link">open Popup</button>
-  #   <%= render "headmin/popup", id: 'popupId' do %#>
+  #   <%= render "headmin/popup", id: "popupId" do %#>
   #     <a href="https://example.com" id="link">
   #   <% end %#>
   data = local_assigns.has_key?(:data) ? data : {}
 
   options = {
-    class: ['h-popup', 'closed'],
-    data: data.merge('popup-target': 'popup', 'popup-id': id)
+    class: ["h-popup", "closed"],
+    data: data.merge("popup-target": "popup", "popup-id": id)
   }
 %>
 

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

@@ -13,7 +13,7 @@
   total_count = content_for(:collection_total_count).to_i || nil
 %>
 
-<div class="h-table card my-2 shadow-sm <%= 'table-drag-sort' if sort_url %>" data-sort-url="<%= sort_url %>">
+<div class="h-table card my-2 shadow-sm <%= "table-drag-sort" if sort_url %>" data-sort-url="<%= sort_url %>">
   <div class="table-responsive">
     <table class="table table-hover m-0"
            data-controller="table"

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

@@ -5,7 +5,7 @@
     <div class="h-thumbnail-bg" style="background-image: url('<%= thumbnail.src %>');"></div>
   <% else %>
     <div class="h-thumbnail-bg">
-      <%= bootstrap_icon(thumbnail.icon_name, class: 'h-thumbnail-icon') %>
+      <%= bootstrap_icon(thumbnail.icon_name, class: "h-thumbnail-icon") %>
     </div>
   <% end %>
 </div>

data/app/views/headmin/dropdown/_button.html.erb

@@ -5,8 +5,8 @@
       id: unique identifier for the dropdown
       class: css class names as string
 %>
-<% id = local_assigns.has_key?(:id) ? id : 'dropdown-1' %>
-<% class_names = local_assigns.has_key?(:class) ? local_assigns[:class] : 'btn' %>
+<% id = local_assigns.has_key?(:id) ? id : "dropdown-1" %>
+<% class_names = local_assigns.has_key?(:class) ? local_assigns[:class] : "btn" %>
 
 <a class="dropdown-toggle d-flex align-items-center <%= class_names %>" type="button" id="<%= id %>" data-bs-toggle="dropdown" aria-expanded="false">
   <%= yield %>

data/app/views/headmin/dropdown/_item.html.erb

@@ -8,8 +8,8 @@
 %>
 
 <% method = local_assigns.has_key?(:method) ? method : nil %>
-<% url = local_assigns.has_key?(:url) ? url : '' %>
-<% name = local_assigns.has_key?(:name) ? name : '' %>
+<% url = local_assigns.has_key?(:url) ? url : "" %>
+<% name = local_assigns.has_key?(:name) ? name : "" %>
 
 <li>
   <a class="dropdown-item" href="<%= url %>" <%= "data-turbo-method=#{method}" if method %>>

data/app/views/headmin/dropdown/_list.html.erb

@@ -7,10 +7,10 @@
   #
   # ==== Examples
   #   Basic version
-  #   <%= render "headmin/dropdown/list", id: 'dropdown-1'  %#>
+  #   <%= render "headmin/dropdown/list", id: "dropdown-1"  %#>
 
-  class_names = local_assigns.has_key?(:class) ? local_assigns[:class] : ''
-  id = local_assigns.has_key?(:id) ? id : 'dropdown-1'
+  class_names = local_assigns.has_key?(:class) ? local_assigns[:class] : ""
+  id = local_assigns.has_key?(:id) ? id : "dropdown-1"
 %>
 
 <ul class="dropdown-menu <%= class_names %>" aria-labelledby="<%= id %>">

data/app/views/headmin/dropdown/_locale.html.erb

@@ -5,13 +5,13 @@
 %>
 
 <%= render "headmin/dropdown" do %>
-  <%= render "headmin/dropdown/button", id: 'locale-dropdown' do %>
-    <%= bootstrap_icon('globe', class: 'me-2') %>
-    <%= t('language_name', locale: ::I18n.locale) %>
+  <%= render "headmin/dropdown/button", id: "locale-dropdown" do %>
+    <%= bootstrap_icon("globe", class: "me-2") %>
+    <%= t("language_name", locale: ::I18n.locale) %>
   <% end %>
-  <%= render "headmin/dropdown/list", id: 'locale-dropdown' do %>
+  <%= render "headmin/dropdown/list", id: "locale-dropdown" do %>
     <% I18n.available_locales.each do |locale| %>
-      <%= render "headmin/dropdown/item", name: t('language_name', locale: locale), url: url_for({locale: locale.to_s}) %>
+      <%= render "headmin/dropdown/item", name: t("language_name", locale: locale), url: url_for({locale: locale.to_s}) %>
     <% end %>
   <% end %>
 <% end %>

data/app/views/headmin/filters/filter/_button.html.erb

@@ -19,11 +19,11 @@
   >
     <%= raw("#{button_view.label} #{button_view.filter&.string(display_values: button_view.display_values)}") %>
     <span class="h-filter-remove" data-action="click->filters#remove">
-      <%= bootstrap_icon('x-lg') %>
+      <%= bootstrap_icon("x-lg") %>
     </span>
   </button>
 
-  <%= render "headmin/popup", id: "#{button_view.id}", data: {'filter-target': 'popup'} do %>
+  <%= render "headmin/popup", id: "#{button_view.id}", data: {"filter-target": "popup"} do %>
     <%= yield %>
   <% end %>
 </div>

data/app/views/headmin/filters/filter/_null_select.html.erb

@@ -1,8 +1,8 @@
 <select class="form-select" data-filter-row-target="null" data-action="change->filter#updateHiddenValue" data-filter-target="value">
   <option value="1" <%= value == 1 ? "selected" : "" %>>
-    <%= t('headmin.filters.values.yes') %>
+    <%= t("headmin.filters.values.yes") %>
   </option>
   <option value="0" <%= value == 0 ? "selected" : "" %>>
-    <%= t('headmin.filters.values.no') %>
+    <%= t("headmin.filters.values.no") %>
   </option>
 </select>

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

@@ -0,0 +1,32 @@
+<%
+  # headmin/forms/color
+  #
+  # ==== Required parameters
+  # * +attribute+ - Name of the attribute of the form model
+  # * +form+ - Form object
+  #
+  # ==== Optional parameters
+  # * +hint+ - Informative text to assist with data input. HTML markup is allowed.
+  # * +label+ - Text to display inside label tag. Defaults to the attribute name. Set to false if you don"t want to show a label.
+  # * +wrapper+ - Hash with all options for the surrounding html tag
+  #
+  # ==== References
+  # https://headmin.dev/docs/forms/color
+  # https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/color
+  # https://apidock.com/rails/v5.2.3/ActionView/Helpers/FormHelper/color_field
+  #
+  # ==== Examples
+  #   Basic version
+  #   <%= form_with do |form| %#>
+  #     <%= render "headmin/forms/color", form: form, attribute: :active %#>
+  #   <% end %#>
+
+  color = Headmin::Form::ColorView.new(local_assigns)
+%>
+
+<%= render "headmin/forms/wrapper", color.wrapper_options do %>
+  <%= render "headmin/forms/label", color.label_options if color.label? %>
+  <%= form.color_field(color.attribute, color.input_options) %>
+  <%= render "headmin/forms/validation", color.validation_options if color.validate? %>
+  <%= render "headmin/forms/hint", color.hint_options if color.hint? %>
+<% end %>

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

@@ -8,7 +8,7 @@
 <% if form.object.errors.any? %>
   <div class="alert alert-danger" role="alert">
     <h5 class="alert-heading d-flex align-items-center">
-      <%= t('errors.template.header', count: form.object.errors.size, model: form.object.model_name.human) %>
+      <%= t("errors.template.header", count: form.object.errors.size, model: form.object.model_name.human) %>
     </h5>
     <ul class="mb-0">
       <% form.object.errors.full_messages.each do |message| %>