cm-admin 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b468292084cb503cdffd0306b66b2d30eabe67f59f3b05037418eba24ed5cc21
-  data.tar.gz: 876b6dc6bf6a003cc4a792cdaf9071737b90b29abe6ba175401f0d63af58fe9b
+  metadata.gz: 2047ac958ebd117645f7089227af0177f495f1cf640791c3e2f9fb2920fc1f04
+  data.tar.gz: 3f81a0d55a072ec52cb51b54e04cfd77edc87e562275539045ec39ca98e5b6ca
 SHA512:
-  metadata.gz: d526d75a25af290a0564fb45beb2c4d59fe31990a8fde29396b2ffbc01d9b46753ea0484e36364bb43a84f7c05d4c8d79de633a875df2fdb2e8888a1f098091d
-  data.tar.gz: d966acb8de4162bdf5dd7cf5e2022d3ce7f0b0451e3c50f73a5dfa6ef8d56804f8f5d0df724895068926dd567322c0d2ebc66eabeb6227f6a69d8df3506876d4
+  metadata.gz: b7f8ac87cb03febd769e5f11a8e4819eff5cb978727c1bc55d73680970147b1e28c15293d1d819dbec11c290fc090126a32bdc3db1f30d7202013bbf4a43c25b
+  data.tar.gz: 370da992ee711a9e2d15d665e4ee2e595ab4767e3761c58d603ad3a6abef95b1f09412e8d92e7ea0dea3763f1ce1332a735f42a9d5b27e7e35f05800fcc6d863

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'pagy'
+gem 'pagy', '~> 4.11.0'
 gem 'slim'
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    cm-admin (0.3.0)
+    cm-admin (0.4.2)
       axlsx_rails (~> 0.6.1)
       cocoon (~> 1.2.15)
-      pagy (~> 3.13)
+      pagy (~> 4.11.0)
       slim (~> 4.1.0)
       webpacker (~> 5.2.1)
 
@@ -34,7 +34,7 @@ GEM
       actionpack (>= 3.1)
       caxlsx (>= 3.0)
     builder (3.2.4)
-    caxlsx (3.1.0)
+    caxlsx (3.1.1)
       htmlentities (~> 4.3, >= 4.3.4)
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
@@ -50,14 +50,12 @@ GEM
     loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    marcel (1.0.1)
+    marcel (1.0.2)
     method_source (1.0.0)
-    mini_portile2 (2.6.1)
     minitest (5.14.4)
-    nokogiri (1.12.4)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
-    pagy (3.14.0)
+    pagy (4.11.0)
     racc (1.5.2)
     rack (2.2.3)
     rack-proxy (0.7.0)
@@ -112,10 +110,10 @@ PLATFORMS
 DEPENDENCIES
   cm-admin!
   cocoon
-  pagy
+  pagy (~> 4.11.0)
   rake (~> 12.0)
   rspec (~> 3.0)
   slim
 
 BUNDLED WITH
-   2.2.17
+   2.0.2

data/README.md

@@ -7,7 +7,7 @@ New CmAdmin gem
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'cm_admin'
+gem 'cm-admin'
 ```
 
 And then execute:
@@ -16,7 +16,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install cm_admin
+    $ gem install cm-admin
 
 ## Usage
 
@@ -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/assets/stylesheets/cm_admin/base/common.scss

@@ -199,7 +199,7 @@
   margin-left: 2px;
 }
 
-.text-ellipsis {
+.text-ellipsis div {
   overflow: hidden;
   text-overflow: ellipsis;
 }

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

@@ -9,7 +9,6 @@
 }
 
 .form-page {
-  margin-top: 140px;
   padding: 24px;
   background-color: $white;
   &__inner {

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

@@ -22,6 +22,8 @@ body {
   .panel-area {
     width: calc(100% - 225px);
     margin-left: 225px;
+    height: 100vh;
+    overflow-y: auto;
   }
 
   .components {

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

@@ -22,5 +22,6 @@
  *= require 'cm_admin/base/common'
  *= require 'cm_admin/components/index'
  *= require 'cm_admin/dependency/bootstrap.min'
+ *= require 'cm_admin/scaffold'
  *= require_self
  */

data/app/assets/stylesheets/cm_admin/components/_status-tag.scss

@@ -4,23 +4,23 @@
   font-size: $t4-text;
   line-height: 22px;
   padding: 4px;
-  &.default-tag {
+  &.default-0 {
     color: $primary-text-clr;
     background: $grey-lighter-clr;
   }
-  &.green-tag {
+  &.default-1 {
     color: $green-regular-clr;
     background: $green-lightest-clr;
   }
-  &.yellow-tag {
+  &.default-2 {
     color: $yellow-regular-clr;
     background: $yellow-lightest-clr;
   }
-  &.red-tag {
+  &.default-3 {
     color: $red-regular-clr;
     background: $red-lightest-clr;
   }
-  &.blue-tag {
+  &.default-4 {
     color: $blue-regular-clr;
     background: $blue-lightest-clr;
   }

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

@@ -0,0 +1,14 @@
+.jGrowl {
+  color: #1D2129 !important;
+  font-size: 14px !important;
+  .success{
+    background-color: #C1EDE2 !important;
+  }
+  .notice {
+    background-color: #CDE1FB !important;
+  }
+  .error {
+    background-color: #FDCFCF !important;
+  }
+  
+}

data/app/javascript/packs/cm_admin/application.js

@@ -6,6 +6,7 @@ require("jquery")
 require("moment")
 require("bootstrap")
 require('flatpickr')
+require("jgrowl")
 require('./scaffolds.js')
 require('./quick_search.js')
 require('./filters.js')

data/app/javascript/stylesheets/cm_admin/application.scss

@@ -1,3 +1,4 @@
 @import "bootstrap/scss/bootstrap";
 @import "flatpickr/dist/flatpickr";
-@import "../../../../node_modules/daterangepicker/daterangepicker.css";
+@import "../../../../node_modules/daterangepicker/daterangepicker.css";
+@import "jgrowl/jquery.jgrowl"

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
@@ -25,7 +25,7 @@
               input.cm-checkbox type="checkbox"
           - @model.available_fields[@action.name.to_sym].each do |column|
             td
-              span class="#{column.cm_css_class}" = show_field_value(ar_object, column)
+              span class="#{column.cm_css_class} text-ellipsis" = 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/_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|
-            td
-              span class="#{column.cm_css_class}" = show_field_value(ar_object, column)
+          - @model.available_fields[:index].each_with_index do |column, index|
+            td.text-ellipsis
+              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"
@@ -37,22 +40,10 @@
                 .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
+                - @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
+                      = link_to custom_action.name, custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb
 
 .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

@@ -5,8 +5,8 @@
     .nav-title-area
       p.title-text = action_title
       p.title-sub-text = action_description
-  - if @model.current_action.name == 'index'
-    .cm-navbar__rhs
+  .cm-navbar__rhs
+    - if @model.current_action.name == 'index'
       .export-container
         .dropdown
           button.secondary-btn data-bs-toggle='dropdown'
@@ -23,3 +23,14 @@
 
       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|
+        - 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_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/cm_admin/main/edit.html.slim

@@ -2,16 +2,19 @@
 .form-page
   .form-page__inner
     .form-wrapper
-      .flag-alert.mb-4
-        p.alert-header
+      - if @ar_object.errors.present?
+        .flag-alert.mb-4
+          p.alert-header
             span
               i.fa.fa-exclamation-triangle
             | Attention
-        .alert-body
-          p.body-title 
-            | Error heading
-          p.body-info 
-            | The details of the error would be explained in this line. It could also be listed out as points on below the other if there are multiple reasons.
+          .alert-body
+            p.body-title 
+              | Error heading
+            p.body-info 
+              ul
+                - @ar_object.errors.full_messages.each do |error_message|
+                  li = error_message
       .form-container
         p.form-title 
           | Section heading

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/_flash_message.html.slim

@@ -0,0 +1,9 @@
+- if flash[:notice].present?
+  javascript:
+    $.jGrowl("#{flash[:notice]}", {theme: 'notice'})
+- elsif flash[:success].present?
+  javascript:
+    $.jGrowl("#{flash[:success]}", {theme: 'success'})
+- elsif flash[:alert].present?
+  javascript:
+    $.jGrowl("#{flash[:alert]}", {theme: 'error'})

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,15 +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/custom_action_modals'
+

data/cm_admin.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.add_runtime_dependency 'pagy', '~> 3.13'
+  spec.add_runtime_dependency 'pagy', '~> 4.11.0'
   spec.add_runtime_dependency 'slim', '~> 4.1.0'
   spec.add_runtime_dependency 'webpacker', '~> 5.2.1'
   spec.add_runtime_dependency 'axlsx_rails', '~> 0.6.1'

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/constants.rb

@@ -27,6 +27,9 @@ module CmAdmin
     destroy: {
       verb: :delete,
       path: ':id'
+    },
+    custom_action: {
+      verb: :post
     }
   }
   REJECTABLE_FIELDS = %w(id created_at updated_at)

data/lib/cm_admin/model.rb

@@ -1,5 +1,6 @@
 require_relative 'constants'
 require_relative 'models/action'
+require_relative 'models/custom_action'
 require_relative 'models/field'
 require_relative 'models/form_field'
 require_relative 'models/blocks'
@@ -91,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
 
@@ -99,8 +99,10 @@ module CmAdmin
             @model = CmAdmin::Model.find_by(name: controller_name.classify)
             @model.params = params
             @action = CmAdmin::Models::Action.find_by(@model, name: action_name)
-            @ar_object = @model.try(action_name, params)
+            @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
@@ -125,6 +127,20 @@ module CmAdmin
                 else
                   format.html { render '/cm_admin/main/new' }
                 end
+              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
+                  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?
                   format.html { render partial: action.partial }

data/lib/cm_admin/models/action.rb

@@ -4,9 +4,11 @@ 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
+      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 = {})
+      def initialize(attributes = {}, &block)
         if attributes[:layout_type].present? && attributes[:layout].nil? && attributes[:partial].nil?
           case attributes[:layout_type]
           when 'cm_association_index'
@@ -20,10 +22,14 @@ module CmAdmin
         attributes.each do |key, value|
           self.send("#{key.to_s}=", value)
         end
+        self.send("code_block=", block) if block_given?
       end
 
       def set_default_values
         self.is_nested_field = false
+        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

@@ -29,7 +29,8 @@ module CmAdmin
         @ar_object.assign_attributes(resource_params(params))
         @ar_object
       end
-  
+
+
       def create(params)
         @ar_object = @ar_model.new(resource_params(params))
       end
@@ -64,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/custom_action.rb

@@ -0,0 +1,13 @@
+require_relative 'actions/blocks'
+
+module CmAdmin
+  module Models
+    class CustomAction < Action
+      class << self
+        def find_by(model, search_hash)
+          model.available_actions.find { |i| i.name == search_hash[:name] }
+        end
+      end
+    end
+  end
+end

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,9 +118,13 @@ module CmAdmin
       #     end
       #   end
       # end
-      def custom_action(name: nil, verb: nil, layout: nil, partial: nil, path: nil, &block)
-        @available_actions << CmAdmin::Models::Action.new(name: name, verb: verb, layout: layout, partial: partial, path: path)
-        self.class.class_eval(&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
 
       def filter(db_column_name, filter_type, options={})

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -38,7 +38,13 @@ module CmAdmin
             end
             content_tag :a, href: link do
               ar_object.send(field.field_name).to_s
-            end 
+            end
+          when :enum
+            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
+            end
           when :attachment
             concat show_attachment_value(ar_object, field)
           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

data/package.json

@@ -11,6 +11,7 @@
     "bootstrap": "^5.0.1",
     "daterangepicker": "^3.1.0",
     "flatpickr": "^4.6.9",
+    "jgrowl": "^1.4.8",
     "jquery": "^3.6.0",
     "moment": "^2.29.1",
     "popper.js": "^1.16.1",

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

@@ -1 +1 @@
-cf780b7d855af05066bcc442a307ca3eecf28623
+b50f217278de15248bddb0b6f2e6be58edbffa7c

data/yarn.lock

@@ -3763,6 +3763,11 @@ jest-worker@^26.5.0:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
+jgrowl@^1.4.8:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/jgrowl/-/jgrowl-1.4.8.tgz#4ba40ffb93757a7e1d9b262d916be299d03df3a4"
+  integrity sha512-JFi609DhWhD4wbnt1/NvYqt702SncgBk2SFssUi6GEUfnxM5TQ9YAKHP/kODwch7Q6QVhOWYvk1QCxLtujwRog==
+
 jquery@>=1.10, jquery@^3.3.1, jquery@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
@@ -5384,9 +5389,9 @@ postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
     uniq "^1.0.1"
 
 postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
-  version "7.0.35"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
-  integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
+  version "7.0.36"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb"
+  integrity sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -6322,9 +6327,9 @@ tapable@^1.0.0, tapable@^1.1.3:
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
 tar@^6.0.2:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83"
-  integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==
+  version "6.1.11"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
@@ -6584,9 +6589,9 @@ urix@^0.1.0:
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 url-parse@^1.4.3, url-parse@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b"
-  integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
+  integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
   dependencies:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
@@ -6872,9 +6877,9 @@ wrappy@1:
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 ws@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
-  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
+  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
   dependencies:
     async-limiter "~1.0.0"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: 4.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: 4.11.0
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +125,7 @@ files:
 - app/assets/stylesheets/cm_admin/helpers/_mixins.scss
 - app/assets/stylesheets/cm_admin/helpers/_variable.scss
 - app/assets/stylesheets/cm_admin/helpers/index.scss
+- app/assets/stylesheets/cm_admin/scaffold.scss
 - app/controllers/cm_admin/application_controller.rb
 - app/controllers/cm_admin/exports_controller.rb
 - app/controllers/cm_admin/static_controller.rb
@@ -151,6 +152,8 @@ 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
 - app/views/layouts/cm_admin.html.slim
@@ -179,6 +182,7 @@ files:
 - lib/cm_admin/models/cm_show_section.rb
 - lib/cm_admin/models/column.rb
 - lib/cm_admin/models/controller_method.rb
+- lib/cm_admin/models/custom_action.rb
 - lib/cm_admin/models/dsl_method.rb
 - lib/cm_admin/models/export.rb
 - lib/cm_admin/models/field.rb