cm-admin 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a604ef5af3423a1ea530076b93e4ef86f1353c5697949131ac198bf374eef9e
-  data.tar.gz: bedbde6c9a8abcc303668e6744964d7bc4e7050beafb6a07c0e17cde1392a687
+  metadata.gz: 2047ac958ebd117645f7089227af0177f495f1cf640791c3e2f9fb2920fc1f04
+  data.tar.gz: 3f81a0d55a072ec52cb51b54e04cfd77edc87e562275539045ec39ca98e5b6ca
 SHA512:
-  metadata.gz: 710123223b9520e39b0dd7426ed62d2941828087543717804361f98c6f668af8e2e829ab4c21e4285fff237306787c24c467922e1eb3ba0175ade65e41a6e49c
-  data.tar.gz: 101a879ca7b6a56a473cf95cffd02ff0d543d96c68f952335ad8639692368ff651905d9198ee7a5a35abe1aaa10f0894d9e841d86976e2c1fd82afc128647b9e
+  metadata.gz: b7f8ac87cb03febd769e5f11a8e4819eff5cb978727c1bc55d73680970147b1e28c15293d1d819dbec11c290fc090126a32bdc3db1f30d7202013bbf4a43c25b
+  data.tar.gz: 370da992ee711a9e2d15d665e4ee2e595ab4767e3761c58d603ad3a6abef95b1f09412e8d92e7ea0dea3763f1ce1332a735f42a9d5b27e7e35f05800fcc6d863

data/README.md

@@ -24,27 +24,6 @@ Install the gem
 
     $ rails g cm_admin:install
 
-For generating the index page views
-
-    $ rails g cm_admin:view products index title description
-
-For generating the show page views
-
-    $ rails g cm_admin:view products show title description
-
-For generating the form page views
-    $ rails g cm_admin:view products form column_name:field_type
-    $ rails g cm_admin:view products form title:string description:string
-
-Following field types are acceted
-
-* input-integer
-* input-string
-* single-select
-* multi-select
-* checkbox
-* radio
-
 ## Usage
 
 For demo check [here](http://cm-admin.labs.commutatus.com/admin/users/)

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/_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/#{@model.ar_model.table_name}/#{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
+        - 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'
       - @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

@@ -19,7 +19,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 +27,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/config/routes.rb

@@ -10,7 +10,7 @@ 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}")
       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
 
@@ -102,6 +101,8 @@ module CmAdmin
             @action = CmAdmin::Models::Action.find_by(@model, name: action_name)
             @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 +127,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 }
+                  redirect_url = request.referrer || "/cm_admin/#{@model.ar_model.table_name}/#{@ar_object.id}"
+                  if @action.code_block.call(@ar_object)
+                    format.html { redirect_to redirect_url }
+                  else
+                    format.html { redirect_to redirect_url }
+                  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
 
       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.4"
+  VERSION = "0.5.0"
 end

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy
@@ -152,6 +152,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