cm-admin 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb9d2bfcdbec704c6259f45f51e317e32ad05d5ca4990a52fca17af831f62566
-  data.tar.gz: 6a357cfe4458e4da3409c8e95e51cda3e36d6d8ebbd00c4518a6928f1815926e
+  metadata.gz: dcd2e766f902e8045d4eba1ae60067d6636477625f6a51a7ce896c0e446ad8bc
+  data.tar.gz: d1ef041f20245116d4dafc04629b75768245a77b0f042e038675516e60692206
 SHA512:
-  metadata.gz: 242b5d01155399a9c9038b1a0811db95c82824ace0c9e4b592c98d9dae5a51b23cf28a80cb89db771f0d647685b5b5b9c83e0ac6774269eb0c88d4c90c792c83
-  data.tar.gz: 17cd6516e61f6e3ff3aa6fc7515807c3a5fb423d0fa016992aba51bbe2b2f40b885aa6e200c8aefa71b713dd2477fcb3bbb7f63e0ba7de96ca6e2351ae058356
+  metadata.gz: 1e152f94b559e7f12d9d0d6cb82688d293c6a799fe0ade4b503c0dc2e8edc0337864741b7a7ae50e8ddcd7e175cc1813125f0409b5f62880fac3c386cae30638
+  data.tar.gz: d7b610b2ff1f329a09d3a31564f7f0d35bd5799803bcbdd31f15faad311803e516b6b828037524161993d139fabed9b08ef508cb2214a7dae6f2b74cb834dd32

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

@@ -49,7 +49,7 @@
                   - custom_actions.each do |custom_action|
                     - if custom_action.name.present? && has_valid_policy(@model.name, custom_action.name)
                       - if custom_action.display_if.call(ar_object)
-                        = 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? && has_valid_policy(@model.name, 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? && has_valid_policy(@model.name, 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/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.6.2"
+  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,8 @@ 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

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.2
+  version: 0.6.3
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-01 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy