cm-admin 0.6.0 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79781db6dbcc1960715b78d50655f618144a805150a64072be3267cc1c79f110
-  data.tar.gz: 3cfa1956fe446d22cc275b5b0bf2b883a42b5c86136ebb4c0361058b3f73b96e
+  metadata.gz: dcd2e766f902e8045d4eba1ae60067d6636477625f6a51a7ce896c0e446ad8bc
+  data.tar.gz: d1ef041f20245116d4dafc04629b75768245a77b0f042e038675516e60692206
 SHA512:
-  metadata.gz: 209bd560223da704b275c9473ccf7b59f0ac074b39f3cfc6b01e37c56c1599209a551de4668c8614a7f98d6e9cbeef0043a51a3108b2d85a462289ae7e0f48c0
-  data.tar.gz: 46f11879d4b8fcb8fe0033c79397e4922a4714c18ae496c96962d949e344dd512af4250d4f4641e697f89465d7ad2a00bc36485a4de8b0291c6a812eb5d8e7b3
+  metadata.gz: 1e152f94b559e7f12d9d0d6cb82688d293c6a799fe0ade4b503c0dc2e8edc0337864741b7a7ae50e8ddcd7e175cc1813125f0409b5f62880fac3c386cae30638
+  data.tar.gz: d7b610b2ff1f329a09d3a31564f7f0d35bd5799803bcbdd31f15faad311803e516b6b828037524161993d139fabed9b08ef508cb2214a7dae6f2b74cb834dd32

data/app/helpers/cm_admin/application_helper.rb

@@ -7,5 +7,11 @@ module CmAdmin
     def current_webpacker_instance
       CmAdmin.webpacker
     end
+
+    # Allow if policy is not defined.
+    def has_valid_policy(model_name, action_name)
+      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
   end
 end

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

@@ -47,9 +47,9 @@
                     = link_to "#{page_url('edit', ar_object)}" do
                       .popup-option Edit
                   - custom_actions.each do |custom_action|
-                    - if custom_action.name.present? && policy([:cm_admin, @model.name.classify.constantize]).send(:"#{custom_action.name}?")
+                    - if custom_action.name.present? && has_valid_policy(@model.name, custom_action.name)
                       - 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
+                        = link_to cm_admin.send("#{@model.name.downcase}_index_path") + '/' + custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb do
                           .popup-option = custom_action.name.titleize
 
 .cm-pagination

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

@@ -1,6 +1,6 @@
 ul.nav.nav-pills
   - @model.available_tabs.each do |nav_item|
-    - if nav_item.custom_action.present? && policy([:cm_admin, @model.name.classify.constantize]).send(:"#{nav_item.custom_action}?")
+    - 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/app/views/cm_admin/main/_top_navbar.html.slim

@@ -1,7 +1,9 @@
 .cm-navbar
   .cm-navbar__lhs
-    .bread-crumb-area
-      = yield :bread_crumb
+    - if cm_admin.method_defined?(:"#{@model.name.downcase}_index_path") && (@model.current_action.name == 'show' || @model.current_action.layout_type.present?)
+      .bread-crumb-area
+        .breadcrumb-text
+          = link_to @model.name + ' /', cm_admin.send(:"#{@model.name.downcase}_index_path")
     .nav-title-area
       p.title-text = action_title
       p.title-sub-text = action_description
@@ -24,18 +26,10 @@
       - if new_action.any? && policy([:cm_admin, @model.name.classify.constantize]).new?
         = 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.name.present? && policy([:cm_admin, @model.name.classify.constantize]).send(:"#{custom_action.name}?")
-          - 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
-          - elsif custom_action.display_type == :modal
-            = link_to custom_action.name.titleize, '', class: 'primary-btn ml-2', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal" }
+        = custom_action_items(custom_action, 'index')
     - elsif @model.current_action.name == 'show'
       - @model.available_actions.select{|act| act if act.route_type == 'member'}.each do |custom_action|
-        - if custom_action.name.present? && policy([:cm_admin, @model.name.classify.constantize]).send(:"#{custom_action.name}?")
-          - if custom_action.display_type == :button && custom_action.display_if.call(@ar_object)
-            = link_to custom_action.name.titleize, custom_action.path.gsub(':id', params[:id]), class: 'primary-btn ml-2', method: custom_action.verb
-          - elsif custom_action.display_type == :modal && custom_action.display_if.call(@ar_object)
-            = link_to custom_action.name.titleize, '', class: 'primary-btn ml-2', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal" }
+        = custom_action_items(custom_action, 'show')
 
       - edit_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('edit')}
       - if edit_action.any? && policy([:cm_admin, @model.name.classify.constantize]).edit?

data/config/routes.rb

@@ -10,7 +10,7 @@ CmAdmin::Engine.routes.draw do
 
   # Defining action routes for each model
   CmAdmin.config.cm_admin_models.each do |model|
-    model.available_actions.sort_by {|act| act.class}.each do |act|
+    model.available_actions.sort_by {|act| act.name}.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}")
       end

data/lib/cm_admin/model.rb

@@ -45,7 +45,6 @@ module CmAdmin
       actions unless @actions_set
       $available_actions = @available_actions.dup
       self.class.all_actions.push(@available_actions)
-      define_policy
       define_controller
     end
 
@@ -101,23 +100,6 @@ module CmAdmin
 
     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
@@ -135,7 +117,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
+            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

data/lib/cm_admin/models/action.rb

@@ -6,7 +6,7 @@ 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, :sort_direction, :sort_column, :accessible_by
+        :display_type, :action_type, :redirection_url, :sort_direction, :sort_column
 
       VALID_SORT_DIRECTION = Set[:asc, :desc].freeze
 
@@ -34,14 +34,12 @@ module CmAdmin
         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)
+      def set_values(page_title, page_description, partial)
         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/controller_method.rb

@@ -5,7 +5,8 @@ module CmAdmin
 
       def show(params)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'show')
-        @ar_object = @ar_model.name.classify.constantize.find(params[:id])
+        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)
@@ -40,7 +41,8 @@ module CmAdmin
         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 = self.name.constantize.where(nil) if records.nil?
+        
+        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)

data/lib/cm_admin/models/dsl_method.rb

@@ -10,28 +10,28 @@ module CmAdmin
         # @current_action = CmAdmin::Models::CustomAction.find_by(self, name: name)
       end
 
-      def cm_index(page_title: nil, page_description: nil, partial: nil, accessible_by: nil, &block)
+      def cm_index(page_title: nil, page_description: nil, partial: nil, &block)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'index')
-        @current_action.set_values(page_title, page_description, partial, accessible_by)
+        @current_action.set_values(page_title, page_description, partial)
         yield
         # action.instance_eval(&block)
       end
 
-      def cm_show(page_title: nil, page_description: nil, partial: nil, accessible_by: nil, &block)
+      def cm_show(page_title: nil, page_description: nil, partial: nil, &block)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'show')
-        @current_action.set_values(page_title, page_description, partial, accessible_by)
+        @current_action.set_values(page_title, page_description, partial)
         yield
       end
 
-      def cm_edit(page_title: nil,page_description: nil, partial: nil, accessible_by: nil, &block)
+      def cm_edit(page_title: nil,page_description: nil, partial: nil, &block)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'edit')
-        @current_action.set_values(page_title, page_description, partial, accessible_by)
+        @current_action.set_values(page_title, page_description, partial)
         yield
       end
 
-      def cm_new(page_title: nil,page_description: nil, partial: nil, accessible_by: nil, &block)
+      def cm_new(page_title: nil,page_description: nil, partial: nil, &block)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'new')
-        @current_action.set_values(page_title, page_description, partial, accessible_by)
+        @current_action.set_values(page_title, page_description, partial)
         yield
       end
 
@@ -47,16 +47,14 @@ module CmAdmin
         end
       end
 
-      def tab(tab_name, custom_action, associated_model: nil, layout_type: nil, layout: nil, partial: nil, accessible_by: nil, &block)
+      def tab(tab_name, custom_action, associated_model: nil, layout_type: nil, layout: nil, partial: 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)
@@ -117,12 +115,11 @@ 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, accessible_by: 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, &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

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.6.0"
+  VERSION = "0.6.3"
 end

data/lib/cm_admin/view_helpers/page_info_helper.rb

@@ -53,6 +53,31 @@ module CmAdmin
           base_path + "/#{ar_object.id}" + '/edit'
         end
       end
+
+      def custom_action_items(custom_action, current_action_name)
+        if custom_action.name.present? && policy([:cm_admin, @model.name.classify.constantize]).send(:"#{custom_action.name}?")
+          if custom_action.display_if.call(@ar_object)
+            case custom_action.display_type
+            when :button
+              custom_action_button(custom_action, current_action_name)
+            when :modal
+              custom_modal_button(custom_action)
+            end
+          end
+        end
+      end
+
+      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
+        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
+        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" }
+      end
     end
   end
 end

data/lib/generators/cm_admin/install_generator.rb

@@ -7,8 +7,9 @@ module CmAdmin
 
       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'
+        copy_file 'custom.js', 'app/assets/javascripts/cm_admin/custom.js'
+        copy_file 'custom.css', 'app/assets/stylesheets/cm_admin/custom.css'
+        copy_file 'application_policy.rb', 'app/policies/application_policy.rb'
         route 'mount CmAdmin::Engine => "/admin"'
       end
     end

data/lib/generators/cm_admin/policy_generator.rb

@@ -0,0 +1,13 @@
+require 'rails/generators'
+
+module CmAdmin
+  module Generators
+    class PolicyGenerator < Rails::Generators::NamedBase
+      source_root File.expand_path('templates', __dir__)
+
+      def copy_policy_files
+        template "policy.rb", "app/policies/cm_admin/#{file_name}_policy.rb"
+      end
+    end
+  end
+end

data/{app/policies → lib/generators/cm_admin/templates}/application_policy.rb

@@ -17,7 +17,7 @@ class ApplicationPolicy
   end
 
   def create?
-    false
+    true
   end
 
   def new?
@@ -43,7 +43,7 @@ class ApplicationPolicy
     end
 
     def resolve
-      raise NotImplementedError, "You must define #resolve in #{self.class}"
+      scope.all
     end
 
     private

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

@@ -0,0 +1,8 @@
+class CmAdmin::<%= class_name %>Policy < ApplicationPolicy
+  <%- available_action_names = (CmAdmin::Model.find_by({name: class_name}).available_actions.map{|action| action.name}.uniq - ['custom_action', 'new', 'edit']) %>
+  <%- available_action_names.each do |action_name| %>
+  def <%= action_name %>?
+    <%= CmAdmin.authorized_roles.map {|role| "@user.#{role}" }.join(' && ') %>
+  end
+  <% end %>
+end

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

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

data/yarn.lock

@@ -4123,9 +4123,9 @@ minimatch@^3.0.4:
     brace-expansion "^1.1.7"
 
 minimist@^1.2.0, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
 minipass-collect@^1.0.2:
   version "1.0.2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.3
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-25 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy
@@ -152,7 +152,6 @@ 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
@@ -222,9 +221,12 @@ 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/policy_generator.rb
+- lib/generators/cm_admin/templates/application_policy.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/generators/cm_admin/templates/policy.rb
 - lib/tasks/webpack_install.rake
 - package.json
 - postcss.config.js