cm-admin 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcd2e766f902e8045d4eba1ae60067d6636477625f6a51a7ce896c0e446ad8bc
-  data.tar.gz: d1ef041f20245116d4dafc04629b75768245a77b0f042e038675516e60692206
+  metadata.gz: 42bd38332aef8d07ca35563f166f706ece3c2da88fa5e22278694da5377bb983
+  data.tar.gz: 292d897394afa6ee6be6a1a1a970e88e77b7d9762d6859c86bafc273de20f619
 SHA512:
-  metadata.gz: 1e152f94b559e7f12d9d0d6cb82688d293c6a799fe0ade4b503c0dc2e8edc0337864741b7a7ae50e8ddcd7e175cc1813125f0409b5f62880fac3c386cae30638
-  data.tar.gz: d7b610b2ff1f329a09d3a31564f7f0d35bd5799803bcbdd31f15faad311803e516b6b828037524161993d139fabed9b08ef508cb2214a7dae6f2b74cb834dd32
+  metadata.gz: 29548bef18b577c1507ce3404a8055c3083d196c4ecaf03e62e1ccd1a9b9fa46ed128c411f95c3446fa8b95a50c245ad04d94c4a131a8b46d95bc41252e3953f
+  data.tar.gz: 4df3cd6b9d6d3a006798a58a292dfac7f77deaff586e622499d2474525c8060e10e4746993b53ed6f9d70d3a635acfab056ffa6ed418d9e5f5f1e4f4152b7c62

data/Gemfile.lock

@@ -54,7 +54,7 @@ GEM
     method_source (1.0.0)
     mini_portile2 (2.8.0)
     minitest (5.15.0)
-    nokogiri (1.13.3)
+    nokogiri (1.13.4)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     pagy (4.11.0)

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

@@ -18,7 +18,6 @@
 
     &__table-container {
       padding: 20px;
-      height: 100%;
     }
 
     .admin-table {
@@ -77,13 +76,14 @@
       overflow: auto;
       margin-top: 40px;
       margin-bottom: 50px;
-      height: 280px;
+      height: calc(100vh - 365px);
       .cm-table {
         table-layout: fixed;
         position: relative;
         min-width: fit-content;
         border-collapse: collapse;
         border: 1px solid $grey-lighter-clr;
+        border-top-width: 0;
         border-radius: $radius-8;
         &__header {
           .header-row {
@@ -91,6 +91,7 @@
             width: 100%;
             position: relative;
             box-shadow: inset 0px -1px 0px rgba(148, 151, 155, 0.15);
+            border-top: 1px solid $grey-lighter-clr;
             th {
               @include font($size: $t6-text, $color: $ink-lighter-clr, $weight: bold);
               text-transform: uppercase;
@@ -129,7 +130,7 @@
           // height: 335px;
           display: block;
           position: relative;
-          width: 100%;        
+          width: 100%;
           .body-row {
             border-bottom: 1.21px solid rgb(240, 239, 239);
             td:nth-child(2){
@@ -138,7 +139,7 @@
               z-index: 2;
               background-color: #fff;
             }
-            
+
             &:nth-last-child(1) {
               box-shadow: none;
             }
@@ -190,7 +191,6 @@
                 justify-content: center;
                 height: 100%;
                 .popup-card {
-                  width:fit-content;
                   .popup-option {
                     a {
                       font-weight: 500;
@@ -210,8 +210,8 @@
         }
       }
       .cm-table > thead {
-        position:sticky;
-        top:0;
+        position: sticky;
+        top: 0;
         background-color: #fff;
         z-index: 3;
       }

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

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

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

@@ -12,38 +12,43 @@
   table.cm-table
     thead.cm-table__header
       tr.header-row
-        th.check-box-space
-          span
-            input.cm-checkbox type="checkbox"
+        // To be added once bulk-select is finalized
+        / th.check-box-space
+        /   span
+        /     input.cm-checkbox type="checkbox"
         - @model.available_fields[@action.name.to_sym].each do |column|
           th = column.header
     tbody.cm-table__body
       - @associated_ar_object.data.each do |ar_object|
         tr.body-row
-          td.check-box-space
-            span
-              input.cm-checkbox type="checkbox"
+          // To be added once bulk-select is finalized
+          / td.check-box-space
+          /   span
+          /     input.cm-checkbox type="checkbox"
           - @model.available_fields[@action.name.to_sym].each do |column|
             td
               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"
-                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
-                - @associated_model && @associated_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
-                      - if custom_action.display_type == :button
-                        = link_to custom_action.name.titleize, custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb
-                      - elsif custom_action.display_type == :modal
-                        = link_to custom_action.name.titleize, '', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal-#{ar_object.id.to_s}" }
+          - associated_model_actions = @associated_model && @associated_model.available_actions.select{|act| act if act.route_type == 'member'}
+          - if associated_model_actions.present?
+            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
+                  // To be added once the associated model has edit actions
+                  / .popup-option
+                  /   a href="#{page_url('edit', ar_object)}"
+                  /     | Edit
+                  - associated_model_actions.each do |custom_action|
+                    - if custom_action.display_if.call(ar_object)
+                      .popup-option
+                        - if custom_action.display_type == :button
+                          = link_to custom_action.name.titleize, custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb
+                        - elsif custom_action.display_type == :modal
+                          = link_to custom_action.name.titleize, '', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal-#{ar_object.id.to_s}" }
                 
 .cm-pagination
   .cm-pagination__lhs Showing #{@associated_ar_object.pagy.from} to #{@associated_ar_object.pagy.to} out of #{@associated_ar_object.pagy.count}

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

@@ -11,17 +11,18 @@
   table.cm-table
     thead.cm-table__header
       tr.header-row
-        th.check-box-space
-          span
-            input.cm-checkbox type="checkbox"
+        // Select all checkbox feature to be added later
+        / th.check-box-space
+        /   span
+        /     input.cm-checkbox type="checkbox"
         - @model.available_fields[:index].each do |column|
           th = column.header
     tbody.cm-table__body
       - @ar_object.data.each do |ar_object|
         tr.body-row
-          td.check-box-space
-            span
-              input.cm-checkbox type="checkbox"
+          / td.check-box-space
+          /   span
+          /     input.cm-checkbox type="checkbox"
           - @model.available_fields[:index].each_with_index do |column, index|
             td.text-ellipsis
               span class="#{column.field_type.to_s} #{column.cm_css_class} "
@@ -45,12 +46,18 @@
                 .popup-card.table-export-popup.hidden
                   - if edit_action.any? && policy([:cm_admin, @model.name.classify.constantize]).edit?
                     = link_to "#{page_url('edit', ar_object)}" do
-                      .popup-option Edit
+                      .popup-option
+                        span
+                          i.fa.fa-edit
+                        | Edit
                   - custom_actions.each do |custom_action|
                     - if custom_action.name.present? && has_valid_policy(@model.name, custom_action.name)
                       - if custom_action.display_if.call(ar_object)
                         = link_to cm_admin.send("#{@model.name.downcase}_index_path") + '/' + custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb do
-                          .popup-option = custom_action.name.titleize
+                          .popup-option
+                            span
+                              i class="#{custom_action.icon_name}"
+                            = 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/layouts/{_flash_message.html.slim → _cm_flash_message.html.slim}

@@ -6,4 +6,4 @@
     $.jGrowl("#{flash[:success]}", {theme: 'success'})
 - elsif flash[:alert].present?
   javascript:
-    $.jGrowl("#{flash[:alert]}", {theme: 'error'})
+    $.jGrowl("#{flash[:alert].html_safe}", {theme: 'error'})

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

@@ -15,9 +15,6 @@ html
     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
-    - flash.each do |type, msg|
-      .alert class="alert-#{type}"
-        = msg
     .cm-admin
       = render 'layouts/left_sidebar_nav'
       .panel-area
@@ -41,6 +38,6 @@ html
             = yield
         - else
           = yield
-    = render 'layouts/flash_message'
+    = render 'layouts/cm_flash_message'
     = render 'layouts/custom_action_modals'
 

data/lib/cm_admin/model.rb

@@ -139,10 +139,15 @@ module CmAdmin
                   format.html { render '/cm_admin/main/'+action_name }
                 end
               elsif %w(create update destroy).include?(action_name)
+                if %w(create update).include?(action_name)
+                  redirect_url = CmAdmin::Engine.mount_path + "/#{@model.name.underscore.pluralize}/#{@ar_object.id}"
+                else
+                  redirect_url = CmAdmin::Engine.mount_path + "/#{@model.name.underscore.pluralize}"
+                end
                 if @ar_object.save
-                  format.html { redirect_to  CmAdmin::Engine.mount_path + "/#{@model.name.underscore.pluralize}" }
+                  format.html { redirect_to  redirect_url, notice: "#{action_name.titleize} #{@ar_object.class.name.downcase} is successful" }
                 else
-                  format.html { render '/cm_admin/main/new' }
+                  format.html { render '/cm_admin/main/new', notice: "#{action_name.titleize} #{@ar_object.class.name.downcase} is unsuccessful" }
                 end
               elsif action.action_type == :custom
                 if action.child_records
@@ -151,11 +156,13 @@ module CmAdmin
                   data = @action.parent == "index" ? @ar_object.data : @ar_object
                   format.html { render action.partial }
                 else
-                  if @action.code_block.call(@ar_object)
+                  ar_object = @action.code_block.call(@ar_object)
+                  if ar_object.errors.empty?
                     redirect_url = @model.current_action.redirection_url || @action.redirection_url || request.referrer || "/cm_admin/#{@model.ar_model.table_name}/#{@ar_object.id}"
-                    format.html { redirect_to redirect_url }
+                    format.html { redirect_to redirect_url, notice: "#{@action.name.titleize} is successful" }
                   else
-                    format.html { redirect_to request.referrer }
+                    error_messages = @ar_object.errors.full_messages.map{|error_message| "<li>#{error_message}</li>"}.join
+                    format.html { redirect_to request.referrer, alert: "<b>#{@action.name.titleize} is unsuccessful</b><br /><ul>#{error_messages}</ul>" }
                   end
                 end
               elsif action.layout.present?

data/lib/cm_admin/models/action.rb

@@ -6,7 +6,7 @@ module CmAdmin
       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,
-        :display_type, :action_type, :redirection_url, :sort_direction, :sort_column
+        :display_type, :action_type, :redirection_url, :sort_direction, :sort_column, :icon_name
 
       VALID_SORT_DIRECTION = Set[:asc, :desc].freeze
 
@@ -34,6 +34,7 @@ module CmAdmin
         self.action_type = :default
         self.sort_column = :created_at
         self.sort_direction = :desc
+        self.icon_name = 'fa fa-th-large'
       end
 
       def set_values(page_title, page_description, partial)

data/lib/cm_admin/models/column.rb

@@ -2,7 +2,7 @@ module CmAdmin
   module Models
     class Column
       attr_accessor :field_name, :field_type, :header, :format, :prefix, :suffix, :exportable, :round,
-      :cm_css_class, :link, :url, :custom_method, :helper_method, :managable, :lockable, :drawer_partial
+      :cm_css_class, :link, :url, :custom_method, :helper_method, :managable, :lockable, :drawer_partial, :tag_class
 
       def initialize(field_name, attributes = {})
         @field_name = field_name
@@ -24,6 +24,7 @@ module CmAdmin
         self.exportable = true
         self.managable = true
         self.lockable = false
+        self.tag_class = {}
       end
 
       #formatting value for different data types

data/lib/cm_admin/models/dsl_method.rb

@@ -115,11 +115,11 @@ module CmAdmin
       #     end
       #   end
       # end
-      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)
+      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, icon_name: 'fa fa-th-large', &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)
+                    action_type: :custom, route_type: route_type, icon_name: icon_name, &block)
         @available_actions << action
         # self.class.class_eval(&block)
       end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -51,7 +51,8 @@ module CmAdmin
           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
+            tag_class = field.tag_class.dig("#{ar_object.send(field.field_name.to_s)}".to_sym).to_s
+            content_tag :span, class: "status-tag #{tag_class}" do
               ar_object.send(field.field_name).to_s.upcase
             end
           when :attachment

data/lib/cm_admin/view_helpers/form_field_helper.rb

@@ -5,21 +5,21 @@ module CmAdmin
         value = field.custom_value || f.object.send(field.field_name)
         case field.input_type
         when :integer
-          return f.text_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, data: {behaviour: 'integer-only'}
+          return f.text_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, placeholder: "Enter #{field.field_name.to_s.humanize.downcase}", data: { behaviour: 'integer-only' }
         when :decimal
-          return f.number_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, data: {behaviour: 'decimal-only'}
+          return f.number_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}", data: { behaviour: 'decimal-only' }
         when :string
-          return f.text_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value
+          return f.text_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}"
         when :single_select
-          return f.select field.field_name, options_for_select(field.collection || []), {}, class: 'normal-input select-2', disabled: field.disabled
+          return f.select field.field_name, options_for_select((field.collection || []), value), {include_blank: "Select #{field.field_name.to_s.downcase.gsub('_', ' ')}"}, class: 'normal-input select-2', disabled: field.disabled
         when :multi_select
-          return f.select field.field_name, options_for_select(field.collection || []), {}, class: 'normal-input select-2', disabled: field.disabled, multiple: true
+          return f.select field.field_name, options_for_select((field.collection || []), value), {include_blank: "Select #{field.field_name.to_s.downcase.gsub('_', ' ')}"}, class: 'normal-input select-2', disabled: field.disabled, multiple: true
         when :date
-          return f.text_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, data: {behaviour: 'date-only'}
+          return f.text_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}", data: { behaviour: 'date-only' }
         when :date_time
-          return f.text_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, data: {behaviour: 'date-time'}
+          return f.text_field field.field_name, class: 'normal-input', disabled: field.disabled, value: value, placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}", data: { behaviour: 'date-time' }
         when :text
