From 7c0e8221c1a9aa91e352a7941e4704ac95d29796 Mon Sep 17 00:00:00 2001
From: Ivan Kljun <ivan@scinote.net>
Date: Mon, 9 Oct 2023 14:54:22 +0200
Subject: [PATCH] Fix moving result elements [SCI-9430]

---
 app/javascript/vue/protocol/step.vue              |  2 +-
 app/javascript/vue/results/result.vue             |  4 ++--
 .../vue/shared/content/modal/delete.vue           |  2 +-
 app/javascript/vue/shared/content/modal/move.vue  |  2 +-
 .../vue/shared/content/modal/table_name.vue       |  2 +-
 app/models/result_orderable_element.rb            | 15 ---------------
 6 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/app/javascript/vue/protocol/step.vue b/app/javascript/vue/protocol/step.vue
index 2153415a0..c286426ce 100644
--- a/app/javascript/vue/protocol/step.vue
+++ b/app/javascript/vue/protocol/step.vue
@@ -108,7 +108,7 @@
         <component
           v-for="(element, index) in orderedElements"
           :is="elements[index].attributes.orderable_type"
-          :key="index"
+          :key="element.id"
           :element.sync="elements[index]"
           :inRepository="inRepository"
           :reorderElementUrl="elements.length > 1 ? urls.reorder_elements_url : ''"
diff --git a/app/javascript/vue/results/result.vue b/app/javascript/vue/results/result.vue
index af72bc010..d82560020 100644
--- a/app/javascript/vue/results/result.vue
+++ b/app/javascript/vue/results/result.vue
@@ -86,7 +86,7 @@
       @close="closeReorderModal"
     />
     <div class="collapse in pl-10" :id="'resultBody' + result.id">
-      <div v-for="(element, index) in orderedElements" :key="index">
+      <div v-for="(element, index) in orderedElements" :key="element.id">
         <component
           :is="elements[index].attributes.orderable_type"
           :element.sync="elements[index]"
@@ -427,7 +427,7 @@
       },
       moveElement(position, target_id) {
         this.elements.splice(position, 1)
-        let unorderedElements = this.elements.map( e => {
+        this.elements.map( e => {
           if (e.attributes.position >= position) {
             e.attributes.position -= 1;
           }
diff --git a/app/javascript/vue/shared/content/modal/delete.vue b/app/javascript/vue/shared/content/modal/delete.vue
index 1aced8490..7beabcdc0 100644
--- a/app/javascript/vue/shared/content/modal/delete.vue
+++ b/app/javascript/vue/shared/content/modal/delete.vue
@@ -4,7 +4,7 @@
       <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="modal-destroy-team-label">
+          <h4 class="modal-title" id="modal-delete-result-element">
             {{ i18n.t('protocols.steps.modals.delete_element.title')}}
           </h4>
         </div>
diff --git a/app/javascript/vue/shared/content/modal/move.vue b/app/javascript/vue/shared/content/modal/move.vue
index e2a7fc745..b904cfe1b 100644
--- a/app/javascript/vue/shared/content/modal/move.vue
+++ b/app/javascript/vue/shared/content/modal/move.vue
@@ -4,7 +4,7 @@
       <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="modal-destroy-team-label">
+          <h4 class="modal-title" id="modal-move-result-element">
             {{ i18n.t(`protocols.steps.modals.move_element.${parent_type}.title`) }}
           </h4>
         </div>
diff --git a/app/javascript/vue/shared/content/modal/table_name.vue b/app/javascript/vue/shared/content/modal/table_name.vue
index 9846aac9a..ddaefabb6 100644
--- a/app/javascript/vue/shared/content/modal/table_name.vue
+++ b/app/javascript/vue/shared/content/modal/table_name.vue
@@ -4,7 +4,7 @@
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" @click="cancel" aria-label="Close"><i class="sn-icon sn-icon-close"></i></button>
-          <h4 class="modal-title" id="modal-destroy-team-label">
+          <h4 class="modal-title" id="modal-table-name">
             {{ i18n.t('protocols.steps.table.name_modal.title')}}
           </h4>
         </div>
diff --git a/app/models/result_orderable_element.rb b/app/models/result_orderable_element.rb
index eb43e280c..11ec1ecb9 100644
--- a/app/models/result_orderable_element.rb
+++ b/app/models/result_orderable_element.rb
@@ -4,8 +4,6 @@ class ResultOrderableElement < ApplicationRecord
   validates :position, uniqueness: { scope: :result }
   validate :check_result_relations
 
-  around_destroy :decrement_following_elements_positions
-
   belongs_to :result, inverse_of: :result_orderable_elements, touch: true
   belongs_to :orderable, polymorphic: true, inverse_of: :result_orderable_element
   acts_as_list scope: :result, top_of_list: 0, sequential_updates: true
@@ -20,17 +18,4 @@ class ResultOrderableElement < ApplicationRecord
       )
     end
   end
-
-  def decrement_following_elements_positions
-    result.with_lock do
-      yield
-      result.result_orderable_elements
-            .where('position > ?', position)
-            .order(position: :asc).each do |result_orderable_element|
-        # find_each ignore any ordering
-        result_orderable_element.position -= 1
-        result_orderable_element.save!
-      end
-    end
-  end
 end