cm-admin 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15cf5f7ed76c8f535bbdea485c0c67075d5bd8c98c4b92346d99212b6ff45d8d
-  data.tar.gz: fffe55bb0ceabb342a712073c7003f329871e24362f6b22cd4165c7fc7d0455b
+  metadata.gz: 0616f7649aac8382d9b74d034ff4bb55287f911cdfc5316be4fa9f33ccfc26a5
+  data.tar.gz: 02ea79e4c6e59777013276da852a30e476a5e847ff7eac90702908dc4c759656
 SHA512:
-  metadata.gz: fbc644ba1802f3e1120ce6f461718a08230f9777b2abd3d442a008510c18156710b8374106f300a6fe70707f63d9a4f69d2eb4ba0adde35daf8696a53b3b7346
-  data.tar.gz: '06967882302a44acd967fee3812538635609f1358e0b5a6dade1b1e32228f6e30fe941d6831e407a6cddfba98e7fc56e2c5a8d1006123e56885423a57d262f5a'
+  metadata.gz: c5f68ebbb03c82e19b7f262c70006f4edf096073013e6c422eb20b43096fbdda004d37e537fd0ffe46c0f8f376442b0c3314b32d0227c21bc0bd5377b4a6e848
+  data.tar.gz: f836df493c54f15c8267b8a9458c67a7844489539274655648aef4cde0caf1250e12f1a9bb6b889a7244d21e21579908f0de7e75f5091f0643f6a294281a7e4f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (1.4.4)
+    cm-admin (1.4.7)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)
@@ -87,7 +87,7 @@ GEM
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     builder (3.2.4)
-    caxlsx (4.0.0)
+    caxlsx (4.1.0)
       htmlentities (~> 4.3, >= 4.3.4)
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
@@ -127,11 +127,11 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     method_source (1.0.0)
     mini_mime (1.1.5)
     minitest (5.18.1)
-    net-imap (0.4.9.1)
+    net-imap (0.4.10)
       date
       net-protocol
     net-pop (0.1.2)
@@ -140,8 +140,8 @@ GEM
       timeout
     net-smtp (0.4.0.1)
       net-protocol
-    nio4r (2.7.0)
-    nokogiri (1.16.0-arm64-darwin)
+    nio4r (2.7.1)
+    nokogiri (1.16.3-arm64-darwin)
       racc (~> 1.4)
     pagy (4.11.0)
     parallel (1.22.1)
@@ -226,7 +226,7 @@ GEM
       temple (>= 0.7.6, < 0.9)
       tilt (>= 2.0.6, < 2.1)
     temple (0.8.2)
-    thor (1.3.0)
+    thor (1.3.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
     timeout (0.4.1)
@@ -245,7 +245,7 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   arm64-darwin-20

data/app/assets/javascripts/cm_admin/scaffolds.js

@@ -39,6 +39,7 @@ document.addEventListener("turbo:load", function () {
     theme: "bootstrap-5",
   });
   jqueryJgrowl()
+  setup_select_2_ajax();
 });
 
 $(document).on('click', '.menu-item', function(e) {
@@ -51,4 +52,21 @@ $(document).on('click', '.destroy-attachment', function(e) {
   $(this).append('<input type="text" name="attachment_destroy_ids[]" value="' + ar_id + '"/>')
 })
 
-window.addEventListener('popstate', e => window.location.reload() );
+window.addEventListener('popstate', e => window.location.reload() );
+
+function setup_select_2_ajax(){
+  $(".select-2-ajax").each(function(index, element){
+    $(element).select2({
+      ajax: {
+        url: $(element)[0]['dataset'].ajaxUrl,
+        dataType: 'json',
+        processResults: (data, params) => {
+          return {
+            results: data.results,
+          }
+        },
+      },
+      minimumInputLength: 0
+    });
+  });
+}

data/app/javascript/packs/cm_admin/scaffolds.js

@@ -35,4 +35,4 @@ $(document).on('turbolinks:load', function () {
   var headerElemHeight = $('.page-top-bar').height() + 64
   var calculatedHeight = "calc(100vh - " + headerElemHeight+"px"+")"
   $('.table-wrapper').css("maxHeight", calculatedHeight);
-});
+});

data/lib/cm_admin/models/form_field.rb

@@ -6,7 +6,7 @@ module CmAdmin
       include Utils::Helpers
 
       attr_accessor :field_name, :label, :header, :input_type, :collection, :disabled, :helper_method,
-                    :placeholder, :display_if, :html_attr, :target, :col_size
+                    :placeholder, :display_if, :html_attr, :target, :col_size, :ajax_url
 
       VALID_INPUT_TYPES = %i[
         integer decimal string single_select multi_select date date_time text

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.4.6'
+  VERSION = '1.4.7'
 end

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -14,10 +14,10 @@ module CmAdmin
         is_required = form_obj.object._validators[cm_field.field_name].map(&:kind).include?(:presence)
         required_class = is_required ? 'required' : ''
         target_action = @model.available_actions.select { |x| x.name == cm_field.target[:action_name].to_s }.first if cm_field.target.present?
-        send("cm_#{cm_field.input_type}_field", form_obj, cm_field, value, required_class, target_action)
+        send("cm_#{cm_field.input_type}_field", form_obj, cm_field, value, required_class, target_action, cm_field.ajax_url)
       end
 
-      def cm_integer_field(form_obj, cm_field, value, required_class, _target_action)
+      def cm_integer_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)
         form_obj.text_field cm_field.field_name,
                             class: "field-control #{required_class}",
                             disabled: cm_field.disabled.call(form_obj.object),