-          return f.text_area field.field_name, class: 'normal-input'
+          return f.text_area field.field_name, class: 'normal-input', placeholder: "Enter #{field.field_name.to_s.downcase.gsub('_', ' ')}"
         when :single_file_upload
           return f.file_field field.field_name, class: 'normal-input'
         when :multi_file_upload

data/package.json

@@ -13,7 +13,7 @@
     "flatpickr": "^4.6.9",
     "jgrowl": "^1.4.8",
     "jquery": "^3.6.0",
-    "moment": "^2.29.1",
+    "moment": "^2.29.2",
     "popper.js": "^1.16.1",
     "turbolinks": "^5.2.0"
   },

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

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

data/yarn.lock

@@ -4199,10 +4199,10 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-moment@^2.29.1, moment@^2.9.0:
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
-  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+moment@^2.29.2, moment@^2.9.0:
+  version "2.29.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
+  integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==
 
 move-concurrently@^1.0.1:
   version "1.0.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-07 00:00:00.000000000 Z
+date: 2022-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy
@@ -171,8 +171,8 @@ files:
 - app/views/cm_admin/static/dashboard.html.slim
 - app/views/cm_admin/static/error_401.html.slim
 - app/views/cm_admin/static/error_403.html.slim
+- app/views/layouts/_cm_flash_message.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