cm-admin 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcbb26a08fa072ec95a1363e72c63ebfad6a1c661d303d50af5379f2f5bce0b1
-  data.tar.gz: 2f2526862a9312a48f768eb001ba52f6365182e105556136e2e763e96e21484a
+  metadata.gz: 590c14bc3ee438f00943ac40316aaf1e0850639a5eda8da1d4c73dec80b11963
+  data.tar.gz: df5b1269f85267cc86e123c15b950e50292396771cb83cc10dc27bb3337d7416
 SHA512:
-  metadata.gz: c8d834bc6b9716aeef9b5c82137106c9aae52afd435ef384e7543be09fd4f18cb3f593374aebf5d840c9d17f7d0ecb99a9c9066508a1645fdff32d433d9ef983
-  data.tar.gz: c21ae398e2d2542186251a98bc706e203164e70319e841041527122358cd9cf3162620d8b860570b5f288f2ba1734c73a2a3a83da917c8b159120ad28c8febae
+  metadata.gz: 1b530f87e1a584d25e43684491ddee0156d7544bcb31f13c8b4d53aedff611ff0ffae7fc4ea9898d5186f4a3453463d7d77b7ecf4f39bee8020fcb4c753f6e76
+  data.tar.gz: ec22d42e7c47f2755642a902821db15616378361b661b0a609d22fe5b678527ae6ddddf62d902ba0aa55fc647eb215bb4704df046f5b7bbf5625c1b7ffceaa2f

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

@@ -74,7 +74,6 @@
         position: relative;
         min-width: fit-content;
         border-collapse: collapse;
-        white-space: nowrap;
         border: 1px solid $grey-lighter-clr;
         border-radius: $radius-8;
         &__header {
@@ -222,7 +221,7 @@
             box-shadow: inset 0px 1px 0px rgba(148, 151, 155, 0.15);
           }
         }
-      } 
+      }
 
       .columns-list {
         .column-item  {
@@ -266,7 +265,7 @@
             }
           }
         }
-      } 
+      }
     }
 
     .cm-pagination {
@@ -317,4 +316,4 @@
       }
     }
   }
-}
+}

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

@@ -37,24 +37,26 @@
                 .popup-option
                   a href="#{page_url('edit', ar_object)}"
                     | Edit
-/ .cm-pagination
-/   .cm-pagination__lhs Showing 1 to 15 out of 104
-/   .cm-pagination__rhs
-/     span.page-move-btn.disabled
-/       i.fa.fa-angle-double-left.bolder.f14
-/     span.page-move-btn.disabled
-/       i.fa.fa-chevron-left.bolder
-/     span.page-num-btn.active 1
-/     span.page-num-btn 2
-/     span.page-num-btn 3
-/     span.page-num-btn 4
-/     span.page-num-btn 5
-/     span.page-move-btn
-/       i.fa.fa-chevron-right.bolder
-/     span.page-move-btn
-/       i.fa.fa-angle-double-right.bolder.f14
-
+                - @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}" }
+                
 .cm-pagination
   .cm-pagination__lhs Showing #{@associated_ar_object.pagy.from} to #{@associated_ar_object.pagy.to} out of #{@associated_ar_object.pagy.count}
   .cm-pagination__rhs
-    == render partial: 'cm_admin/main/cm_pagy_nav', locals: { pagy: @associated_ar_object.pagy }
+    == 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|
+    .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
+          .modal-header
+            h5.modal-title id="#{custom_action.name.classify}ModalLabel" = custom_action.name.classify
+            button.btn-close aria-label="Close" data-bs-dismiss="modal" type="button" 
+          .modal-body
+            = render partial: custom_action.partial, locals: { ar_object: ar_object }

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

@@ -28,9 +28,14 @@
           = 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" }
-    - elsif @model.current_action.name == 'show' || @action.layout_type == "cm_association_show"
+    - elsif @model.current_action.name == 'show'
       - @model.available_actions.select{|act| act if act.route_type == 'member'}.each do |custom_action|
         - 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" }
+          = link_to custom_action.name.titleize, '', class: 'primary-btn ml-2', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal" }
+
+      - 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}"

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

@@ -1,9 +1,9 @@
-- @model.available_actions.select{|act| act if act.route_type == 'collection' && act.display_type == :modal}.each do |custom_action|
-  .modal.fade id="#{custom_action.name.classify}Modal" aria-hidden="true" aria-labelledby="exampleModalLabel" tabindex="1" 
+- @model.available_actions.select{|act| act if act.display_type == :modal}.each do |custom_action|
+  .modal.fade id="#{custom_action.name.classify}Modal" aria-hidden="true" aria-labelledby="#{custom_action.name.classify}ModalLabel" tabindex="1" 
     .modal-dialog
       .modal-content
         .modal-header
-          h5#exampleModalLabel.modal-title = custom_action.name.classify
+          h5.modal-title id="#{custom_action.name.classify}ModalLabel" = custom_action.name.classify
           button.btn-close aria-label="Close" data-bs-dismiss="modal" type="button" 
         .modal-body
           = render partial: custom_action.partial

data/lib/cm_admin/model.rb

@@ -22,7 +22,7 @@ module CmAdmin
     include Models::DslMethod
     include Models::ControllerMethod
     attr_accessor :available_actions, :actions_set, :available_fields, :permitted_fields, :current_action, :params, :filters, :available_tabs
-    attr_reader :name, :ar_model
+    attr_reader :name, :ar_model, :is_visible_on_sidebar
 
     # Class variable for storing all actions
     # CmAdmin::Model.all_actions
@@ -31,6 +31,7 @@ module CmAdmin
     def initialize(entity, &block)
       @name = entity.name
       @ar_model = entity
+      @is_visible_on_sidebar = true
       @available_actions ||= []
       @current_action = nil
       @available_tabs ||= []
@@ -85,6 +86,10 @@ module CmAdmin
       @actions_set = true
     end
 
+    def visible_on_sidebar(visible_option)
+      @is_visible_on_sidebar = visible_option
+    end
+
 
     private
 

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/lib/cm_admin/view_helpers/navigation_helper.rb

@@ -5,26 +5,28 @@ module CmAdmin
       include Pagy::Frontend
       def navigation_links(navigation_type)
         CmAdmin.cm_admin_models.map { |model|
-          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
-              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
+          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
                 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
+                  end
+                end
+              end
             end
           end
         }.join.html_safe

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

@@ -1 +1 @@
-b50f217278de15248bddb0b6f2e6be58edbffa7c
+33d3c35c58c8db0310c4cb3ec7ff742813910e07

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy