cm-admin 1.1.5 → 1.1.7

data/app/controllers/cm_admin/resource_controller.rb

@@ -93,7 +93,22 @@ module CmAdmin
       end
     end
 
-    def cm_history(params)
+    def cm_bulk_action(params)
+      @model = Model.find_by({ name: controller_name.classify })
+      @bulk_action_processor = CmAdmin::BulkActionProcessor.new(@action, @model, params).perform_bulk_action
+      respond_to do |format|
+        if @bulk_action_processor.invalid_records.empty?
+          format.html { redirect_to request.referrer, notice: "#{@action.name.humanize} is successful" }
+        else
+          error_messages = @bulk_action_processor.invalid_records.map { |invalid_record|
+            "<li>#{invalid_record.error_message}</li>"
+          }.join
+          format.html { redirect_to request.referrer, alert: "<b>#{@action.name.humanize} is unsuccessful</b><br /><ul>#{error_messages}</ul>" }
+        end
+      end
+    end
+
+    def cm_history(_params)
       @current_action = CmAdmin::Models::Action.find_by(@model, name: 'history')
       resource_identifier
       respond_to do |format|

data/app/helpers/cm_admin/application_helper.rb

@@ -68,5 +68,9 @@ module CmAdmin
       model.available_actions.map(&:name).include?('show') &&
       has_valid_policy(model.name, 'show')
     end
+
+    def actions_filter(model, action_type)
+      model.available_actions.select { |action| action.action_type == action_type && has_valid_policy(model.name, action.name) }
+    end
   end
 end

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

@@ -14,6 +14,7 @@ require('/app/assets/javascripts/cm_admin/form_validation.js')
 require('/app/assets/javascripts/cm_admin/quick_search.js')
 require('/app/assets/javascripts/cm_admin/filters.js')
 require('/app/assets/javascripts/cm_admin/exports.js')
+require('/app/assets/javascripts/cm_admin/bulk_actions.js')
 
 import jQuery from 'jquery'
 import LocalTime from "local-time"

data/app/models/concerns/cm_admin/bulk_action_processor.rb

@@ -0,0 +1,29 @@
+class CmAdmin::BulkActionProcessor
+  extend ActiveSupport::Concern
+  attr_accessor :invalid_records
+
+  def initialize(current_action, model, params)
+    @invalid_records = []
+    @current_action = current_action
+    @model = model
+    @params = params
+  end
+
+  def perform_bulk_action
+    @params[:selected_ids].split(',').each do |id|
+      ar_object = @model.ar_model.find(id)
+      column_name = @model.available_fields[:index].first.field_name
+      begin
+        @current_action.code_block.call(id)
+      rescue NoMethodError, NameError => e
+        @error_message = "#{e.message.slice(0..(e.message.index(' for')))} at #{ar_object.send(column_name)}"
+      rescue ActiveRecord::RecordInvalid => e
+        @error_message = "#{e.message} at #{ar_object.send(column_name)}"
+      rescue StandardError => e
+        @error_message = e.message
+      end
+      @invalid_records << OpenStruct.new({ row_identifier: ar_object.send(column_name), error_message: @error_message }) if @error_message
+    end
+    self
+  end
+end

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

@@ -14,25 +14,35 @@
     /     i.fa.fa-columns.bolder
     /   span
     /     i.fa.fa-angle-down
-
+- if flash[:alert].present?
+  .alert.alert-danger role="alert"
+    = flash[:alert].html_safe
+- elsif flash[:notice].present?
+  .alert.alert-success
+    = flash[:notice].html_safe
+- bulk_actions = actions_filter(@associated_model, :bulk_action)
+- if bulk_actions.present?
+  .table-top.hidden data-section="bulk-action"
+    - bulk_actions.each do |action|
+      = custom_action_items(action, 'index')
 .new-admin-table.scrollable
   table.cm-table
     thead.cm-table__header
       tr.header-row
-        // To be added once bulk-select is finalized
-        / th.check-box-space
-        /   span
-        /     input.cm-checkbox type="checkbox"
+        - if bulk_actions.present?
+          th.check-box-space
+            span
+              input.cm-checkbox type="checkbox" data-behaviour="bulk-action-select-all"
         - @model.available_fields[@action.name.to_sym].each do |column|
           - if column.display_if.call(Current.user) && column.viewable
             th = column.header
     tbody.cm-table__body
       - @associated_ar_object.data.each do |ar_object|
         tr.body-row
-          // To be added once bulk-select is finalized
-          / td.check-box-space
-          /   span
-          /     input.cm-checkbox type="checkbox"
+          - if bulk_actions.present?
+            td.check-box-space
+              span
+                input.cm-checkbox type="checkbox" data-behaviour="bulk-action-checkbox" data-ar-object-id="#{ar_object.id}"
           - @model.available_fields[@action.name.to_sym].each_with_index do |column, index|
             - if column.display_if.call(Current.user) && column.viewable
               td class="text-ellipsis"

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

@@ -1,28 +1,41 @@
 .table-top
   p.table-top__total-count = "#{humanized_ar_collection_count(@ar_object.pagy.count, @model.ar_model.table_name)}"
