From 4cd2bce83f2134c173674c4bf0c01d3194e364e8 Mon Sep 17 00:00:00 2001
From: Urban Rotnik <urban.rotnik@gmail.com>
Date: Thu, 11 Feb 2021 12:36:39 +0100
Subject: [PATCH] Fix Move button on Experiment card

---
 app/assets/javascripts/projects/show.js    | 12 ++++++++++++
 app/assets/stylesheets/experiments.scss    |  1 +
 app/views/experiments/_move_modal.html.erb |  8 +++++---
 app/views/experiments/_new_modal.html.erb  |  5 ++++-
 app/views/projects/show.html.erb           |  1 -
 app/views/projects/show/_toolbar.html.erb  | 13 +++++++------
 6 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/projects/show.js b/app/assets/javascripts/projects/show.js
index 357c573e5..1fef0b09a 100644
--- a/app/assets/javascripts/projects/show.js
+++ b/app/assets/javascripts/projects/show.js
@@ -239,6 +239,17 @@
       });
   }
 
+  function initNewExperimentToolbarButton() {
+    let forms = '.new-experiment-form';
+    $(experimentsPage)
+      .on('ajax:success', forms, function(ev, data) {
+        appendActionModal($(data.html));
+      })
+      .on('ajax:error', forms, function(ev, data) {
+        HelperModule.flashAlertMsg(data.responseJSON.message, 'danger');
+      });
+  }
+
   function init() {
     $('.workflowimg-container').each(function() {
       let container = $(this);
@@ -284,6 +295,7 @@
     initExperimentsSelector();
     initArchiveRestoreToolbarButtons();
     initEditMoveDuplicateToolbarButton();
+    initNewExperimentToolbarButton();
     initSelectAllCheckbox();
   }
 
diff --git a/app/assets/stylesheets/experiments.scss b/app/assets/stylesheets/experiments.scss
index 40f793f05..98bc4b117 100644
--- a/app/assets/stylesheets/experiments.scss
+++ b/app/assets/stylesheets/experiments.scss
@@ -36,6 +36,7 @@
     .clone-experiments-form,
     .move-experiments-form,
     .archive-experiments-form,
+    .new-experiments-form,
     .restore-experiments-form {
       display: inline-block;
     }
diff --git a/app/views/experiments/_move_modal.html.erb b/app/views/experiments/_move_modal.html.erb
index c0cf7fafa..697d87e8a 100644
--- a/app/views/experiments/_move_modal.html.erb
+++ b/app/views/experiments/_move_modal.html.erb
@@ -1,11 +1,13 @@
-<div class="modal"
+<div class="modal move-experiment-modal"
      id="move-experiment-modal-<%= @experiment.id %>"
      tabindex="-1"
      role="dialog"
      aria-labelledby="move-experiment-modal-label">
-     <%= bootstrap_form_for @experiment, url: move_experiment_path(@experiment),
+     <%= bootstrap_form_for @experiment,
+                            url: move_experiment_path(@experiment),
                             method: :post,
-                            remote: true do |f| %>
+                            remote: true,
+                            html: { class: 'experiment-action-form' } do |f| %>
     <div class="modal-dialog" role="document">
       <div class="modal-content">
         <div class="modal-header">
diff --git a/app/views/experiments/_new_modal.html.erb b/app/views/experiments/_new_modal.html.erb
index 33b8e85ee..8356e0f4b 100644
--- a/app/views/experiments/_new_modal.html.erb
+++ b/app/views/experiments/_new_modal.html.erb
@@ -1,7 +1,10 @@
 <div class="modal" id="new-experiment-modal" tabindex="-1" role="dialog" aria-labelledby="new-experiment-modal-label">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
-      <%= bootstrap_form_for [@project, @experiment], remote: true, method: :post do |f| %>
+      <%= bootstrap_form_for [@project, @experiment],
+                             remote: true,
+                             method: :post,
+                             html: { class: 'experiment-action-form' } do |f| %>
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('general.close') %>"><span aria-hidden="true">&times;</span></button>
           <h4 class="modal-title" id="new-eperiment-modal-label"><%= t("experiments.new.modal_title") %></h4>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index a9f73b310..ac1ea83e1 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -32,6 +32,5 @@
   </div>
 </div>
 
-<%= javascript_include_tag("experiments/dropdown_actions") %>
 <%= javascript_include_tag("projects/show") %>
 <i data-hook="project-show-js"></i>
diff --git a/app/views/projects/show/_toolbar.html.erb b/app/views/projects/show/_toolbar.html.erb
index b441039f0..22bbf6fd9 100644
--- a/app/views/projects/show/_toolbar.html.erb
+++ b/app/views/projects/show/_toolbar.html.erb
@@ -1,12 +1,13 @@
 <div id="projectShowToolbar" class="project-show-toolbar">
   <!-- new experiment button -->
   <% if can_create_experiments?(@project) %>
-    <%= link_to new_project_experiment_url(@project),
-                remote: true,
-                type: "button",
-                data: {view_mode: :active},
-                id: 'new-experiment',
-                class: 'btn btn-primary' do %>
+    <%= button_to new_project_experiment_url(@project),
+                  remote: true,
+                  form_class: 'new-experiment-form',
+                  data: {view_mode: :active},
+                  id: 'new-experiment',
+                  method: :get,
+                  class: 'btn btn-primary' do %>
       <span class="fas fa-plus" aria-hidden="true"></span>
       <span class="hidden-xs"><%= t('experiments.toolbar.new_button') %></span>
     <% end %>