cm-admin 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72119a5aae30fb36067825d4ed89fc085907b1a31a7b79e18dd30690b8379991
-  data.tar.gz: 917b3dc2d4d59d4099c77e169694579f1d82c5dc53664025fb98edbd9ccc3ff3
+  metadata.gz: 38f55f5eb7db0ce9a1ef95f111085f1aa36132e6f729fc18e9d81f09a3896b68
+  data.tar.gz: 569e799bacc88c9bd811fbd55e0c8ee313c0af32874aa63a64786f4dd477923d
 SHA512:
-  metadata.gz: 42bbbf83a0d81aa5d193cb23a3469ed3392f13fe573605a55886611805c2e388e3a3664c2be6202eea743f13658cd6faf7870a2ba786339620d87484b823ccab
-  data.tar.gz: e6474599f0f7de99642a056713baf93f9f7dcb6352d2385fc080059d310fa22b4b7199c28dff7b9a36be9d025aacf0fa395206e225e4ec26843befa2a640a3d3
+  metadata.gz: 4802b0d59a4d4eed99d9ced6d3cbefb96af6cb4c610e2542e5fe5ca9035bcb432935cb7f4db61f0775d978fd0b83c8ed21de6f939c071498f26b888d25fe2fe5
+  data.tar.gz: bdcf0cda0c49c059ed6fc87abc960c04e59b611d079b5ce3a9aaccbebaa0feaba711ecd18546eec9a466129c39537056a28cbc98b4712ff4d5ba2bd45e0fd150

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,15 +47,13 @@ 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)

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/_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,7 +140,9 @@ 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}"

data/lib/cm_admin/models/controller_method.rb

@@ -58,7 +58,15 @@ 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
             elsif x.class.name.include?('HasMany')

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/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.2"
+  VERSION = "0.7.3"
 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|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy