active_element 0.0.22 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9d94959c19253efbd6ed4d945304d6397d4d1ad1a9aa0d8bd23ef5329559980
-  data.tar.gz: b3a0d8f7bc1d514c6cca342e7e8fadc37a818497c87ebf5e894c757186ae6b21
+  metadata.gz: d4f5dd5354dc376a1a2179ab3f2d95d64ad1bcdbb12811c3f42419311ae9667a
+  data.tar.gz: 9e27dcd69d2117ff43a10c4319cdfb8567f49b3a746a8d66960b9071b1481b94
 SHA512:
-  metadata.gz: 7a019e911c0d376c2a12f44e5d37ef697cf00a9a11d889c016784a2a3b41df9b0deb17f93c545ee0e2563d5f8a132a9f2c49cb0f900ed4bd926fa361cf67f81b
-  data.tar.gz: f7e4b9a719611918516bb1d2601eb66eb77f87dc648dffe93cbdf1b5c7c96f829bf76098145e698b27b943fa8331128409ccb8fc089d32c0e8f4b91851afe514
+  metadata.gz: d7c47f04a28e066443c39c559c99be9d5ef90da0d130096ab1e1dd6a100ca5eb10c39d72af509ad6f6843526bdfb2613801578738d4f30d5ee267dbe61f2c2b8
+  data.tar.gz: ec1c2359b328cdc16de9123282106b851a5e9deac0f11764e6d7fd0356c6fbb898e5be653f5432c89f2bc620c10560b8ba7c670b526b3ab073d9a5cd1394fd68

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_element (0.0.22)
+    active_element (0.0.24)
       bootstrap (~> 5.3.0alpha3)
       kaminari (~> 1.2)
       paintbrush (~> 0.1.2)
@@ -150,7 +150,7 @@ GEM
     mini_mime (1.1.5)
     mini_portile2 (2.8.2)
     minitest (5.18.1)
-    net-imap (0.4.11)
+    net-imap (0.4.12)
       date
       net-protocol
     net-pop (0.1.2)

data/app/assets/javascripts/active_element/form.js

@@ -1,6 +1,8 @@
 (() => {
   const cloneElement = (id) => ActiveElement.cloneElement('form', id);
 
+  if (window._active_element_form_loaded) return;
+
   const initModalButtons = () => {
     document.querySelectorAll('[data-field-type="form-modal"]').forEach((element) => {
       const formId = element.dataset.formId;
@@ -17,9 +19,10 @@
 
       document.body.append(modal);
 
-      element.addEventListener('click', () => {
+      element.addEventListener('click', (ev) => {
         wrapper.classList.remove('d-none');
         bootstrapModal.toggle();
+        ev.stopPropagation();
         return false;
       });
     });
@@ -43,4 +46,6 @@
     initModalButtons();
     initClearFormButtons();
   });
+
+  window._active_element_secrets_loaded = true;
 })();

data/app/views/active_element/components/form.html.erb

@@ -84,7 +84,8 @@
                          field: field,
                          options: options,
                          component: component,
-                         record: record }
+                         record: record
+                      }
             %>
           <% if type != :hidden_field %></div><% end %>
         <% end %>

data/app/views/active_element/components/table/collection.html.erb

@@ -51,3 +51,10 @@
                          row_class_mapper: row_class_mapper } %>
   <% end %>
 <% end %>
+
+<% if footer_pagination %>
+  <%=
+    render partial: 'active_element/components/table/pagination',
+           locals: { collection: collection, params: params, page_size: page_size, page_sizes: page_sizes }
+  %>
+<% end %>

data/app/views/layouts/active_element.html.erb

@@ -122,6 +122,7 @@
     <%= render_active_element_hook 'active_element/after_content' %>
 
     <% if !respond_to?(:javascript_importmap_tags) && Rails.application.assets&.find_asset('application.js').present? %>
+      <%= javascript_include_tag 'active_element/active_element', 'data-turbo-track': 'reload', 'data-turbolinks-track': 'reload' %>
       <%= javascript_include_tag 'application', 'data-turbo-track': 'reload', 'data-turbolinks-track': 'reload' %>
     <% end %>
   </body>

data/example_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_element (0.0.21)
+    active_element (0.0.20)
       bootstrap (~> 5.3.0alpha3)
       kaminari (~> 1.2)
       paintbrush (~> 0.1.2)

data/lib/active_element/components/collection_table.rb

