From 79b801121a89c0e50e41ca2fbbfd8f2c7156cad0 Mon Sep 17 00:00:00 2001
From: artoscinote <85488244+artoscinote@users.noreply.github.com>
Date: Mon, 4 Jul 2022 13:55:26 +0200
Subject: [PATCH] Fix protocol title, disable reordering of elements if less
 than 2 [SCI-6934] (#4187)

---
 app/javascript/vue/protocol/step.vue      | 20 ++++++++++++--------
 app/javascript/vue/shared/inline_edit.vue |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/javascript/vue/protocol/step.vue b/app/javascript/vue/protocol/step.vue
index 730bb087d..14b6e5559 100644
--- a/app/javascript/vue/protocol/step.vue
+++ b/app/javascript/vue/protocol/step.vue
@@ -89,17 +89,21 @@
             <button class="btn btn-light dropdown-toggle insert-button" type="button" :id="'stepInserMenu_' + step.id" data-toggle="dropdown" data-display="static" aria-haspopup="true" aria-expanded="true">
               <i class="fas fa-ellipsis-v"></i>
             </button>
-            <ul class="dropdown-menu insert-element-dropdown" :aria-labelledby="'stepInserMenu_' + step.id">
+            <ul class="dropdown-menu dropdown-menu-right insert-element-dropdown" :aria-labelledby="'stepInserMenu_' + step.id">
               <li class="title">
                 {{ i18n.t('protocols.steps.options_dropdown.title') }}
               </li>
-              <li v-if="urls.reorder_elements_url" class="action" @click="openReorderModal">
-                <i class="fas fa-arrows-alt-v"></i>
-                {{ i18n.t('protocols.steps.options_dropdown.rearrange') }}
+              <li v-if="urls.reorder_elements_url" class="action">
+                <a @click="openReorderModal" :class="{ 'disabled': elements.length < 2 }">
+                  <i class="fas fa-arrows-alt-v"></i>
+                  {{ i18n.t('protocols.steps.options_dropdown.rearrange') }}
+                </a>
               </li>
-              <li v-if="urls.delete_url" class="action" @click="showDeleteModal">
-                <i class="fas fa-trash"></i>
-                {{ i18n.t('protocols.steps.options_dropdown.delete') }}
+              <li v-if="urls.delete_url" class="action">
+                <a @click="showDeleteModal">
+                  <i class="fas fa-trash"></i>
+                  {{ i18n.t('protocols.steps.options_dropdown.delete') }}
+                </a>
               </li>
             </ul>
           </div>
@@ -114,7 +118,7 @@
             :key="index"
             :element.sync="elements[index]"
             :inRepository="inRepository"
-            :reorderElementUrl="urls.reorder_elements_url"
+            :reorderElementUrl="elements.length > 1 ? urls.reorder_elements_url : ''"
             @component:delete="deleteElement"
             @update="updateElement"
             @reorder="openReorderModal"
diff --git a/app/javascript/vue/shared/inline_edit.vue b/app/javascript/vue/shared/inline_edit.vue
index 086af177f..81cec626d 100644
--- a/app/javascript/vue/shared/inline_edit.vue
+++ b/app/javascript/vue/shared/inline_edit.vue
@@ -85,7 +85,7 @@
         }
       },
       handleBlur() {
-        if (!this.isBlank) {
+        if (this.allowBlank || !this.isBlank) {
           this.$nextTick(this.update);
         } else {
           this.$emit('delete');