-  // .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
+- if flash[:alert].present?
+  .alert.alert-danger role="alert"
+    = flash[:alert].html_safe
+- elsif flash[:notice].present?
+  .alert.alert-success
+    = flash[:notice].html_safe
+
+- bulk_actions = actions_filter(@model, :bulk_action)
+- if bulk_actions.present?
+  .table-top.hidden data-section="bulk-action"
+    - bulk_actions.each do |action|
+      = custom_action_items(action, 'index')
 .new-admin-table
   table.cm-table
     thead.cm-table__header
       tr.header-row
-        // Select all checkbox feature to be added later
-        / th.check-box-space
-        /   span
-        /     input.cm-checkbox type="checkbox"
+        - if bulk_actions.present?
+          th.check-box-space
+            span
+              input.cm-checkbox type="checkbox" data-behaviour="bulk-action-select-all"
         - @model.available_fields[:index].each do |column|
           - if column.display_if.call(Current.user) && column.viewable
             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"
+          - if bulk_actions.present?
+            td.check-box-space
+              span
+                input.cm-checkbox type="checkbox"  data-behaviour="bulk-action-checkbox" data-ar-object-id="#{ar_object.id}"
           - @model.available_fields[:index].each_with_index do |column, index|
             - if column.display_if.call(Current.user) && column.viewable
               td.text-ellipsis
@@ -41,4 +54,4 @@
     .cm-pagination__rhs
       == render partial: 'cm_admin/main/cm_pagy_nav', locals: { pagy: @ar_object.pagy }
 
-= render partial: 'cm_admin/main/member_custom_action_modal', locals: { cm_model: @model, ar_collection: @ar_object }
+/ = render partial: 'cm_admin/main/member_custom_action_modal', locals: { cm_model: @model, ar_collection: @ar_object }

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

@@ -1,3 +1,4 @@
+
 .cm-index-page.cm-page-container
   .sticky-container.page-top-bar
     == render 'cm_admin/main/top_navbar'
@@ -9,7 +10,6 @@
       == render @action.partial
     - else
       == render 'cm_admin/main/table'
-
   = column_pop_up(@model)
   = manage_column_pop_up(@model)
 

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

@@ -1,4 +1,7 @@
-- @model.available_actions.select{|act| act if act.display_type == :modal}.each do |custom_action|
+- custom_action_with_modals = @model.available_actions.select{ |act| act if act.display_type == :modal }
+- if @associated_model
+  - custom_action_with_modals += @associated_model.available_actions.select{ |act| act if act.display_type == :modal }
+- custom_action_with_modals.each do |custom_action|
   .modal.fade id="#{custom_action.name.classify}Modal" aria-hidden="true" aria-labelledby="#{custom_action.name.classify}ModalLabel" tabindex="1" 
     .modal-dialog
       .modal-content

data/lib/cm_admin/model.rb

@@ -2,6 +2,7 @@ require_relative 'constants'
 require_relative 'models/action'
 require_relative 'models/importer'
 require_relative 'models/custom_action'
+require_relative 'models/bulk_action'
 require_relative 'models/field'
 require_relative 'models/form_field'
 require_relative 'models/blocks'
@@ -24,7 +25,7 @@ module CmAdmin
     include Models::Blocks
     include Models::DslMethod
     attr_accessor :available_actions, :actions_set, :available_fields, :additional_permitted_fields,
-      :current_action, :params, :filters, :available_tabs, :icon_name
+      :current_action, :params, :filters, :available_tabs, :icon_name, :bulk_actions
     attr_reader :name, :ar_model, :is_visible_on_sidebar, :importer
 
     def initialize(entity, &block)
@@ -33,6 +34,7 @@ module CmAdmin
       @is_visible_on_sidebar = true
       @icon_name = 'fa fa-th-large'
       @available_actions ||= []
+      @bulk_actions ||= []
       @additional_permitted_fields ||= []
       @current_action = nil
       @available_tabs ||= []

data/lib/cm_admin/models/action.rb

@@ -36,6 +36,10 @@ module CmAdmin
         self.sort_direction = :desc
         self.scopes ||= []
         self.icon_name = 'fa fa-th-large'
+        self.verb = :get
+        self.route_type = nil
+        self.display_type = nil
+
       end
 
       def set_values(page_title, page_description, partial)
@@ -45,12 +49,14 @@ module CmAdmin
       end
 
       def controller_action_name
-        if self.action_type == :custom
+        if action_type == :custom
           'cm_custom_method'
-        elsif self.parent
-          'cm_' + self.parent
+        elsif action_type == :bulk_action
+          'cm_bulk_action'
+        elsif parent
+          "cm_#{parent}"
         else
-          'cm_' + name
+          "cm_#{name}"
         end
       end
 

data/lib/cm_admin/models/bulk_action.rb

@@ -0,0 +1,18 @@
+require_relative 'actions/blocks'
+
+module CmAdmin
+  module Models
+    class BulkAction < Action
+
+      def initialize(attributes = {}, &block)
+        super
+        override_default_values
+      end
+
+      def override_default_values
+        self.icon_name = 'fa fa-layer-group'
+        self.verb = :post
+      end
+    end
+  end
+end

data/lib/cm_admin/models/dsl_method.rb

@@ -127,6 +127,15 @@ module CmAdmin
         # self.class.class_eval(&block)
       end
 
+      def bulk_action(name: nil, display_name: nil, display_if: lambda { |arg| return true }, redirection_url: nil, icon_name: nil, verb: nil, display_type: nil, route_type: nil, partial: nil, &block)
+        bulk_action = CmAdmin::Models::BulkAction.new(
+          name: name, display_name: display_name, display_if: display_if,
+          redirection_url: redirection_url, icon_name: icon_name, action_type: :bulk_action,
+          verb: verb, display_type: display_type, route_type: route_type, partial: partial, &block
+        )
+        @available_actions << bulk_action
+      end
+
       def filter(db_column_name, filter_type, options={})
         @filters << CmAdmin::Models::Filter.new(db_column_name: db_column_name, filter_type: filter_type, options: options)
       end

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.1.5'
+  VERSION = '1.1.7'
 end

data/lib/cm_admin/view_helpers/page_info_helper.rb

@@ -60,6 +60,8 @@ module CmAdmin
         if custom_action.name.present? && policy([:cm_admin, @model.name.classify.constantize]).send(:"#{custom_action.name}?")
           if custom_action.display_if.call(@ar_object)
             case custom_action.display_type
+            when :icon_only
+              custom_action_icon(custom_action, current_action_name)
             when :button
               custom_action_button(custom_action, current_action_name)
             when :modal
@@ -71,6 +73,14 @@ module CmAdmin
         end
       end
 
+      def custom_action_icon(custom_action, current_action_name)
+        button_to cm_admin.send("#{@model.name.underscore}_#{custom_action.name}_path"), method: :post, params: {selected_ids: ''} do
+          content_tag(:span) do
+            content_tag(:i, '', class: custom_action.icon_name)
+          end
+        end
+      end
+
       def custom_action_button(custom_action, current_action_name)
         if current_action_name == "index"
           button_to custom_action_title(custom_action), @model.ar_model.table_name + '/' + custom_action.path, class: 'secondary-btn ml-2', method: custom_action.verb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.7
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-26 00:00:00.000000000 Z
+date: 2023-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -168,6 +168,7 @@ files:
 - ".gitignore"
 - ".reek.yml"
 - ".rspec"
+- ".rubocop-https---raw-githubusercontent-com-commutatus-cm-linters-main-rubocop-yml"
 - ".rubocop.yml"
 - ".stylelintrc.json"
 - ".travis.yml"
@@ -178,10 +179,20 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/cm_admin_manifest.js
+- app/assets/fonts/fa-brands-400.ttf
+- app/assets/fonts/fa-brands-400.woff2
+- app/assets/fonts/fa-regular-400.ttf
+- app/assets/fonts/fa-regular-400.woff2
+- app/assets/fonts/fa-solid-900.ttf
+- app/assets/fonts/fa-solid-900.woff2
+- app/assets/fonts/fa-v4compatibility.ttf
+- app/assets/fonts/fa-v4compatibility.woff2
 - app/assets/images/image_not_available.png
 - app/assets/images/logo.png
 - app/assets/javascripts/cm_admin/application.js
+- app/assets/javascripts/cm_admin/bulk_actions.js
 - app/assets/javascripts/cm_admin/cocoon.js
+- app/assets/javascripts/cm_admin/custom.js
 - app/assets/javascripts/cm_admin/exports.js
 - app/assets/javascripts/cm_admin/filters.js
 - app/assets/javascripts/cm_admin/form_validation.js
@@ -212,6 +223,7 @@ files:
 - app/assets/stylesheets/cm_admin/components/index.scss
 - app/assets/stylesheets/cm_admin/dependency/bootstrap.min.css
 - app/assets/stylesheets/cm_admin/dependency/flatpickr.min.css
+- app/assets/stylesheets/cm_admin/dependency/fontawesome.all.css
 - app/assets/stylesheets/cm_admin/helpers/_mixins.scss
 - app/assets/stylesheets/cm_admin/helpers/_variable.scss
 - app/assets/stylesheets/cm_admin/helpers/index.scss
@@ -228,6 +240,7 @@ files:
 - app/javascript/packs/cm_admin/scaffolds.js
 - app/javascript/stylesheets/cm_admin/application.scss
 - app/jobs/file_import_processor_job.rb
+- app/models/concerns/cm_admin/bulk_action_processor.rb
 - app/models/concerns/cm_admin/file_import.rb
 - app/models/file_import.rb
 - app/policies/cm_admin/file_import_policy.rb
@@ -285,6 +298,7 @@ files:
 - lib/cm_admin/models/action.rb
 - lib/cm_admin/models/actions/blocks.rb
 - lib/cm_admin/models/blocks.rb
+- lib/cm_admin/models/bulk_action.rb
 - lib/cm_admin/models/column.rb
 - lib/cm_admin/models/custom_action.rb
 - lib/cm_admin/models/dsl_method.rb