From 32fac2f9ab978342c4d2c0f823daff7ebb0dde6b Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Thu, 14 Jul 2022 12:50:06 +0200
Subject: [PATCH] Fix merge issues for step [SCI-6949]

---
 app/javascript/vue/protocol/step.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/javascript/vue/protocol/step.vue b/app/javascript/vue/protocol/step.vue
index a515e8b8f..ac48af81e 100644
--- a/app/javascript/vue/protocol/step.vue
+++ b/app/javascript/vue/protocol/step.vue
@@ -25,13 +25,18 @@
               <span class="fas fa-caret-right"></span>
           </a>
           <div v-if="!inRepository" class="step-complete-container">
-            <div :class="`step-state ${step.attributes.completed ? 'completed' : ''}`" @click="changeState"></div>
+            <div :class="`step-state ${step.attributes.completed ? 'completed' : ''}`"
+                 @click="changeState"
+                 @keyup.enter="changeState"
+                 tabindex="0"
+                 :title="step.attributes.completed ? i18n.t('protocols.steps.status.uncomplete') : i18n.t('protocols.steps.status.complete')"
+            ></div>
           </div>
           <div class="step-position">
             {{ step.attributes.position + 1 }}.
           </div>
         </div>
-        <div class="step-name-container">
+        <div class="step-name-container" :class="{'strikethrough': step.attributes.completed}">
           <InlineEdit
             v-if="urls.update_url"
             :value="step.attributes.name"
@@ -41,6 +46,7 @@
             :autofocus="editingName"
             @editingEnabled="editingName = true"
             @editingDisabled="editingName = false"
+            :editOnload="step.newStep == true"
             @update="updateName"
           />
           <span v-else>