effective_bootstrap 1.19.2 → 1.19.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30ed0755d71e2507d659e3b3c0a4fe94f5aa87cdd28b18b98e00ac355d18b317
-  data.tar.gz: '0423308054e7ac0369dc1d980c02d108ad938990dc9e02fc0b036f2df1fa91bb'
+  metadata.gz: d38e3aeed6ac436788cde46ed41d2526d0965fb8c07c91671bfa2d348d66d72e
+  data.tar.gz: 3dc6dab7793b5979a2da94f373b861e381bec4f43af7ae9d0bd9c207446b289b
 SHA512:
-  metadata.gz: 4cd32bb7192b96ac9349d0451749bff769ff93b48772b2f0d1ba508091410bd276eccce7b884f5855fb5d8b5ecdc2c1b79c349433bdeb5a62a487f8c772549b2
-  data.tar.gz: 1d0ec5d073cc37811ac8ee38e524bdf4311eacd1a745c3719db38453f16526757d865fb704a564fcf51e4660e337cd4ccc2c1c91eae487a88d4428b2f9df8062
+  metadata.gz: a884258ed006d5282fd2e37509232e203fbaffc5357a3aa94deeb8eef360edff0b9a2b0223756c540019e5b08d4db0e0c23b906f2a8048d6b00fd559ae01bba1
+  data.tar.gz: eaf25457e6a73a2c664286c074cacf32e99010ebb591c1573a45d11cf9853c36b1e035587a6f26b9d985ac05d6634deb078b273ee88eb826c72522c5574a541a

data/app/assets/javascripts/effective_select_or_text/initialize.js

@@ -16,6 +16,12 @@ $(document).on('click', '[data-effective-select-or-text]', function(event) {
   $visible_input = $visible.find('input,textarea,select').first()
   $hidden_input = $hidden.find('input,textarea,select').first()
 
+  if ($visible.find('select').length > 0) {
+    $obj.removeClass('select-enabled').addClass('text-enabled')
+  } else {
+    $obj.removeClass('text-enabled').addClass('select-enabled')
+  }
+
   required = $visible_input.prop('required') || $hidden_input.prop('required')
 
   $hidden_input.prop('required', required)

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

@@ -65,6 +65,12 @@ module Effective
       def assign_options_collection!
         super
 
+        if ajax? && !include_null
+          if options_collection.kind_of?(Array) && options_collection.first.respond_to?(:to_select2)
+            @options_collection = options_collection.map { |obj| [obj.to_select2, obj.to_param] }
+          end
+        end
+
         return unless include_null
 
         # Check for singles - transform the array

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

@@ -15,11 +15,19 @@ module Effective
         @name_text = options.delete(:name_text) || raise('Please include a text method name')
         @select_collection = options.delete(:collection) || raise('Please include a collection')
 
-        @select_options = { placeholder: 'Please choose, or...', required: false }
-          .merge(options[:select] || options.presence || {})
+        @shared_options = (options[:input_html] || {})
 
-        @text_options = { placeholder: 'Enter freeform', required: false }
-          .merge(options[:text] || options[:text_field] || options.presence || {})
+        @select_options = { 
+          placeholder: '', 
+          hint: "Can't find your #{(options[:name] || name).to_s.chomp('_id')}? <a class='effective-select-or-text-switch' title='Switch to enter freeform' data-effective-select-or-text='true' href='#'>Click here</a> to add one",
+          required: false,
+        }.merge(options[:select] || options.presence || {}).merge(@shared_options)
+
+        @text_options = { 
+          placeholder: '', 
+          hint: "Looking for an existing #{(options[:name] || name).to_s.chomp('_id')}? <a class='effective-select-or-text-switch' title='Switch to search for existing' data-effective-select-or-text='true' href='#'>Click here</a> to search",
+          required: false 
+        }.merge(options[:text] || options[:text_field] || options.presence || {}).merge(@shared_options)
 
         @email_field = options.fetch(:email, name_text.to_s.include?('email'))
 
@@ -27,15 +35,16 @@ module Effective
       end
 
       def to_html(&block)
-        content_tag(:div, class: 'effective-select-or-text') do
+        wrapper_class = ['effective-select-or-text', (select? ? 'select-enabled' : 'text-enabled'), options.dig(:wrapper, :class)].compact.join(' ')
+
+        content_tag(:div, (options[:wrapper] || {}).merge(class: wrapper_class)) do
           if select?
             @builder.send(email_field? ? :email_field : :text_field, name_text, text_options) +
             @builder.select(name, select_collection, select_options)
           else
             @builder.select(name, select_collection, select_options) +
             @builder.send(email_field? ? :email_field : :text_field, name_text, text_options)
-          end +
-          link_to(icon('rotate-ccw'), '#', class: 'effective-select-or-text-switch', title: 'Switch between choice and freeform', 'data-effective-select-or-text': true)
+          end
         end
       end
 

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '1.19.2'.freeze
+  VERSION = '1.19.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.19.2
+  version: 1.19.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-20 00:00:00.000000000 Z
+date: 2024-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails