cm-admin 0.7.2 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72119a5aae30fb36067825d4ed89fc085907b1a31a7b79e18dd30690b8379991
-  data.tar.gz: 917b3dc2d4d59d4099c77e169694579f1d82c5dc53664025fb98edbd9ccc3ff3
+  metadata.gz: 8603d897651307b80517b9918c60ab3d2d62abdc2931af5ea7d8def1453b4865
+  data.tar.gz: 0afafa900d9c51bee526e9781df8dd41baf1603cf768bb8db3e1d8353fc4adc0
 SHA512:
-  metadata.gz: 42bbbf83a0d81aa5d193cb23a3469ed3392f13fe573605a55886611805c2e388e3a3664c2be6202eea743f13658cd6faf7870a2ba786339620d87484b823ccab
-  data.tar.gz: e6474599f0f7de99642a056713baf93f9f7dcb6352d2385fc080059d310fa22b4b7199c28dff7b9a36be9d025aacf0fa395206e225e4ec26843befa2a640a3d3
+  metadata.gz: '02398dcf148b0d90bd6de2dfd2fdeae4fd4d3353d75c33433a75518da87c6d6c739349279f9f6f3a4632256c37e463009838e9ec21821d224728730a8656b87b'
+  data.tar.gz: 2f390a32636c40fdeb3afc5128ad824135565450d0b833aafc9ac828d8d4178d5dda2316e01f654a45266514a4a31e0b22985c41d3e1b10cf049ee56b6cf663c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (0.5.7)
+    cm-admin (0.7.5)
       axlsx_rails (~> 0.6.1)
       cocoon (~> 1.2.15)
       pagy (~> 4.11.0)
@@ -47,29 +47,27 @@ GEM
     htmlentities (4.3.4)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.15.0)
+    loofah (2.18.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.6-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.4)
     rack-proxy (0.7.2)
       rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack-test (2.0.2)
+      rack (>= 1.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
     railties (7.0.2.3)
       actionpack (= 7.0.2.3)
@@ -107,7 +105,7 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -30,7 +30,7 @@ You can find more detailed documentation [here](https://github.com/commutatus/cm
 
 ## Demo
 
-For demo check [here](http://cm-admin.labs.commutatus.com/admin/users/)
+For demo check [here](http://cm-admin.labs.commutatus.com)
 For demo repo check [here](https://github.com/commutatus/cm-admin-panel-demo)
 
 ## Development

data/app/controllers/cm_admin/application_controller.rb

@@ -1,6 +1,7 @@
 module CmAdmin
   class ApplicationController < ::ActionController::Base
     include Pundit::Authorization
+    include Pagy::Backend
     # before_action :check_cm_admin
     layout 'cm_admin'
     helper CmAdmin::ViewHelpers

data/app/controllers/cm_admin/resource_controller.rb

@@ -0,0 +1,192 @@
+module CmAdmin
+  class ResourceController < ApplicationController
+    include Pundit::Authorization
+    include Pagy::Backend
+
+    def cm_index(params)
+      @current_action = CmAdmin::Models::Action.find_by(@model, name: 'index')
+      # Based on the params the filter and pagination object to be set
+      @ar_object = filter_by(params, nil, @model.filter_params(params))
+      # resource_identifier
+      respond_to do |format|
+        if request.xhr?
+          format.html { render partial: '/cm_admin/main/table' }
+        else
+          format.html { render '/cm_admin/main/' + action_name }
+        end
+      end
+    end
+
+    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])
+      resource_identifier
+      respond_to do |format|
+        format.html { render '/cm_admin/main/' + action_name }
+      end
+    end
+
+    def cm_new(params)
+      @current_action = CmAdmin::Models::Action.find_by(@model, name: 'new')
+      @ar_object = @model.ar_model.new
+      resource_identifier
+      respond_to do |format|
+        format.html { render '/cm_admin/main/' + action_name }
+      end
+    end
+
+    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])
+      resource_identifier
+      respond_to do |format|
+        format.html { render '/cm_admin/main/' + action_name }
+      end
+    end
+
+    def cm_update(params)
+      @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
+      @ar_object.assign_attributes(resource_params(params))
+      resource_identifier
+      resource_responder
+    end
+
+    def cm_create(params)
+      @ar_object = @model.ar_model.name.classify.constantize.new(resource_params(params))
+      resource_identifier
+      resource_responder
+    end
+
+    def cm_destroy(params)
+      @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
+      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" }
+        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" }
+        end
+      end
+    end
+
+    def cm_custom_method(params)
+      scoped_model = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve
+      resource_identifier
+      respond_to do |format|
+        if @action.action_type == :custom
+          if @action.child_records
+            format.html { render @action.layout }
+          elsif @action.display_type == :page
+            data = @action.parent == "index" ? @ar_object.data : @ar_object
+            format.html { render @action.partial }
+          else
+            ar_object = @action.code_block.call(@ar_object)
+            if ar_object.errors.empty?
+              redirect_url = @model.current_action.redirection_url || @action.redirection_url || request.referrer || "/cm_admin/#{@model.ar_model.table_name}/#{@ar_object.id}"
+              format.html { redirect_to redirect_url, notice: "#{@action.name.titleize} is successful" }
+            else
+              error_messages = ar_object.errors.full_messages.map{|error_message| "<li>#{error_message}</li>"}.join
+              format.html { redirect_to request.referrer, alert: "<b>#{@action.name.titleize} is unsuccessful</b><br /><ul>#{error_messages}</ul>" }
+            end
+          end
+        end
+      end
+    end
+
+    def resource_identifier
+      @ar_object, @associated_model, @associated_ar_object = custom_controller_action(action_name, params.permit!) if !@ar_object.present? && params[:id].present?
+      authorize controller_name.classify.constantize, 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]
+      nested_tables = @model.available_fields[:new].except(:fields).keys
+      nested_tables += @model.available_fields[:edit].except(:fields).keys
+      @reflections = @model.ar_model.reflect_on_all_associations
+      nested_tables.each do |table_name|
+        reflection = @reflections.select {|x| x if x.name == table_name}.first
+        if reflection.macro == :has_many
+          @ar_object.send(table_name).build if action_name == "new" || action_name == "edit"
+        elsif action_name == "new"
+          @ar_object.send(('build_' + table_name.to_s).to_sym)
+        end
+      end
+    end
+
+    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
+          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" }
+        end
+      end
+    end
+
+    def custom_controller_action(action_name, params)
+      current_action = CmAdmin::Models::Action.find_by(@model, name: action_name.to_s)
+      if current_action
+        @current_action = current_action
+        @ar_object = @model.ar_model.name.classify.constantize.find(params[:id])
+        if @current_action.child_records
+          child_records = @ar_object.send(@current_action.child_records)
+          @associated_model = CmAdmin::Model.find_by(name: @model.ar_model.reflect_on_association(@current_action.child_records).klass.name)
+          if child_records.is_a? ActiveRecord::Relation
+            @associated_ar_object = filter_by(params, child_records)
+          else
+            @associated_ar_object = child_records
+          end
+          return @ar_object, @associated_model, @associated_ar_object
+        end
+        return @ar_object
+      end
+    end
+
+    def filter_by(params, records, filter_params={}, sort_params={})
+      filtered_result = OpenStruct.new
+      sort_column = "created_at"
+      sort_direction = %w[asc desc].include?(sort_params[:sort_direction]) ? sort_params[:sort_direction] : "asc"
+      sort_params = {sort_column: sort_column, sort_direction: sort_direction}
+      
+      records = "CmAdmin::#{@model.name}Policy::Scope".constantize.new(Current.user, @model.name.constantize).resolve if records.nil?
+      records = records.order("#{@current_action.sort_column} #{@current_action.sort_direction}")
+
+      final_data = CmAdmin::Models::Filter.filtered_data(filter_params, records, @model.filters)
+      pagy, records = pagy(final_data)
+      filtered_result.data = records
+      filtered_result.pagy = pagy
+      # filtered_result.facets = paginate(page, raw_data.size)
+      # filtered_result.sort = sort_params
+      # filtered_result.facets.sort = sort_params
+      return filtered_result
+    end
+
+    def resource_params(params)
+      permittable_fields = @permitted_fields || @model.ar_model.columns.map(&:name).reject { |i| CmAdmin::REJECTABLE_FIELDS.include?(i) }.map(&:to_sym)
+      permittable_fields += @model.ar_model.name.constantize.reflect_on_all_associations.map {|x|
+        next if x.options[:polymorphic]
+        if x.class.name.include?('HasOne')
+          x.name.to_s.gsub('_attachment', '').gsub('rich_text_', '').to_sym
+        elsif x.class.name.include?('HasMany')
+          Hash[x.name.to_s.gsub('_attachment', ''), []]
+        end
+      }.compact
+      nested_tables = @model.available_fields[:new].except(:fields).keys
+      nested_tables += @model.available_fields[:edit].except(:fields).keys
+      nested_fields = nested_tables.uniq.map {|table|
+        Hash[
+          table.to_s + '_attributes',
+          table.to_s.classify.constantize.columns.map(&:name).reject { |i| CmAdmin::REJECTABLE_FIELDS.include?(i) }.map(&:to_sym) + [:id, :_destroy]
+        ]
+      }
+      permittable_fields += nested_fields
+      @model.ar_model.columns.map { |col| permittable_fields << col.name.split('_cents') if col.name.include?('_cents') }
+
+      params.require(@model.name.underscore.to_sym).permit(*permittable_fields)
+    end
+
+  end
+end

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

@@ -10,7 +10,6 @@ require_relative 'models/export'
 require_relative 'models/cm_show_section'
 require_relative 'models/tab'
 require_relative 'models/dsl_method'
-require_relative 'models/controller_method'
 require 'pagy'
 require 'axlsx'
 require 'cocoon'
@@ -21,7 +20,6 @@ module CmAdmin
     include Pagy::Backend
     include Models::Blocks
     include Models::DslMethod
-    include Models::ControllerMethod
     attr_accessor :available_actions, :actions_set, :available_fields, :permitted_fields,
       :current_action, :params, :filters, :available_tabs, :icon_name
     attr_reader :name, :ar_model, :is_visible_on_sidebar
@@ -89,12 +87,13 @@ module CmAdmin
       @icon_name = name
     end
 
+    # Shared between export controller and resource controller
     def filter_params(params)
       # OPTIMIZE: Need to check if we can permit the filter_params in a better way
-      date_columns = @filters.select{|x| x.filter_type.eql?(:date)}.map(&:db_column_name)
-      range_columns = @filters.select{|x| x.filter_type.eql?(:range)}.map(&:db_column_name)
-      single_select_columns = @filters.select{|x| x.filter_type.eql?(:single_select)}.map(&:db_column_name)
-      multi_select_columns = @filters.select{|x| x.filter_type.eql?(:multi_select)}.map{|x| Hash["#{x.db_column_name}", []]}
+      date_columns = self.filters.select{|x| x.filter_type.eql?(:date)}.map(&:db_column_name)
+      range_columns = self.filters.select{|x| x.filter_type.eql?(:range)}.map(&:db_column_name)
+      single_select_columns = self.filters.select{|x| x.filter_type.eql?(:single_select)}.map(&:db_column_name)
+      multi_select_columns = self.filters.select{|x| x.filter_type.eql?(:multi_select)}.map{|x| Hash["#{x.db_column_name}", []]}
 
       params.require(:filters).permit(:search, date: date_columns, range: range_columns, single_select: single_select_columns, multi_select: multi_select_columns) if params[:filters]
     end
@@ -104,7 +103,7 @@ module CmAdmin
     # Controller defined for each model
     # If model is User, controller will be UsersController
     def define_controller
-      klass = Class.new(CmAdmin::ApplicationController) do
+      klass = Class.new(CmAdmin::ResourceController) do
         include Pundit::Authorization
         rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
@@ -116,66 +115,14 @@ module CmAdmin
             @model.params = params
             @action = CmAdmin::Models::Action.find_by(@model, name: action_name)
             @model.current_action = @action
-            @ar_object = @model.try(@action.parent || action_name, params)
-            @ar_object, @associated_model, @associated_ar_object = @model.custom_controller_action(action_name, params.permit!) if !@ar_object.present? && params[:id].present?
-            authorize controller_name.classify.constantize, 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]
-            nested_tables = @model.available_fields[:new].except(:fields).keys
-            nested_tables += @model.available_fields[:edit].except(:fields).keys
-            @reflections = @model.ar_model.reflect_on_all_associations
-            nested_tables.each do |table_name|
-              reflection = @reflections.select {|x| x if x.name == table_name}.first
-              if reflection.macro == :has_many
-                @ar_object.send(table_name).build if action_name == "new" || action_name == "edit"
-              else
-                @ar_object.send(('build_' + table_name.to_s).to_sym) if action_name == "new"
-              end
-            end
-            respond_to do |format|
-              if %w(show index new edit).include?(action_name)
-                if request.xhr? && action_name.eql?('index')
-                  format.html { render partial: '/cm_admin/main/table' }
-                else
-                  format.html { render '/cm_admin/main/'+action_name }
-                end
-              elsif %w(create update destroy).include?(action_name)
-                if %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
-                  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" }
-                end
-              elsif action.action_type == :custom
-                if action.child_records
-                  format.html { render action.layout }
-                elsif action.display_type == :page
-                  data = @action.parent == "index" ? @ar_object.data : @ar_object
-                  format.html { render action.partial }
-                else
-                  ar_object = @action.code_block.call(@ar_object)
-                  if ar_object.errors.empty?
-                    redirect_url = @model.current_action.redirection_url || @action.redirection_url || request.referrer || "/cm_admin/#{@model.ar_model.table_name}/#{@ar_object.id}"
-                    format.html { redirect_to redirect_url, notice: "#{@action.name.titleize} is successful" }
-                  else
-                    error_messages = ar_object.errors.full_messages.map{|error_message| "<li>#{error_message}</li>"}.join
-                    format.html { redirect_to request.referrer, alert: "<b>#{@action.name.titleize} is unsuccessful</b><br /><ul>#{error_messages}</ul>" }
-                  end
-                end
-              elsif action.layout.present?
-                if request.xhr? && action.partial.present?
-                  format.html { render partial: action.partial }
-                else
-                  format.html { render action.layout }
-                end
-              end
-            end
+            send(@action.controller_action_name, params)
+            # @ar_object = @model.try(@action.parent || action_name, params)
           end
         end
+
+        def pundit_user
+          Current.user
+        end
         private
 
         def user_not_authorized

data/lib/cm_admin/models/action.rb

@@ -43,6 +43,16 @@ module CmAdmin
         self.partial = partial
       end
 
+      def controller_action_name
+        if self.action_type == :custom
+          'cm_custom_method'
+        elsif self.parent
+          'cm_' + self.parent
+        else
+          'cm_' + name
+        end
+      end
+
       class << self
         def find_by(model, search_hash)
           model.available_actions.find { |i| i.name == search_hash[:name] }

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.5"
 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/lib/generators/cm_admin/add_authentication_generator.rb

@@ -0,0 +1,31 @@
+require 'rails/generators'
+
+module CmAdmin
+  module Generators
+    class AddAuthenticationGenerator < Rails::Generators::Base
+      source_root File.expand_path('templates', __dir__)
+
+      # This generator is used to add authentication, if no auth system is present.
+      # Adds authentication through devise and sets up the current user.
+      def add_authentication
+        gem "devise"
+        generate "devise:install"
+        model_name = ask("What would you like the user model to be called? [user]")
+        generate "devise", model_name
+        rake "db:migrate"
+        copy_file 'application_controller.rb', 'app/controllers/cm_admin/application_controller.rb'
+        gsub_file 'app/controllers/cm_admin/application_controller.rb', 'authenticate_user', "authenticate_#{model_name}"
+        copy_file 'authentication.rb', 'app/controllers/concerns/authentication.rb'
+        gsub_file 'app/controllers/concerns/authentication.rb', 'current_user', "current_#{model_name}"
+        copy_file 'current.rb', 'app/models/current.rb'
+        inject_into_file "app/models/#{model_name.underscore}.rb", before: "end\n" do <<-'RUBY'
+  # Remove this once role is setup and mentioned in zcm_admin.rb
+  def super_admin?
+    true
+  end
+        RUBY
+        end
+      end
+    end
+  end
+end

data/lib/generators/cm_admin/templates/application_controller.rb

@@ -0,0 +1,8 @@
+module CmAdmin
+  class ApplicationController < ActionController::Base
+    include Authentication
+    before_action :authenticate_user!
+    layout 'cm_admin'
+    helper CmAdmin::ViewHelpers
+  end
+end

data/lib/generators/cm_admin/templates/authentication.rb

@@ -0,0 +1,14 @@
+module Authentication
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :check_current_user
+  end
+
+  private
+  def check_current_user
+    if current_user
+      Current.user = current_user
+    end
+  end
+end

data/lib/generators/cm_admin/templates/cm_admin_initializer.rb

@@ -1,4 +1,6 @@
 CmAdmin.configure do |config|
   # Sets the default layout to be used for admin
   config.layout = 'admin'
+  # config.authorized_roles = [:super_admin?]
+  # config.included_models = [Admin]
 end

data/lib/generators/cm_admin/templates/current.rb

@@ -0,0 +1,9 @@
+class Current < ActiveSupport::CurrentAttributes
+  attribute :user, :request_id, :user_agent, :ip_address
+
+  resets { Time.zone = nil }
+
+  def user=(user)
+    super
+  end
+end

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

@@ -1 +1 @@
-09d7dd65a776413eb9615ccfd2071782565b6619
+00ac6841e4fa3607e5f705b375dada0dcaf2c84d

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.5
 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-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy
@@ -144,6 +144,7 @@ files:
 - app/assets/stylesheets/cm_admin/scaffold.scss
 - app/controllers/cm_admin/application_controller.rb
 - app/controllers/cm_admin/exports_controller.rb
+- app/controllers/cm_admin/resource_controller.rb
 - app/controllers/cm_admin/static_controller.rb
 - app/helpers/cm_admin/application_helper.rb
 - app/helpers/cm_admin/custom_helper.rb
@@ -203,7 +204,6 @@ files:
 - lib/cm_admin/models/blocks.rb
 - lib/cm_admin/models/cm_show_section.rb
 - lib/cm_admin/models/column.rb
-- lib/cm_admin/models/controller_method.rb
 - lib/cm_admin/models/custom_action.rb
 - lib/cm_admin/models/dsl_method.rb
 - lib/cm_admin/models/export.rb
@@ -221,11 +221,15 @@ files:
 - lib/cm_admin/view_helpers/manage_column_popup_helper.rb
 - lib/cm_admin/view_helpers/navigation_helper.rb
 - lib/cm_admin/view_helpers/page_info_helper.rb
+- lib/generators/cm_admin/add_authentication_generator.rb
 - lib/generators/cm_admin/install_generator.rb
 - lib/generators/cm_admin/policy_generator.rb
 - lib/generators/cm_admin/templates/actiontext.scss
+- lib/generators/cm_admin/templates/application_controller.rb
 - lib/generators/cm_admin/templates/application_policy.rb
