scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-06 20:05:55 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8381 from KlemenSciNote/kb_SCI-11747_add-data-e2e-protocol-login

Browse source 
Add data-e2e to move and delete modal, add to login page [SCI-11747]
This commit is contained in:
KlemenSciNote 2025-04-02 09:44:04 +02:00 • committed by GitHub
commit 9b6f1ff631
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/javascript/vue/shared/content/modal/delete.vue
View file

@ -1,21 +1,27 @@
<template> <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-dialog modal-sm" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="sn-icon sn-icon-close"></i></button> <button type="button" class="close" data-dismiss="modal" aria-label="Close" data-e2e="e2e-BT-deleteStepResultElementModal-close">
<h4 class="modal-title" id="modal-delete-result-element"> <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')}} {{ i18n.t('protocols.steps.modals.delete_element.title')}}
</h4> </h4>
</div> </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>{{ i18n.t('protocols.steps.modals.delete_element.description_1')}}</p>
<p><b>{{ i18n.t('protocols.steps.modals.delete_element.description_2')}}</b></p> <p><b>{{ i18n.t('protocols.steps.modals.delete_element.description_2')}}</b></p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-secondary" @click="close">{{ i18n.t('general.cancel') }}</button> <button class="btn btn-secondary" @click="close" data-e2e="e2e-BT-deleteStepResultElementModal-cancel">
<button class="btn btn-danger" @click="confirm">{{ i18n.t('protocols.steps.modals.delete_element.confirm')}}</button> {{ 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> </div>
</div> </div>

21
app/javascript/vue/shared/content/modal/move.vue
View file

@ -1,10 +1,12 @@
<template> <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-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="sn-icon sn-icon-close"></i></button> <button type="button" class="close" data-dismiss="modal" aria-label="Close" data-e2e="e2e-BT-moveStepResultElementModal-close">
<h4 class="modal-title" id="modal-move-result-element"> <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`) }} {{ i18n.t(`protocols.steps.modals.move_element.${parent_type}.title`) }}
</h4> </h4>
</div> </div>
@ -26,20 +28,25 @@
`my_modules.results.move_modal.${parent_type}.no_options_placeholder` `my_modules.results.move_modal.${parent_type}.no_options_placeholder`
) )
" "
:data-e2e="`e2e-DD-moveStepResultElementModal-selectTarget`"
/> />
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-secondary" @click="cancel">{{ i18n.t('general.cancel') }}</button> <button class="btn btn-secondary" @click="cancel" data-e2e="e2e-BT-moveStepResultElementModal-cancel">
<button class="btn btn-primary" @click="confirm" :disabled="!target">{{ i18n.t('general.move')}}</button> {{ 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> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import axios from '../../../../packs/custom_axios.js'; import axios from '../../../../packs/custom_axios.js';
import SelectDropdown from "../../select_dropdown.vue"; import SelectDropdown from '../../select_dropdown.vue';
export default { export default {
name: 'moveElementModal', name: 'moveElementModal',

16
app/views/users/sessions/new.html.erb
View file

@ -1,9 +1,9 @@
<% provide(:head_title, t("devise.sessions.new.head_title")) %> <% provide(:head_title, t("devise.sessions.new.head_title")) %>
<% content_for(:body_class, 'sign-in-layout') %> <% 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="sign-in-form-wrapper">
<div class="center-block center-block-narrow"> <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 %> <%- if Rails.configuration.x.enable_user_registration && Rails.configuration.x.linkedin_signin_enabled && @oauth_authorize != true %>
<div class="linkedin-container"> <div class="linkedin-container">
@ -15,19 +15,19 @@
<% unless Rails.application.config.x.disable_local_passwords %> <% unless Rails.application.config.x.disable_local_passwords %>
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<div class="input-group form-group sci-input-container"> <div class="input-group form-group sci-input-container">
<%= f.label :email, t("devise.sessions.new.email_field") %> <%= 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") %> <%= 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>
<div class="input-group form-group sci-input-container"> <div class="input-group form-group sci-input-container">
<%= f.label :password, t("devise.sessions.new.password_field") %> <%= 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") %> <%= 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> </div>
<% if devise_mapping.rememberable? && !@simple_sign_in %> <% if devise_mapping.rememberable? && !@simple_sign_in %>
<div class="field remember-me"> <div class="field remember-me">
<div class="sci-checkbox-container"> <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> <span class="sci-checkbox-label"></span>
</div> </div>
<%= f.label :remember_me, t("devise.sessions.new.remember_me") %> <%= f.label :remember_me, t("devise.sessions.new.remember_me") %>
@ -37,7 +37,7 @@
<%= hidden_field_tag(:simple_sign_in, @simple_sign_in) %> <%= hidden_field_tag(:simple_sign_in, @simple_sign_in) %>
<div class="actions" style="margin-top: 10px; margin-bottom: 10px;"> <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> </div>
<% end %> <% end %>
<% end %> <% end %>

4
app/views/users/shared/_links.html.erb
View file

@ -7,11 +7,11 @@
<% end -%> <% end -%>
<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> <%- 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 -%> <% end -%>
<%- if devise_mapping.registerable? && Rails.configuration.x.enable_user_registration && controller_name != 'registrations' %> <%- 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 -%> <% end -%>
<%- if Rails.configuration.x.enable_email_confirmations && devise_mapping.confirmable? && controller_name != 'confirmations' %> <%- if Rails.configuration.x.enable_email_confirmations && devise_mapping.confirmable? && controller_name != 'confirmations' %>