@@ -26,7 +26,7 @@ module CmAdmin
                             data: { behaviour: 'integer-only' }
       end
 
-      def cm_decimal_field(form_obj, cm_field, value, required_class, _target_action)
+      def cm_decimal_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)
         form_obj.text_field cm_field.field_name,
                               class: "field-control #{required_class}",
                               disabled: cm_field.disabled.call(form_obj.object),
@@ -35,7 +35,7 @@ module CmAdmin
                               data: { behaviour: 'decimal-only' }
       end
 
-      def cm_string_field(form_obj, cm_field, value, required_class, _target_action)
+      def cm_string_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)
         form_obj.text_field cm_field.field_name,
                             class: "field-control #{required_class}",
                             disabled: cm_field.disabled.call(form_obj.object),
@@ -50,16 +50,18 @@ module CmAdmin
                         placeholder: cm_field.placeholder
       end
 
-      def cm_single_select_field(form_obj, cm_field, value, required_class, target_action)
+      def cm_single_select_field(form_obj, cm_field, value, required_class, target_action, ajax_url)
+        class_name = ajax_url.present? ? 'select-2-ajax' : 'select-2'
         form_obj.select cm_field.field_name, options_for_select(select_collection_value(form_obj.object, cm_field), form_obj.object.send(cm_field.field_name)),
                         { include_blank: cm_field.placeholder },
-                        class: "field-control #{required_class} select-2",
+                        class: "field-control #{required_class} #{class_name}",
                         disabled: cm_field.disabled.call(form_obj.object),
                         data: {
                           field_name: cm_field.field_name,
                           field_type: 'linked-field',
                           target_action: target_action&.name,
-                          target_url: target_action&.name ? cm_admin.send("#{@model.name.underscore}_#{target_action&.name}_path") : ''
+                          target_url: target_action&.name ? cm_admin.send("#{@model.name.underscore}_#{target_action&.name}_path") : '',
+                          ajax_url: ajax_url
                         }
       end
 
@@ -87,7 +89,7 @@ module CmAdmin
                         disabled: cm_field.disabled.call(form_obj.object), multiple: true
       end
 
-      def cm_date_field(form_obj, cm_field, value, required_class, _target_action)
+      def cm_date_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)
         form_obj.text_field cm_field.field_name,
                             class: "field-control #{required_class}",
                             disabled: cm_field.disabled.call(form_obj.object),
@@ -105,7 +107,7 @@ module CmAdmin
                             data: { behaviour: 'date-only' }
       end
 
-      def cm_date_time_field(form_obj, cm_field, value, required_class, _target_action)
+      def cm_date_time_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)
         form_obj.text_field cm_field.field_name,
                             class: "field-control #{required_class}",
                             disabled: cm_field.disabled.call(form_obj.object),
@@ -114,13 +116,13 @@ module CmAdmin
                             data: { behaviour: 'date-time' }
       end
 
-      def cm_text_field(form_obj, cm_field, value, required_class, _target_action)
+      def cm_text_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)
         form_obj.text_area cm_field.field_name,
                            class: "field-control #{required_class}",
                            placeholder: cm_field.placeholder
       end
 
-      def cm_rich_text_field(form_obj, cm_field, value, required_class, _target_action)
+      def cm_rich_text_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)
         form_obj.rich_text_area cm_field.field_name,
                                 class: "field-control #{required_class}",
                                 placeholder: cm_field.placeholder
@@ -142,7 +144,7 @@ module CmAdmin
 
       def attachment_list(form_obj, cm_field, _value, required_class, _target_action)
         attached = form_obj.object.send(cm_field.field_name)
-        return if attached.instance_of?(Paperclip::Attachment)
+        return if defined?(::Paperclip) && attached.instance_of?(::Paperclip::Attachment)
         
         content_tag(:div) do
           if attached.class == ActiveStorage::Attached::Many
@@ -164,15 +166,15 @@ module CmAdmin
         end
       end
 
-      def cm_check_box_field(form_obj, cm_field, value, required_class, target_action)
+      def cm_check_box_field(form_obj, cm_field, value, required_class, target_action, _ajax_url)
         format_check_box_options(value, form_obj, cm_field, required_class, target_action)
       end
 
-      def cm_radio_button_field(form_obj, cm_field, value, required_class, _target_action)
+      def cm_radio_button_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)
         format_radio_button_options(value, form_obj)
       end
 
-      def cm_hidden_field(form_obj, cm_field, value, required_class, _target_action)
+      def cm_hidden_field(form_obj, cm_field, value, required_class, _target_action, _ajax_url)
         form_obj.hidden_field cm_field.field_name,
                               value: value,
                               name: cm_field.html_attr[:name] || "#{form_obj.object_name}[#{cm_field.field_name}]"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-24 00:00:00.000000000 Z
+date: 2024-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -498,7 +498,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: CmAdmin is a robust gem designed to assist in creating admin panels for Rails