active_element 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8ae4f6f2b316d246e1e839840c7a291dd038d20ed12706ca8aa3f5965ce2053
-  data.tar.gz: 7b895b021ddfd7635cbecfffc9e43a92efb5816efe1a629dc3290374259cc476
+  metadata.gz: d4f5dd5354dc376a1a2179ab3f2d95d64ad1bcdbb12811c3f42419311ae9667a
+  data.tar.gz: 9e27dcd69d2117ff43a10c4319cdfb8567f49b3a746a8d66960b9071b1481b94
 SHA512:
-  metadata.gz: b75b45ef552b25e48c6ac8cfbc5489a7fe45066c14f13f172a169d6a8bb7d168d02668d494e065da8d1a9799b66f82047d37fbba6e46db22978b018eb31c2b22
-  data.tar.gz: fe6c78e7e9fecdeeaef7153ef44168b9caa6dfbca3cac02cba6dd3d9952d614eb03e9cd52d26b921b64f45e177ed58e653450b21159691475ef0aa8074c97fec
+  metadata.gz: d7c47f04a28e066443c39c559c99be9d5ef90da0d130096ab1e1dd6a100ca5eb10c39d72af509ad6f6843526bdfb2613801578738d4f30d5ee267dbe61f2c2b8
+  data.tar.gz: ec1c2359b328cdc16de9123282106b851a5e9deac0f11764e6d7fd0356c6fbb898e5be653f5432c89f2bc620c10560b8ba7c670b526b3ab073d9a5cd1394fd68

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_element (0.0.23)
+    active_element (0.0.24)
       bootstrap (~> 5.3.0alpha3)
       kaminari (~> 1.2)
       paintbrush (~> 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/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.23'
+  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.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-04 00:00:00.000000000 Z
+date: 2024-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap