cm-admin 0.4.3 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfec95ffd823756a98b20c323fbe673123031f28c0ba4da0f99148b9ecb5bde6
-  data.tar.gz: 78601ced8fbacade877acb859adb35d3467fb59a30f8378378d4ea18187ca38f
+  metadata.gz: bcbb26a08fa072ec95a1363e72c63ebfad6a1c661d303d50af5379f2f5bce0b1
+  data.tar.gz: 2f2526862a9312a48f768eb001ba52f6365182e105556136e2e763e96e21484a
 SHA512:
-  metadata.gz: 74277a250eea68170ba20c9f084a5733c07ffddd2948a189e43b183900ec125ca8768dcffeec4308b85de1cfa6e376193d1513279c3b083b0a1c6f65b7e4d6d9
-  data.tar.gz: b1f323c0340c805ad4190d35d0e87cec5fb922e35eafea36091c8fb7c127e352fcbc8e3a10c422b0b42bbd30b09c97acb6e628b03f4b170865ecea2809edea68
+  metadata.gz: c8d834bc6b9716aeef9b5c82137106c9aae52afd435ef384e7543be09fd4f18cb3f593374aebf5d840c9d17f7d0ecb99a9c9066508a1645fdff32d433d9ef983
+  data.tar.gz: c21ae398e2d2542186251a98bc706e203164e70319e841041527122358cd9cf3162620d8b860570b5f288f2ba1734c73a2a3a83da917c8b159120ad28c8febae

data/app/assets/stylesheets/cm_admin/scaffold.scss

@@ -12,3 +12,13 @@
   }
   
 }
+
+.nested-field-wrapper {
+  label {
+    font-size: 14px;
+    margin-bottom: 16px;
+  }
+  .nested-fields {
+    margin-bottom: 16px;
+  }
+}

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

@@ -1,6 +1,6 @@
 .admin-table-index
   .table-top
-    p.table-top__total-count = "#{@associated_ar_object.pagy.count} #{@associated_model.ar_model.table_name} found"
+    p.table-top__total-count = "#{@associated_ar_object.pagy.count} #{@associated_model&.ar_model&.table_name} found"
     .table-top__column-action
       button.secondary-btn.column-btn data-target="#columnActionModal" data-toggle="modal" type="button"
         span

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

@@ -1,7 +1,8 @@
 .nested-fields
   - @model.available_fields[action_name.to_sym][assoc_name].each do |field|
-    = f.label field.field_name, class: 'field-label'
-    br
-    = input_field_for_column(f, field)
-  - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
-    = link_to_remove_association "remove #{assoc_name}", f
+    .row
+      .col-sm-10
+        = input_field_for_column(f, field)
+      .col-sm-2
+        - if @reflections.select {|x| x if x.name == assoc_name}.first.macro == :has_many
+          = link_to_remove_association "x", f

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

@@ -1,6 +1,7 @@
-#tasks
+.nested-field-wrapper
+  label.field-label = table_name.to_s.titleize
   = f.fields_for table_name do |record|
     = render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: table_name }
   - if @reflections.select {|x| x if x.name == table_name}.first.macro == :has_many
     .links
-      = link_to_add_association "add #{table_name}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: table_name }}
+      = link_to_add_association "+ Add #{table_name.to_s.titleize}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options:  {locals: { assoc_name: table_name }}

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

@@ -1,13 +1,12 @@
 .admin-table-index
   .table-top
     p.table-top__total-count = "#{@ar_object.pagy.count} #{@model.ar_model.table_name} found"
-    .table-top__column-action
-      button.secondary-btn.column-btn data-bs-target="#columnActionModal" data-bs-toggle="modal"
-        span
-          i.fa.fa-columns.bolder
-        span
-          i.fa.fa-angle-down
-
+    // .table-top__column-action
+    //  button.secondary-btn.column-btn data-bs-target="#columnActionModal" data-bs-toggle="modal"
+    //    span
+    //      i.fa.fa-columns.bolder
+    //    span
+    //      i.fa.fa-angle-down
 .new-admin-table.scrollable
   table.cm-table
     thead.cm-table__header
@@ -23,9 +22,13 @@
           td.check-box-space
             span
               input.cm-checkbox type="checkbox"
-          - @model.available_fields[:index].each do |column|
+          - @model.available_fields[:index].each_with_index do |column, index|
             td.text-ellipsis
-              span class="#{column.cm_css_class}" = show_field_value(ar_object, column)
+              span class="#{column.cm_css_class}"
+                - if index == 0
+                  = link_to ar_object.send(column.field_name), "/cm_admin/#{ar_object.model_name.collection}/#{ar_object.id}"
+                - else
+                  = show_field_value(ar_object, column)
           td.row-action-cell
             .row-action-tool
               button.secondary-btn.tool-btn type="button"

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

@@ -24,8 +24,13 @@
       a.primary-btn.ml-2 href="#{page_url('new')}"
         | Add
       - @model.available_actions.select{|act| act if act.route_type == 'collection'}.each do |custom_action|
-        = link_to custom_action.name, @model.ar_model.table_name + '/' + custom_action.path, class: 'primary-btn ml-2', method: custom_action.verb
-    - elsif @model.current_action.name == 'show'
+        - 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" }
+    - elsif @model.current_action.name == 'show' || @action.layout_type == "cm_association_show"
       - @model.available_actions.select{|act| act if act.route_type == 'member'}.each do |custom_action|
-        - if custom_action.display_if.call(@ar_object)
-          = link_to custom_action.name, custom_action.path.gsub(':id', params[:id]), class: 'primary-btn ml-2', method: custom_action.verb
+        - 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" }

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
-			== render 'cm_admin/main/associated_table'
+			== render partial: 'cm_admin/main/associated_table'
 
-		= column_pop_up(@associated_model)
+		// = column_pop_up(@associated_model)

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

@@ -0,0 +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" 
+    .modal-dialog
+      .modal-content
+        .modal-header
+          h5#exampleModalLabel.modal-title = custom_action.name.classify
+          button.btn-close aria-label="Close" data-bs-dismiss="modal" type="button" 
+        .modal-body
+          = render partial: custom_action.partial

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

@@ -10,6 +10,8 @@ html
     = stylesheet_pack_tag 'cm_admin/application', 'data-turbolinks-track': 'reload'
     link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" /
     = javascript_pack_tag 'cm_admin/application', 'data-turbolinks-track': 'reload'
+    = javascript_include_tag 'cm_admin/custom', 'data-turbolinks-track': 'reload'
+    = stylesheet_link_tag 'cm_admin/custom', media: 'all', 'data-turbolinks-track': 'reload'
     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
@@ -19,7 +21,7 @@ html
     .cm-admin
       = render 'layouts/left_sidebar_nav'
       .panel-area
-        - if defined?(@action) && @action&.layout_type.to_s == 'cm_association_show'
+        - if defined?(@action) && (@action&.layout_type.to_s == 'cm_association_show' || @action.parent == "show")
           .show-page.page-container
             .show-page__tabs.sticky-container
               .cm-tabs-bar
@@ -27,16 +29,18 @@ html
                 == render 'cm_admin/main/tabs'
             .show-page__inner.scrollable
               = yield
-        - elsif defined?(@action) && @action&.layout_type.to_s == 'cm_association_index'
+        - elsif defined?(@action) && (@action&.layout_type.to_s == 'cm_association_index' || @action.parent == "index")
           .show-page.page-container
             .show-page__tabs.sticky-container
               .cm-tabs-bar
                 == render 'cm_admin/main/top_navbar'
                 == render 'cm_admin/main/tabs'
-                - if @associated_model.filters.present?
+                - if @associated_model && @associated_model.filters.present?
                   .index-page__filters
                     == render partial: 'cm_admin/main/filters', locals: { filters: @associated_model.filters }
             = yield
         - else
           = yield
-    = render 'layouts/flash_message'
+    = render 'layouts/flash_message'
+    = render 'layouts/custom_action_modals'
+

data/cm_admin.gemspec

@@ -3,8 +3,8 @@ require_relative 'lib/cm_admin/version'
 Gem::Specification.new do |spec|
   spec.name          = "cm-admin"
   spec.version       = CmAdmin::VERSION
-  spec.authors       = ["sajinmp", "anbublacky", "manikandan0603"]
-  spec.email         = ["sajinprasadkm@gmail.com", "anbublacky@gmail.com"]
+  spec.authors       = ["sajinmp", "anbublacky", "AdityaTiwari2102"]
+  spec.email         = ["sajinprasadkm@gmail.com", "anbublacky@gmail.com", "taditya.tiwari007@gmail.com"]
 
   spec.summary       = %q{This is an admin panel gem}
   spec.description   = %q{This is an admin panel gem}

