cm-admin 0.5.5 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 740dc3d69ceebeee0f6137dc2858b9d10bea0f5ef5c71013c988115e445b779b
-  data.tar.gz: d6f44e0ad96646096ab7fd33595c9e57e9605d5f6e746638b1a3141876854adb
+  metadata.gz: 66abe7aa4429da591b8c42766dce265104e59e7807c8ff52de628b7932768379
+  data.tar.gz: 35af15138ef79c97af5446e40e04f9008bbeca657dc6781396a5eba2c4314256
 SHA512:
-  metadata.gz: 95e5b8b2e3ac48e776577fe2cdbfb864f82c29777210e57c5342a726593b51d8f543d4b5ef1bafe7e4bb693746881b646ca3504857d07b7749c5ee791b8d4721
-  data.tar.gz: 3b6a1a37c18bbae57b57e662f4ff6401a8fba43470cc7da6b5e1b8af3f174120d15fa928e8d745afddb7f3be20841b4f9b6bc391a935ca2dd29de66bf7f1fe47
+  metadata.gz: 8e532c2897602d9d5b83cc609bc6382d9a5aae1928d7f1b77a6d612dba8b329f29b3f6f4a12a366e462ebef819bc46e1c8726498798c7cce9a4103f866a4ecc0
+  data.tar.gz: dbbc22f148540d5b1f0370d41ceece55490069810960a903247245bf0896e00d5c1cfc3b46680e80b22a7103016c6cafd8cbf91bcbb36a9cd9b1bb5075c29357

data/Gemfile

@@ -5,6 +5,7 @@ gem 'slim'
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
 gem 'cocoon'
+gem 'pundit'
 
 # Specify your gem's dependencies in cm_admin.gemspec
 gemspec

data/Gemfile.lock

@@ -1,40 +1,40 @@
 PATH
   remote: .
   specs:
-    cm-admin (0.4.2)
+    cm-admin (0.5.7)
       axlsx_rails (~> 0.6.1)
       cocoon (~> 1.2.15)
       pagy (~> 4.11.0)
+      pundit (~> 2.2.0)
       slim (~> 4.1.0)
       webpacker (~> 5.2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.4.1)
-      actionview (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.2.3)
+      actionview (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionview (7.0.2.3)
+      activesupport (= 7.0.2.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.1.4.1)
+    activesupport (7.0.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     axlsx_rails (0.6.1)
       actionpack (>= 3.1)
       caxlsx (>= 3.0)
     builder (3.2.4)
-    caxlsx (3.1.1)
+    caxlsx (3.2.0)
       htmlentities (~> 4.3, >= 4.3.4)
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
@@ -45,20 +45,24 @@ GEM
     diff-lcs (1.4.4)
     erubi (1.10.0)
     htmlentities (4.3.4)
-    i18n (1.8.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.12.0)
+    loofah (2.15.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     marcel (1.0.2)
     method_source (1.0.0)
-    minitest (5.14.4)
-    nokogiri (1.12.5-x86_64-darwin)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     pagy (4.11.0)
-    racc (1.5.2)
+    pundit (2.2.0)
+      activesupport (>= 3.0.0)
+    racc (1.6.0)
     rack (2.2.3)
-    rack-proxy (0.7.0)
+    rack-proxy (0.7.2)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -67,12 +71,13 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    railties (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
       method_source
-      rake (>= 0.13)
+      rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rake (12.3.3)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -93,7 +98,7 @@ GEM
       temple (>= 0.7.6, < 0.9)
       tilt (>= 2.0.6, < 2.1)
     temple (0.8.2)
-    thor (1.1.0)
+    thor (1.2.1)
     tilt (2.0.10)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
@@ -102,7 +107,7 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
@@ -111,9 +116,10 @@ DEPENDENCIES
   cm-admin!
   cocoon
   pagy (~> 4.11.0)
+  pundit
   rake (~> 12.0)
   rspec (~> 3.0)
   slim
 
 BUNDLED WITH
-   2.0.2
+   2.2.33

data/README.md

@@ -24,7 +24,11 @@ Install the gem
 
     $ rails g cm_admin:install
 
-## Usage
+## Documentation
+
+You can find more detailed documentation [here](https://github.com/commutatus/cm-admin/wiki)
+
+## Demo
 
 For demo check [here](http://cm-admin.labs.commutatus.com/admin/users/)
 

data/app/assets/stylesheets/cm_admin/base/scaffold.scss

@@ -79,6 +79,27 @@ a {
   overflow: auto;
 }
 
+.input-wrapper {
+  margin-bottom: 24px;
+  input, select, .select2 {
+    width: 320px;
+  }
+  textarea {
+    width: 480px;
+  }
+}
+.input-wrapper.disabled {
+  input:disabled {
+    background-color: $grey-lightest-clr;
+  }
+  label {
+    color: $ink-lightest-clr;
+  }
+}
+.nested-fields .select2 {
+  width: 320px !important;
+}
+
 .datetime-wrapper {
   position: relative;
 }

data/app/assets/stylesheets/cm_admin/components/_drawer.scss

@@ -83,4 +83,10 @@
       left: -400px;
      opacity: 0;
   }
-}
+}
+
+.drawer-btn {
+  cursor: pointer;
+  margin-left: 8px;
+  @include font($size: $t4-text, $color: $brand-color);
+}

data/app/assets/stylesheets/cm_admin/scaffold.scss

@@ -1,16 +1,18 @@
+@import "helpers/index.scss";
+
 .jGrowl {
-  color: #1D2129 !important;
+  color: $ink-regular-clr !important;
   font-size: 14px !important;
   .success{
-    background-color: #C1EDE2 !important;
+    background-color: $green-light-clr !important;
   }
   .notice {
-    background-color: #CDE1FB !important;
+    background-color: $blue-light-clr !important;
   }
   .error {
-    background-color: #FDCFCF !important;
+    background-color: $red-light-clr !important;
   }
-  
+
 }
 
 .nested-field-wrapper {
@@ -21,4 +23,8 @@
   .nested-fields {
     margin-bottom: 16px;
   }
-}
+}
+
+.ink-light-clr {
+  color: $ink-lighter-clr;
+}

data/app/controllers/cm_admin/application_controller.rb

@@ -1,11 +1,14 @@
 module CmAdmin
   class ApplicationController < ::ActionController::Base
+    include Pundit::Authorization
     # before_action :check_cm_admin
     layout 'cm_admin'
     helper CmAdmin::ViewHelpers
 
+
     def check_cm_admin
       redirect_to CmAdmin::Engine.mount_path + '/access-denied' unless defined?(::Current) && ::Current.cm_admin_user
     end
+
   end
 end

data/app/javascript/packs/cm_admin/scaffolds.js

@@ -45,21 +45,23 @@ $(document).on('click', '.row-action-cell', function(e) {
 
 $(document).on('click', '.drawer-btn', function(e) {
   e.stopPropagation();
-  if ($('.cm-drawer').hasClass('hidden')) {
-     $('.cm-drawer').removeClass('hidden');
-     if ($('#drawer-container').hasClass('drawer-slide-out')) {
-        $('#drawer-container').removeClass('drawer-slide-out');
+  drawer_el = $(this).parent().closest('.drawer').find('.cm-drawer')
+  if (drawer_el.hasClass('hidden')) {
+     drawer_el.removeClass('hidden');
+     drawer_container = drawer_el.find('.drawer-container')
+     if (drawer_container.hasClass('drawer-slide-out')) {
+        drawer_container.removeClass('drawer-slide-out');
      }
-     $('#drawer-container').addClass('drawer-slide-in');
+     drawer_container.addClass('drawer-slide-in');
   } else {
-    return $('.cm-drawer').addClass('hidden');
+    return drawer_el.addClass('hidden');
   }
 });
 
 $(document).on('click', '.drawer-close', function(e) {
   e.stopPropagation();
-  $('#drawer-container').removeClass('drawer-slide-in');
-  $('#drawer-container').addClass('drawer-slide-out');
+  $('.drawer-container').removeClass('drawer-slide-in');
+  $('.drawer-container').addClass('drawer-slide-out');
   setTimeout(() => {
     $('.cm-drawer').addClass('hidden');
   }, 300);

data/app/policies/application_policy.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+class ApplicationPolicy
+  attr_reader :user, :record
+
+  def initialize(user, record)
+    @user = user
+    @record = record
+  end
+
+  def index?
+    false
+  end
+
+  def show?
+    true
+  end
+
+  def create?
+    false
+  end
+
+  def new?
+    create?
+  end
+
+  def update?
+    false
+  end
+
+  def edit?
+    update?
+  end
+
+  def destroy?
+    false
+  end
+
+  class Scope
+    def initialize(user, scope)
+      @user = user
+      @scope = scope
+    end
+
+    def resolve
+      raise NotImplementedError, "You must define #resolve in #{self.class}"
+    end
+
+    private
+
+    attr_reader :user, :scope
+  end
+end

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

@@ -1,6 +1,6 @@
 .admin-table-index
   .table-top
-    p.table-top__total-count = "#{@associated_ar_object.pagy.count} #{@associated_model&.ar_model&.table_name} found"
+    p.table-top__total-count = "#{@associated_ar_object.pagy.count} #{@action.child_records.to_s.gsub('_', ' ')} found"
     .table-top__column-action
       button.secondary-btn.column-btn data-target="#columnActionModal" data-toggle="modal" type="button"
         span
@@ -51,7 +51,7 @@
     == render partial: 'cm_admin/main/cm_pagy_nav', locals: { pagy: @associated_ar_object.pagy }
 
 - @associated_ar_object.data.each do |ar_object|
-  - @associated_model && @associated_model.available_actions.select{|act| act if act.route_type == 'member'}.each do |custom_action|
+  - @associated_model && @associated_model.available_actions.select{|act| act if (act.route_type == 'member' && act.display_type == :modal)}.each do |custom_action|
     .modal.fade id="#{custom_action.name.classify}Modal-#{ar_object.id.to_s}" aria-hidden="true" aria-labelledby="#{custom_action.name.classify}ModalLabel" tabindex="1" 
       .modal-dialog
         .modal-content

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

@@ -16,7 +16,6 @@
             input.cm-checkbox type="checkbox"
         - @model.available_fields[:index].each do |column|
           th = column.header
-        // th Drawer
     tbody.cm-table__body
       - @ar_object.data.each do |ar_object|
         tr.body-row
@@ -25,28 +24,32 @@
               input.cm-checkbox type="checkbox"
           - @model.available_fields[:index].each_with_index do |column, index|
             td.text-ellipsis
-              span class="#{column.cm_css_class}"
+              span class="#{column.field_type.to_s} #{column.cm_css_class} "
                 - if index == 0
                   = link_to ar_object.send(column.field_name), "/cm_admin/#{ar_object.model_name.collection}/#{ar_object.id}"
                 - else
                   = show_field_value(ar_object, column)
-          // td
-           // button.drawer-btn Open Drawer
-          td.row-action-cell
-            .row-action-tool
-              button.secondary-btn.tool-btn type="button"
-                span
-                  i.fa.fa-bars.bolder
-                span
-                  i.fa.fa-angle-down
-              .popup-card.table-export-popup.hidden
-                .popup-option
-                  a href="#{page_url('edit', ar_object)}"
-                    | Edit
-                - @model.available_actions.select{|act| act if act.route_type == 'member'}.each do |custom_action|
-                  - if custom_action.display_if.call(ar_object)
-                    .popup-option
-                      = link_to custom_action.name, custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb
+                  - if column.field_type == :drawer
+                    = 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')}
+          - 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?
+            td.row-action-cell
+              .row-action-tool
+                button.secondary-btn.tool-btn type="button"
+                  span
+                    i.fa.fa-bars.bolder
+                  span
+                    i.fa.fa-angle-down
+                .popup-card.table-export-popup.hidden
+                  - if edit_action.any?
+                    = link_to "#{page_url('edit', ar_object)}" do
+                      .popup-option Edit
+                  - custom_actions.each do |custom_action|
+                    - if custom_action.display_if.call(ar_object)
+                      = link_to custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb do
+                        .popup-option = custom_action.name.titleize
 
 .cm-pagination
   .cm-pagination__lhs Showing #{@ar_object.pagy.from} to #{@ar_object.pagy.to} out of #{@ar_object.pagy.count}

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

@@ -1,5 +1,6 @@
 ul.nav.nav-pills
   - @model.available_tabs.each do |nav_item|
-    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 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/app/views/cm_admin/main/_top_navbar.html.slim

@@ -20,9 +20,9 @@
             li
               .popup-option.pointer data-bs-toggle='modal' data-bs-target='#exportmodal'
                 span Export
-
-      a.primary-btn.ml-2 href="#{page_url('new')}"
-        | Add
+      - new_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('new')}
+      - if new_action.any?
+        = link_to 'Add', "#{page_url('new')}", class: 'primary-btn ml-2'
       - @model.available_actions.select{|act| act if act.route_type == 'collection'}.each do |custom_action|
         - if custom_action.display_type == :button
           = link_to custom_action.name.titleize, @model.ar_model.table_name + '/' + custom_action.path, class: 'primary-btn ml-2', method: custom_action.verb
@@ -37,5 +37,4 @@
 
       - edit_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('edit')}
       - if edit_action.any?
-        a.primary-btn.ml-2 href="#{page_url('edit', @ar_object)}"
-          = "Edit #{@model.name}"
+        = link_to "Edit #{@model.name}", "#{page_url('edit', @ar_object)}", class: 'primary-btn ml-2'

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

@@ -1,6 +1,6 @@
 .cm-index-page
 	.index-page
-		.index-page__table-container.pt-0
+		.index-page__table-container
 			== render partial: 'cm_admin/main/associated_table'
 
 		// = column_pop_up(@associated_model)

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

@@ -2,12 +2,15 @@
   .index-page.page-container
     .sticky-container
       == render 'cm_admin/main/top_navbar'
-      - if @model.filters.present?
+      - if @model.filters.present? && @action.partial.nil?
         .index-page__filters
           == render partial: 'cm_admin/main/filters', locals: { filters: @model.filters }
     .index-page__table-container
-      == render 'cm_admin/main/table'
+      - if @action.partial
+        == render @action.partial
+      - else
+        == render 'cm_admin/main/table'
 
     = column_pop_up(@model)
     = manage_column_pop_up(@model)
-  == render 'cm_admin/main/drawer'
+

data/app/views/cm_admin/static/dashboard.html.slim

@@ -0,0 +1 @@
+| Dashboard section

data/app/views/cm_admin/static/error_403.html.slim

@@ -0,0 +1,4 @@
+main.flex-shrink-0
+  .container
+    h1.mt-5 403
+    p.lead You do not have permission to access this page.

data/cm_admin.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'webpacker', '~> 5.2.1'
   spec.add_runtime_dependency 'axlsx_rails', '~> 0.6.1'
   spec.add_runtime_dependency 'cocoon', '~> 1.2.15'
+  spec.add_runtime_dependency 'pundit', '~> 2.2.0'
 end

data/config/initializers/active_record_extension.rb

@@ -2,7 +2,7 @@ ActiveSupport.on_load(:active_record) do
   module ActiveRecord
     class Base
       def self.cm_admin(&block)
-        CmAdmin.config(self, &block)
+        CmAdmin.initialize_model(self, &block)
       end
     end
   end

data/config/routes.rb

@@ -9,7 +9,7 @@ CmAdmin::Engine.routes.draw do
   end
 
   # Defining action routes for each model
-  CmAdmin.cm_admin_models.each do |model|
+  CmAdmin.config.cm_admin_models.each do |model|
     model.available_actions.sort_by {|act| act.class}.each do |act|
       scope model.name.tableize do
         send(act.verb, act.path.present? ? act.path : act.name, to: "#{model.name.underscore}##{act.name}", as: "#{model.name.underscore}_#{act.name}")

data/lib/cm_admin/configuration.rb

@@ -0,0 +1,10 @@
+module CmAdmin
+  class Configuration
+    attr_accessor :layout, :included_models, :cm_admin_models
+    
+    def initialize
+      @included_models = []
+      @cm_admin_models = []
+    end
+  end
+end

data/lib/cm_admin/model.rb

@@ -14,6 +14,7 @@ require_relative 'models/controller_method'
 require 'pagy'
 require 'axlsx'
 require 'cocoon'
+require 'pundit'
 
 module CmAdmin
   class Model
@@ -21,7 +22,8 @@ module CmAdmin
     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
+    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
 
     # Class variable for storing all actions
@@ -32,6 +34,7 @@ module CmAdmin
       @name = entity.name
       @ar_model = entity
       @is_visible_on_sidebar = true
+      @icon_name = 'fa fa-th-large'
       @available_actions ||= []
       @current_action = nil
       @available_tabs ||= []
@@ -42,6 +45,7 @@ module CmAdmin
       actions unless @actions_set
       $available_actions = @available_actions.dup
       self.class.all_actions.push(@available_actions)
+      define_policy
       define_controller
     end
 
@@ -51,7 +55,7 @@ module CmAdmin
       end
 
       def find_by(search_hash)
-        CmAdmin.cm_admin_models.find { |x| x.name == search_hash[:name] }
+        CmAdmin.config.cm_admin_models.find { |x| x.name == search_hash[:name] }
       end
     end
 
@@ -59,7 +63,7 @@ module CmAdmin
       current_action = CmAdmin::Models::Action.find_by(self, name: action_name.to_s)
       if current_action
         @current_action = current_action
-        @ar_object = @ar_model.find(params[:id])
+        @ar_object = @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: @ar_model.reflect_on_association(@current_action.child_records).klass.name)
@@ -90,13 +94,37 @@ module CmAdmin
       @is_visible_on_sidebar = visible_option
     end
 
+    def set_icon(name)
+      @icon_name = name
+    end
+
 
     private
 
+    def define_policy
+      klass = Class.new(ApplicationPolicy) do
+        def initialize(user, record)
+          @user = user
+          @record = record
+        end
+
+        $available_actions.each do |action|
+          define_method :"#{action.name}?" do
+            accessible_by = action.accessible_by.map { |role| "user.#{role}" }.join(' || ')
+            eval(accessible_by)
+          end
+        end
+      end
+      CmAdmin.const_set "#{@name}Policy", klass
+    end
+
     # Controller defined for each model
     # If model is User, controller will be UsersController
     def define_controller
       klass = Class.new(CmAdmin::ApplicationController) do
+        include Pundit::Authorization
+        rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
+
         $available_actions.each do |action|
           define_method action.name.to_sym do
 
@@ -107,6 +135,7 @@ module CmAdmin
             @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
             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
@@ -141,7 +170,7 @@ module CmAdmin
                   format.html { render action.partial }
                 else
                   if @action.code_block.call(@ar_object)
-                    redirect_url = @action.redirection_url || request.referrer || "/cm_admin/#{@model.ar_model.table_name}/#{@ar_object.id}"
+                    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 }
                   else
                     format.html { redirect_to request.referrer }
@@ -157,6 +186,12 @@ module CmAdmin
             end
           end
         end
+        private
+
+        def user_not_authorized
+          flash[:alert] = 'You are not authorized to perform this action.'
+          redirect_to CmAdmin::Engine.mount_path + '/access-denied'
+        end
       end if $available_actions.present?
       CmAdmin.const_set "#{@name}Controller", klass
     end

data/lib/cm_admin/models/action.rb

@@ -6,7 +6,9 @@ module CmAdmin
       include Actions::Blocks
       attr_accessor :name, :verb, :layout_type, :layout, :partial, :path, :page_title, :page_description,
         :child_records, :is_nested_field, :nested_table_name, :parent, :display_if, :route_type, :code_block,
-        :display_type, :action_type, :redirection_url
+        :display_type, :action_type, :redirection_url, :sort_direction, :sort_column, :accessible_by
+
+      VALID_SORT_DIRECTION = Set[:asc, :desc].freeze
 
       def initialize(attributes = {}, &block)
         if attributes[:layout_type].present? && attributes[:layout].nil? && attributes[:partial].nil?
@@ -30,6 +32,16 @@ module CmAdmin
         self.display_if = lambda { |arg| return true }
         self.display_type = :button
         self.action_type = :default
+        self.sort_column = :created_at
+        self.sort_direction = :desc
+        self.accessible_by = CmAdmin.authorized_roles
+      end
+
+      def set_values(page_title, page_description, partial, accessible_by)
+        self.page_title = page_title
+        self.page_description = page_description
+        self.partial = partial
+        self.accessible_by = (CmAdmin.authorized_roles.dup << accessible_by).flatten.compact.uniq if accessible_by
       end
 
       class << self

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,
-      :cm_css_class, :link, :url, :custom_method, :helper_method, :managable, :lockable
+      :cm_css_class, :link, :url, :custom_method, :helper_method, :managable, :lockable, :drawer_partial
 
       def initialize(field_name, attributes = {})
         @field_name = field_name

data/lib/cm_admin/models/controller_method.rb

@@ -5,7 +5,7 @@ module CmAdmin
 
       def show(params)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'show')
-        @ar_object = @ar_model.find(params[:id])
+        @ar_object = @ar_model.name.classify.constantize.find(params[:id])
       end
 
       def index(params)
@@ -21,11 +21,11 @@ module CmAdmin
 
       def edit(params)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'edit')
-        @ar_object = @ar_model.find(params[:id])
+        @ar_object = @ar_model.name.classify.constantize.find(params[:id])
       end
 
       def update(params)
-        @ar_object = @ar_model.find(params[:id])
+        @ar_object = @ar_model.name.classify.constantize.find(params[:id])
         @ar_object.assign_attributes(resource_params(params))
         @ar_object
       end
@@ -41,6 +41,8 @@ module CmAdmin
         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 = self.name.constantize.where(nil) 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

data/lib/cm_admin/models/dsl_method.rb

@@ -10,32 +10,28 @@ module CmAdmin
         # @current_action = CmAdmin::Models::CustomAction.find_by(self, name: name)
       end
 
-      def cm_index(page_title: nil ,page_description: nil, &block)
+      def cm_index(page_title: nil, page_description: nil, partial: nil, accessible_by: nil, &block)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'index')
-        @current_action.page_title = page_title
-        @current_action.page_description = page_description
+        @current_action.set_values(page_title, page_description, partial, accessible_by)
         yield
         # action.instance_eval(&block)
       end
 
-      def cm_show(page_title: nil,page_description: nil,&block)
+      def cm_show(page_title: nil, page_description: nil, partial: nil, accessible_by: nil, &block)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'show')
-        @current_action.page_title = page_title
-        @current_action.page_description = page_description
+        @current_action.set_values(page_title, page_description, partial, accessible_by)
         yield
       end
-  
-      def cm_edit(page_title: nil,page_description: nil, &block)
+
+      def cm_edit(page_title: nil,page_description: nil, partial: nil, accessible_by: nil, &block)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'edit')
-        @current_action.page_title = page_title
-        @current_action.page_description = page_description
+        @current_action.set_values(page_title, page_description, partial, accessible_by)
         yield
       end
-  
-      def cm_new(page_title: nil,page_description: nil,&block)
+
+      def cm_new(page_title: nil,page_description: nil, partial: nil, accessible_by: nil, &block)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'new')
-        @current_action.page_title = page_title
-        @current_action.page_description = page_description
+        @current_action.set_values(page_title, page_description, partial, accessible_by)
         yield
       end
 
@@ -44,33 +40,35 @@ module CmAdmin
           @current_action.page_title = title
         end
       end
-  
+
       def page_description(description)
         if @current_action
           @current_action.page_description = description
         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, accessible_by: nil, &block)
         if custom_action.to_s == ''
           @current_action = CmAdmin::Models::Action.find_by(self, name: 'show')
+          @current_action.accessible_by = (CmAdmin.authorized_roles.dup << accessible_by).flatten.compact.uniq  if accessible_by
           @available_tabs << CmAdmin::Models::Tab.new(tab_name, '', &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)
