e2e - modified and added new tags at inventories section [SCI-9813] (#6741) (#6832)

Co-authored-by: Martin Artnik <martin@scinote.net>
Co-authored-by: mvrazic <144342580+mvrazic@users.noreply.github.com>
This commit is contained in:
Alex Kriuchykhin 2023-12-15 16:33:13 +01:00 committed by GitHub
parent b91792e392
commit 528d411910
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 38 additions and 32 deletions

View file

@ -67,7 +67,7 @@
orderable: false,
render: function() {
return `<div class="sci-checkbox-container">
<input class='repository-row-selector sci-checkbox' type='checkbox' data-e2e="e2e-CB-inventory">
<input class='repository-row-selector sci-checkbox' type='checkbox' data-e2e="e2e-CB-inventories-all">
<span class='sci-checkbox-label'></span>
</div>`;
}

View file

@ -15,7 +15,8 @@ $.fn.dataTable.render.editRowName = function(formId, cell) {
name="repository_row[name]"
value=""
placeholder="${I18n.t('repositories.table.enter_row_name')}"
data-type="RowName">
data-type="RowName"
data-e2e="e2e-IF-invInventoryEditItemTR-name">
</div>
`);
$cell.find('input').val(text);

View file

@ -13,7 +13,8 @@ $.fn.dataTable.render.newRowName = function(formId, $cell) {
name="repository_row[name]"
value=""
placeholder="${I18n.t('repositories.table.enter_row_name')}"
data-type="RowName">
data-type="RowName"
data-e2e="e2e-IF-invInventoryNewItemTR-name">
</div>
`);
};

View file

@ -671,7 +671,7 @@ var RepositoryDatatable = (function(global) {
visible: true,
render: function(data, type, row) {
return "<a href='" + row.recordInfoUrl + "'"
+ "class='record-info-link' data-e2e='e2e-TL-invInventory-Item-" + row.DT_RowId + "'>" + data + '</a>';
+ "class='record-info-link' data-e2e='e2e-TL-invInventoryTR-Item-" + row.DT_RowId + "'>" + data + '</a>';
}
}, {
// Added on column

View file

@ -30,7 +30,7 @@ module RepositoriesDatatableHelper
'data-rename-modal-url': team_repository_rename_modal_path(team, repository_id: repository),
'data-shared': repository.shared_with?(team),
'data-i-shared': repository.i_shared?(team),
'data-e2e': "e2e-RT-inventories-tableItemRow-#{repository.id}"
'data-e2e': "e2e-TR-inventories-bodyRow-#{repository.id}"
}
)
end

View file

