cm-admin 1.4.5 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00cd64c6ef60a6e6a8764533d677a742765dc47b30db30fb64e302d350faaaac
-  data.tar.gz: 6a9ab9b8dd72eedf62c31892753103f1c73570ff3a17c6cea60edddfaa52f9b1
+  metadata.gz: 0616f7649aac8382d9b74d034ff4bb55287f911cdfc5316be4fa9f33ccfc26a5
+  data.tar.gz: 02ea79e4c6e59777013276da852a30e476a5e847ff7eac90702908dc4c759656
 SHA512:
-  metadata.gz: 02c38abf40ff1651525e1b103bafaf920e18a320abd5fc631779fa6b5d99944bc9546c1145ddfa2a0cd2ef5b78b94eab45fb06b012d66fc74e64e3550d24b8ad
-  data.tar.gz: 63051f6070b8ab489b3d6e55b397cdb7e7e8402284d3436c80cb46d821613a62303544acee2fd0c9bc876bd3631062f9191d3d11334cd50d2b0b461aabe9dc8f
+  metadata.gz: c5f68ebbb03c82e19b7f262c70006f4edf096073013e6c422eb20b43096fbdda004d37e537fd0ffe46c0f8f376442b0c3314b32d0227c21bc0bd5377b4a6e848
+  data.tar.gz: f836df493c54f15c8267b8a9458c67a7844489539274655648aef4cde0caf1250e12f1a9bb6b889a7244d21e21579908f0de7e75f5091f0643f6a294281a7e4f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (1.4.5)
+    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

@@ -18,7 +18,6 @@ import 'flatpickr'
 import 'jgrowl'
 import Select2 from "select2"
 Select2()
-jqueryJgrowl()
 
 // import '@nathanvda/cocoon'
 import 'daterangepicker'
@@ -39,7 +38,8 @@ document.addEventListener("turbo:load", function () {
   $('.select-2').select2({
     theme: "bootstrap-5",
   });
-  
+  jqueryJgrowl()
+  setup_select_2_ajax();
 });
 
 $(document).on('click', '.menu-item', function(e) {
@@ -52,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/controllers/cm_admin/resource_controller.rb

@@ -31,7 +31,7 @@ module CmAdmin
     def cm_show(params)
       @current_action = CmAdmin::Models::Action.find_by(@model, name: 'show')
       scoped_model = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve
-      @ar_object = scoped_model.find(params[:id])
+      @ar_object = fetch_ar_object(scoped_model, params[:id])
       resource_identifier
       respond_to do |format|
         if request.xhr?
@@ -53,7 +53,7 @@ module CmAdmin
 
     def cm_edit(params)
       @current_action = CmAdmin::Models::Action.find_by(@model, name: 'edit')
-      @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
+      @ar_object = fetch_ar_object(@model.ar_model.name.classify.constantize, params[:id])
       resource_identifier
       respond_to do |format|
         format.html { render '/cm_admin/main/' + action_name }
@@ -61,7 +61,7 @@ module CmAdmin
     end
 
     def cm_update(params)
-      @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
+      @ar_object = fetch_ar_object(@model.ar_model.name.classify.constantize, params[:id])
       @ar_object.assign_attributes(resource_params(params))
       resource_identifier
       resource_responder
@@ -74,7 +74,7 @@ module CmAdmin
     end
 
     def cm_destroy(params)
-      @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
+      @ar_object = fetch_ar_object(@model.ar_model.name.classify.constantize, params[:id])
       redirect_url = request.referrer || cm_admin.send("#{@model.name.underscore}_index_path")
       respond_to do |format|
         if @ar_object.destroy
@@ -185,7 +185,7 @@ module CmAdmin
       @ar_object, @associated_model, @associated_ar_object = custom_controller_action(action_name, params.permit!) if !@ar_object.present? && params[:id].present?
       authorize @ar_object, policy_class: "CmAdmin::#{controller_name.classify}Policy".constantize if defined? "CmAdmin::#{controller_name.classify}Policy".constantize
       aar_model = request.url.split('/')[-2].classify.constantize  if params[:aar_id]
-      @associated_ar_object = aar_model.find(params[:aar_id]) if params[:aar_id]
+      @associated_ar_object = fetch_ar_object(aar_model, params[:aar_id]) if params[:aar_id]
       nested_fields = get_nested_table_fields(@model.available_fields[:new])
       nested_fields += get_nested_table_fields(@model.available_fields[:edit])
       @reflections = @model.ar_model.reflect_on_all_associations
@@ -202,12 +202,12 @@ module CmAdmin
 
     def resource_responder
       respond_to do |format|
-        if params["referrer"]
-          redirect_url = params["referrer"]
-        else
-          redirect_url = CmAdmin::Engine.mount_path + "/#{@model.name.underscore.pluralize}/#{@ar_object.id}"
-        end
         if @ar_object.save
+          redirect_url = if params['referrer']
+                           params['referrer']
+                         else
+                           cm_admin.send("#{@model.name.underscore}_show_path", @ar_object)
+                         end
           if params['attachment_destroy_ids'].present?
             ActiveStorage::Attachment.where(id: params['attachment_destroy_ids']).destroy_all
           end
@@ -222,7 +222,7 @@ module CmAdmin
       @current_action = CmAdmin::Models::Action.find_by(@model, name: action_name.to_s)
       return unless @current_action
 
-      @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
+      @ar_object = fetch_ar_object(@model.ar_model.name.classify.constantize, params[:id])
       return @ar_object unless @current_action.child_records
 
       child_records = @ar_object.send(@current_action.child_records)
@@ -353,7 +353,10 @@ module CmAdmin
       params.require(@model.name.underscore.to_sym).permit(*permittable_fields)
     end
 
-    
+    def fetch_ar_object(model_object, id)
+      return model_object.friendly.find(id) if model_object.respond_to?(:friendly)
 
+      model_object.find(id)
+    end
   end
 end

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/app/views/cm_admin/main/_actions_dropdown.html.slim

@@ -11,9 +11,9 @@
       .popup-card.table-export-popup.hidden
         - if edit_action.present?
           - if @associated_model
-            - path = cm_admin.send("#{current_model.name.underscore}_edit_path", ar_object.id, referrer: request.path)
+            - path = cm_admin.send("#{current_model.name.underscore}_edit_path", ar_object, referrer: request.path)
           - else
-            - path = cm_admin.send("#{current_model.name.underscore}_edit_path", ar_object.id)
+            - path = cm_admin.send("#{current_model.name.underscore}_edit_path", ar_object)
           = link_to path do
             .popup-option
               span
@@ -21,13 +21,13 @@
               | Edit
         - if destroy_action.present?
           - if @associated_model
-            = button_to cm_admin.send("#{current_model.name.underscore}_destroy_path", ar_object.id, referrer: request.path), method: :delete, form: { data: { turbo_confirm: 'Are you sure?' } } do
+            = button_to cm_admin.send("#{current_model.name.underscore}_destroy_path", ar_object, referrer: request.path), method: :delete, form: { data: { turbo_confirm: 'Are you sure?' } } do
               .popup-option
                 span
                   i.fa.fa-trash
                 | Destroy
           - else
-            = link_to '', data: { bs_toggle: 'modal', bs_target: "##{@model.name.classify}DestroyModal-#{ar_object.id.to_s}" } do  
+            = link_to '', data: { bs_toggle: 'modal', bs_target: "##{@model.name.classify}DestroyModal-#{ar_object.id.to_s}" } do
               .popup-option
                 span
                   i.fa.fa-trash

data/app/views/cm_admin/main/_associated_table.html.slim

@@ -5,7 +5,7 @@
   p.table-top__total-count = "#{humanized_ar_collection_count(@associated_ar_object.pagy.count, @action.child_records.to_s)}"
   .table-top__column-action
     - if @associated_model && @associated_model.available_actions.map(&:name).include?('new') && has_valid_policy(@associated_ar_object, 'new')
-      - association = @ar_object.class.reflect_on_all_associations.select{|x| x.name == @associated_model.name.tableize.to_sym }.first      
+      - association = @ar_object.class.reflect_on_all_associations.select{|x| x.name == @associated_model.name.tableize.to_sym }.first
       - polymorphic_name = (association && association.inverse_of && association.inverse_of.options[:polymorphic]) ? association.inverse_of.name : ''
       a href="#{CmAdmin::Engine.mount_path}/#{@associated_model.name.tableize}/new?associated_id=#{@ar_object.id}&associated_class=#{@ar_object.class.name.underscore}&polymorphic_name=#{polymorphic_name}&referrer=#{request.path}"
         button.btn-secondary Add

data/app/views/cm_admin/main/_table.html.slim

@@ -45,7 +45,7 @@
             - if column.display_if.call(Current.user) && column.viewable
               td.text-ellipsis data-field-type="#{column.field_type || 'string'}"
                 - if index == 0 && is_show_action_available(@model, ar_object) && !([:link, :custom, :attachment, :drawer, :image].include?(column.field_type))
-                  = link_to ar_object.send(column.field_name), cm_admin.send("#{ar_object.model_name.singular}_show_path", ar_object.id)
+                  = link_to ar_object.send(column.field_name), cm_admin.send("#{ar_object.model_name.singular}_show_path", ar_object)
                 - else
                   = show_field_value(ar_object, column)
                   - if column.field_type == :drawer

data/app/views/cm_admin/main/_tabs.html.slim

@@ -5,10 +5,10 @@ ul.tabs
         li.nav-item
           - nav_item_action_name = nav_item.custom_action.present? ? nav_item.custom_action : 'show'
           - if via_xhr
-            = link_to tab_display_name(nav_item.nav_item_name), cm_admin.send("#{@ar_object.model_name.singular}_#{nav_item_action_name}_path", @ar_object.id), class: "nav-link #{ nav_item_action_name == action_name ? 'active' : ''}", target: '_blank'
+            = link_to tab_display_name(nav_item.nav_item_name), cm_admin.send("#{@ar_object.model_name.singular}_#{nav_item_action_name}_path", @ar_object), class: "nav-link #{ nav_item_action_name == action_name ? 'active' : ''}", target: '_blank'
           - else
-            = link_to tab_display_name(nav_item.nav_item_name), cm_admin.send("#{@ar_object.model_name.singular}_#{nav_item_action_name}_path", @ar_object.id), class: "nav-link #{ nav_item_action_name == action_name ? 'active' : ''}"
+            = link_to tab_display_name(nav_item.nav_item_name), cm_admin.send("#{@ar_object.model_name.singular}_#{nav_item_action_name}_path", @ar_object), class: "nav-link #{ nav_item_action_name == action_name ? 'active' : ''}"
   // current_action_name is defined when action trail is added to that model
   - if policy([:cm_admin, @model.name.classify.constantize]).send(:history?)
     li.nav-item
-      = link_to 'History', cm_admin.send("#{@ar_object.model_name.singular}_history_path", @ar_object.id), class: "nav-link #{ action_name == 'history' ? 'active' : ''}"
+      = link_to 'History', cm_admin.send("#{@ar_object.model_name.singular}_history_path", @ar_object), class: "nav-link #{ action_name == 'history' ? 'active' : ''}"

data/app/views/layouts/_destroy_action_modal.html.slim

@@ -1,16 +1,15 @@
-.modal.fade id="#{@model.name.classify}DestroyModal-#{ar_object.id}" aria-hidden="true" aria-labelledby="#{@model.name.classify}DestroyModalLabel" tabindex="1" 
+.modal.fade id="#{@model.name.classify}DestroyModal-#{ar_object.id}" aria-hidden="true" aria-labelledby="#{@model.name.classify}DestroyModalLabel" tabindex="1"
   .modal-dialog
     .modal-content
       .modal-header
         h5.modal-title id="#{@model.name.classify}DestroyModalLabel" = "#{@model.name.classify} Destroy"
-        button.btn-close aria-label="Close" data-bs-dismiss="modal" type="button" 
+        button.btn-close aria-label="Close" data-bs-dismiss="modal" type="button"
       .modal-body
         .custom-modal-body
           .modal-info data-section="bulk-action"
             | Are you sure you want to delete this #{@model.name.classify}
           .modal-footer
-            = button_to cm_admin.send("#{@model.name.underscore}_destroy_path", ar_object.id), method: :delete, class: "btn btn-primary" do
+            = button_to cm_admin.send("#{@model.name.underscore}_destroy_path", ar_object), method: :delete, class: "btn btn-primary" do
               span
                 i.fa.fa-trash
-              | Destroy
-              
+              |  Destroy

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.5'
+  VERSION = '1.4.7'
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -102,9 +102,9 @@ module CmAdmin
           if field.association_type.to_s == 'polymorphic'
             association_name = ar_object.send(field.association_name).class.to_s.underscore
             field_name = find_field_name(field, association_name)
-            link_to ar_object.send(field.association_name).send(field_name), cm_admin.send("#{association_name}_show_path", ar_object.send(field.association_name).id)
+            link_to ar_object.send(field.association_name).send(field_name), cm_admin.send("#{association_name}_show_path", ar_object.send(field.association_name))
           elsif ['belongs_to', 'has_one'].include? field.association_type.to_s
-            link_to ar_object.send(field.association_name).send(field.field_name), cm_admin.send("#{field.association_name}_show_path", ar_object.send(field.association_name).id)
+            link_to ar_object.send(field.association_name).send(field.field_name), cm_admin.send("#{field.association_name}_show_path", ar_object.send(field.association_name))
           end
         end
       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
@@ -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.5
+  version: 1.4.7
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-01 00:00:00.000000000 Z
+date: 2024-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails