cm-admin 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0637794147d28cbeb2b09c9162104aabb3c5b7f52e3fb9e42c6a291e89b8e5e
-  data.tar.gz: 7971b87140570d9a486c65522fa762a960b5d5bc1e2cb392abcb36beec867003
+  metadata.gz: eca7a51066874791c62583654eea82878e1b84fefaca0ac6893972573fa21bdc
+  data.tar.gz: eb36d11d0a1d47f8c854fd79b19621148ef84ed45d2afcb72609441761c47f0b
 SHA512:
-  metadata.gz: 5e61028998a91e7279541570fd4e881cdc9263f3bd89f03db97e0b057c6667e32f69481164cf294bd6c517a55ec34de5c744b50e98340192c56861325eb9a7bb
-  data.tar.gz: 2cacfa59737f253733fe9b362464515f944e876e4e67b5e21f0895bd5691c6888c7a9d4013432d80b0ad24b04b4e9f52712786e445826ab539aef4d490a6a1cc
+  metadata.gz: 9c0596af7a585db67aa2f16a902f7765f94b6419fdff631efff2cdad9f6f9d885d61fe2ce55c783704c91b575919253b6cc3b504bfc4cba02fe945dbec139030
+  data.tar.gz: b1228ab04a4664b6b0452b83667e5bef30591e5787775002a66897db3b1a1145ebc00360abbffa9bd659f508b6fc99c1f4a96b364601564f038afcf7ad3cb0e7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (2.4.4)
+    cm-admin (2.4.5)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)

data/app/controllers/cm_admin/resource_controller.rb

@@ -111,22 +111,37 @@ module CmAdmin
 
     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
+      @bulk_action_processor = CmAdmin::BulkActionProcessor.new(@action, @model, params)
+      if @action.execution_mode.to_sym == :bulk
+        @bulk_action_processor.perform_bulk_action
+      else
+        @bulk_action_processor.perform_individual_action
+      end
       respond_to do |format|
+        action_name = @action.display_name || @action.name.humanize
         if @bulk_action_processor.invalid_records.empty?
-          flash[:notice] = "#{@action.formatted_name} was successful"
-          flash[:bulk_action_success] = "<b>#{@action.formatted_name} was successful</b>"
-          format.html { redirect_to request.referrer }
+          flash[:bulk_action_success] = "#{action_name} was successful"
+          format.html { redirect_to request.referrer, notice: "#{action_name} was successful" }
         else
-          error_messages = @bulk_action_processor.invalid_records.map do |invalid_record|
-            "<li>#{invalid_record.error_message}</li>"
-          end.join
-          flash[:alert] = "#{@action.formatted_name} was unsuccessful"
-          flash[:bulk_action_error] = "<div>
-              <div><b>#{@action.formatted_name} encountered the following errors:</b></div>
+          error_messages = @bulk_action_processor.invalid_records.map{|record| "<li>#{record.error_message}</li>"}.join
+
+          if @action.execution_mode.to_sym == :individual
+            flash[:bulk_action_success] = "#{@bulk_action_processor.success_records.size} rows were successful for #{action_name}" if @bulk_action_processor.success_records.present?
+            flash[:alert] = "<b>#{@bulk_action_processor.invalid_records.size} rows were unsuccessful for #{action_name}</b>"  
+            flash[:bulk_action_error] = "<div>
+              <div>
+                <div><b>#{@bulk_action_processor.invalid_records.size} rows were unsuccessful for #{action_name}</b></div>
+                <ul>#{error_messages}</ul>
+              </div>
+            </div>"
+          else
+            flash[:alert] = "<b>#{action_name} was unsuccessful</b>"
+            flash[:bulk_action_error] = "<div>
+              <div><b>#{action_name} encountered the following errors:</b></div>
               <ul>#{error_messages}</ul>
             </div>"
-          format.html { redirect_to request.referrer }
+          end          
+          format.html { redirect_to request.referrer}
         end
       end
     end

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

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

data/lib/cm_admin/models/action.rb

@@ -7,7 +7,7 @@ module CmAdmin
       attr_accessor :name, :display_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, :icon_name, :scopes, :view_type,
-                    :kanban_attr, :model_name, :redirect_to
+                    :kanban_attr, :model_name, :redirect_to, :execution_mode
 
       VALID_SORT_DIRECTION = Set[:asc, :desc].freeze
 

data/lib/cm_admin/models/dsl_method.rb

@@ -286,16 +286,18 @@ module CmAdmin
       # @param modal_configuration [Hash] the configuration of modal
       # @param route_type [String] the route type of action, +member+, +collection+
       # @param partial [String] the partial path of action
+      # @param execution_mode [Symbol] the types of execution mode are +:bulk+, +:individual+ [default +:individual+]
       # @example Creating a bulk action
-      #   bulk_action name: 'approve', display_name: 'Approve', display_if: lambda { |arg| arg.draft? }, redirection_url: '/posts', icon_name: 'fa-regular fa-circle-check', verb: :patch, display_type: :modal, modal_configuration: { title: 'Approve Post', description: 'Are you sure you want approve this post', confirmation_text: 'Approve' } do
+      #   bulk_action name: 'approve', display_name: 'Approve', display_if: lambda { |arg| arg.draft? }, redirection_url: '/posts', icon_name: 'fa-regular fa-circle-check', verb: :patch, display_type: :modal, modal_configuration: { title: 'Approve Post', description: 'Are you sure you want approve this post', confirmation_text: 'Approve' }, execution_mode: :individual do
       #     posts = ::Post.where(id: params[:ids])
       #     posts.each(&:approved!)
       #     posts
       #   end
-      def bulk_action(name: nil, display_name: nil, display_if: ->(_arg) { true }, redirection_url: nil, icon_name: nil, verb: nil, display_type: nil, modal_configuration: {}, route_type: nil, partial: nil, &block)
+      def bulk_action(name: nil, display_name: nil, display_if: ->(_arg) { true }, redirection_url: nil, icon_name: nil, verb: nil, display_type: nil, modal_configuration: {}, route_type: nil, partial: nil, execution_mode: :individual, &block)
         bulk_action = CmAdmin::Models::BulkAction.new(
           name:, display_name:, display_if:, modal_configuration:,
           redirection_url:, icon_name:, action_type: :bulk_action,
+          execution_mode:,
           verb:, display_type:, route_type:, partial:, &block
         )
         @available_actions << bulk_action

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '2.4.4'
+  VERSION = '2.4.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - Michael