cm-admin 0.7.1 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cd6e52585c8e5905473e55c80965b14da5679c38bbff1aee74a97e436552dbe
-  data.tar.gz: ec82f91588d998b19a6361365599e13223ad7254998481cfd7b83843b0908f3e
+  metadata.gz: 810496f7dd375b4849ce820652272c6d36dec1767807beab966e4abc1a00a922
+  data.tar.gz: 522f04bc7abeddf95dceebfe980c3b7d955b3d3907de9060af5923803622ed59
 SHA512:
-  metadata.gz: 8644e740f96af96d2a88ade91b50f697585e7b9e95a124a4a07afe84ea9cc6ef9302ff73f1311ea0ebc0ba49eb367d601bc5bb5bb09085406934d416f0222ff3
-  data.tar.gz: 55c444fdf18df0a8710014a361765268068561eb7d5704650d3a7ba1b296dcc8780510f948c161d36ceeae3c2a5a3a3fbc32e076c9b2459312dead070b1a951c
+  metadata.gz: fc0a6ebd3f81ee0c8df337d630c71cff47d49bb7e422e1d39f9f5f1663c21e7714bd740cf8b1a37d37cbbc3827d18ccc58822031794a228696043633886466ec
+  data.tar.gz: 6a13e1994ea27658ac281f88970b1d5b471ee52982be02af9e8ce55dd1b9f6706085543a3f0cbddced246371254b8143243ed6e2756e413d6302fde891718c9d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (0.5.7)
+    cm-admin (0.7.3)
       axlsx_rails (~> 0.6.1)
       cocoon (~> 1.2.15)
       pagy (~> 4.11.0)
@@ -47,21 +47,19 @@ GEM
     htmlentities (4.3.4)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.15.0)
+    loofah (2.17.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     marcel (1.0.2)
     method_source (1.0.0)
-    mini_portile2 (2.8.0)
     minitest (5.15.0)
-    nokogiri (1.13.4)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.13.5-arm64-darwin)
       racc (~> 1.4)
     pagy (4.11.0)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
     racc (1.6.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-proxy (0.7.2)
       rack
     rack-test (1.1.0)

data/app/helpers/cm_admin/application_helper.rb

@@ -13,5 +13,16 @@ module CmAdmin
       return true unless policy([:cm_admin, model_name.classify.constantize]).methods.include?(:"#{action_name}?")
       policy([:cm_admin, model_name.classify.constantize]).send(:"#{action_name}?")
     end
+
+    def action(action_name)
+      case action_name.to_sym
+      when :update
+        return :edit
+      when :create
+        return :new
+      else
+        return action_name.to_sym
+      end
+    end
   end
 end

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

@@ -2,6 +2,11 @@
   .table-top
     p.table-top__total-count = "#{@associated_ar_object.pagy.count} #{@action.child_records.to_s.gsub('_', ' ')} found"
     .table-top__column-action
+      - if @associated_model && @associated_model.available_actions.map(&:name).include?('new')
+        - 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.secondary-btn.column-btn Add
       / button.secondary-btn.column-btn data-target="#columnActionModal" data-toggle="modal" type="button"
       /   span
       /     i.fa.fa-columns.bolder
@@ -17,7 +22,7 @@
         /   span
         /     input.cm-checkbox type="checkbox"
         - @model.available_fields[@action.name.to_sym].each do |column|
-          th = column.header
+            th = column.header
     tbody.cm-table__body
       - @associated_ar_object.data.each do |ar_object|
         tr.body-row
@@ -25,9 +30,12 @@
           / td.check-box-space
           /   span
           /     input.cm-checkbox type="checkbox"
-          - @model.available_fields[@action.name.to_sym].each do |column|
+          - @model.available_fields[@action.name.to_sym].each_with_index do |column, index|
             td class="text-ellipsis"
-              span class="#{column.cm_css_class}" = show_field_value(ar_object, column)
+              - if index == 0 && @associated_model && @associated_model.available_actions.map(&:name).include?('show')
+                a href="#{CmAdmin::Engine.mount_path}/#{@associated_model.name.tableize}/#{ar_object.id}" = show_field_value(ar_object, column)
+              - else
+                span class="#{column.cm_css_class}" = show_field_value(ar_object, column)
           - associated_model_actions = @associated_model && @associated_model.available_actions.select{|act| act if act.route_type == 'member'}
           - if associated_model_actions.present?
             td.row-action-cell

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

@@ -1,5 +1,5 @@
 .nested-fields
-  - @model.available_fields[action_name.to_sym][assoc_name].each do |field|
+  - @model.available_fields[ action(action_name) ][assoc_name].each do |field|
     .row
       .col-sm-10
         = input_field_for_column(f, field)

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

@@ -34,8 +34,9 @@
                     = render partial: column.drawer_partial, locals: { ar_object: ar_object}
 
           - edit_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('edit')}
