cm-admin 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e71407dad6f3a42e093faa7247489382dd4b650b3c61f85b6758286a7d2ee45
-  data.tar.gz: e50e11e94676d06e9044a58b84f20cb416d92e8a0a92507afa5ff362b98d9640
+  metadata.gz: 4005c7711af2f931298a2054cd527de1a67a92a42deaecd8fb71b37fbcdc5fb2
+  data.tar.gz: 8fa616289069247a2418896b7ac2cb4f6ca5ec1dfc121d5a06cececb9c3a5242
 SHA512:
-  metadata.gz: 07bf22fe0ea5157252da7a3b17b012f6842ce5da4815764fd6ace17af0203db2dd09158d97efc9f19c51e9df5529f742c7284e501b5879b3694e48aed4283cf3
-  data.tar.gz: 9433f9fd8d71db8f7d1a95668e723cf655cc91e66df19b73d73f405336a7649e8c2a1f011c901a898990512a1e4eefe5092ed7f6502feabf75599a2e0ac0ff1d
+  metadata.gz: 82d898a13ff420a9c3e7b9df6f9daca9174df4bc3587c879cac1817cdbdcb5e812562f81a7e5ed8716729da466da5240037e3d7bca36900d5efb355859c4ca1a
+  data.tar.gz: 29a54f03bb2aaa0cec4aa0fecaef373376e94a4e6e47e67219245ae257f2f2774ad388e9a4b8b9510a23d45f130fc9a6703128403b512256525d2197dae292a0

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

@@ -83,4 +83,8 @@
       left: -400px;
      opacity: 0;
   }
+}
+
+.drawer {
+  cursor: pointer;
 }

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

@@ -31,21 +31,25 @@
                   = show_field_value(ar_object, column)
                   - if column.field_type == :drawer
                     = render partial: column.drawer_partial, locals: { ar_object: ar_object}
-          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' && [:button, :modal].include?(act.display_type)}.each do |custom_action|
-                  - if custom_action.display_if.call(ar_object)
-                    .popup-option
-                      = link_to custom_action.name.titleize, custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb
+
+          - 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/_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/lib/cm_admin/model.rb

@@ -21,7 +21,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 +33,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 ||= []
@@ -59,7 +61,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,6 +92,10 @@ module CmAdmin
       @is_visible_on_sidebar = visible_option
     end
 
+    def set_icon(name)
+      @icon_name = name
+    end
+
 
     private
 

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -43,7 +43,7 @@ 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)

data/lib/cm_admin/view_helpers/navigation_helper.rb

@@ -11,16 +11,16 @@ module CmAdmin
               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'
+                    concat tag.i class: "#{model.icon_name}"
                   end +
-                  model.name
+                  model.name.pluralize
                 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'
+                    concat tag.i class: "#{model.icon_name}"
                   end +
                   content_tag(:span) do
                     model.name

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-02 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: This is an admin panel gem