@@ -15,7 +15,7 @@ module ActiveElement
       # rubocop:disable Metrics/MethodLength
       def initialize(controller, class_name:, collection:, fields:, params:, model_name: nil, style: nil,
                      show: false, new: false, edit: false, destroy: false, paginate: true, group: nil,
-                     group_title: false, nested_for: nil, row_class: nil, title: nil, **_kwargs)
+                     group_title: false, nested_for: nil, row_class: nil, title: nil, footer_pagination: nil, **_kwargs)
         @controller = controller
         @class_name = class_name
         @model_name = model_name
@@ -34,6 +34,7 @@ module ActiveElement
         @title = title
         @nested_for = nested_for
         verify_paginate_and_group
+        @footer_pagination = footer_pagination
       end
       # rubocop:enable Metrics/MethodLength
 
@@ -60,7 +61,8 @@ module ActiveElement
           page_sizes: [5, 10, 25, 50, 75, 100, 200],
           page_size: page_size,
           i18n: i18n,
-          row_class_mapper: row_class_mapper
+          row_class_mapper: row_class_mapper,
+          footer_pagination: @footer_pagination && display_pagination?
         }
       end
 

data/lib/active_element/components/form.rb

@@ -7,7 +7,7 @@ module ActiveElement
     class Form # rubocop:disable Metrics/ClassLength
       include Translations
 
-      attr_reader :controller
+      attr_reader :controller, :search
 
       # rubocop:disable Metrics/MethodLength
       def initialize(controller, fields:, submit:, item:, title: nil, destroy: false, search: false,
@@ -142,7 +142,7 @@ module ActiveElement
       private
 
       attr_reader :fields, :submit, :title, :kwargs, :item, :method, :action,
-                  :destroy, :modal, :columns, :search
+                  :destroy, :modal, :columns
 
       def form_field_mapping
         @form_field_mapping ||= Util::FormFieldMapping.new(

data/lib/active_element/components/util/form_field_mapping.rb

@@ -231,9 +231,9 @@ module ActiveElement
 
         def options_with_inferred_translations(field, options)
           options.reverse_merge({
-                                  label: i18n.label(field),
-                                  description: i18n.description(field),
-                                  placeholder: i18n.placeholder(field)
+                                  label: i18n.label(field, record: record),
+                                  description: i18n.description(field, record: record),
+                                  placeholder: i18n.placeholder(field, record: record)
                                 })
         end
 
@@ -267,6 +267,7 @@ module ActiveElement
         end
 
         def required?(field)
+          return false if search
           return false if record.blank?
           return false unless record.class.respond_to?(:validators)
 

data/lib/active_element/components/util/i18n.rb

@@ -15,31 +15,31 @@ module ActiveElement
           @component = component
         end
 
-        def label(field)
-          return titleize(field) unless model?
+        def label(field, record: nil)
+          return titleize(field) unless model?(record)
 
-          key = "admin.models.#{model_key}.fields.#{field}.label"
+          key = "admin.models.#{model_key(record)}.fields.#{field}.label"
           ::I18n.t(key, default: titleize(field))
         end
 
-        def description(field)
-          return nil unless model?
+        def description(field, record: nil)
+          return nil unless model?(record)
 
-          key = "admin.models.#{model_key}.fields.#{field}.description"
+          key = "admin.models.#{model_key(record)}.fields.#{field}.description"
           ::I18n.t(key, default: nil)
         end
 
-        def placeholder(field)
-          return nil unless model?
+        def placeholder(field, record: nil)
+          return nil unless model?(record)
 
-          key = "admin.models.#{model_key}.fields.#{field}.placeholder"
+          key = "admin.models.#{model_key(record)}.fields.#{field}.placeholder"
           ::I18n.t(key, default: nil)
         end
 
-        def format(field)
-          return nil unless model?
+        def format(field, record: nil)
+          return nil unless model?(record)
 
-          key = "admin.models.#{model_key}.fields.#{field}.format"
+          key = "admin.models.#{model_key(record)}.fields.#{field}.format"
           ::I18n.t(key, default: nil)
         end
 
@@ -47,14 +47,14 @@ module ActiveElement
 
         attr_reader :component
 
-        def model_key
-          @model_key ||= component.model.name.underscore.pluralize
+        def model_key(record = nil)
+          @model_key ||= (record&.class || component.model).name.underscore.pluralize
         end
 
-        def model?
-          return false if component.model.nil?
+        def model?(record = nil)
+          return false if record.nil? && component.model.nil?
 
-          component.model.is_a?(ActiveModel::Naming)
+          (record&.class || component.model).is_a?(ActiveModel::Naming)
         end
 
         def titleize(field)

data/lib/active_element/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveElement
-  VERSION = '0.0.22'
+  VERSION = '0.0.24'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_element
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.24
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-29 00:00:00.000000000 Z
+date: 2024-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap