cm-admin 0.8.4 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8341533113fd9b7a9192af76438144a864b42449e6a2a6f6f805a36b187bae7
-  data.tar.gz: 4a48bf48899e59f0734f81a836eb22534f39528c5d007abd9ec5c62aba6de7bf
+  metadata.gz: 47fc71a05e69092828694cc38ea2722580571bff16dfd6a9e52a59fd1177820f
+  data.tar.gz: 547bbce4e9127b0c411a9a869cdb0621ce3dcd191d24846e64bdec0415403d26
 SHA512:
-  metadata.gz: b7f866ab3ecdca38fe1296549271b69d49745f001c57f3119d96af0626cd1d966da51a4f0a3d0ac31c034a3fbb4ee788072c8278d8c63697230fce034e7e6002
-  data.tar.gz: 42a81533540eadfc057d86d199a1cf8116e7cdb5e18a37a1a8a3c0ecb44e4d63c2e76c65061a196b3a25ef9bef5f99d9aeb1fe82a0a01d860d43fa429300d2ba
+  metadata.gz: 13a83281f4010e9f7921089047e5c7ca60577ce61587413f2475cb0747b801bfdc9beb03744f8595a94743ad15a187b48f80547be5a8bd8b5217c40595551532
+  data.tar.gz: 8ac891bb57c06f67ede8e325196a693a78c79ef4b7a19d0f2ba72e53ce65f0273e7872916ce7fbe0883dad8c959b2c11ee6195962a81f9c098210e24ca61eb67

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (0.8.4)
+    cm-admin (0.8.6)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)

data/app/controllers/cm_admin/resource_controller.rb

@@ -62,11 +62,12 @@ module CmAdmin
 
     def cm_destroy(params)
       @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
+      redirect_url = request.referrer || cm_admin.send("#{@model.name.underscore}_index_path")
       respond_to do |format|
         if @ar_object.destroy
-          format.html { redirect_back fallback_location: cm_admin.send("#{@model.name.underscore}_index_path"), notice: "#{action_name.titleize} #{@ar_object.class.name.downcase} is successful" }
+          format.html { redirect_back fallback_location: redirect_url, notice: "#{action_name.titleize} #{@ar_object.class.name.downcase} is successful" }
         else
-          format.html { redirect_back fallback_location: cm_admin.send("#{@model.name.underscore}_index_path"), notice: "#{action_name.titleize} #{@ar_object.class.name.downcase} is unsuccessful" }
+          format.html { redirect_back fallback_location: redirect_url, notice: "#{action_name.titleize} #{@ar_object.class.name.downcase} is unsuccessful" }
         end
       end
     end

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

@@ -18,11 +18,18 @@
                 i.fa.fa-edit
               | Edit
         - if destroy_action.present?
-          = link_to cm_admin.send("#{current_model.name.underscore}_destroy_path", ar_object.id), method: :delete do
-            .popup-option
-              span
-                i.fa.fa-trash
-              | Destroy
+          - if @associated_model
+            = link_to cm_admin.send("#{current_model.name.underscore}_destroy_path", ar_object.id, referrer: request.path), method: :delete do
+              .popup-option
+                span
+                  i.fa.fa-trash
+                | Destroy
+          - else  
+            = link_to cm_admin.send("#{current_model.name.underscore}_destroy_path", ar_object.id), method: :delete do
+              .popup-option
+                span
+                  i.fa.fa-trash
+                | Destroy
         - custom_actions.each do |custom_action|
           - if custom_action.display_if.call(ar_object)
             - case custom_action.display_type

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

@@ -5,7 +5,7 @@
         == render partial: 'cm_admin/main/filters', locals: { filters: @associated_model.filters }
     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')
+      - if @associated_model && @associated_model.available_actions.map(&:name).include?('new') && has_valid_policy(@associated_model.name, '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}"
@@ -35,10 +35,11 @@
           /     input.cm-checkbox type="checkbox"
           - @model.available_fields[@action.name.to_sym].each_with_index do |column, index|
             td class="text-ellipsis"
-              - 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)
+              span class="#{column.cm_css_class}"
+                - 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
+                  = show_field_value(ar_object, column)
           - if @associated_model
             == render partial: 'cm_admin/main/actions_dropdown', locals: { cm_model: @associated_model, ar_object: ar_object }
 

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

@@ -1,8 +1,9 @@
-.nested-fields
+.nested-fields class=assoc_name
   - @model.available_fields[ action(action_name) ][assoc_name].each do |field|
     .row
       .col-sm-10
         = input_field_for_column(f, field)
       .col-sm-2
