cm-admin 0.8.9 → 0.9.1

data/lib/cm_admin/models/dsl_method.rb

@@ -77,10 +77,23 @@ module CmAdmin
       def column(field_name, options={})
         @available_fields[@current_action.name.to_sym] ||= []
         if @available_fields[@current_action.name.to_sym].select{|x| x.lockable}.size > 0 && options[:lockable]
-          raise "Only one column can be locked in a table."
+          raise 'Only one column can be locked in a table.'
         end
 
-        unless @available_fields[@current_action.name.to_sym].map{|x| x.field_name.to_sym}.include?(field_name)
+        duplicate_columns = @available_fields[@current_action.name.to_sym].filter{|x| x.field_name.to_sym == field_name}
+        terminate = false
+
+        if duplicate_columns.size.positive?
+          duplicate_columns.each do |column|
+            if options[:field_type].to_s != 'association'
+              terminate = true
+            elsif options[:field_type].to_s == 'association' && column.association_name.to_s == options[:association_name].to_s
+              terminate = true
+            end
+          end
+        end
+
+        unless terminate
           @available_fields[@current_action.name.to_sym] << CmAdmin::Models::Column.new(field_name, options)
         end
       end
@@ -107,9 +120,9 @@ module CmAdmin
       #     end
       #   end
       # end
-      def custom_action(name: nil, verb: nil, layout: nil, layout_type: nil, partial: nil, path: nil, display_type: nil, display_if: lambda { |arg| return true }, route_type: nil, icon_name: 'fa fa-th-large', &block)
+      def custom_action(name: nil, display_name: nil, verb: nil, layout: nil, layout_type: nil, partial: nil, path: nil, display_type: nil, display_if: lambda { |arg| return true }, route_type: nil, icon_name: 'fa fa-th-large', &block)
         action = CmAdmin::Models::CustomAction.new(
-                    name: name, verb: verb, layout: layout, layout_type: layout_type, partial: partial, path: path,
+                    name: name, display_name: display_name, verb: verb, layout: layout, layout_type: layout_type, partial: partial, path: path,
                     parent: self.current_action.name, display_type: display_type, display_if: display_if,
                     action_type: :custom, route_type: route_type, icon_name: icon_name, &block)
         @available_actions << action

data/lib/cm_admin/models/field.rb

@@ -1,9 +1,13 @@
+require_relative 'utils/associations'
+
 module CmAdmin
   module Models
     class Field
+      include Utils::Associations
 
       attr_accessor :field_name, :label, :header, :field_type, :format, :precision, :height,
-        :width, :helper_method, :preview, :custom_link, :precision, :prefix, :suffix, :tag_class, :display_if
+        :width, :helper_method, :preview, :custom_link, :prefix, :suffix, :tag_class,
+        :display_if, :association_name, :association_type
 
       def initialize(field_name, attributes = {})
         @field_name = field_name
@@ -14,6 +18,8 @@ module CmAdmin
         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?
+
+        validation_for_association
       end
 
       def set_default_values

data/lib/cm_admin/models/filter.rb

@@ -70,7 +70,7 @@ module CmAdmin
 
             if filter.db_column_name.map{|x| x.is_a?(Hash)}.include?(true)
               associations_hash = filter.db_column_name.select{|x| x if x.is_a?(Hash)}.last
-              records = records.joins(associations_hash.keys)
+              records = records.left_joins(associations_hash.keys).distinct
             end
 
             records = records.where(

data/lib/cm_admin/models/utils/associations.rb

@@ -0,0 +1,25 @@
+module CmAdmin
+  module Models
+    module Utils
+      module Associations
+        extend ActiveSupport::Concern
+
+        def validation_for_association
+          return unless field_type.to_s == "association"
+
+          raise ArgumentError, 'Expected association_name and association_type to be present' if association_name.nil? || association_type.nil?
+
+          if association_type.to_s == 'polymorphic'
+            raise ArgumentError, "Expected field_name - #{field_name} - to be an array of hash. Eg, [{table_name_1: 'column_name_1'}, {table_name_2: 'column_name_2'}]" unless field_name.is_a?(Array)
+
+            field_name.each do |element|
+              raise ArgumentError, "Expected element #{element} to be a hash. Eg, [{table_name_1: 'column_name_1'}, {table_name_2: 'column_name_2'}]" unless element.is_a?(Hash)
+            end
+          elsif ['belongs_to', 'has_one'].include? association_type.to_s
+            raise ArgumentError, "Expected field_name - #{field_name} to be a String or Symbol" unless field_name.is_a?(Symbol) || field_name.is_a?(String)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '0.8.9'
+  VERSION = '0.9.1'
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -11,7 +11,14 @@ module CmAdmin
 
       def show_field_label(ar_object, field)
         content_tag(:div, class: "info-split__lhs") do
-          p = field.label.present? ? field.label.to_s : field.field_name.to_s.titleize
+          field_label = if field.label.present?
+                          field.label.to_s
+                        elsif field.association_type.to_s == "polymorphic"
+                          ar_object.send(field.association_name).class.to_s.titleize
+                        else
+                          field.field_name.to_s.titleize
+                        end
+          p = field_label
         end
       end
 
@@ -73,6 +80,14 @@ module CmAdmin
               image_tag('https://cm-admin.s3.ap-south-1.amazonaws.com/gem_static_assets/image_not_available.png', height: 50, width: 50)
             end
           end
+        when :association
+          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)
+          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)
+          end
         end
       end
 
@@ -92,6 +107,11 @@ module CmAdmin
         end
       end
 
+      def find_field_name(field, association_name)
+        field.field_name.each do |hash|
+          return hash[association_name.to_sym] if hash.has_key?(association_name.to_sym)
+        end
+      end
     end
   end
 end

data/lib/cm_admin/view_helpers/page_info_helper.rb

@@ -71,14 +71,22 @@ module CmAdmin
 
       def custom_action_button(custom_action, current_action_name)
         if current_action_name == "index"
-          link_to custom_action.name.titleize, @model.ar_model.table_name + '/' + custom_action.path, class: 'secondary-btn ml-2', method: custom_action.verb
+          link_to custom_action_title(custom_action), @model.ar_model.table_name + '/' + custom_action.path, class: 'secondary-btn ml-2', method: custom_action.verb
         elsif current_action_name == "show"
-          link_to custom_action.name.titleize, custom_action.path.gsub(':id', params[:id]), class: 'secondary-btn ml-2', method: custom_action.verb
+          link_to custom_action_title(custom_action), custom_action.path.gsub(':id', params[:id]), class: 'secondary-btn ml-2', method: custom_action.verb
         end
       end
 
       def custom_modal_button(custom_action)
-        link_to custom_action.name.titleize, '', class: 'secondary-btn ml-2', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal" }
+        link_to custom_action_title(custom_action), '', class: 'secondary-btn ml-2', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal" }
+      end
+
+      def custom_action_title(custom_action)
+         custom_action.display_name.to_s.presence || custom_action.name.to_s.titleize
+      end
+
+      def tab_display_name(nav_item_name)
+        nav_item_name.instance_of?(Symbol) ? nav_item_name.to_s.titleize : nav_item_name.to_s
       end
     end
   end