@ -17,7 +17,7 @@ module RepositoryDatatableHelper
row = public_send("#{repository.class.name.underscore}_default_columns", record)
row.merge!(
DT_RowId: record.id,
DT_RowAttr: { 'data-state': row_style(record), 'data-e2e': "e2e-RT-invInventory-row-#{record.id}" },
DT_RowAttr: { 'data-state': row_style(record), 'data-e2e': "e2e-TR-invInventory-bodyRow-#{record.id}" },
recordInfoUrl: Rails.application.routes.url_helpers.repository_repository_row_path(repository, record),
rowRemindersUrl:
Rails.application.routes.url_helpers

View file

@ -29,6 +29,7 @@
:data-object-type="groupAction.item_type"
:data-object-id="groupAction.item_id"
:data-action="groupAction.type"
:data-e2e="`e2e-BT-actionToolbar-${groupAction.name}`"
@click="closeExportDropdown($event); doAction(groupAction, $event);">
<span class="sn-action-toolbar__button-text">{{ groupAction.label }}</span>
</a>
@ -46,6 +47,7 @@
:data-object-type="action.actions[0].item_type"
:data-object-id="action.actions[0].item_id"
:data-action="action.actions[0].type"
:data-e2e="`e2e-BT-actionToolbar-${action.name}`"
@click="doAction(action.actions[0], $event);">
<i :class="action.actions[0].icon"></i>
<span class="sn-action-toolbar__button-text">{{ action.group_label }}</span>
@ -61,6 +63,7 @@
:data-object-type="action.item_type"
:data-object-id="action.item_id"
:data-action="action.type"
:data-e2e="`e2e-BT-actionToolbar-${action.name}`"
@click="doAction(action, $event)">
<i :class="action.icon"></i>
<span class="sn-action-toolbar__button-text">{{ action.label }}</span>

View file

@ -233,7 +233,7 @@
:class="{ 'pb-6': customColumns?.length }">
<div id="divider" class="w-500 bg-sn-light-grey flex px-8 items-center self-stretch h-px mb-6"></div>
<div id="bottom-button-wrapper" class="flex h-10 justify-end">
<button type="button" class="btn btn-primary print-label-button"
<button type="button" class="btn btn-primary print-label-button" data-e2e="e2e-BT-invInventoryItemSB-print"
:data-rows="JSON.stringify([repositoryRowId])">
{{ i18n.t('repositories.item_card.print_label') }}
</button>

View file

@ -1,6 +1,6 @@
<template>
<div ref="modal" class="modal fade" id="modal-print-repository-row-label" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document">
<div class="modal-dialog" role="document" data-e2e="e2e-MD-printLabel">
<div class="modal-content">
<div v-if="availablePrinters.length > 0" class="printers-available">
<div class="modal-header">
@ -70,7 +70,7 @@
</div>
<div v-else class="no-printers-available">
<div class="modal-body no-printers-container">
<button type="button" class="close modal-absolute-close-button" data-dismiss="modal" aria-label="Close"><i class="sn-icon sn-icon-close"></i></button>
<button type="button" class="close modal-absolute-close-button" data-dismiss="modal" aria-label="Close"><i class="sn-icon sn-icon-close" data-e2e="e2e-BT-printLabelMD-close"></i></button>
<img src='/images/printers/no_available_printers.png'>
<p class="no-printer-title">
{{ i18n.t('repository_row.modal_print_label.no_printers.title') }}
@ -80,7 +80,7 @@
</p>
</div>
<div class="modal-footer">
<a :href="urls.fluicsInfo" target="blank" class="btn btn-primary" >
<a :href="urls.fluicsInfo" target="blank" class="btn btn-primary" data-e2e="e2e-BT-printLabelMD-visitBlog" >
{{ i18n.t('repository_row.modal_print_label.no_printers.visit_blog') }}
</a>
</div>

View file

@ -3,7 +3,7 @@
class="flex items-center mr-3 flex-nowrap relative"
v-click-outside="closeSearchInputs"
>
<button :class="{hidden: searchOpened}" ref='searchInputBtn' class="btn btn-light btn-black icon-btn" :title="i18n.t('repositories.show.search_button_tooltip')" @click="openSearch">
<button :class="{hidden: searchOpened}" ref='searchInputBtn' class="btn btn-light btn-black icon-btn" data-e2e="e2e-BT-invInventoryRT-search" :title="i18n.t('repositories.show.search_button_tooltip')" @click="openSearch">
<i class="sn-icon sn-icon-search"></i>
</button>
<div v-if="searchOpened || barcodeSearchOpened" class="w-52 flex">
@ -28,7 +28,7 @@
<i class='sn-icon sn-icon-barcode barcode-scanner !mr-2.5'></i>
</div>
</div>
<button :class="{hidden: barcodeSearchOpened}" ref='barcodeSearchInputBtn' class="btn btn-light btn-black icon-btn ml-2" :title="i18n.t('repositories.show.ean_search_button_tooltip')" @click="openBarcodeSearch">
<button :class="{hidden: barcodeSearchOpened}" ref='barcodeSearchInputBtn' class="btn btn-light btn-black icon-btn ml-2" data-e2e="e2e-BT-invInventoryRT-barcode" :title="i18n.t('repositories.show.ean_search_button_tooltip')" @click="openBarcodeSearch">
<i class='sn-icon sn-icon-barcode barcode-scanner'></i>
</button>
</div>

View file

@ -130,6 +130,7 @@ module Toolbars
def export_actions
{
name: 'export_group',
type: :group,
group_label: I18n.t('repositories.exports.export'),
actions: [export_items_action, export_consumption_action].compact

View file

@ -3,13 +3,13 @@
<div class="modal-dialog" role="document" data-e2e="e2e-MD-invNewInventory">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close" data-e2e="e2e-BT-invNewInventory-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-invNewInventoryMD-close"><i class="sn-icon sn-icon-close"></i></button>
<h3 class="modal-title" id="create-repo-modal-label">
<%= t("repositories.index.modal_create.title") %>
</h3>
</div>
<div class="modal-body">
<div class="form-group sci-input-container" data-e2e="e2e-IF-invNewInventory-input">
<div class="form-group sci-input-container">
<label><%= t("repositories.index.modal_create.name_label") %> </label>
<%= f.text_field :name,
autofocus: true,
@ -18,8 +18,8 @@
</div>
</div>
<div class="modal-footer">
<button type="button" data-e2e="e2e-BT-invNewInventory-cancel" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<%= f.submit t("repositories.index.modal_create.submit"), class: "btn btn-success", 'data-e2e':"e2e-BT-invNewInventory-create" %>
<button type="button" data-e2e="e2e-BT-invNewInventoryMD-cancel" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
<%= f.submit t("repositories.index.modal_create.submit"), class: "btn btn-success", 'data-e2e':"e2e-BT-invNewInventoryMD-create" %>
</div>
</div>
</div>

View file

@ -1,16 +1,16 @@
<div class="modal fade" id="deleteRepositoryRecord" tabindex="-1" role="dialog" aria-labelledby="deleteRepositoryRecordLabel">
<div class="modal-dialog" role="document">
<div class="modal-dialog" role="document" data-e2e="e2e-MD-invInventoryDeleteAT">
<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>
<button type="button" data-e2e="e2e-BT-invInventoryDeleteMD-close" class="close" data-dismiss="modal" aria-label="Close"><i class="sn-icon sn-icon-close"></i></button>
<h4 class="modal-title"><%= t("repositories.modal_delete_record.title") %></h4>
</div>
<div class="modal-body">
<%= t("repositories.modal_delete_record.notice") %>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t("general.cancel")%></button>
<button type="button" class="btn btn-danger delete-record-modal-button" data-dismiss="modal">
<button type="button" data-e2e="e2e-BT-invInventoryDeleteMD-cancel" class="btn btn-secondary" data-dismiss="modal"><%= t("general.cancel")%></button>
<button type="button" data-e2e="e2e-BT-invInventoryDeleteMD-delete" class="btn btn-danger delete-record-modal-button" data-dismiss="modal">
<%= t("repositories.modal_delete_record.delete") %>
</button>
</div>

View file

@ -6,10 +6,10 @@
<%= form_with(url: export_repository_team_path(repository),
html: { id: 'form-repository-rows-export' },
data: { remote: true }) do |f| %>
<div class="modal-dialog" role="document">
<div class="modal-dialog" role="document" data-e2e="e2e-MD-invInventoryExportAT">
<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>
<button type="button" data-e2e="e2e-BT-invInventoryExportMD-close" class="close" data-dismiss="modal" aria-label="Close"><i class="sn-icon sn-icon-close"></i></button>
<h4 class="modal-title"><%=t 'zip_export.repositories_modal_label' %></h4>
</div>
<div class="modal-body">
@ -18,7 +18,7 @@
<div><%=t 'zip_export.repository_footer_html' %></div>
</div>
<div class="modal-footer">
<button type='button' class='btn btn-secondary' data-dismiss='modal' id='close-modal-export-repository-rows'><%= t('general.cancel')%></button>
<button type='button' data-e2e='e2e-BT-invInventoryExportMD-cancel' class='btn btn-secondary' data-dismiss='modal' id='close-modal-export-repository-rows'><%= t('general.cancel')%></button>
<%= f.submit t('my_modules.repository.export'), id: "export-repository-rows", class: "btn btn-success" %>
</div>
</div>

View file

@ -1,8 +1,8 @@
<div class="modal fade" id="modal-info-repository-row" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document">
<div class="modal-content" data-e2e="e2e-MD-invInventoryItem">
<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" data-e2e="e2e-BT-invInventoryItem-cancel"></i></button>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="sn-icon sn-icon-close"></i></button>
<h4 class="modal-title">
<%= t('repository_row.modal_info.head_title', repository_row: @repository_row.name) %>
<%= @repository_row.archived? ? I18n.t('atwho.res.archived') : '' %>
@ -138,8 +138,8 @@
</button>
</span>
<% else %>
<button data-e2e="e2e-BT-invInventoryItem-close" type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('general.close')%></button>
<button data-e2e="e2e-BT-invInventoryItem-print" type="button" class="btn btn-primary print-label-button" data-rows="[<%= @repository_row.id %>]"><%= t('repository_row.modal_print_label.print_label') %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('general.close')%></button>
<button type="button" class="btn btn-primary print-label-button" data-rows="[<%= @repository_row.id %>]"><%= t('repository_row.modal_print_label.print_label') %></button>
<% end %>
</div>
</div>

View file

@ -27,7 +27,7 @@
data-snapshot-provisioning="<%= @snapshot_provisioning %>"
data-status-url="<%= repository_status_path(@repository) %>">
<thead>
<tr class="repository-table-head-<%= repository.id %> hidden" data-e2e="e2e-RT-invInventory-tableHeadRow-<%= repository.id %>">
<tr class="repository-table-head-<%= repository.id %> hidden" data-e2e="e2e-TR-invInventory-headRow-<%= repository.id %>">
<th id="checkbox" data-unmanageable="true">
<div class="sci-checkbox-container">
<input name="select_all" value="1" type="checkbox" class="sci-checkbox">

View file

@ -88,7 +88,7 @@
<button class="btn btn-light btn-black icon-btn manage-repo-column-index" title="<%= t("libraries.manange_modal_column.button_tooltip") %>"
data-modal-url="<%= repository_repository_columns_path(@repository) %>"
data-action="new">
<span class="sn-icon sn-icon sn-icon-reports">
<span class="sn-icon sn-icon sn-icon-reports" data-e2e="e2e-BT-invInventoryRT-manageColumns">
</button>
</div>
</div>

View file

@ -1,16 +1,16 @@
<div class="dropdown view-switch" >
<div href="#" class="btn btn-light btn-black view-switch-button prevent-shrink <%= "disabled" if disabled %>" id="viewSwitchButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span class="state-view-switch-btn-name"><%= archived ? t('toolbar.archived_state') : t('toolbar.active_state') %></span>
<span class="state-view-switch-btn-name" data-e2e="e2e-TX-invInventoryViewSwitchRT-selected"><%= archived ? t('toolbar.archived_state') : t('toolbar.active_state') %></span>
<span class="sn-icon sn-icon-down"></span>
</div>
<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="viewSwitchButton">
<% if switchable %>
<li class="view-switch-active">
<li class="view-switch-active" data-e2e="e2e-BT-invInventoryViewSwitchRT-active">
<%= link_to active_url, class: "#{ 'form-dropdown-state-item prevent-shrink' unless archived }" do %>
<%= t('toolbar.active_state') %>
<% end %>
</li>
<li class="view-switch-archived">
<li class="view-switch-archived" data-e2e="e2e-BT-invInventoryViewSwitchRT-archived">
<%= link_to archived_url, class: "#{ 'form-dropdown-state-item prevent-shrink' if archived }" do %>
<%= t('toolbar.archived_state') %>
<% end %>