data/config/routes.rb

@@ -10,9 +10,9 @@ CmAdmin::Engine.routes.draw do
 
   # Defining action routes for each model
   CmAdmin.cm_admin_models.each do |model|
-    model.available_actions.each do |act|
+    model.available_actions.sort_by {|act| act.class}.each do |act|
       scope model.name.tableize do
-        send(act.verb, act.path.present? ? act.path : act.name, to: "#{model.name.underscore}##{act.name}")
+        send(act.verb, act.path.present? ? act.path : act.name, to: "#{model.name.underscore}##{act.name}", as: "#{model.name.underscore}_#{act.name}")
       end
     end
   end

data/lib/cm_admin/engine.rb

@@ -12,6 +12,8 @@ module CmAdmin
     initializer 'RailsAdmin precompile hook', group: :all do |app|
       app.config.assets.precompile += %w(
         cm_admin/cm_admin.css
+        cm_admin/custom.js
+        cm_admin/custom.css
       )
     end
 

data/lib/cm_admin/model.rb

@@ -92,7 +92,6 @@ module CmAdmin
     # If model is User, controller will be UsersController
     def define_controller
       klass = Class.new(CmAdmin::ApplicationController) do
-
         $available_actions.each do |action|
           define_method action.name.to_sym do
 
@@ -100,8 +99,11 @@ module CmAdmin
             @model = CmAdmin::Model.find_by(name: controller_name.classify)
             @model.params = params
             @action = CmAdmin::Models::Action.find_by(@model, name: action_name)
+            @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?
+            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
             nested_tables += @model.available_fields[:edit].except(:fields).keys
             @reflections = @model.ar_model.reflect_on_all_associations
@@ -126,13 +128,19 @@ module CmAdmin
                 else
                   format.html { render '/cm_admin/main/new' }
                 end
-              elsif action.class == CmAdmin::Models::CustomAction
-                redirect_url = request.referrer || "/cm_admin/#{@model.ar_model.table_name}/#{@ar_object.id}"
-                data = @action.parent == "index" ? @ar_object.data : @ar_object
-                if @action.code_block.call(@ar_object)
-                  format.html { redirect_to redirect_url }
+              elsif action.action_type == :custom
+                if action.child_records
+                  format.html { render action.layout }
+                elsif action.display_type == :page
+                  data = @action.parent == "index" ? @ar_object.data : @ar_object
+                  format.html { render action.partial }
                 else
-                  format.html { redirect_to redirect_url }
+                  if @action.code_block.call(@ar_object)
+                    redirect_url = @action.redirection_url || request.referrer || "/cm_admin/#{@model.ar_model.table_name}/#{@ar_object.id}"
+                    format.html { redirect_to redirect_url }
+                  else
+                    format.html { redirect_to request.referrer }
+                  end
                 end
               elsif action.layout.present?
                 if request.xhr? && action.partial.present?

data/lib/cm_admin/models/action.rb

@@ -4,7 +4,9 @@ module CmAdmin
   module Models
     class Action
       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
+      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
 
       def initialize(attributes = {}, &block)
         if attributes[:layout_type].present? && attributes[:layout].nil? && attributes[:partial].nil?
@@ -25,7 +27,9 @@ module CmAdmin
 
       def set_default_values
         self.is_nested_field = false
-        self.display_if = true
+        self.display_if = lambda { |arg| return true }
+        self.display_type = :button
+        self.action_type = :default
       end
 
       class << self

data/lib/cm_admin/models/controller_method.rb

@@ -65,7 +65,7 @@ module CmAdmin
         nested_fields = nested_tables.map {|table|
           Hash[
             table.to_s + '_attributes',
-            table.to_s.singularize.titleize.constantize.columns.map(&:name).reject { |i| CmAdmin::REJECTABLE_FIELDS.include?(i) }.map(&:to_sym) + [:id, :_destroy]
+            table.to_s.classify.constantize.columns.map(&:name).reject { |i| CmAdmin::REJECTABLE_FIELDS.include?(i) }.map(&:to_sym) + [:id, :_destroy]
           ]
         }
         permittable_fields += nested_fields