+          - destroy_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('destroy')}
           - custom_actions = @model.available_actions.select{|act| act if act.route_type == 'member' && [:button, :modal].include?(act.display_type)}
-          - if custom_actions.any? || edit_action.any?
+          - if custom_actions.any? || edit_action.any? || destroy_action.any?
             td.row-action-cell
               .row-action-tool
                 button.secondary-btn.tool-btn type="button"
@@ -50,6 +51,12 @@
                         span
                           i.fa.fa-edit
                         | Edit
+                  - if destroy_action.any? && policy([:cm_admin, @model.name.classify.constantize]).destroy?
+                    = link_to "#{page_url('destroy', ar_object)}", method: :delete do
+                      .popup-option
+                        span
+                          i.fa.fa-trash
+                        | Destroy
                   - custom_actions.each do |custom_action|
                     - if custom_action.name.present? && has_valid_policy(@model.name, custom_action.name)
                       - if custom_action.display_if.call(ar_object)

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

@@ -1,6 +1,7 @@
 ul.nav.nav-pills
   - @model.available_tabs.each do |nav_item|
-    - if nav_item.custom_action.empty? || (nav_item.custom_action.present? && policy([:cm_admin, @model.name.classify.constantize]).send(:"#{nav_item.custom_action}?"))
-      li.nav-item
-        - nav_item_action_name = nav_item.custom_action.present? ? nav_item.custom_action : 'show'
-        = link_to nav_item.nav_item_name.to_s.titleize, "/cm_admin/#{@model.name.underscore.pluralize}/#{@ar_object.id}/#{nav_item.custom_action}", class: "nav-link #{ nav_item_action_name == action_name ? 'active' : ''}"
+    - if nav_item.display_if.call(@ar_object)
+      - if nav_item.custom_action.empty? || (nav_item.custom_action.present? && policy([:cm_admin, @model.name.classify.constantize]).send(:"#{nav_item.custom_action}?"))
+        li.nav-item
+          - nav_item_action_name = nav_item.custom_action.present? ? nav_item.custom_action : 'show'
+          = link_to nav_item.nav_item_name.to_s.titleize, "/cm_admin/#{@model.name.underscore.pluralize}/#{@ar_object.id}/#{nav_item.custom_action}", class: "nav-link #{ nav_item_action_name == action_name ? 'active' : ''}"

data/lib/cm_admin/model.rb

@@ -140,12 +140,14 @@ module CmAdmin
                   format.html { render '/cm_admin/main/'+action_name }
                 end
               elsif %w(create update destroy).include?(action_name)
-                if %w(create update).include?(action_name)
+                if params["referrer"]
+                  redirect_url = params["referrer"]
+                elsif %w(create update).include?(action_name)
                   redirect_url = CmAdmin::Engine.mount_path + "/#{@model.name.underscore.pluralize}/#{@ar_object.id}"
                 else
                   redirect_url = CmAdmin::Engine.mount_path + "/#{@model.name.underscore.pluralize}"
                 end
-                if @ar_object.save
+                if action_name.eql?('destroy') || @ar_object.save
                   format.html { redirect_to  redirect_url, notice: "#{action_name.titleize} #{@ar_object.class.name.downcase} is successful" }
                 else
                   format.html { render '/cm_admin/main/new', notice: "#{action_name.titleize} #{@ar_object.class.name.downcase} is unsuccessful" }

data/lib/cm_admin/models/controller_method.rb

@@ -36,6 +36,11 @@ module CmAdmin
         @ar_object = @ar_model.name.classify.constantize.new(resource_params(params))
       end
 