+- lib/generators/cm_admin/templates/authentication.rb
 - lib/generators/cm_admin/templates/cm_admin_initializer.rb
+- lib/generators/cm_admin/templates/current.rb
 - lib/generators/cm_admin/templates/custom.css
 - lib/generators/cm_admin/templates/custom.js
 - lib/generators/cm_admin/templates/policy.rb

data/lib/cm_admin/models/controller_method.rb

@@ -1,86 +0,0 @@
-module CmAdmin
-  module Models
-    module ControllerMethod
-      extend ActiveSupport::Concern
-
-      def show(params)
-        @current_action = CmAdmin::Models::Action.find_by(self, name: 'show')
-        scoped_model = "CmAdmin::#{self.name}Policy::Scope".constantize.new(Current.user, self.name.constantize).resolve
-        @ar_object = scoped_model.find(params[:id])
-      end
-
-      def index(params)
-        @current_action = CmAdmin::Models::Action.find_by(self, name: 'index')
-        # Based on the params the filter and pagination object to be set
-        @ar_object = filter_by(params, nil, filter_params(params))
-      end
-
-      def new(params)
-        @current_action = CmAdmin::Models::Action.find_by(self, name: 'new')
-        @ar_object = @ar_model.new
-      end
-
-      def edit(params)
-        @current_action = CmAdmin::Models::Action.find_by(self, name: 'edit')
-        @ar_object = @ar_model.name.classify.constantize.find(params[:id])
-      end
-
-      def update(params)
-        @ar_object = @ar_model.name.classify.constantize.find(params[:id])
-        @ar_object.assign_attributes(resource_params(params))
-        @ar_object
-      end
-
-
-      def create(params)
-        @ar_object = @ar_model.name.classify.constantize.new(resource_params(params))
-      end
-
-      def filter_by(params, records, filter_params={}, sort_params={})
-        filtered_result = OpenStruct.new
-        sort_column = "created_at"
-        sort_direction = %w[asc desc].include?(sort_params[:sort_direction]) ? sort_params[:sort_direction] : "asc"
-        sort_params = {sort_column: sort_column, sort_direction: sort_direction}
-        
-        records = "CmAdmin::#{self.name}Policy::Scope".constantize.new(Current.user, self.name.constantize).resolve if records.nil?
-        records = records.order("#{current_action.sort_column} #{current_action.sort_direction}")
-
-        final_data = CmAdmin::Models::Filter.filtered_data(filter_params, records, @filters)
-        pagy, records = pagy(final_data)
-        filtered_result.data = records
-        filtered_result.pagy = pagy
-        # filtered_result.facets = paginate(page, raw_data.size)
-        # filtered_result.sort = sort_params
-        # filtered_result.facets.sort = sort_params
-        return filtered_result
-      end
-
-      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"
-            if x.class.name.include?('HasOne')
-              x.name
-            elsif x.class.name.include?('HasMany')
-              Hash[x.name.to_s, []]
-            end
-          elsif x.klass.name == "ActionText::RichText"
-            x.name.to_s.gsub('rich_text_', '').to_sym
-          end
-        }.compact
-        nested_tables = self.available_fields[:new].except(:fields).keys
-        nested_tables += self.available_fields[:edit].except(:fields).keys
-        nested_fields = nested_tables.uniq.map {|table|
-          Hash[
-            table.to_s + '_attributes',
-            table.to_s.classify.constantize.columns.map(&:name).reject { |i| CmAdmin::REJECTABLE_FIELDS.include?(i) }.map(&:to_sym) + [:id, :_destroy]
-          ]
-        }
-        permittable_fields += nested_fields
-        @ar_model.columns.map { |col| permittable_fields << col.name.split('_cents') if col.name.include?('_cents') }
-
-        params.require(self.name.underscore.to_sym).permit(*permittable_fields)
-      end
-    end
-  end
-end