cm-admin 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d3c3ae7aac9de6be7c89c6f074c9b2634e1091e89328daa100281aac6fd868b
-  data.tar.gz: 62c6e179d26f54873a1fca654b29c4721e1e4c2e455d0b268c8f75a93776af59
+  metadata.gz: dfec95ffd823756a98b20c323fbe673123031f28c0ba4da0f99148b9ecb5bde6
+  data.tar.gz: 78601ced8fbacade877acb859adb35d3467fb59a30f8378378d4ea18187ca38f
 SHA512:
-  metadata.gz: 06fb9aa911f2ed904725fa3c8d653e7468b9e800f0bf3c26843c3b275b16ba691587e8e6d62dcf01a5797cdc5360d0c65f538e08aa61d3bfdad63a184200d425
-  data.tar.gz: a2a35fbcc0cd41aa3db83296ddc307668561bb963c5e1caab6649c01b9d478edaf74f17c7f2e9791a94821acffb46d17caaf7d1f777a1f96c99b4cf884db9933
+  metadata.gz: 74277a250eea68170ba20c9f084a5733c07ffddd2948a189e43b183900ec125ca8768dcffeec4308b85de1cfa6e376193d1513279c3b083b0a1c6f65b7e4d6d9
+  data.tar.gz: b1f323c0340c805ad4190d35d0e87cec5fb922e35eafea36091c8fb7c127e352fcbc8e3a10c422b0b42bbd30b09c97acb6e628b03f4b170865ecea2809edea68

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (0.3.0)
+    cm-admin (0.4.2)
       axlsx_rails (~> 0.6.1)
       cocoon (~> 1.2.15)
       pagy (~> 4.11.0)
@@ -52,10 +52,8 @@ GEM
       nokogiri (>= 1.5.9)
     marcel (1.0.2)
     method_source (1.0.0)
-    mini_portile2 (2.6.1)
     minitest (5.14.4)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
     pagy (4.11.0)
     racc (1.5.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

@@ -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

@@ -24,7 +24,7 @@
             span
               input.cm-checkbox type="checkbox"
           - @model.available_fields[:index].each do |column|
-            td
+            td.text-ellipsis
               span class="#{column.cm_css_class}" = show_field_value(ar_object, column)
           td.row-action-cell
             .row-action-tool
@@ -37,22 +37,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,9 @@
 
       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'
+      - @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

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/_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

@@ -39,3 +39,4 @@ html
             = yield
         - else
           = yield
+    = render 'layouts/flash_message'

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'
@@ -99,7 +100,7 @@ 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?
             nested_tables = @model.available_fields[:new].except(:fields).keys
             nested_tables += @model.available_fields[:edit].except(:fields).keys
@@ -125,6 +126,14 @@ 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 }
+                else
+                  format.html { redirect_to redirect_url }
+                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,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
+      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
 
-      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 +20,12 @@ 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 = true
       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

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

@@ -109,9 +109,9 @@ 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, 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)
+        # 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.2"
+  VERSION = "0.4.3"
 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/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.2
+  version: 0.4.3
 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-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy
@@ -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,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/_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 +181,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