From cc8a10edb037af11ac0aad211b2a468ac44cd305 Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <giga@scinote.net>
Date: Fri, 29 Dec 2023 12:53:46 +0400
Subject: [PATCH 1/6] "Move" feature for multiple selected tasks and
 experiments (bulk action)

---
 app/controllers/experiments_controller.rb    | 50 ++++++++++++--------
 app/services/toolbars/experiments_service.rb |  8 +---
 app/services/toolbars/my_modules_service.rb  |  6 +--
 app/views/experiments/_move_modal.html.erb   | 15 +++---
 config/locales/en.yml                        |  2 +-
 5 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
index 32542e5a2..fd4802707 100644
--- a/app/controllers/experiments_controller.rb
+++ b/app/controllers/experiments_controller.rb
@@ -10,17 +10,17 @@ class ExperimentsController < ApplicationController
 
   before_action :load_project, only: %i(new create archive_group restore_group)
   before_action :load_experiment, except: %i(new create archive_group restore_group
-                                             inventory_assigning_experiment_filter actions_toolbar)
+                                             inventory_assigning_experiment_filter actions_toolbar move_modal move)
+  before_action :load_experiments, only: %i(move_modal move)
   before_action :check_read_permissions, except: %i(edit archive clone move new
                                                     create archive_group restore_group
-                                                    inventory_assigning_experiment_filter actions_toolbar)
+                                                    inventory_assigning_experiment_filter actions_toolbar move_modal)
   before_action :check_canvas_read_permissions, only: %i(canvas)
   before_action :check_create_permissions, only: %i(new create)
   before_action :check_manage_permissions, only: %i(edit batch_clone_my_modules)
   before_action :check_update_permissions, only: %i(update)
   before_action :check_archive_permissions, only: :archive
   before_action :check_clone_permissions, only: %i(clone_modal clone)
-  before_action :check_move_permissions, only: %i(move_modal move)
   before_action :set_inline_name_editing, only: %i(canvas table module_archive)
   before_action :set_breadcrumbs_items, only: %i(canvas table module_archive)
   before_action :set_navigator, only: %i(canvas module_archive table)
@@ -274,7 +274,7 @@ class ExperimentsController < ApplicationController
 
   # GET: move_modal_experiment_path(id)
   def move_modal
-    @projects = @experiment.movable_projects(current_user)
+    @projects = @experiments.first.movable_projects(current_user)
     render json: {
       html: render_to_string(partial: 'move_modal', formats: :html)
     }
@@ -297,23 +297,28 @@ class ExperimentsController < ApplicationController
 
   # POST: move_experiment(id)
   def move
-    service = Experiments::MoveToProjectService
-              .call(experiment_id: @experiment.id,
-                    project_id: move_experiment_param,
-                    user_id: current_user.id)
-    if service.succeed?
-      flash[:success] = t('experiments.move.success_flash',
-                          experiment: @experiment.name)
-      status = :ok
-      view_state = @experiment.current_view_state(current_user)
-      view_type = view_state.state['my_modules']['view_type'] || 'canvas'
-      path = view_mode_redirect_url(view_type)
-    else
-      message = "#{service.errors.values.join('. ')}."
-      status = :unprocessable_entity
-    end
+    move_responses = []
 
-    render json: { message: message, path: path }, status: status
+    @experiments.each do |experiment|
+      @experiment = experiment
+      service = Experiments::MoveToProjectService
+                .call(experiment_id: experiment.id,
+                      project_id: params[:project_id],
+                      user_id: current_user.id)
+      if service.succeed?
+        flash[:success] = t('experiments.move.success_flash', experiment: experiment.name)
+        status = :ok
+        view_state = experiment.current_view_state(current_user)
+        view_type = view_state.state['my_modules']['view_type'] || 'canvas'
+        path = view_mode_redirect_url(view_type)
+      else
+        message = "#{service.errors.values.join('. ')}."
+        status = :unprocessable_entity
+      end
+
+      move_responses << {message: message, path: path, status: status }
+    end
+    render json: move_responses
   end
 
   def move_modules_modal
@@ -531,6 +536,11 @@ class ExperimentsController < ApplicationController
     render_404 unless @experiment
   end
 
+  def load_experiments
+    @experiments = Experiment.preload(user_assignments: %i(user user_role)).where(id: params[:ids])
+    render_404 unless @experiments
+  end
+
   def load_project
     @project = Project.find_by(id: params[:project_id])
     render_404 unless @project
diff --git a/app/services/toolbars/experiments_service.rb b/app/services/toolbars/experiments_service.rb
index 414bc05f6..a4a65affe 100644
--- a/app/services/toolbars/experiments_service.rb
+++ b/app/services/toolbars/experiments_service.rb
@@ -87,18 +87,14 @@ module Toolbars
     end
 
     def move_action
-      return unless @single
-
-      experiment = @experiments.first
-
-      return unless can_move_experiment?(experiment)
+      return unless @experiments.all? { |experiment| can_move_experiment?(experiment) }
 
       {
         name: 'move',
         label: I18n.t('experiments.toolbar.move_button'),
         icon: 'sn-icon sn-icon-move',
         button_class: 'move-experiments-btn',
-        path: move_modal_experiments_path(id: experiment.id),
+        path: move_modal_experiments_path(ids: @experiments.map(&:id)),
         type: 'remote-modal'
       }
     end
diff --git a/app/services/toolbars/my_modules_service.rb b/app/services/toolbars/my_modules_service.rb
index c8a7f6fac..989fb7e88 100644
--- a/app/services/toolbars/my_modules_service.rb
+++ b/app/services/toolbars/my_modules_service.rb
@@ -88,11 +88,7 @@ module Toolbars
     end
 
     def move_action
-      return unless @single
-
-      my_module = @my_modules.first
-
-      return unless can_move_my_module?(my_module)
+      return unless @my_modules.all? { |my_module| can_move_my_module?(my_module) }
 
       {
         name: 'move',
diff --git a/app/views/experiments/_move_modal.html.erb b/app/views/experiments/_move_modal.html.erb
index 68d45ee4f..e2cc90aa1 100644
--- a/app/views/experiments/_move_modal.html.erb
+++ b/app/views/experiments/_move_modal.html.erb
@@ -1,10 +1,10 @@
 <div class="modal move-experiment-modal"
-     id="move-experiment-modal-<%= @experiment.id %>"
+     id="move-experiment-modal-<%=  @experiments.map(&:id) %>"
      tabindex="-1"
      role="dialog"
      aria-labelledby="move-experiment-modal-label">
      <%= form_with model: @experiment,
-                   url: move_experiment_path(@experiment),
+                   url: move_experiment_path(id: @experiments.map(&:id)),
                    method: :post,
                    data: { remote: true },
                    html: { class: 'experiment-action-form' } do |f| %>
@@ -12,11 +12,11 @@
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="sn-icon sn-icon-close"></i></button>
-          <h4 class="modal-title" id="move-experiment-modal-label"><%= t("experiments.move.modal_title", experiment: @experiment.name ) %></h5>
+          <h4 class="modal-title" id="move-experiment-modal-label"><%= t("experiments.move.modal_title") %></h5>
         </div>
         <div class="modal-body">
           <p><small><%= t("experiments.move.notice") %></small></p>
-          <% if @projects.any? && can_manage_all_experiment_my_modules?(@experiment) %>
+          <% if @projects.any? && @experiments.all? { |experiment| can_manage_all_experiment_my_modules?(experiment) } %>
             <%= f.select :project_id, options_for_select(@projects.collect { |p| [ p.name, p.id ] }),
                         { label: t("experiments.move.target_project") }, { class: "form-control selectpicker", "data-role" => "clear" } %>
           <% else %>
@@ -24,15 +24,18 @@
               <i class="fas fa-exclamation-triangle"></i>
               <% if @projects.blank? %>
                 <%= t("experiments.move.no_projects") %>
-              <% elsif !can_manage_all_experiment_my_modules?(@experiment) %>
+              <% elsif !@experiments.all? { |experiment| can_manage_all_experiment_my_modules?(experiment) }  %>
                 <%= t("experiments.move.task_permission") %>
               <% end %>
             </div>
           <% end %>
         </div>
+        <% @experiments.each do |experiment| %>
+          <%= f.hidden_field :ids, multiple: true, value: experiment.id %>
+        <% end %>
         <div class="modal-footer">
           <button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
-          <% if @projects.any? && can_manage_all_experiment_my_modules?(@experiment) %>
+          <% if @projects.any? && @experiments.all? { |experiment| can_manage_all_experiment_my_modules?(experiment) }  %>
             <%= f.submit t("experiments.move.modal_submit"), class: "btn btn-primary" %>
           <% end %>
         </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1a25225f1..5599022c3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1515,7 +1515,7 @@ en:
       success: 'Successfully duplicated %{count} task(s) as template.'
       duplicating: 'Duplicating contents...'
     move:
-      modal_title: 'Move experiment %{experiment}'
+      modal_title: 'Move experiment(s)'
       notice: 'Moving is possible to projects, where you have permissions to create experiments and tasks.'
       target_project: 'Target project'
       label_title: 'Move'

From ebdeaf8b42045b75a69c6af2aad301d9d53bce09 Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <giga@scinote.net>
Date: Wed, 3 Jan 2024 12:58:13 +0400
Subject: [PATCH 2/6] add transaction to move exp function

---
 app/controllers/experiments_controller.rb | 41 ++++++++++++-----------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
index fd4802707..ff06ad10f 100644
--- a/app/controllers/experiments_controller.rb
+++ b/app/controllers/experiments_controller.rb
@@ -297,28 +297,31 @@ class ExperimentsController < ApplicationController
 
   # POST: move_experiment(id)
   def move
-    move_responses = []
+    move_response = nil
 
-    @experiments.each do |experiment|
-      @experiment = experiment
-      service = Experiments::MoveToProjectService
-                .call(experiment_id: experiment.id,
-                      project_id: params[:project_id],
-                      user_id: current_user.id)
-      if service.succeed?
-        flash[:success] = t('experiments.move.success_flash', experiment: experiment.name)
-        status = :ok
-        view_state = experiment.current_view_state(current_user)
-        view_type = view_state.state['my_modules']['view_type'] || 'canvas'
-        path = view_mode_redirect_url(view_type)
-      else
-        message = "#{service.errors.values.join('. ')}."
-        status = :unprocessable_entity
+    ActiveRecord::Base.transaction do
+      @experiments.each do |experiment|
+        @experiment = experiment
+        service = Experiments::MoveToProjectService
+                  .call(experiment_id: experiment.id,
+                        project_id: params[:project_id],
+                        user_id: current_user.id)
+        if service.succeed?
+          flash[:success] = t('experiments.move.success_flash', experiment: experiment.name)
+          status = :ok
+          view_state = experiment.current_view_state(current_user)
+          view_type = view_state.state['my_modules']['view_type'] || 'canvas'
+          path = view_mode_redirect_url(view_type)
+        else
+          message = "#{service.errors.values.join('. ')}."
+          status = :unprocessable_entity
+        end
+
+        move_response = { message: message, path: path, status: status }
       end
-
-      move_responses << {message: message, path: path, status: status }
     end
-    render json: move_responses
+
+    render json: move_response
   end
 
   def move_modules_modal

From eaf713e4bdc872641fe47d095c190ec096b75103 Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <giga@scinote.net>
Date: Wed, 3 Jan 2024 17:50:18 +0400
Subject: [PATCH 3/6] move response status fix

---
 app/controllers/experiments_controller.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
index ff06ad10f..297d4f14a 100644
--- a/app/controllers/experiments_controller.rb
+++ b/app/controllers/experiments_controller.rb
@@ -298,6 +298,7 @@ class ExperimentsController < ApplicationController
   # POST: move_experiment(id)
   def move
     move_response = nil
+    status = nil
 
     ActiveRecord::Base.transaction do
       @experiments.each do |experiment|
@@ -317,11 +318,11 @@ class ExperimentsController < ApplicationController
           status = :unprocessable_entity
         end
 
-        move_response = { message: message, path: path, status: status }
+        move_response = { message: message, path: path }
       end
     end
 
-    render json: move_response
+    render json: move_response, status: status
   end
 
   def move_modules_modal

From a5c7e7b8c864100e03edcff9b2cd6210bff10acf Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <giga@scinote.net>
Date: Wed, 17 Jan 2024 12:58:43 +0400
Subject: [PATCH 4/6] changed flash message

---
 app/controllers/experiments_controller.rb | 15 ++++++---------
 config/locales/en.yml                     |  1 +
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
index 297d4f14a..800b3341d 100644
--- a/app/controllers/experiments_controller.rb
+++ b/app/controllers/experiments_controller.rb
@@ -297,8 +297,7 @@ class ExperimentsController < ApplicationController
 
   # POST: move_experiment(id)
   def move
-    move_response = nil
-    status = nil
+    project = Project.find_by(id: params[:project_id])
 
     ActiveRecord::Base.transaction do
       @experiments.each do |experiment|
@@ -309,20 +308,18 @@ class ExperimentsController < ApplicationController
                         user_id: current_user.id)
         if service.succeed?
           flash[:success] = t('experiments.move.success_flash', experiment: experiment.name)
-          status = :ok
           view_state = experiment.current_view_state(current_user)
           view_type = view_state.state['my_modules']['view_type'] || 'canvas'
-          path = view_mode_redirect_url(view_type)
         else
-          message = "#{service.errors.values.join('. ')}."
-          status = :unprocessable_entity
+          render json: {
+            message: service.errors.values.join('. ')
+          }, status: :unprocessable_entity
         end
-
-        move_response = { message: message, path: path }
       end
     end
 
-    render json: move_response, status: status
+    render json: { message: t('experiments.table.move_success_flash',
+      project: escape_input(project.name)), path: project_path(project) }
   end
 
   def move_modules_modal
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5599022c3..ffbd8e011 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1526,6 +1526,7 @@ en:
       no_projects: 'No projects: You don’t have edit access to any other projects.'
     table:
       head_title: "%{experiment} | Overview"
+      move_success_flash: "Successfully moved experiment(s) to project %{project}."
       column:
         id_html: 'ID'
         task_name_html: 'Task name'

From 9b49e891a08106d35f51f36c55fe4044590e7602 Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <giga@scinote.net>
Date: Mon, 22 Jan 2024 02:16:24 +0400
Subject: [PATCH 5/6] changed experiment move logic similar to modules move

---
 app/controllers/experiments_controller.rb | 30 +++++++++++------------
 config/locales/en.yml                     |  1 +
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
index 800b3341d..00db69f7d 100644
--- a/app/controllers/experiments_controller.rb
+++ b/app/controllers/experiments_controller.rb
@@ -299,27 +299,27 @@ class ExperimentsController < ApplicationController
   def move
     project = Project.find_by(id: params[:project_id])
 
-    ActiveRecord::Base.transaction do
+    project.transaction do
       @experiments.each do |experiment|
-        @experiment = experiment
-        service = Experiments::MoveToProjectService
+        Experiments::MoveToProjectService
                   .call(experiment_id: experiment.id,
                         project_id: params[:project_id],
                         user_id: current_user.id)
-        if service.succeed?
-          flash[:success] = t('experiments.move.success_flash', experiment: experiment.name)
-          view_state = experiment.current_view_state(current_user)
-          view_type = view_state.state['my_modules']['view_type'] || 'canvas'
-        else
-          render json: {
-            message: service.errors.values.join('. ')
-          }, status: :unprocessable_entity
-        end
       end
