From 769bbcaf41f77bee2d9b7ad6916eb7299e3a75d1 Mon Sep 17 00:00:00 2001
From: Klemen Benedicic <klemen.benedicic@scinote.net>
Date: Tue, 1 Apr 2025 12:30:07 +0200
Subject: [PATCH 1/2] Add data-e2e to move and delete modal, add to login page
 [SCI-11747]

---
 .../vue/shared/content/modal/delete.vue        | 18 ++++++++++++------
 .../vue/shared/content/modal/move.vue          | 13 ++++++++-----
 app/views/users/sessions/new.html.erb          | 16 ++++++++--------
 app/views/users/shared/_links.html.erb         |  4 ++--
 4 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/app/javascript/vue/shared/content/modal/delete.vue b/app/javascript/vue/shared/content/modal/delete.vue
index 5fc176631..1e5213996 100644
--- a/app/javascript/vue/shared/content/modal/delete.vue
+++ b/app/javascript/vue/shared/content/modal/delete.vue
@@ -1,21 +1,27 @@
 <template>
-  <div ref="modal" @keydown.esc="cancel" class="modal" id="modalDestroyProtocolContent" tabindex="-1" role="dialog">
+  <div ref="modal" @keydown.esc="cancel" class="modal" id="modalDestroyProtocolContent" tabindex="-1" role="dialog" data-e2e="e2e-MD-deleteStepResultElement">
     <div class="modal-dialog modal-sm" role="document">
       <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-delete-result-element">
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close" data-e2e="e2e-BT-deleteStepResultElementModal-close">
+            <i class="sn-icon sn-icon-close"></i>
+          </button>
+          <h4 class="modal-title" id="modal-delete-result-element" data-e2e="e2e-TX-deleteStepResultElementModal-title">
             {{ i18n.t('protocols.steps.modals.delete_element.title')}}
           </h4>
         </div>
-        <div class="modal-body">
+        <div class="modal-body" data-e2e="e2e-TX-deleteStepResultElementModal-description">
           <p>{{ i18n.t('protocols.steps.modals.delete_element.description_1')}}</p>
           <p><b>{{ i18n.t('protocols.steps.modals.delete_element.description_2')}}</b></p>
 
         </div>
         <div class="modal-footer">
-          <button class="btn btn-secondary" @click="close">{{ i18n.t('general.cancel') }}</button>
-          <button class="btn btn-danger" @click="confirm">{{ i18n.t('protocols.steps.modals.delete_element.confirm')}}</button>
+          <button class="btn btn-secondary" @click="close" data-e2e="e2e-BT-deleteStepResultElementModal-cancel">
+            {{ i18n.t('general.cancel') }}
+          </button>
+          <button class="btn btn-danger" @click="confirm" data-e2e="e2e-BT-deleteStepResultElementModal-confirm">
+            {{ i18n.t('protocols.steps.modals.delete_element.confirm')}}
+          </button>
         </div>
       </div>
     </div>
diff --git a/app/javascript/vue/shared/content/modal/move.vue b/app/javascript/vue/shared/content/modal/move.vue
index 01913cc11..dab9de46e 100644
--- a/app/javascript/vue/shared/content/modal/move.vue
+++ b/app/javascript/vue/shared/content/modal/move.vue
@@ -1,10 +1,12 @@
 <template>
-  <div ref="modal" @keydown.esc="cancel" class="modal" id="modalMoveProtocolContent" tabindex="-1" role="dialog">
+  <div ref="modal" @keydown.esc="cancel" class="modal" id="modalMoveProtocolContent" tabindex="-1" role="dialog" data-e2e="e2e-MD-moveStepResultElement">
     <div class="modal-dialog" role="document">
       <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-move-result-element">
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close" data-e2e="e2e-BT-moveStepResultElementModal-close">
+            <i class="sn-icon sn-icon-close"></i>
+          </button>
+          <h4 class="modal-title" id="modal-move-result-element" data-e2e="e2e-TX-moveStepResultElementModal-title">
             {{ i18n.t(`protocols.steps.modals.move_element.${parent_type}.title`) }}
           </h4>
         </div>
@@ -26,6 +28,7 @@
                   `my_modules.results.move_modal.${parent_type}.no_options_placeholder`
                 )
               "
+              :data-e2e="`e2e-DD-moveStepResultElementModal-selectTarget`"
             />
           </div>
         </div>
@@ -37,9 +40,9 @@
     </div>
   </div>
 </template>
- <script>
+<script>
 import axios from '../../../../packs/custom_axios.js';
-import SelectDropdown from "../../select_dropdown.vue";
+import SelectDropdown from '../../select_dropdown.vue';
 
 export default {
   name: 'moveElementModal',
diff --git a/app/views/users/sessions/new.html.erb b/app/views/users/sessions/new.html.erb
index bed17caea..4c5fe3b10 100644
--- a/app/views/users/sessions/new.html.erb
+++ b/app/views/users/sessions/new.html.erb
@@ -1,9 +1,9 @@
 <% provide(:head_title, t("devise.sessions.new.head_title")) %>
 <% content_for(:body_class, 'sign-in-layout') %>
-<div class="sign-in-container" data-e2e="e2e-CO-signin">
+<div class="sign-in-container" data-e2e="e2e-CO-signIn">
   <div class="sign-in-form-wrapper">
     <div class="center-block center-block-narrow">
-      <h1 class="log-in-title"><%=t "devise.sessions.new.title" %></h1>
+      <h1 class="log-in-title" data-e2e="e2e-TX-signIn-title"><%=t "devise.sessions.new.title" %></h1>
 
       <%- if Rails.configuration.x.enable_user_registration && Rails.configuration.x.linkedin_signin_enabled && @oauth_authorize != true %>
         <div class="linkedin-container">
@@ -15,19 +15,19 @@
       <% unless Rails.application.config.x.disable_local_passwords %>
         <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
           <div class="input-group form-group sci-input-container">
-            <%= f.label :email, t("devise.sessions.new.email_field") %>
-            <%= f.email_field :email, autofocus: true, class: "form-control sci-input-field", placeholder: t("devise.sessions.new.email_placeholder") %>
+            <%= f.label :email, t("devise.sessions.new.email_field"), :'data-e2e' => "e2e-LB-signIn-email" %>
+            <%= f.email_field :email, autofocus: true, class: "form-control sci-input-field", placeholder: t("devise.sessions.new.email_placeholder"), :'data-e2e' => "e2e-IF-signIn-email" %>
           </div>
 
           <div class="input-group form-group sci-input-container">
-            <%= f.label :password, t("devise.sessions.new.password_field") %>
-            <%= f.password_field :password, autocomplete: "off", class: "form-control sci-input-field", placeholder: t("devise.sessions.new.password_placeholder") %>
+            <%= f.label :password, t("devise.sessions.new.password_field"), :'data-e2e' => "e2e-LB-signIn-password" %>
+            <%= f.password_field :password, autocomplete: "off", class: "form-control sci-input-field", placeholder: t("devise.sessions.new.password_placeholder"), :'data-e2e' => "e2e-IF-signIn-password" %>
           </div>
 
           <% if devise_mapping.rememberable? && !@simple_sign_in %>
             <div class="field remember-me">
               <div class="sci-checkbox-container">
-                <%= f.check_box :remember_me, class: "sci-checkbox" %>
+                <%= f.check_box :remember_me, class: "sci-checkbox", :'data-e2e' => "e2e-CB-signIn-rememberMe" %>
                 <span class="sci-checkbox-label"></span>
               </div>
               <%= f.label :remember_me, t("devise.sessions.new.remember_me") %>
@@ -37,7 +37,7 @@
           <%= hidden_field_tag(:simple_sign_in, @simple_sign_in) %>
 
           <div class="actions" style="margin-top: 10px; margin-bottom: 10px;">
-            <%= f.button t("devise.sessions.new.submit"), class: "btn btn-primary log-in-button" %>
+            <%= f.button t("devise.sessions.new.submit"), class: "btn btn-primary log-in-button", :'data-e2e' => "e2e-BT-signIn-logIn" %>
           </div>
         <% end %>
       <% end %>
diff --git a/app/views/users/shared/_links.html.erb b/app/views/users/shared/_links.html.erb
index 8864e5a2a..a7807bfa9 100644
--- a/app/views/users/shared/_links.html.erb
+++ b/app/views/users/shared/_links.html.erb
@@ -7,11 +7,11 @@
     <% end -%>
 
     <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-      <%= link_to t("devise.links.forgot"), new_password_path(resource_name), class: 'forgot-password-link' %><br />
+      <%= link_to t("devise.links.forgot"), new_password_path(resource_name), class: 'forgot-password-link', :'data-e2e' => "e2e-TL-signIn-forgotPassword" %><br />
     <% end -%>
 
     <%- if devise_mapping.registerable? && Rails.configuration.x.enable_user_registration && controller_name != 'registrations' %>
-      <%= link_to t("devise.links.signup"), new_registration_path(resource_name), class: 'signup-link' %><br />
+      <%= link_to t("devise.links.signup"), new_registration_path(resource_name), class: 'signup-link', :'data-e2e' => "e2e-TL-signIn-signUp" %><br />
     <% end -%>
 
     <%- if Rails.configuration.x.enable_email_confirmations && devise_mapping.confirmable? && controller_name != 'confirmations' %>

From 3c217f88b701a889ddbe470b7d89bd11b90b80c2 Mon Sep 17 00:00:00 2001
From: Klemen Benedicic <klemen.benedicic@scinote.net>
Date: Wed, 2 Apr 2025 09:29:47 +0200
Subject: [PATCH 2/2] Add data-e2e to move and cancel buttons [SCI-11747]

---
 app/javascript/vue/shared/content/modal/move.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/javascript/vue/shared/content/modal/move.vue b/app/javascript/vue/shared/content/modal/move.vue
index dab9de46e..47f03f760 100644
--- a/app/javascript/vue/shared/content/modal/move.vue
+++ b/app/javascript/vue/shared/content/modal/move.vue
@@ -33,8 +33,12 @@
           </div>
         </div>
         <div class="modal-footer">
-          <button class="btn btn-secondary" @click="cancel">{{ i18n.t('general.cancel') }}</button>
-          <button class="btn btn-primary" @click="confirm" :disabled="!target">{{ i18n.t('general.move')}}</button>
+          <button class="btn btn-secondary" @click="cancel" data-e2e="e2e-BT-moveStepResultElementModal-cancel">
+            {{ i18n.t('general.cancel') }}
+          </button>
+          <button class="btn btn-primary" @click="confirm" :disabled="!target" data-e2e="e2e-BT-moveStepResultElementModal-move">
+            {{ i18n.t('general.move')}}
+          </button>
         </div>
       </div>
     </div>