-        - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
-          = link_to_remove_association "x", f
+        - unless field.input_type == :hidden
+          - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
+            = link_to_remove_association "x", f

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

@@ -16,7 +16,8 @@
         /   span
         /     input.cm-checkbox type="checkbox"
         - @model.available_fields[:index].each do |column|
-          th = column.header
+          - if column.display_if.call(Current.user)
+            th = column.header
     tbody.cm-table__body
       - @ar_object.data.each do |ar_object|
         tr.body-row
@@ -24,14 +25,15 @@
           /   span
           /     input.cm-checkbox type="checkbox"
           - @model.available_fields[:index].each_with_index do |column, index|
-            td.text-ellipsis
-              span class="#{column.field_type.to_s} #{column.cm_css_class} "
-                - if index == 0 && !([: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)
-                - else
-                  = show_field_value(ar_object, column)
-                  - if column.field_type == :drawer
-                    = render partial: column.drawer_partial, locals: { ar_object: ar_object }
+            - if column.display_if.call(Current.user)
+              td.text-ellipsis
+                span class="#{column.field_type.to_s} #{column.cm_css_class} "
+                  - if index == 0 && !([: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)
+                  - else
+                    = show_field_value(ar_object, column)
+                    - if column.field_type == :drawer
+                      = render partial: column.drawer_partial, locals: { ar_object: ar_object }
           - if @model
             == render partial: 'cm_admin/main/actions_dropdown', locals: { cm_model: @model, ar_object: ar_object }
 

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

@@ -23,7 +23,7 @@
               li
                 .popup-option.pointer data-bs-toggle='modal' data-bs-target='#exportmodal'
                   span Export
-      - if @model.importer
+      - if @model.importer && has_valid_policy(@model.name, :importable)
         = link_to 'Import', cm_admin.send(:"#{@model.name.underscore}_import_path"), class: 'primary-btn ml-2'
       - new_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('new')}
       - if new_action.any? && policy([:cm_admin, @model.name.classify.constantize]).new?

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

@@ -8,8 +8,9 @@
       == render @action.partial
     - else
       - @model.available_fields[:show].each do |section|
-        .info-section
-          p.section-heading = section.section_name
-          .paper
-            - section.available_section_fields.each do |field|
-              = show_field(@ar_object, field)
+        - if section.display_if.call(@ar_object)
+          .info-section
+            p.section-heading = section.section_name
+            .paper
+              - section.available_section_fields.each do |field|
+                = show_field(@ar_object, field)

data/lib/cm_admin/models/cm_show_section.rb

@@ -2,11 +2,12 @@ module CmAdmin
   module Models
     class CmShowSection
 
-      attr_accessor :section_name, :available_section_fields
+      attr_accessor :section_name, :available_section_fields, :display_if
 
-      def initialize(section_name, &block)
+      def initialize(section_name, display_if, &block)
         @available_section_fields = []
         @section_name = section_name
+        @display_if = display_if || lambda { |arg| return true }
         instance_eval(&block)
       end
 

data/lib/cm_admin/models/column.rb

@@ -2,7 +2,7 @@ module CmAdmin
   module Models
     class Column
       attr_accessor :field_name, :field_type, :header, :format, :prefix, :suffix, :exportable, :round, :height, :width,
-      :cm_css_class, :link, :url, :custom_method, :helper_method, :managable, :lockable, :drawer_partial, :tag_class
+      :cm_css_class, :link, :url, :custom_method, :helper_method, :managable, :lockable, :drawer_partial, :tag_class, :display_if
 
       def initialize(field_name, attributes = {})
         @field_name = field_name
@@ -15,6 +15,7 @@ module CmAdmin
         self.send("header=", format_header)
         self.height = 50 if self.field_type == :image && self.height.nil?
         self.width = 50 if self.field_type == :image && self.width.nil?
+        self.display_if = lambda { |arg| return true } if self.display_if.nil?
       end
 
       #returns a string value as a header (either field_name or value present in header attribute)

data/lib/cm_admin/models/dsl_method.rb

@@ -54,9 +54,9 @@ module CmAdmin
         yield if block
       end
 
-      def cm_show_section(section_name, &block)
+      def cm_show_section(section_name, display_if: nil, &block)
         @available_fields[@current_action.name.to_sym] ||= []
-        @available_fields[@current_action.name.to_sym] << CmAdmin::Models::CmShowSection.new(section_name, &block)
+        @available_fields[@current_action.name.to_sym] << CmAdmin::Models::CmShowSection.new(section_name, display_if, &block)
       end
 
       def form_field(field_name, options={}, arg=nil)

data/lib/cm_admin/models/field.rb

@@ -3,7 +3,7 @@ module CmAdmin
     class Field
 
       attr_accessor :field_name, :label, :header, :field_type, :format, :precision, :height,
-        :width, :helper_method, :preview, :custom_link, :precision, :prefix, :suffix, :tag_class
+        :width, :helper_method, :preview, :custom_link, :precision, :prefix, :suffix, :tag_class, :display_if
 
       def initialize(field_name, attributes = {})
         @field_name = field_name
@@ -13,6 +13,7 @@ module CmAdmin
         end
         self.height = 50 if self.field_type == :image && self.height.nil?
         self.width = 50 if self.field_type == :image && self.width.nil?
+        self.display_if = lambda { |arg| return true } if self.display_if.nil?
       end
 
       def set_default_values

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, :disabled, :helper_method, :placeholder
+      attr_accessor :field_name, :label, :header, :input_type, :collection, :disabled, :helper_method, :placeholder, :display_if, :html_attr
       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 = {})