-    end
 
-    render json: { message: t('experiments.table.move_success_flash',
-      project: escape_input(project.name)), path: project_path(project) }
+      flash[:success] = t('experiments.table.move_success_flash', project: escape_input(project.name))
+      render json: { message: t('experiments.table.move_success_flash',
+        project: escape_input(project.name)), path: project_path(project) }
+    rescue StandardError => e
+      Rails.logger.error(e.message)
+      Rails.logger.error(e.backtrace.join("\n"))
+      render json: {
+        message: t('experiments.table.move_success_flash', project: escape_input(project.name))
+      }, status: :unprocessable_entity
+      raise ActiveRecord::Rollback
+    end
+  rescue ActiveRecord::RecordNotFound
+    render_404
   end
 
   def move_modules_modal
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ffbd8e011..19f445fec 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1527,6 +1527,7 @@ en:
     table:
       head_title: "%{experiment} | Overview"
       move_success_flash: "Successfully moved experiment(s) to project %{project}."
+      error_flash: "Failed to move experiment(s) to project %{project}."
       column:
         id_html: 'ID'
         task_name_html: 'Task name'

From 98af81cd8aa8771270f2956da61001dc864c4dc4 Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <giga@scinote.net>
Date: Tue, 23 Jan 2024 17:28:11 +0400
Subject: [PATCH 6/6] Changed error handling [SCI-9840]

---
 app/assets/javascripts/projects/show.js   | 3 +--
 app/controllers/experiments_controller.rb | 8 +++++---
 config/locales/en.yml                     | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/projects/show.js b/app/assets/javascripts/projects/show.js
index 887c1bd2a..56f4369e8 100644
--- a/app/assets/javascripts/projects/show.js
+++ b/app/assets/javascripts/projects/show.js
@@ -335,10 +335,9 @@
         if (data.path) {
           window.location.replace(data.path);
         }
-        refreshCurrentView();
       })
       .on('ajax:error', '.experiment-action-form', function(ev, data) {
-        $(this).renderFormErrors('experiment', data.responseJSON);
+        HelperModule.flashAlertMsg(data.responseJSON.message, 'danger');
       });
 
     window.initActionToolbar();
diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
index 00db69f7d..723abfb60 100644
--- a/app/controllers/experiments_controller.rb
+++ b/app/controllers/experiments_controller.rb
@@ -297,14 +297,16 @@ class ExperimentsController < ApplicationController
 
   # POST: move_experiment(id)
   def move
-    project = Project.find_by(id: params[:project_id])
+    project = Project.viewable_by_user(current_user, current_team)
+                     .find_by(id: params[:project_id])
 
     project.transaction do
       @experiments.each do |experiment|
-        Experiments::MoveToProjectService
+        service = Experiments::MoveToProjectService
                   .call(experiment_id: experiment.id,
                         project_id: params[:project_id],
                         user_id: current_user.id)
+        raise StandardError unless service.succeed?
       end
 
       flash[:success] = t('experiments.table.move_success_flash', project: escape_input(project.name))
@@ -314,7 +316,7 @@ class ExperimentsController < ApplicationController
       Rails.logger.error(e.message)
       Rails.logger.error(e.backtrace.join("\n"))
       render json: {
-        message: t('experiments.table.move_success_flash', project: escape_input(project.name))
+        message: t('experiments.table.move_error_flash', project: escape_input(project.name))
       }, status: :unprocessable_entity
       raise ActiveRecord::Rollback
     end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 19f445fec..f40bb12d6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1527,7 +1527,7 @@ en:
     table:
       head_title: "%{experiment} | Overview"
       move_success_flash: "Successfully moved experiment(s) to project %{project}."
-      error_flash: "Failed to move experiment(s) to project %{project}."
+      move_error_flash: "Failed to move experiment(s) to project %{project}."
       column:
         id_html: 'ID'
         task_name_html: 'Task name'