cm-admin 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8603d897651307b80517b9918c60ab3d2d62abdc2931af5ea7d8def1453b4865
-  data.tar.gz: 0afafa900d9c51bee526e9781df8dd41baf1603cf768bb8db3e1d8353fc4adc0
+  metadata.gz: d15eef9e06296f53028093dfc869ae0f0ecba8ba271bc3d39ef48e2f1bd09f16
+  data.tar.gz: 9ae45db5314a0187bf45a1f6864e97f18bfcb9de5cc32dc2ce1c5d388188e1b1
 SHA512:
-  metadata.gz: '02398dcf148b0d90bd6de2dfd2fdeae4fd4d3353d75c33433a75518da87c6d6c739349279f9f6f3a4632256c37e463009838e9ec21821d224728730a8656b87b'
-  data.tar.gz: 2f390a32636c40fdeb3afc5128ad824135565450d0b833aafc9ac828d8d4178d5dda2316e01f654a45266514a4a31e0b22985c41d3e1b10cf049ee56b6cf663c
+  metadata.gz: 31116fa28dcabfbbbfb404156e8aca01d2d3b12e04bfb82b08a8bf34520b416b4609167c43e921ff652f7ff1ef268b67df2f52f436fb08197062c0f91379b847
+  data.tar.gz: 3b1c8a5007cdb2d2d26a276ad77d261c99a354983c2ce782646c183093383e5526cb77cb027a89454bd1d2574dde61963a7adcd96b16dade5fcf194a4db4e0ab

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    cm-admin (0.7.5)
+    cm-admin (0.7.6)
       axlsx_rails (~> 0.6.1)
       cocoon (~> 1.2.15)
+      local_time (~> 2.1.0)
       pagy (~> 4.11.0)
       pundit (~> 2.2.0)
       slim (~> 4.1.0)
@@ -47,13 +48,16 @@ GEM
     htmlentities (4.3.4)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
+    local_time (2.1.0)
     loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     marcel (1.0.2)
     method_source (1.0.0)
+    mini_portile2 (2.8.0)
     minitest (5.15.0)
-    nokogiri (1.13.6-arm64-darwin)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     pagy (4.11.0)
     pundit (2.2.0)

data/app/controllers/cm_admin/application_controller.rb

@@ -1,10 +1,8 @@
 module CmAdmin
   class ApplicationController < ::ActionController::Base
-    include Pundit::Authorization
-    include Pagy::Backend
+    
     # before_action :check_cm_admin
     layout 'cm_admin'
-    helper CmAdmin::ViewHelpers
 
 
     def check_cm_admin

data/app/controllers/cm_admin/resource_controller.rb

@@ -3,6 +3,8 @@ module CmAdmin
     include Pundit::Authorization
     include Pagy::Backend
 
+    helper CmAdmin::ViewHelpers
+
     def cm_index(params)
       @current_action = CmAdmin::Models::Action.find_by(@model, name: 'index')
       # Based on the params the filter and pagination object to be set

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

@@ -15,9 +15,11 @@ require('./filters.js')
 require('./exports.js')
 
 import jQuery from 'jquery'
+import LocalTime from "local-time"
 window.$ = jQuery
 window.jQuery = jQuery
 
+LocalTime.start()
 require("@nathanvda/cocoon")
 import "@fortawesome/fontawesome-free/css/all"
 import "daterangepicker"

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

@@ -0,0 +1,52 @@
+- edit_action = available_actions(cm_model, 'edit')
+- destroy_action = available_actions(cm_model, 'destroy')
+- custom_actions = available_actions(cm_model, 'custom_actions')
+- custom_actions_modals = custom_actions.select{ |act| act if act.display_type.eql?(:modal) }
+
+- if custom_actions.any? || edit_action.present? || destroy_action.present?
+  td.row-action-cell
+    .row-action-tool
+      button.secondary-btn.tool-btn
+        span
+          i.fa.fa-bars.bolder
+        span
+          i.fa.fa-angle-down
+      .popup-card.table-export-popup.hidden
+        - if edit_action.present?
+          = link_to "#{page_url('edit', ar_object)}" do
+            .popup-option
+              span
+                i.fa.fa-edit
+              | Edit
+        - if destroy_action.present?
+          = link_to "#{page_url('destroy', ar_object)}", method: :delete do
+            .popup-option
+              span
+                i.fa.fa-trash
+              | Destroy
+        - custom_actions.each do |custom_action|
+          - if custom_action.display_if.call(ar_object)
+            - case custom_action.display_type
+            - when :button
+              = link_to cm_admin.send("#{cm_model.name.underscore}_index_path") + '/' + custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb do
+                .popup-option
+                  span
+                    i class="#{custom_action.icon_name}"
+                  = custom_action.name.humanize
+            - when :modal
+              = link_to '', data: { bs_toggle: 'modal', bs_target: "##{custom_action.name.classify}Modal-#{ar_object.id.to_s}" } do
+                .popup-option
+                  span
+                    i class="#{custom_action.icon_name}"
+                  = custom_action.name.humanize
+
+- if custom_actions_modals.any?
+  - custom_actions_modals.each do |custom_action|
+    .modal.fade id="#{custom_action.name.classify}Modal-#{ar_object.id.to_s}" aria-hidden='true' aria-labelledby="#{custom_action.name.classify}ModalLabel" tabindex='1'
+      .modal-dialog
+        .modal-content
+          .modal-header
+            h5.modal-title id="#{custom_action.name.classify}ModalLabel" = custom_action.name.classify
+            button.btn-close aria-label='Close' data-bs-dismiss='modal'
+          .modal-body
+            = render partial: custom_action.partial, locals: { ar_object: ar_object }

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

@@ -36,43 +36,10 @@
                 a href="#{CmAdmin::Engine.mount_path}/#{@associated_model.name.tableize}/#{ar_object.id}" = show_field_value(ar_object, column)
               - else
                 span class="#{column.cm_css_class}" = show_field_value(ar_object, column)
-          - 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 cm_admin.send("#{@associated_model.name.underscore}_index_path") + '/' + custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb do
-                            span
-                              i class="#{custom_action.icon_name}"
-                            = custom_action.name.humanize
-                        - elsif custom_action.display_type == :modal
-                          = link_to custom_action.name.humanize, '', data: { bs_toggle: 'modal', bs_target: "##{custom_action.name.classify}Modal-#{ar_object.id.to_s}" }
+          - if @associated_model
+            == render partial: 'cm_admin/main/actions_dropdown', locals: { cm_model: @associated_model, ar_object: ar_object }
 
 .cm-pagination
   .cm-pagination__lhs Showing #{@associated_ar_object.pagy.from} to #{@associated_ar_object.pagy.to} out of #{@associated_ar_object.pagy.count}
   .cm-pagination__rhs
     == render partial: 'cm_admin/main/cm_pagy_nav', locals: { pagy: @associated_ar_object.pagy }
-
-- @associated_ar_object.data.each do |ar_object|
-  - @associated_model && @associated_model.available_actions.select{|act| act if (act.route_type == 'member' && act.display_type == :modal)}.each do |custom_action|
-    .modal.fade id="#{custom_action.name.classify}Modal-#{ar_object.id.to_s}" aria-hidden='true' aria-labelledby="#{custom_action.name.classify}ModalLabel" tabindex='1'
-      .modal-dialog
-        .modal-content
-          .modal-header
-            h5.modal-title id="#{custom_action.name.classify}ModalLabel" = custom_action.name.classify
-            button.btn-close aria-label='Close' data-bs-dismiss='modal'
-          .modal-body
-            = render partial: custom_action.partial, locals: { ar_object: ar_object }

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

@@ -31,40 +31,9 @@
                 - else
                   = show_field_value(ar_object, column)
                   - if column.field_type == :drawer
-                    = render partial: column.drawer_partial, locals: { ar_object: ar_object}
-
-          - edit_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('edit')}
-          - destroy_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('destroy')}
-          - custom_actions = @model.available_actions.select{|act| act if act.route_type == 'member' && [:button, :modal].include?(act.display_type)}
-          - if custom_actions.any? || edit_action.any? || destroy_action.any?
-            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
-                  - if edit_action.any? && policy([:cm_admin, @model.name.classify.constantize]).edit?
-                    = link_to "#{page_url('edit', ar_object)}" do
-                      .popup-option
-                        span
-                          i.fa.fa-edit
-                        | Edit
-                  - if destroy_action.any? && policy([:cm_admin, @model.name.classify.constantize]).destroy?
-                    = link_to "#{page_url('destroy', ar_object)}", method: :delete do
-                      .popup-option
-                        span
-                          i.fa.fa-trash
-                        | Destroy
-                  - 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.underscore}_index_path") + '/' + custom_action.path.gsub(':id', ar_object.id.to_s), method: custom_action.verb do
-                          .popup-option
-                            span
-                              i class="#{custom_action.icon_name}"
-                            = custom_action.name.humanize
+                    = render partial: column.drawer_partial, locals: { ar_object: ar_object }
+          - if @model
+            == render partial: 'cm_admin/main/actions_dropdown', locals: { cm_model: @model, ar_object: ar_object }
 
 .cm-pagination
   .cm-pagination__lhs Showing #{@ar_object.pagy.from} to #{@ar_object.pagy.to} out of #{@ar_object.pagy.count}

data/cm_admin.gemspec

@@ -26,10 +26,11 @@ 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', '~> 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'
   spec.add_runtime_dependency 'cocoon', '~> 1.2.15'
+  spec.add_runtime_dependency 'local_time', '~> 2.1.0'
+  spec.add_runtime_dependency 'pagy', '~> 4.11.0'
   spec.add_runtime_dependency 'pundit', '~> 2.2.0'
+  spec.add_runtime_dependency 'slim', '~> 4.1.0'
+  spec.add_runtime_dependency 'webpacker', '~> 5.2.1'
 end

data/lib/cm_admin/model.rb

@@ -14,6 +14,7 @@ require 'pagy'
 require 'axlsx'
 require 'cocoon'
 require 'pundit'
+require 'local_time'
 
 module CmAdmin
   class Model

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

data/lib/cm_admin/view_helpers/action_dropdown_helper.rb

@@ -0,0 +1,21 @@
+module CmAdmin
+  module ViewHelpers
+    module ActionDropdownHelper
+      def available_actions(cm_model, action_type)
+        if action_type.eql?('custom_actions')
+          cm_model.available_actions.select {
+            |act| act if act.route_type.eql?('member') &&
+                         [:button, :modal].include?(act.display_type) &&
+                         act.name.present? &&
+                         has_valid_policy(cm_model.name, act.name)
+          }
+        else
+          cm_model.available_actions.select {
+            |act| act if act.action_type.eql?(:default) &&
+                         act.name.eql?(action_type)
+          } if has_valid_policy(cm_model.name, action_type)
+        end
+      end
+    end
+  end
+end

data/lib/cm_admin/view_helpers/field_display_helper.rb

@@ -1,7 +1,6 @@
 module CmAdmin
   module ViewHelpers
     module FieldDisplayHelper
-
       def show_field(ar_object, field)
         content_tag(:div, class: "info-split") do
           concat show_field_label(ar_object, field)
@@ -33,7 +32,8 @@ module CmAdmin
         when :string
           ar_object.send(field.field_name).to_s
         when :datetime
-          ar_object.send(field.field_name).strftime(field.format || "%d/%m/%Y").to_s if ar_object.send(field.field_name)
+          self.extend LocalTimeHelper
+          local_time(ar_object.send(field.field_name).strftime(field.format || "%d/%m/%Y").to_s) if ar_object.send(field.field_name)
         when :text
           ar_object.send(field.field_name)
         when :custom

data/lib/cm_admin/view_helpers.rb

@@ -2,12 +2,15 @@ module CmAdmin
   module ViewHelpers
     Dir[File.expand_path("view_helpers", __dir__) + "/*.rb"].each  { |f| require f }
 
-    include PageInfoHelper
-    include NavigationHelper
-    include FormHelper
+    include ActionDropdownHelper
     include FieldDisplayHelper
     include FilterHelper
+    include FormHelper
     include ManageColumnPopupHelper
+    include NavigationHelper
+    include PageInfoHelper
+
+    # Included Rails view helper
     include ActionView::Helpers::FormTagHelper
     include ActionView::Helpers::TagHelper