@@ -10,6 +10,7 @@ module CmAdmin
         attributes.each do |key, value|
           self.send("#{key.to_s}=", value)
         end
+        self.display_if = lambda { |arg| return true } if self.display_if.nil?
         raise ArgumentError, "Kindly select a valid input type like #{VALID_INPUT_TYPES.sort.to_sentence(last_word_connector: ', or ')} instead of #{self.input_type} for form field #{field_name}" unless VALID_INPUT_TYPES.include?(self.input_type.to_sym)
       end
 
@@ -18,6 +19,7 @@ module CmAdmin
         self.label = self.field_name.to_s.titleize
         self.input_type = :string
         self.placeholder = "Enter #{self.field_name.to_s.downcase.gsub('_', ' ')}"
+        self.html_attr = {}
       end
     end
   end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.8.4"
+  VERSION = "0.8.6"
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -2,6 +2,7 @@ module CmAdmin
   module ViewHelpers
     module FieldDisplayHelper
       def show_field(ar_object, field)
+        return unless field.display_if.call(ar_object)
         content_tag(:div, class: "info-split") do
           concat show_field_label(ar_object, field)
           concat value_with_prefix_and_suffix(ar_object, field)

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -2,7 +2,8 @@ module CmAdmin
   module ViewHelpers
     module FormFieldHelper
       def input_field_for_column(f, field)
-        value = field.helper_method ? send(field.helper_method) : f.object.send(field.field_name)
+        return unless field.display_if.call(f.object)
+        value = field.helper_method ? send(field.helper_method, f.object, field.field_name) : f.object.send(field.field_name)
         is_required = f.object._validators[field.field_name].map(&:kind).include?(:presence)
         required_class = is_required ? 'required' : ''
         case field.input_type
@@ -13,9 +14,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(select_collection_value(field), f.object.send(field.field_name)), {include_blank: field.placeholder.to_s}, class: "normal-input #{required_class} select-2", disabled: field.disabled
+          return f.select field.field_name, options_for_select(select_collection_value(f.object, field), f.object.send(field.field_name)), {include_blank: field.placeholder.to_s}, class: "normal-input #{required_class} select-2", disabled: field.disabled
         when :multi_select
-          return f.select field.field_name, options_for_select(select_collection_value(field), f.object.send(field.field_name)), {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(f.object, field), f.object.send(field.field_name)), {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
@@ -29,15 +30,15 @@ module CmAdmin
         when :multi_file_upload
           return f.file_field field.field_name, multiple: true, class: "normal-input #{required_class}"
         when :hidden
-          return f.hidden_field field.field_name, value: value
+          return f.hidden_field field.field_name, value: value, name: field.html_attr[:name] || "#{f.object_name}[#{field.field_name}]"
         end
       end
 
       # Refactor: Collection argument can be removed.
       # helper_method argument will accept a method where value can be passed.
-      def select_collection_value(field)
+      def select_collection_value(object, field)
         if field.helper_method
-          collection = send(field.helper_method)
+          collection = send(field.helper_method, object, field.field_name)
         elsif field.collection
           collection = field.collection
         else

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -50,6 +50,7 @@ module CmAdmin
           available_fields_hash.each do |key, fields_array|
             if key == :fields
               fields_array.each do |field|
+                next unless field.display_if.call(f.object)
                 if field.input_type.eql?(:hidden)
                   concat input_field_for_column(f, field)
                 else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.6
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-17 00:00:00.000000000 Z
+date: 2022-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails