cm-admin 0.6.1 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e28d75f3c079c84bbf3e36a395b277390810ae103b87f2678b15c5c12210257
-  data.tar.gz: f207f2665af3246e6f285c626dcfc23bd2f6160b893e665311e4e0babf42f919
+  metadata.gz: 42bd38332aef8d07ca35563f166f706ece3c2da88fa5e22278694da5377bb983
+  data.tar.gz: 292d897394afa6ee6be6a1a1a970e88e77b7d9762d6859c86bafc273de20f619
 SHA512:
-  metadata.gz: 2c1834f17fa138e419d25cd20140ee6e9b78594a3ce8d37f1834eb113f9e88def0b9532b09e3d4c0f0c3e5d1334ddb88d298274b4e70e12779d9e349732d215e
-  data.tar.gz: 0e2781411e73d8ba757462451992f65292a47bb9d9042546a0b70486e7d38e6a60209bf4130ca08d47dc6617ecec75558f15f586c21c90187d998ba9ec74f699
+  metadata.gz: 29548bef18b577c1507ce3404a8055c3083d196c4ecaf03e62e1ccd1a9b9fa46ed128c411f95c3446fa8b95a50c245ad04d94c4a131a8b46d95bc41252e3953f
+  data.tar.gz: 4df3cd6b9d6d3a006798a58a292dfac7f77deaff586e622499d2474525c8060e10e4746993b53ed6f9d70d3a635acfab056ffa6ed418d9e5f5f1e4f4152b7c62

data/Gemfile.lock

@@ -54,7 +54,7 @@ GEM
     method_source (1.0.0)
     mini_portile2 (2.8.0)
     minitest (5.15.0)
-    nokogiri (1.13.3)
+    nokogiri (1.13.4)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     pagy (4.11.0)

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

@@ -18,7 +18,6 @@
 
     &__table-container {
       padding: 20px;
-      height: 100%;
     }
 
     .admin-table {
@@ -77,13 +76,14 @@
       overflow: auto;
       margin-top: 40px;
       margin-bottom: 50px;
-      height: 280px;
+      height: calc(100vh - 365px);
       .cm-table {
         table-layout: fixed;
         position: relative;
         min-width: fit-content;
         border-collapse: collapse;
         border: 1px solid $grey-lighter-clr;
+        border-top-width: 0;
         border-radius: $radius-8;
         &__header {
           .header-row {
@@ -91,6 +91,7 @@
             width: 100%;
             position: relative;
             box-shadow: inset 0px -1px 0px rgba(148, 151, 155, 0.15);
+            border-top: 1px solid $grey-lighter-clr;
             th {
               @include font($size: $t6-text, $color: $ink-lighter-clr, $weight: bold);
               text-transform: uppercase;
@@ -129,7 +130,7 @@
           // height: 335px;
           display: block;
           position: relative;
-          width: 100%;        
+          width: 100%;
           .body-row {
             border-bottom: 1.21px solid rgb(240, 239, 239);
             td:nth-child(2){
@@ -138,7 +139,7 @@
               z-index: 2;
               background-color: #fff;
             }
-            
+
             &:nth-last-child(1) {
               box-shadow: none;
             }
@@ -190,7 +191,6 @@
                 justify-content: center;
                 height: 100%;
                 .popup-card {
-                  width:fit-content;
                   .popup-option {
                     a {
                       font-weight: 500;
@@ -210,8 +210,8 @@
         }
       }
       .cm-table > thead {
-        position:sticky;
-        top:0;
+        position: sticky;
+        top: 0;
         background-color: #fff;
         z-index: 3;
       }

data/app/assets/stylesheets/cm_admin/components/_status-tag.scss

@@ -4,26 +4,12 @@
   font-size: $t4-text;
   line-height: 22px;
   padding: 4px;
-  &.default-0 {
-    color: $primary-text-clr;
-    background: $grey-lighter-clr;
-  }
-  &.default-1 {
+  color: $primary-text-clr;
+  background: $grey-lighter-clr;
+  &.success {
     color: $green-regular-clr;
     background: $green-lightest-clr;
   }
-  &.default-2 {
-    color: $yellow-regular-clr;
-    background: $yellow-lightest-clr;
-  }
-  &.default-3 {
-    color: $red-regular-clr;
-    background: $red-lightest-clr;
-  }
-  &.default-4 {
-    color: $blue-regular-clr;
-    background: $blue-lightest-clr;
-  }
 }
 
 .filter-chip {

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/_associated_table.html.slim

@@ -12,38 +12,43 @@
   table.cm-table
     thead.cm-table__header
       tr.header-row
-        th.check-box-space
-          span
-            input.cm-checkbox type="checkbox"
+        // To be added once bulk-select is finalized
+        / th.check-box-space
+        /   span
+        /     input.cm-checkbox type="checkbox"
         - @model.available_fields[@action.name.to_sym].each do |column|
           th = column.header
     tbody.cm-table__body
       - @associated_ar_object.data.each do |ar_object|
         tr.body-row
-          td.check-box-space
-            span
-              input.cm-checkbox type="checkbox"
+          // To be added once bulk-select is finalized
+          / td.check-box-space
+          /   span
+          /     input.cm-checkbox type="checkbox"
           - @model.available_fields[@action.name.to_sym].each do |column|
             td
               span class="#{column.cm_css_class} text-ellipsis" = show_field_value(ar_object, column)
-          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
-                - @associated_model && @associated_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
-                      - if custom_action.display_type == :button
-                        = link_to custom_action.name.titleize, custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb
-                      - elsif custom_action.display_type == :modal
-                        = link_to custom_action.name.titleize, '', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal-#{ar_object.id.to_s}" }
+          - 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
+              .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
+                  // To be added once the associated model has edit actions
+                  / .popup-option
+                  /   a href="#{page_url('edit', ar_object)}"
+                  /     | Edit
+                  - associated_model_actions.each do |custom_action|
+                    - if custom_action.display_if.call(ar_object)
+                      .popup-option
+                        - if custom_action.display_type == :button
+                          = link_to custom_action.name.titleize, custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb
+                        - elsif custom_action.display_type == :modal
+                          = link_to custom_action.name.titleize, '', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal-#{ar_object.id.to_s}" }
                 
 .cm-pagination
   .cm-pagination__lhs Showing #{@associated_ar_object.pagy.from} to #{@associated_ar_object.pagy.to} out of #{@associated_ar_object.pagy.count}

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

@@ -11,17 +11,18 @@
   table.cm-table
     thead.cm-table__header
       tr.header-row
-        th.check-box-space
-          span
-            input.cm-checkbox type="checkbox"
+        // Select all checkbox feature to be added later
+        / th.check-box-space
+        /   span
+        /     input.cm-checkbox type="checkbox"
         - @model.available_fields[:index].each do |column|
           th = column.header
     tbody.cm-table__body
       - @ar_object.data.each do |ar_object|
         tr.body-row
-          td.check-box-space
-            span
-              input.cm-checkbox type="checkbox"
+          / td.check-box-space
+          /   span
+          /     input.cm-checkbox type="checkbox"
           - @model.available_fields[:index].each_with_index do |column, index|
             td.text-ellipsis
               span class="#{column.field_type.to_s} #{column.cm_css_class} "
@@ -45,12 +46,18 @@
                 .popup-card.table-export-popup.hidden
                   - if edit_action.any? && policy([:cm_admin, @model.name.classify.constantize]).edit?
                     = link_to "#{page_url('edit', ar_object)}" do
-                      .popup-option Edit
+                      .popup-option
+                        span
+                          i.fa.fa-edit
+                        | 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
-                          .popup-option = custom_action.name.titleize
+                        = 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
+                            span
+                              i class="#{custom_action.icon_name}"
+                            = 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,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/app/views/layouts/{_flash_message.html.slim → _cm_flash_message.html.slim}

@@ -6,4 +6,4 @@
     $.jGrowl("#{flash[:success]}", {theme: 'success'})
 - elsif flash[:alert].present?
   javascript:
-    $.jGrowl("#{flash[:alert]}", {theme: 'error'})
+    $.jGrowl("#{flash[:alert].html_safe}", {theme: 'error'})

data/app/views/layouts/cm_admin.html.slim

@@ -15,9 +15,6 @@ html
     script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js" 
     script src="https://raw.githack.com/SortableJS/Sortable/master/Sortable.js"
   body
-    - flash.each do |type, msg|
-      .alert class="alert-#{type}"
-        = msg
     .cm-admin
       = render 'layouts/left_sidebar_nav'
       .panel-area
@@ -41,6 +38,6 @@ html
             = yield
         - else
           = yield
-    = render 'layouts/flash_message'
+    = render 'layouts/cm_flash_message'
     = render 'layouts/custom_action_modals'
 

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
@@ -157,10 +139,15 @@ module CmAdmin
                   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  CmAdmin::Engine.mount_path + "/#{@model.name.underscore.pluralize}" }
+                  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' }
+                  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
@@ -169,11 +156,13 @@ module CmAdmin
                   data = @action.parent == "index" ? @ar_object.data : @ar_object
                   format.html { render action.partial }
                 else
-                  if @action.code_block.call(@ar_object)
+                  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 }
+                    format.html { redirect_to redirect_url, notice: "#{@action.name.titleize} is successful" }
                   else
-                    format.html { redirect_to request.referrer }
+                    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?

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, :icon_name
 
       VALID_SORT_DIRECTION = Set[:asc, :desc].freeze
 
@@ -34,14 +34,13 @@ module CmAdmin
         self.action_type = :default
         self.sort_column = :created_at
         self.sort_direction = :desc
-        self.accessible_by = CmAdmin.authorized_roles
+        self.icon_name = 'fa fa-th-large'
       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/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, :drawer_partial
+      :cm_css_class, :link, :url, :custom_method, :helper_method, :managable, :lockable, :drawer_partial, :tag_class
 
       def initialize(field_name, attributes = {})
         @field_name = field_name
@@ -24,6 +24,7 @@ module CmAdmin
         self.exportable = true
         self.managable = true
         self.lockable = false
+        self.tag_class = {}
       end
 
       #formatting value for different data types

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, icon_name: 'fa fa-th-large', &block)
         action = CmAdmin::Models::CustomAction.new(
                     name: name, verb: verb, layout: layout, layout_type: layout_type, partial: partial, path: path,
                     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
+                    action_type: :custom, route_type: route_type, icon_name: icon_name, &block)
         @available_actions << action
         # self.class.class_eval(&block)
       end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.6.1"
+  VERSION = "0.6.4"
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -51,7 +51,8 @@ module CmAdmin
           when :enum
             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
+            tag_class = field.tag_class.dig("#{ar_object.send(field.field_name.to_s)}".to_sym).to_s
+            content_tag :span, class: "status-tag #{tag_class}" do
               ar_object.send(field.field_name).to_s.upcase
             end
           when :attachment

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -5,21 +5,21 @@ module CmAdmin
         value = field.custom_value || f.object.send(field.field_name)
         case field.input_type
         when :integer
-          return f.text_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, data: {behaviour: 'integer-only'}
+          return f.text_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, placeholder: "Enter #{field.field_name.to_s.humanize.downcase}", data: { behaviour: 'integer-only' }
         when :decimal
-          return f.number_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, data: {behaviour: 'decimal-only'}
+          return f.number_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}", data: { behaviour: 'decimal-only' }
         when :string
-          return f.text_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value
+          return f.text_field field.field_name, class: 'normal-input', 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 || []), {}, class: 'normal-input select-2', disabled: field.disabled
+          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 select-2', disabled: field.disabled
         when :multi_select
-          return f.select field.field_name, options_for_select(field.collection || []), {}, class: 'normal-input select-2', disabled: field.disabled, multiple: true
+          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 select-2', disabled: field.disabled, multiple: true
         when :date
-          return f.text_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, data: {behaviour: 'date-only'}
+          return f.text_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}", data: { behaviour: 'date-only' }
         when :date_time
-          return f.text_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, data: {behaviour: 'date-time'}
+          return f.text_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}", data: { behaviour: 'date-time' }
         when :text
-          return f.text_area field.field_name, class: 'normal-input'
+          return f.text_area field.field_name, class: 'normal-input', placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}"
         when :single_file_upload
           return f.file_field field.field_name, class: 'normal-input'
         when :multi_file_upload

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/package.json

@@ -13,7 +13,7 @@
     "flatpickr": "^4.6.9",
     "jgrowl": "^1.4.8",
     "jquery": "^3.6.0",
-    "moment": "^2.29.1",
+    "moment": "^2.29.2",
     "popper.js": "^1.16.1",
     "turbolinks": "^5.2.0"
   },

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"
@@ -4199,10 +4199,10 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-moment@^2.29.1, moment@^2.9.0:
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
-  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+moment@^2.29.2, moment@^2.9.0:
+  version "2.29.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
+  integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==
 
 move-concurrently@^1.0.1:
   version "1.0.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.4
 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-13 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
@@ -172,8 +171,8 @@ files:
 - 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/_cm_flash_message.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
 - app/views/layouts/_quick_links.html.slim
 - app/views/layouts/cm_admin.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