effective_bootstrap 1.16.1 → 1.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccf7a54e3db3db623fce49bd558b72f39938d3c01bef4b5c06e0250e0b581946
-  data.tar.gz: 06aadcb37db501af97921a20a558e29a3693d8de08162cc2b621b305a015b36c
+  metadata.gz: 7a43d4059d694f254fb05f0cb43f12dc5f3b5fbeb5df8dc7aa7aa21fc8a3bad9
+  data.tar.gz: 8967aad36784c29bd334837b2bf9d4683258e7afafd61d509821dd31a860688c
 SHA512:
-  metadata.gz: e378b4f94cb4bc226b8ce80a18703e8348f84d023ed61d6d9aecd03191ae7cbeb6ab71b7374553ec91dfa7d623f7a5ecff88a3e114fc302648da1aeec0431864
-  data.tar.gz: 3ca5c93e2c8207d8460f138036564d228baff8383fc14827df107f1f12e5f7c781ff7624a53338bd16e9978e1f4309a0dbbdb5629970d575ef1c032bbac49929
+  metadata.gz: 8dc33e68ff3d7383d22d60971c577490c4fbc9d93f606ec66b7ac45a38cb1fca4ef2ef514525b0b1a0fa974b65d36599791ae14d2f134bd8a5ad0b1ac3ca0670
+  data.tar.gz: 383b522a6c0839f578f545f7535aac54682a9640f1c88c3d61d48879a445683047f0a95d373b0b3b74777bed218be622fa5f1a387979d4841f06263fe5630928

data/app/assets/javascripts/effective_bootstrap/logic.js.coffee

@@ -1,3 +1,5 @@
+elementSelector = 'input,textarea,select,button,div.form-has-many'
+
 (this.EffectiveBootstrap || {}).effective_hide_if = ($element, options) ->
   $affects = $element.closest('form,div.effective-datatables-filters').find("input[name='#{options.name}'],select[name='#{options.name}']")
 
@@ -11,16 +13,15 @@
 
     if matches
       $element.hide()
-      $element.find('input,textarea,select,button').prop('disabled', true)
+      $element.find(elementSelector).prop('disabled', true)
     else
       $element.fadeIn()
-      $element.find('input,textarea,select,button').removeAttr('disabled')
+      $element.find(elementSelector).removeAttr('disabled')
       $element.find('textarea.effective_article_editor').each (i, editor) -> ArticleEditor('#' + $(editor).attr('id')).enable()
 
   # Maybe disable it now
   if options.needDisable
-    $element.find('input,textarea,select,button').prop('disabled', true)
-
+    $element.find(elementSelector).prop('disabled', true)
 
 (this.EffectiveBootstrap || {}).effective_show_if = ($element, options) ->
   $affects = $element.closest('form,div.effective-datatables-filters').find("input[name='#{options.name}'],select[name='#{options.name}'],input[name='#{options.name}[]']")
@@ -39,15 +40,15 @@
 
     if matches
       $element.fadeIn()
-      $element.find('input,textarea,select,button').removeAttr('disabled')
+      $element.find(elementSelector).removeAttr('disabled')
       $element.find('textarea.effective_article_editor').each (i, editor) -> ArticleEditor('#' + $(editor).attr('id')).enable()
     else
       $element.hide()
-      $element.find('input,textarea,select,button').prop('disabled', true)
+      $element.find(elementSelector).prop('disabled', true)
 
   # Maybe disable it now
   if options.needDisable
-    $element.find('input,textarea,select,button').prop('disabled', true)
+    $element.find(elementSelector).prop('disabled', true)
 
 (this.EffectiveBootstrap || {}).effective_show_if_any = ($element, options) ->
   $affects = $element.closest('form,div.effective-datatables-filters').find("input[name='#{options.name}'],select[name='#{options.name}']")
@@ -59,13 +60,13 @@
 
     if found
       $element.fadeIn()
-      $element.find('input,textarea,select,button').removeAttr('disabled')
+      $element.find(elementSelector).removeAttr('disabled')
       $element.find('textarea.effective_article_editor').each (i, editor) -> ArticleEditor('#' + $(editor).attr('id')).enable()
 
     else
       $element.hide()
-      $element.find('input,textarea,select,button').prop('disabled', true)
+      $element.find(elementSelector).prop('disabled', true)
 
   # Maybe disable it now
   if options.needDisable
-    $element.find('input,textarea,select,button').prop('disabled', true)
+    $element.find(elementSelector).prop('disabled', true)

data/app/assets/stylesheets/effective_datetime/overrides.scss

@@ -29,3 +29,7 @@
 .effective_date_time_picker_input_group {
   cursor: pointer;
 }
+
+.effective_date_time_picker_input_group:has(input:disabled) {
+  color: red;
+}

data/app/assets/stylesheets/effective_has_many/input.scss

@@ -34,3 +34,8 @@
   margin-top: 0;
   .eb-icon { height: 1.0rem; width: 1.0rem; margin-bottom: 2px; }
 }
+
+.form-has-many[disabled] {
+  .has-many-links { display: none; }
+  .has-many-remove { display: none; }
+}

data/app/models/effective/form_inputs/date_field.rb

@@ -17,7 +17,10 @@ module Effective
       end
 
       def input_group_options
-        { input_group: { class: 'input-group effective_date_time_picker_input_group' }, prepend: content_tag(:span, icon('calendar'), class: 'input-group-text') }
+        { 
+          input_group: { class: 'input-group effective_date_time_picker_input_group' }, 
+          prepend: (content_tag(:span, icon('calendar'), class: 'input-group-text') unless disabled?)
+        }
       end
 
       def datetime_to_s # ruby

data/app/models/effective/form_inputs/file_field.rb

@@ -161,7 +161,7 @@ module Effective
       end
 
       def build_purge
-        return ''.html_safe unless purge?
+        return ''.html_safe unless purge? && !disabled?
 
         label = (multiple? ? 'Delete existing files on save' : 'Delete existing file on save')
         @builder.check_box('_purge', multiple: true, label: label, id: "#{tag_id}_purge", checked_value: name)

data/app/models/effective/form_inputs/has_many.rb

@@ -125,21 +125,21 @@ module Effective
 
       def has_many_links_for(block)
         return BLANK unless add? || reorder?
-        return BLANK if disabled?
+        # We can't return BLANK when disabled? here or it breaks f.show_if
 
         content_tag(:div, class: 'has-many-links mt-2') do
           [*(link_to_add(block) if add?), *(link_to_reorder(block) if reorder?)].join(' ').html_safe
         end
       end
 
-      def render_resource(resource, block)
+      def render_resource(resource, block, skip_disabled: nil)
         remove = BLANK
         reorder = BLANK
         insert = BLANK
         can_remove = (can_remove_method.blank? || !!resource.send(can_remove_method))
 
         content = @builder.fields_for(name, resource) do |form|
-          form.disabled = disabled?
+          form.disabled = disabled? unless skip_disabled
 
           fields = block.call(form)
 
@@ -149,11 +149,11 @@ module Effective
           fields
         end
 
-        if remove? && !disabled?
+        if remove?
           remove += (can_remove || resource.new_record?) ? link_to_remove(resource) : disabled_link_to_remove(resource)
         end
 
-        if insert? && !disabled?
+        if insert?
           insert = render_insert() if add? && reorder?
         end
 
@@ -188,14 +188,18 @@ module Effective
         content_tag(:div, link_to_insert(), class: 'has-many-actions')
       end
 
-      def render_template(block)
+      def render_template(block, skip_disabled: nil)
         resource = build_resource()
-        index = collection.length
+        length = collection.length
 
-        html = render_resource(resource, block)
+        html = render_resource(resource, block, skip_disabled: skip_disabled)
 
-        unless html.include?("#{name}_attributes][#{index}]")
-          raise('unexpected index. unable to render resource template.')
+        # Guess the index
+        index = length if html.include?("#{name}_attributes][#{length}]")
+        index ||= html.match(/#{name}_attributes\]\[(\d+)\]/).try(:[], 1).try(:to_i)
+
+        if index.blank?
+          raise('unknown index. unable to render resource template.')
         end
 
         html.gsub!("#{name}_attributes][#{index}]", "#{name}_attributes][HASMANYINDEX]")
@@ -212,7 +216,7 @@ module Effective
           title: 'Add Another',
           data: {
             'effective-form-has-many-add': true,
-            'effective-form-has-many-template': render_template(block)
+            'effective-form-has-many-template': render_template(block, skip_disabled: true)
           }
         )
       end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '1.16.1'.freeze
+  VERSION = '1.16.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.16.1
+  version: 1.16.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-03 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails