headmin 0.4.0 → 0.5.0

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

@@ -0,0 +1,25 @@
+module Headmin
+  module Form
+    class DatetimeRangeView < ViewModel
+      def start_options
+        default_start_options.deep_merge(@start || {})
+      end
+
+      def end_options
+        default_end_options.deep_merge(@end || {})
+      end
+
+      private
+
+      def default_start_options
+        keys = attributes - %i[start]
+        to_h.slice(*keys)
+      end
+
+      def default_end_options
+        keys = attributes - %i[end]
+        to_h.slice(*keys)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+module Headmin
+  module Form
+    class DatetimeView < 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 float form input_group input_group label prepend validate wrapper]
+        options = to_h.slice(*keys)
+        default_input_options.deep_merge(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
+
+      private
+
+      def default_input_options
+        {
+          aria: {describedby: validation_id},
+          class: [form_control_class, validation_class],
+          placeholder: placeholder
+        }
+      end
+
+      def form_control_class
+        plaintext ? "form-control-plaintext" : "form-control"
+      end
+    end
+  end
+end

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

@@ -13,21 +13,21 @@ module Headmin
       def input_options
         keys = attributes - %i[append attribute collection float form input_group label prepend validate wrapper]
         options = to_h.slice(*keys)
-        options = default_input_options.merge(options)
-        options.merge(autocomplete_input_options)
+        options = default_input_options.deep_merge(options)
+        options.deep_merge(autocomplete_input_options)
       end
 
       def input_group_options
         default_input_group_options
-          .merge(autocomplete_input_group_options)
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(autocomplete_input_group_options)
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3", ("form-floating" if float)]
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       private

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

@@ -11,24 +11,24 @@ module Headmin
       def input_options
         keys = attributes - %i[append attribute dropzone destroy form input_group label prepend preview validate wrapper]
         options = to_h.slice(*keys)
-        options = default_input_options.merge(options)
-        options = options.merge(required: false) if attachments.any?
+        options = default_input_options.deep_merge(options)
+        options = options.deep_merge(required: false) if attachments.any?
         options
       end
 
       def input_group_options
         default_input_group_options
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3 h-form-file", ("form-floating" if float)],
           data: {
             controller: ("file-preview" if preview)
           }
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       def preview

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

@@ -22,32 +22,29 @@ module Headmin
       end
 
       def start_options
-        default_start_options.merge(@start || {})
+        default_start_options.deep_merge(@start || {})
       end
 
       def end_options
-        default_end_options.merge(@end || {})
+        default_end_options.deep_merge(@end || {})
       end
 
       def input_options
         keys = attributes - %i[append attribute end float form input_group label prepend start validate wrapper]
         options = to_h.slice(*keys)
-        default_input_options.merge(options)
+        default_input_options.deep_merge(options)
       end
 
       def input_group_options
         default_input_group_options
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
-          class: ["mb-3", ("form-floating" if float)],
-          data: {
-            controller: "flatpickr date-range"
-          }
-        }).merge(@wrapper || {})
+        default_wrapper_options.deep_merge({
+          class: ["mb-3", ("form-floating" if float)]
+        }).deep_merge(@wrapper || {})
       end
 
       private
@@ -59,19 +56,11 @@ module Headmin
       end
 
       def default_start_options
-        {
-          data: {
-            'date-range-target': "startDateInput"
-          }
-        }
+        {}
       end
 
       def default_end_options
-        {
-          data: {
-            'date-range-target': "endDateInput"
-          }
-        }
+        {}
       end
 
       def default_input_options
@@ -81,7 +70,7 @@ module Headmin
           placeholder: placeholder,
           name: nil,
           data: {
-            "flatpickr-target": "input",
+            controller: "flatpickr date-range",
             action: "change->date-range#update",
             flatpickr: {
               mode: "range",

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

@@ -2,36 +2,27 @@ module Headmin
   module Form
     class FlatpickrView < ViewModel
       def options
-        keys = attributes - %i[data wrapper]
+        keys = attributes - %i[data]
         options = to_h.slice(*keys)
-        default_options.merge(options)
+        default_options.deep_merge(options)
       end
 
       private
 
       def default_options
         {
-          data: default_data.merge(data || {}),
-          wrapper: default_wrapper_options.merge(wrapper || {})
+          data: default_data.deep_merge(data || {})
         }
       end
 
       def default_data
         {
-          "flatpickr-target": "input",
+          controller: "flatpickr",
           flatpickr: {
             defaultDate: form.object&.send(attribute)&.strftime("%d/%m/%Y")
           }
         }
       end
-
-      def default_wrapper_options
-        {
-          data: {
-            controller: "flatpickr"
-          }
-        }
-      end
     end
   end
 end

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

@@ -4,7 +4,7 @@ module Headmin
       def options
         keys = attributes - %i[bypass append prepend]
         options = to_h.slice(*keys)
-        default_options.merge(options)
+        default_options.deep_merge(options)
       end
 
       private

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

@@ -8,7 +8,7 @@ module Headmin
       def options
         keys = attributes - %i[attribute form text]
         options = to_h.slice(*keys)
-        default_options.merge(options)
+        default_options.deep_merge(options)
       end
 
       private

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

@@ -12,19 +12,19 @@ module Headmin
       def input_options
         keys = attributes - %i[append attribute float form input_group label prepend validate wrapper]
         options = to_h.slice(*keys)
-        default_input_options.merge(options)
+        default_input_options.deep_merge(options)
       end
 
       def input_group_options
         default_input_group_options
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3", float_class]
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       private

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

@@ -11,19 +11,19 @@ module Headmin
       def input_options
         keys = attributes - %i[append attribute float form input_group label prepend validate wrapper]
         options = to_h.slice(*keys)
-        default_input_options.merge(options)
+        default_input_options.deep_merge(options)
       end
 
       def input_group_options
         default_input_group_options
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3", ("form-floating" if float)]
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       private

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

@@ -2,7 +2,7 @@ module Headmin
   module Form
     class RedactorxView < ViewModel
       def options
-        default_options.merge(to_h)
+        default_options.deep_merge(to_h)
       end
 
       private
@@ -39,7 +39,7 @@ module Headmin
       attr_reader :topbar
 
       def redactor_options
-        default_redactor_options.merge(redactor || {})
+        default_redactor_options.deep_merge(redactor || {})
       end
 
       def default_redactor_options

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

@@ -13,21 +13,21 @@ module Headmin
       def input_options
         keys = attributes - %i[append attribute collection float form input_group label prepend validate wrapper]
         options = to_h.slice(*keys)
-        options = default_input_options.merge(options)
-        options.merge(autocomplete_input_options)
+        options = default_input_options.deep_merge(options)
+        options.deep_merge(autocomplete_input_options)
       end
 
       def input_group_options
         default_input_group_options
-          .merge(autocomplete_input_group_options)
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(autocomplete_input_group_options)
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3", ("form-floating" if float)]
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       private

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

@@ -12,25 +12,25 @@ module Headmin
       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)
-        default_input_options.merge(options)
+        default_input_options.deep_merge(options)
       end
 
       def input_group_options
         default_input_group_options
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3", ("form-floating" if float)]
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       def select_options
         keys = %i[include_blank selected]
         options = to_h.slice(*keys)
-        default_options.merge(options)
+        default_options.deep_merge(options)
       end
 
       private

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

@@ -2,7 +2,7 @@ module Headmin
   module Form
     class SwitchView < ViewModel
       def options
-        default_options.merge(to_h)
+        default_options.deep_merge(to_h)
       end
 
       private

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

@@ -13,21 +13,21 @@ module Headmin
       def input_options
         keys = attributes - %i[append attribute collection float form input_group label prepend validate wrapper]
         options = to_h.slice(*keys)
-        options = default_input_options.merge(options)
-        options.merge(autocomplete_input_options)
+        options = default_input_options.deep_merge(options)
+        options.deep_merge(autocomplete_input_options)
       end
 
       def input_group_options
         default_input_group_options
-          .merge(autocomplete_input_group_options)
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(autocomplete_input_group_options)
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3", ("form-floating" if float)]
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       private

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

@@ -11,19 +11,19 @@ module Headmin
       def input_options
         keys = attributes - %i[attribute float form input_group label validate wrapper]
         options = to_h.slice(*keys)
-        default_input_options.merge(options)
+        default_input_options.deep_merge(options)
       end
 
       def input_group_options
         default_input_group_options
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3", ("form-floating" if float)]
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       private

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

@@ -13,21 +13,21 @@ module Headmin
       def input_options
         keys = attributes - %i[append attribute collection float form input_group label prepend validate wrapper]
         options = to_h.slice(*keys)
-        options = default_input_options.merge(options)
-        options.merge(autocomplete_input_options)
+        options = default_input_options.deep_merge(options)
+        options.deep_merge(autocomplete_input_options)
       end
 
       def input_group_options
         default_input_group_options
-          .merge(autocomplete_input_group_options)
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(autocomplete_input_group_options)
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3", ("form-floating" if float)]
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       private

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

@@ -4,7 +4,7 @@ module Headmin
       def options
         keys = attributes - %i[bypass]
         options = to_h.slice(*keys)
-        default_options.merge(options)
+        default_options.deep_merge(options)
       end
 
       private

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

@@ -2,7 +2,7 @@ module Headmin
   module Form
     class WysiwygView < ViewModel
       def options
-        default_options.merge(to_h)
+        default_options.deep_merge(to_h)
       end
 
       private

data/app/models/view_model.rb

@@ -33,7 +33,7 @@ class ViewModel
   end
 
   def to_hash
-    attributes.map { |attribute| {attribute => value_for(attribute)} }.inject(:merge)
+    attributes.map { |attribute| {attribute => value_for(attribute)} }.inject(:merge) || {}
   end
 
   alias_method :to_h, :to_hash

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

@@ -11,26 +11,26 @@
 </head>
 
 <body>
-<%= render 'headmin/layout/main' 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/main" 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' %>
       <div class="d-block d-md-none">
-        <%= render 'headmin/layout/sidebar/menu/locale' do end %>
-        <%= render 'headmin/layout/sidebar/menu/account' do end %>
+        <%= render "headmin/layout/sidebar/menu/locale" do end %>
+        <%= render "headmin/layout/sidebar/menu/account" do end %>
       </div>
     <% end %>
   <% end %>
-  <%= render 'headmin/layout/body' do %>
-    <%= render 'headmin/layout/header' do %>
-      <%= render 'headmin/layout/header/locale' do end %>
-      <%= render 'headmin/layout/header/account' do end %>
+  <%= render "headmin/layout/body" do %>
+    <%= render "headmin/layout/header" do %>
+      <%= render "headmin/layout/header/locale" do end %>
+      <%= render "headmin/layout/header/account" do end %>
     <% end %>
-    <%= render 'headmin/layout/content' do %>
-      <%= render 'headmin/notifications' %>
+    <%= render "headmin/layout/content" do %>
+      <%= render "headmin/notifications" %>
       <%= yield %>
     <% end %>
-    <%= render 'headmin/layout/footer', class: 'text-secondary' do %>
+    <%= 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') %>

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

@@ -10,7 +10,7 @@
 </head>
 <body class="bg-light w-100 vh-100">
 
-<%= render 'headmin/notifications' %>
+<%= render "headmin/notifications" %>
 
 <main class="d-flex justify-content-center align-items-center w-100 vh-100 p-3">
   <%= yield %>

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

@@ -14,16 +14,16 @@
   #   <%= render "headmin/filters", url: admin_polls_path %#>
 
   action = local_assigns.has_key?(:url) ? url : request.path
-
-  # Perform yield in order to capture content blocks
-  yield
 %>
 
-<form action="<%= action %>" data-controller="filters" data-filters-target="form">
+<%= form_with 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) %>
 
   <!-- Default parameters (e.g. sorting, pagination) -->
   <% default_params.except('page').each do |name, value| %>
-    <%= hidden_field_tag(name.to_sym, value) %>
+    <%= form.hidden_field name.to_sym, value: value %>
   <% end %>
 
   <div class="d-flex flex-column flex-md-row align-content-start align-items-md-start">
@@ -69,8 +69,8 @@
 
   <!-- Filter templates -->
   <%= yield :filters_templates %>
-</form>
 
+<% end %>
 
 <%
   # Clears content blocks to make this view reusable

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

@@ -19,12 +19,12 @@
   #
   # === Examples
   #   Basic version
-  #   <%= render 'headmin/form', model: @product do |form| %#>
+  #   <%= render "headmin/form", model: @product do |form| %#>
   #     Form content
   #   <% end %#>
   #
   #   Specify URL to post to
-  #   <%= render 'headmin/form', model: @product, url: admin_products_path do |form| %#>
+  #   <%= render "headmin/form", model: @product, url: admin_products_path do |form| %#>
   #     Form content
   #   <% end %#>
 

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

@@ -3,7 +3,7 @@
   #
   # === Examples
   #   Basic version
-  #   <%= render 'headmin/index' do %#>
+  #   <%= render "headmin/index" do %#>
   #     Index content
   #   <% end %#>
 %>

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

@@ -11,7 +11,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">
+  <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) %>
   </div>
   <%= paginate collection, views_prefix: 'headmin/pagination' %>