+          action.accessible_by = (CmAdmin.authorized_roles.dup << accessible_by).flatten.compact.uniq  if accessible_by
           @available_actions << action
           @current_action = action
           @available_tabs << CmAdmin::Models::Tab.new(tab_name, custom_action, &block)
         end
         yield if block
       end
-  
+
       def cm_show_section(section_name, &block)
         @available_fields[@current_action.name.to_sym] ||= []
         @available_fields[@current_action.name.to_sym] << CmAdmin::Models::CmShowSection.new(section_name, &block)
       end
-  
+
       def form_field(field_name, options={}, arg=nil)
         unless @current_action.is_nested_field
           @available_fields[@current_action.name.to_sym][:fields] << CmAdmin::Models::FormField.new(field_name, options[:input_type], options)
@@ -79,23 +77,24 @@ module CmAdmin
           @available_fields[@current_action.name.to_sym][@current_action.nested_table_name] << CmAdmin::Models::FormField.new(field_name, options[:input_type], options)
         end
       end
-  
+
       def nested_form_field(field_name, &block)
         @current_action.is_nested_field = true
         @current_action.nested_table_name = field_name
         yield
       end
-  
+
       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."
         end
+
         unless @available_fields[@current_action.name.to_sym].map{|x| x.field_name.to_sym}.include?(field_name)
           @available_fields[@current_action.name.to_sym] << CmAdmin::Models::Column.new(field_name, options)
         end
       end
-  
+
       def all_db_columns(options={})
         field_names = self.instance_variable_get(:@ar_model)&.columns&.map{|x| x.name.to_sym}
         if options.include?(:exclude) && field_names
@@ -118,11 +117,12 @@ 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, &block)
+      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, accessible_by: nil, &block)
         action = CmAdmin::Models::CustomAction.new(
                     name: 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, &block)
+        action.accessible_by = (CmAdmin.authorized_roles.dup << accessible_by).flatten.compact.uniq  if accessible_by
         @available_actions << action
         # self.class.class_eval(&block)
       end
@@ -130,6 +130,24 @@ module CmAdmin
       def filter(db_column_name, filter_type, options={})
         @filters << CmAdmin::Models::Filter.new(db_column_name: db_column_name, filter_type: filter_type, options: options)
       end
+
+      def sort_direction(direction = :desc)
+        raise ArgumentError, "Select a valid sort direction like #{CmAdmin::Models::Action::VALID_SORT_DIRECTION.join(' or ')} instead of #{direction}" unless CmAdmin::Models::Action::VALID_SORT_DIRECTION.include?(direction.to_sym.downcase)
+
+        @current_action.sort_direction = direction.to_sym if @current_action
+      end
+
+      def sort_column(column = :created_at)
+        model = if @current_action.child_records
+          CmAdmin::Model.find_by(name: @current_action.child_records.to_s.classify)
+        else
+          self
+        end
+        db_columns = model.instance_variable_get(:@ar_model)&.columns&.map{|x| x.name.to_sym}
+        raise "Sorting for custom column #{column} does not exist." unless db_columns.include?(column.to_sym)
+
+        @current_action.sort_column = column.to_sym if @current_action
+      end
     end
   end
-end
+end

data/lib/cm_admin/models/field.rb

@@ -2,7 +2,8 @@ module CmAdmin
   module Models
     class Field
 
-      attr_accessor :field_name, :label, :header, :field_type, :format, :precision, :helper_method, :preview, :custom_link, :precision
+      attr_accessor :field_name, :label, :header, :field_type, :format, :precision,
+        :helper_method, :preview, :custom_link, :precision, :prefix, :suffix
 
       def initialize(field_name, attributes = {})
         @field_name = field_name

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.5.5"
+  VERSION = "0.5.8"
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -5,7 +5,7 @@ module CmAdmin
       def show_field(ar_object, field)
         content_tag(:div, class: "info-split") do
           concat show_field_label(ar_object, field)
-          concat show_field_value(ar_object, field)
+          concat value_with_prefix_and_suffix(ar_object, field)
         end
       end
 
@@ -14,9 +14,18 @@ module CmAdmin
           p = field.label.present? ? field.label.to_s : field.field_name.to_s.titleize
         end
       end
-      
-      def show_field_value(ar_object, field)
+
+      def value_with_prefix_and_suffix(ar_object, field)
+        value = show_field_value(ar_object, field)
         content_tag(:div, class: "info-split__rhs") do
+          concat field.prefix
+          concat value
+          concat field.suffix
+        end
+      end
+
+      def show_field_value(ar_object, field)
+        content_tag(:span) do
           case field.field_type || :string
           when :integer
             ar_object.send(field.field_name).to_s
@@ -43,10 +52,15 @@ module CmAdmin
             ar_object.send(field.field_name).to_s.titleize
           when :tag
             content_tag :span, class: "status-tag default-#{ar_object.send(field.field_name.to_s + '_before_type_cast')}" do
-              ar_object.send(field.field_name).to_s.titleize
+              ar_object.send(field.field_name).to_s.upcase
             end
           when :attachment
             concat show_attachment_value(ar_object, field)
+          when :drawer
+            content_tag :span do
+              concat content_tag(:span, truncate(ar_object.send(field.field_name).to_s, length: 25))
+              concat content_tag(:span, 'View', class: 'drawer-btn')
+            end
           end
         end
       end
@@ -55,12 +69,12 @@ module CmAdmin
         if ar_object.send(field.field_name).attached?
           if ar_object.send(field.field_name).class.name.include?('One')
             content_tag :a, href: rails_blob_path(ar_object.send(field.field_name), disposition: "attachment") do
-              ar_object.send(field.field_name).filename.to_s 
+              ar_object.send(field.field_name).filename.to_s
             end
           elsif ar_object.send(field.field_name).class.name.include?('Many')
             ar_object.send(field.field_name).map do |asset|
               content_tag :a, href: rails_blob_path(asset, disposition: "attachment") do
-                asset.filename.to_s 
+                asset.filename.to_s
               end
             end.join("\n").html_safe
           end

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -44,12 +44,14 @@ module CmAdmin
                 if field.input_type.eql?(:hidden)
                   concat input_field_for_column(f, field)
                 else
-                  concat f.label field.label, class: 'field-label'
-                  concat tag.br
-                  concat(content_tag(:div, class: "datetime-wrapper") do
-                    concat input_field_for_column(f, field)
+                  concat(content_tag(:div, class: "input-wrapper #{field.disabled ? 'disabled' : ''}") do
+                    concat f.label field.label, field.label, class: "field-label"
+                    concat tag.br
+                    concat(content_tag(:div, class: "datetime-wrapper") do
+                      concat input_field_for_column(f, field)
+                    end)
+                    concat tag.p resource.errors[field.field_name].first if resource.errors[field.field_name].present?
                   end)
-                  concat tag.p resource.errors[field.field_name].first if resource.errors[field.field_name].present?
                 end
               end
             else

data/lib/cm_admin/view_helpers/navigation_helper.rb

@@ -4,26 +4,28 @@ module CmAdmin
     module NavigationHelper
       include Pagy::Frontend
       def navigation_links(navigation_type)
-        CmAdmin.cm_admin_models.map { |model|
+        CmAdmin.config.cm_admin_models.map { |model|
           if model.is_visible_on_sidebar
             path = CmAdmin::Engine.mount_path + '/' + model.name.underscore.pluralize
-            if navigation_type == "sidebar"
-              content_tag(:a, href: path) do
-                content_tag(:div, class: 'menu-item') do
-                  content_tag(:span, class: 'menu-icon') do
-                    concat tag.i class: 'fa fa-th-large'
-                  end +
-                  model.name
+            if policy([:cm_admin, model.name.classify.constantize]).index?
+              if navigation_type == "sidebar"
+                content_tag(:a, href: path) do
+                  content_tag(:div, class: 'menu-item') do
+                    content_tag(:span, class: 'menu-icon') do
+                      concat tag.i class: "#{model.icon_name}"
+                    end +
+                    model.name.pluralize
+                  end
                 end
-              end
-            elsif navigation_type == "quick_links"
-              content_tag(:a, href: path, class: 'visible') do
-                content_tag(:div, class: 'result-item') do
-                  content_tag(:span) do
-                    concat tag.i class: 'fa fa-th-large'
-                  end +
-                  content_tag(:span) do
-                    model.name
+              elsif navigation_type == "quick_links"
+                content_tag(:a, href: path, class: 'visible') do
+                  content_tag(:div, class: 'result-item') do
+                    content_tag(:span) do
+                      concat tag.i class: "#{model.icon_name}"
+                    end +
+                    content_tag(:span) do
+                      model.name
+                    end
                   end
                 end
               end

data/lib/cm_admin/view_helpers/page_info_helper.rb

@@ -15,8 +15,6 @@ module CmAdmin
           case action_name
           when 'index'
             title + " list record"
-          when 'show'
-            title + " detail"
           when 'new'
             title + " create record"
           when 'edit'
@@ -36,8 +34,6 @@ module CmAdmin
           case action_name
           when 'index'
             title + " list record"
-          when 'show'
-            title + " detail"
           when 'new'
             title + " new record"
           when 'edit'

data/lib/cm_admin.rb

@@ -4,14 +4,17 @@ require 'cm_admin/engine'
 require 'cm_admin/model'
 require 'cm_admin/view_helpers'
 require 'cm_admin/utils'
+require 'cm_admin/configuration'
 
 module CmAdmin
   class Error < StandardError; end
 
-  mattr_accessor :layout
+  mattr_accessor :layout, :authorized_roles
   mattr_accessor :included_models, :cm_admin_models
+  @@authorized_roles ||= []
   @@included_models ||= []
   @@cm_admin_models ||= []
+  
 
   class << self
     def webpacker
@@ -21,15 +24,18 @@ module CmAdmin
       )
     end
 
-    def setup
-      yield self
+    def configure(&block)
+      instance_eval(&block)
     end
 
-    def config(entity, &block)
+    def config
+      @config ||= Configuration.new
+    end
+
+    def initialize_model(entity, &block)
       if entity.is_a?(Class)
-        unless CmAdmin::Model.find_by({name: entity.name})
-          @@cm_admin_models << CmAdmin::Model.new(entity, &block)
-        end
+        return if CmAdmin::Model.find_by({name: entity.name})
+        config.cm_admin_models << CmAdmin::Model.new(entity, &block)
       end
     end
   end

data/lib/generators/cm_admin/install_generator.rb

@@ -1,26 +1,16 @@
 require 'rails/generators'
 
-    def add_required_gems
-      gem 'slim'
-      gem 'simple_form'
-      system("yarn add bootstrap")
-      system("yarn add @fortawesome/fontawesome-free")
-      system("yarn add select2")
-      system("yarn add daterangepicker")
-      system("yarn add jgrowl")
-    end
-
-    def copy_layout_file
-      copy_file "layouts/_side_navbar.html.slim", "app/views/layouts/_side_navbar.html.slim"
-      copy_file "layouts/_navbar.html.slim", "app/views/layouts/_navbar.html.slim"
-      remove_file "app/views/layouts/application.html.erb"
-      copy_file "layouts/application.html.slim", "app/views/layouts/application.html.slim"
-    end
+module CmAdmin
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path('templates', __dir__)
 
-    def copy_asset_file
-      copy_file "assets/images/cm.png", "app/assets/images/cm.png"
-      directory "assets/stylesheets/", "app/assets/stylesheets/"
-      remove_file "app/assets/stylesheets/application.css"
+      def copy_initializer
+        copy_file 'cm_admin_initializer.rb', 'config/initializers/cm_admin.rb'
+        copy_file 'custom.js', 'app/assets/javascripts/custom.js'
+        copy_file 'custom.css', 'app/assets/stylesheets/custom.css'
+        route 'mount CmAdmin::Engine => "/admin"'
+      end
     end
   end
-end
+end

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

@@ -0,0 +1,4 @@
+CmAdmin.setup do |config|
+  # Sets the default layout to be used for admin
+  config.layout = 'admin'
+end

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

@@ -1 +1 @@
-07d558738c316293586496817b2bccbf6430b5bd
+d5850cd60f91abe79ff8a84a45a9e24c75cb0e4b

data/yarn.lock

@@ -6589,9 +6589,9 @@ urix@^0.1.0:
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 url-parse@^1.4.3, url-parse@^1.5.1:
-  version "1.5.7"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.7.tgz#00780f60dbdae90181f51ed85fb24109422c932a"
-  integrity sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA==
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
   dependencies:
     querystringify "^2.1.1"
     requires-port "^1.0.0"

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.8
 platform: ruby
 authors:
 - sajinmp
 - anbublacky
 - AdityaTiwari2102
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2022-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy
@@ -82,6 +82,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.15
+- !ruby/object:Gem::Dependency
+  name: pundit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 description: This is an admin panel gem
 email:
 - sajinprasadkm@gmail.com
@@ -138,6 +152,7 @@ files:
 - app/javascript/packs/cm_admin/quick_search.js
 - app/javascript/packs/cm_admin/scaffolds.js
 - app/javascript/stylesheets/cm_admin/application.scss
+- app/policies/application_policy.rb
 - app/views/cm_admin/main/_associated_table.html.slim
 - app/views/cm_admin/main/_cm_pagy_nav.html.slim
 - app/views/cm_admin/main/_drawer.html.slim
@@ -154,7 +169,9 @@ files:
 - app/views/cm_admin/main/index.html.slim
 - app/views/cm_admin/main/new.html.slim
 - app/views/cm_admin/main/show.html.slim
+- app/views/cm_admin/static/dashboard.html.slim
 - app/views/cm_admin/static/error_401.html.slim
+- app/views/cm_admin/static/error_403.html.slim
 - app/views/layouts/_custom_action_modals.html.slim
 - app/views/layouts/_flash_message.html.slim
 - app/views/layouts/_left_sidebar_nav.html.slim
@@ -176,6 +193,7 @@ files:
 - config/webpacker.yml
 - lib/.DS_Store
 - lib/cm_admin.rb
+- lib/cm_admin/configuration.rb
 - lib/cm_admin/constants.rb
 - lib/cm_admin/engine.rb
 - lib/cm_admin/model.rb
@@ -204,6 +222,9 @@ files:
 - lib/cm_admin/view_helpers/navigation_helper.rb
 - lib/cm_admin/view_helpers/page_info_helper.rb
 - lib/generators/cm_admin/install_generator.rb
+- lib/generators/cm_admin/templates/cm_admin_initializer.rb
+- lib/generators/cm_admin/templates/custom.css
+- lib/generators/cm_admin/templates/custom.js
 - lib/tasks/webpack_install.rake
 - package.json
 - postcss.config.js
@@ -215,7 +236,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
@@ -230,8 +251,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: This is an admin panel gem
 test_files: []