From c89968453ea959cf775d6a3048f9099289211e89 Mon Sep 17 00:00:00 2001
From: artoscinote <85488244+artoscinote@users.noreply.github.com>
Date: Tue, 12 Jul 2022 10:41:58 +0200
Subject: [PATCH] Fix checklist issues [SCI-6960] (#4222)

---
 .../step_elements/checklist_items_controller.rb  |  4 +++-
 app/javascript/vue/protocol/step.vue             |  2 +-
 .../vue/protocol/step_elements/checklist.vue     | 13 +++++++++++--
 .../vue/protocol/step_elements/checklistItem.vue | 16 ++++++++--------
 app/javascript/vue/shared/inline_edit.vue        |  1 +
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/app/controllers/step_elements/checklist_items_controller.rb b/app/controllers/step_elements/checklist_items_controller.rb
index 465d2a526..67feaabe9 100644
--- a/app/controllers/step_elements/checklist_items_controller.rb
+++ b/app/controllers/step_elements/checklist_items_controller.rb
@@ -30,7 +30,9 @@ module StepElements
     end
 
     def update
-      @checklist_item.assign_attributes(checklist_item_params)
+      @checklist_item.assign_attributes(
+        checklist_item_params.merge(last_modified_by: current_user)
+      )
 
       if @checklist_item.save!
         if @checklist_item.saved_change_to_attribute?(:checked)
diff --git a/app/javascript/vue/protocol/step.vue b/app/javascript/vue/protocol/step.vue
index 2f4c346bf..766a3990b 100644
--- a/app/javascript/vue/protocol/step.vue
+++ b/app/javascript/vue/protocol/step.vue
@@ -15,7 +15,7 @@
       <div class="step-element-header">
         <div class="step-controls">
           <div v-if="reorderStepUrl" class="step-element-grip" @click="$emit('reorder')">
-            <i class="fas fa-grip-vertical"></i>
+            <i class="fas fas-rotated-90 fa-exchange-alt"></i>
           </div>
           <a class="step-collapse-link"
             :href="'#stepBody' + step.id"
diff --git a/app/javascript/vue/protocol/step_elements/checklist.vue b/app/javascript/vue/protocol/step_elements/checklist.vue
index c783fcf90..df7244ca9 100644
--- a/app/javascript/vue/protocol/step_elements/checklist.vue
+++ b/app/javascript/vue/protocol/step_elements/checklist.vue
@@ -94,6 +94,10 @@
       },
       reorderElementUrl: {
         type: String
+      },
+      isNew: {
+        type: Boolean,
+        default: false
       }
     },
     data() {
@@ -109,6 +113,10 @@
       this.checklistItems = this.element.attributes.orderable.checklist_items.map((item, index) => {
         return { attributes: {...item, position: index } }
       });
+
+      if (this.isNew) {
+        this.addItem();
+      }
     },
     computed: {
       orderedChecklistItems() {
@@ -177,7 +185,8 @@
             attributes: {
               text: '',
               checked: false,
-              position: this.checklistItems.length
+              position: this.checklistItems.length,
+              isNew: true
             }
           }
         );
@@ -212,7 +221,7 @@
       },
       handleMultilinePaste(data) {
         this.linesToPaste = data.length;
-        let nextPosition = this.checklistItems.length;
+        let nextPosition = this.checklistItems.length - 1;
 
         // we need to post items to API in the right order, to avoid positions breaking
         let synchronousPost = (index) => {
diff --git a/app/javascript/vue/protocol/step_elements/checklistItem.vue b/app/javascript/vue/protocol/step_elements/checklistItem.vue
index 4bd5d94a0..f6d2cc8d1 100644
--- a/app/javascript/vue/protocol/step_elements/checklistItem.vue
+++ b/app/javascript/vue/protocol/step_elements/checklistItem.vue
@@ -9,6 +9,7 @@
           <input ref="checkbox"
                  type="checkbox"
                  class="sci-checkbox"
+                 :disabled="checklistItem.attributes.isNew"
                  :checked="checklistItem.attributes.checked" @change="toggleChecked($event)" />
           <span class="sci-checkbox-label" >
           </span>
@@ -24,7 +25,7 @@
             :autofocus="editingText"
             :attributeName="`${i18n.t('ChecklistItem')} ${i18n.t('name')}`"
             :multilinePaste="true"
-            :editOnload="newItem()"
+            :editOnload="checklistItem.attributes.isNew"
             :smartAnnotation="true"
             @editingEnabled="enableTextEdit"
             @editingDisabled="disableTextEdit"
@@ -41,23 +42,21 @@
         <button v-if="!checklistItem.attributes.urls || updateUrl" class="btn icon-btn btn-light" @click="enableTextEdit" tabindex="-1">
           <i class="fas fa-pen"></i>
         </button>
-        <button v-if="!checklistItem.attributes.urls || deleteUrl" class="btn icon-btn btn-light" @click="showDeleteModal" tabindex="-1">
+        <button v-if="!checklistItem.attributes.urls || deleteUrl" class="btn icon-btn btn-light" @click="deleteElement" tabindex="-1">
           <i class="fas fa-trash"></i>
         </button>
       </div>
     </div>
-    <deleteElementModal v-if="confirmingDelete" @confirm="deleteElement" @cancel="closeDeleteModal"/>
   </div>
 </template>
 
  <script>
   import DeleteMixin from 'vue/protocol/mixins/components/delete.js'
-  import deleteElementModal from 'vue/protocol/modals/delete_element.vue'
   import InlineEdit from 'vue/shared/inline_edit.vue'
 
   export default {
     name: 'ChecklistItem',
-    components: { deleteElementModal, InlineEdit },
+    components: { InlineEdit },
     mixins: [DeleteMixin],
     props: {
       checklistItem: {
@@ -107,6 +106,10 @@
         this.$emit('editStart');
       },
       disableTextEdit() {
+        if (this.checklistItem.attributes.isNew) {
+          this.removeItem();
+          return;
+        }
         this.editingText = false;
         this.$emit('editEnd');
       },
@@ -131,9 +134,6 @@
           this.$emit('removeItem', this.checklistItem.attributes.position);
         }
       },
-      newItem(){
-        return this.checklistItem.attributes.text === ''
-      },
       update() {
         this.$emit('update', this.checklistItem);
       }
diff --git a/app/javascript/vue/shared/inline_edit.vue b/app/javascript/vue/shared/inline_edit.vue
index 1f9e35fed..20fda3ea7 100644
--- a/app/javascript/vue/shared/inline_edit.vue
+++ b/app/javascript/vue/shared/inline_edit.vue
@@ -11,6 +11,7 @@
         @keydown="handleKeypress"
         @paste="handlePaste"
         @blur="handleBlur"
+        @keyup.escape="cancelEdit"
       ></textarea>
       <div v-else @click="enableEdit($event)" class="sci-inline-edit__view" v-html="sa_value || value || placeholder" :class="{ 'blank': isBlank }"></div>
       <div v-if="editing && error" class="sci-inline-edit__error">