+      def destroy(params)
+        @ar_object = @ar_model.name.classify.constantize.find(params[:id])
+        @ar_object.destroy
+      end
+
       def filter_by(params, records, filter_params={}, sort_params={})
         filtered_result = OpenStruct.new
         sort_column = "created_at"
@@ -58,11 +63,19 @@ module CmAdmin
       def resource_params(params)
         permittable_fields = @permitted_fields || @ar_model.columns.map(&:name).reject { |i| CmAdmin::REJECTABLE_FIELDS.include?(i) }.map(&:to_sym)
         permittable_fields += @ar_model.name.constantize.reflect_on_all_associations.map {|x|
-          if x.klass.name == "ActiveStorage::Attachment"
+          next if x.options[:polymorphic]
+          # The first if statement is added for compatibilty with cm-page-builder.
+          # One of the associated models of cm-page-builder was throwing error.
+          # The associated model is CmPageBuilder::Rails::PageComponent.
+          # When using reflection, the value of klass of the above association is uninitialized.
+          # As a result, it was throwing error in the 2nd elsif statement.
+          if x.name == :page_components
+            x.name
+          elsif x.klass.name == "ActiveStorage::Attachment"
             if x.class.name.include?('HasOne')
-              x.name
+              x.name.to_s.gsub('_attachment', '').to_sym
             elsif x.class.name.include?('HasMany')
-              Hash[x.name.to_s, []]
+              Hash[x.name.to_s.gsub('_attachment', ''), []]
             end
           elsif x.klass.name == "ActionText::RichText"
             x.name.to_s.gsub('rich_text_', '').to_sym

data/lib/cm_admin/models/dsl_method.rb

@@ -39,17 +39,17 @@ module CmAdmin
         end
       end
 
-      def tab(tab_name, custom_action, associated_model: nil, layout_type: nil, layout: nil, partial: nil, &block)
+      def tab(tab_name, custom_action, associated_model: nil, layout_type: nil, layout: nil, partial: nil, display_if: nil, &block)
         if custom_action.to_s == ''
           @current_action = CmAdmin::Models::Action.find_by(self, name: 'show')
-          @available_tabs << CmAdmin::Models::Tab.new(tab_name, '', &block)
+          @available_tabs << CmAdmin::Models::Tab.new(tab_name, '', display_if, &block)
         else
           action = CmAdmin::Models::Action.new(name: custom_action.to_s, verb: :get, path: ':id/'+custom_action,
                       layout_type: layout_type, layout: layout, partial: partial, child_records: associated_model,
                       action_type: :custom, display_type: :page)
           @available_actions << action
           @current_action = action
-          @available_tabs << CmAdmin::Models::Tab.new(tab_name, custom_action, &block)
+          @available_tabs << CmAdmin::Models::Tab.new(tab_name, custom_action, display_if, &block)
         end
         yield if block
       end

data/lib/cm_admin/models/export.rb

@@ -25,6 +25,10 @@ module CmAdmin
           records_arr = []
           records.includes(deserialized_columns[:include].keys).find_each do |record|
             record_hash = record.as_json({only: columns.map(&:to_sym)})
+            columns.each do |column|
+              break unless model.available_fields[:index].map(&:field_name).include?(column.to_sym)
+              record_hash[column.to_sym] = record.send(column.to_sym)
+            end
             custom_fields.each do |field|
               record_hash[field.field_name.to_sym] = helpers.send(field.helper_method, record, field.field_name)
             end

data/lib/cm_admin/models/form_field.rb

@@ -1,7 +1,7 @@
 module CmAdmin
   module Models
     class FormField
-      attr_accessor :field_name, :label, :header, :input_type, :collection, :custom_value, :disabled
+      attr_accessor :field_name, :label, :header, :input_type, :collection, :custom_value, :disabled, :collection_method
       VALID_INPUT_TYPES = [:integer, :decimal, :string, :single_select, :multi_select, :date, :date_time, :text, :single_file_upload, :multi_file_upload, :hidden, :rich_text].freeze
 
       def initialize(field_name, input_type, attributes = {})

data/lib/cm_admin/models/tab.rb

@@ -2,11 +2,12 @@ module CmAdmin
   module Models
     class Tab
 
-      attr_accessor :nav_item_name, :custom_action
+      attr_accessor :nav_item_name, :custom_action, :display_if
 
-      def initialize(nav_item_name, custom_action)
+      def initialize(nav_item_name, custom_action, display_if)
         @nav_item_name = nav_item_name
         @custom_action = custom_action
+        @display_if = display_if || lambda { |arg| return true }
       end
     end
   end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.7.1"
+  VERSION = "0.7.4"
 end

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -13,9 +13,9 @@ module CmAdmin
         when :string
           return f.text_field field.field_name, class: "normal-input #{required_class}", disabled: field.disabled, value: value, placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}"
         when :single_select
-          return f.select field.field_name, options_for_select((field.collection || []), value), {include_blank: "Select #{field.field_name.to_s.downcase.gsub('_', ' ')}"}, class: "normal-input #{required_class} select-2", disabled: field.disabled
+          return f.select field.field_name, options_for_select(select_collection_value(field), value), {include_blank: "Select #{field.field_name.to_s.downcase.gsub('_', ' ')}"}, class: "normal-input #{required_class} select-2", disabled: field.disabled
         when :multi_select
-          return f.select field.field_name, options_for_select((field.collection || []), value), {include_blank: "Select #{field.field_name.to_s.downcase.gsub('_', ' ')}"}, class: "normal-input #{required_class} select-2", disabled: field.disabled, multiple: true
+          return f.select field.field_name, options_for_select(select_collection_value(field), value), {include_blank: "Select #{field.field_name.to_s.downcase.gsub('_', ' ')}"}, class: "normal-input #{required_class} select-2", disabled: field.disabled, multiple: true
         when :date
           return f.text_field field.field_name, class: "normal-input #{required_class}", disabled: field.disabled, value: value&.strftime('%d-%m-%Y'), placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}", data: { behaviour: 'date-only' }
         when :date_time
@@ -32,6 +32,16 @@ module CmAdmin
           return f.hidden_field field.field_name, value: field.custom_value
         end
       end
+
+      def select_collection_value(field)
+        if field.collection_method
+          collection = send(field.collection_method)
+        elsif field.collection
+          collection = field.collection
+        else
+          collection = []
+        end
+      end
     end
   end
 end

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -38,6 +38,15 @@ module CmAdmin
 
       def set_form_for_fields(resource, available_fields_hash, url, method)
         form_for(resource, url: url, method: method, html: { class: "cm_#{resource.class.name.downcase}_form" } ) do |f|
+          if params[:referrer]
+            concat f.text_field "referrer", class: "normal-input", hidden: true, value: params[:referrer], name: 'referrer'
+          end
+          if params[:polymorphic_name].present?
+            concat f.text_field params[:polymorphic_name] + '_type', class: "normal-input", hidden: true, value: params[:associated_class].classify
+            concat f.text_field params[:polymorphic_name] + '_id', class: "normal-input", hidden: true, value: params[:associated_id]
+          elsif params[:associated_class] && params[:associated_id]
+            concat f.text_field params[:associated_class] + '_id', class: "normal-input", hidden: true, value: params[:associated_id]
+          end
           available_fields_hash.each do |key, fields_array|
             if key == :fields
               fields_array.each do |field|

data/lib/cm_admin/view_helpers/page_info_helper.rb

@@ -51,6 +51,8 @@ module CmAdmin
           base_path + '/new'
         when 'edit'
           base_path + "/#{ar_object.id}" + '/edit'
+        when 'destroy'
+          base_path + "/#{ar_object.id}"
         end
       end
 

data/tmp/cache/webpacker/last-compilation-digest-development

@@ -1 +1 @@
-d5850cd60f91abe79ff8a84a45a9e24c75cb0e4b
+09d7dd65a776413eb9615ccfd2071782565b6619

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.4
 platform: ruby
 authors:
 - sajinmp
 - anbublacky
 - AdityaTiwari2102
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy
@@ -240,7 +240,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/commutatus/cm-admin
   source_code_uri: https://github.com/commutatus/cm-admin
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -255,8 +255,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.2.32
+signing_key: 
 specification_version: 4
 summary: This is an admin panel gem
 test_files: []