data/lib/cm_admin/models/dsl_method.rb

@@ -3,6 +3,13 @@ module CmAdmin
     module DslMethod
       extend ActiveSupport::Concern
 
+      def cm_page(name: nil, partial: nil, path: nil, route_type: nil, page_title: nil, display_type: :button, &block)
+        action = CmAdmin::Models::CustomAction.new(name: name, verb: :get, partial: partial, path: path, route_type: route_type, display_type: display_type, &block)
+        @available_actions << action
+        # @available_actions << CmAdmin::Models::CustomAction.new(name: name, verb: 'get', layout: 'cm_admin', partial: partial, path: path, parent: self.current_action.name, route_type: route_type, page_title: page_title, display_type: display_type, &block)
+        # @current_action = CmAdmin::Models::CustomAction.find_by(self, name: name)
+      end
+
       def cm_index(page_title: nil ,page_description: nil, &block)
         @current_action = CmAdmin::Models::Action.find_by(self, name: 'index')
         @current_action.page_title = page_title
@@ -49,7 +56,9 @@ module CmAdmin
           @current_action = CmAdmin::Models::Action.find_by(self, name: 'show')
           @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 = 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)
           @available_actions << action
           @current_action = action
           @available_tabs << CmAdmin::Models::Tab.new(tab_name, custom_action, &block)
@@ -109,8 +118,12 @@ module CmAdmin
       #     end
       #   end
       # end
-      def custom_action(name: nil, verb: nil, layout: nil, partial: nil, path: nil, display_if: lambda { |arg| return true }, route_type: nil, &block)
-        @available_actions << CmAdmin::Models::CustomAction.new(name: name, verb: verb, layout: layout, partial: partial, path: path, parent: self.current_action.name, display_if: display_if, route_type: route_type, &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)
+        @available_actions << action
         # self.class.class_eval(&block)
       end
 

data/lib/cm_admin/version.rb

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

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -22,7 +22,7 @@ module CmAdmin
 
       def form_with_all_fields(resource, method)
         columns = resource.class.columns.dup
-        table_name = resource.class.table_name
+        table_name = resource.model_name.collection
         columns.reject! { |i| REJECTABLE.include?(i.name) }
         url = CmAdmin::Engine.mount_path + "/#{table_name}/#{resource.id}"
         set_form_for_fields(resource, columns, url, method)
@@ -30,7 +30,7 @@ module CmAdmin
 
       def form_with_mentioned_fields(resource, available_fields, method)
         # columns = resource.class.columns.select { |i| available_fields.map(&:field_name).include?(i.name.to_sym) }
-        table_name = resource.class.table_name
+        table_name = resource.model_name.collection
         # columns.reject! { |i| REJECTABLE.include?(i.name) }
         url = CmAdmin::Engine.mount_path + "/#{table_name}/#{resource.id}"
         set_form_for_fields(resource, available_fields, url, method)

data/lib/cm_admin/view_helpers/page_info_helper.rb

@@ -6,8 +6,10 @@ module CmAdmin
       end
 
       def action_title
-        if @model.current_action.page_title
-          title = @model.current_action.page_title
+        show_action = CmAdmin::Models::Action.find_by(@model, name: 'show')
+        title = @model.current_action.page_title || show_action.page_title
+        if title
+          title = (title.class == Symbol) ? @ar_object.send(title) : title
         else
           title = "#{@model.name}"
           case action_name
@@ -24,8 +26,11 @@ module CmAdmin
       end
 
       def action_description
+        show_action = CmAdmin::Models::Action.find_by(@model, name: 'show')
         if @model.current_action.page_description
           title = @model.current_action.page_description
+        elsif show_action.page_description
+          title = show_action.page_description
         else
           title = "#{@model.name}"
           case action_name

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.3
 platform: ruby
 authors:
 - sajinmp
 - anbublacky
-- manikandan0603
+- AdityaTiwari2102
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy
@@ -86,6 +86,7 @@ description: This is an admin panel gem
 email:
 - sajinprasadkm@gmail.com
 - anbublacky@gmail.com
+- taditya.tiwari007@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -152,6 +153,7 @@ files:
 - app/views/cm_admin/main/new.html.slim
 - app/views/cm_admin/main/show.html.slim
 - app/views/cm_admin/static/error_401.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