From 528d4119109d02a68811f2bcd14de7a341ce77eb Mon Sep 17 00:00:00 2001 From: Alex Kriuchykhin Date: Fri, 15 Dec 2023 16:33:13 +0100 Subject: [PATCH] e2e - modified and added new tags at inventories section [SCI-9813] (#6741) (#6832) Co-authored-by: Martin Artnik Co-authored-by: mvrazic <144342580+mvrazic@users.noreply.github.com> --- app/assets/javascripts/repositories/index.js | 2 +- .../javascripts/repositories/renderers/edit_renderers.js | 3 ++- .../javascripts/repositories/renderers/new_renderers.js | 3 ++- .../javascripts/repositories/repository_datatable.js | 2 +- app/helpers/repositories_datatable_helper.rb | 2 +- app/helpers/repository_datatable_helper.rb | 2 +- app/javascript/vue/components/action_toolbar.vue | 3 +++ .../vue/repository_item_sidebar/RepositoryItemSidebar.vue | 2 +- app/javascript/vue/repository_print_modal/container.vue | 6 +++--- app/javascript/vue/repository_search/container.vue | 4 ++-- app/services/toolbars/repository_rows_service.rb | 1 + app/views/repositories/_create_repository_modal.html.erb | 8 ++++---- app/views/repositories/_delete_record_modal.html.erb | 8 ++++---- .../repositories/_export_repository_rows_modal.html.erb | 6 +++--- .../repositories/_repository_row_info_modal.html.erb | 8 ++++---- app/views/repositories/_repository_table.html.erb | 2 +- app/views/repositories/_toolbar_buttons.html.erb | 2 +- app/views/shared/_state_view_switch.html.erb | 6 +++--- 18 files changed, 38 insertions(+), 32 deletions(-) diff --git a/app/assets/javascripts/repositories/index.js b/app/assets/javascripts/repositories/index.js index 18eb46955..579ee3bb7 100644 --- a/app/assets/javascripts/repositories/index.js +++ b/app/assets/javascripts/repositories/index.js @@ -67,7 +67,7 @@ orderable: false, render: function() { return `
- +
`; } diff --git a/app/assets/javascripts/repositories/renderers/edit_renderers.js b/app/assets/javascripts/repositories/renderers/edit_renderers.js index 0f1e320ff..83c87d575 100644 --- a/app/assets/javascripts/repositories/renderers/edit_renderers.js +++ b/app/assets/javascripts/repositories/renderers/edit_renderers.js @@ -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"> `); $cell.find('input').val(text); diff --git a/app/assets/javascripts/repositories/renderers/new_renderers.js b/app/assets/javascripts/repositories/renderers/new_renderers.js index 3002856d8..73e08bdc5 100644 --- a/app/assets/javascripts/repositories/renderers/new_renderers.js +++ b/app/assets/javascripts/repositories/renderers/new_renderers.js @@ -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"> `); }; diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js index 52809fd56..4c0c954b6 100644 --- a/app/assets/javascripts/repositories/repository_datatable.js +++ b/app/assets/javascripts/repositories/repository_datatable.js @@ -671,7 +671,7 @@ var RepositoryDatatable = (function(global) { visible: true, render: function(data, type, row) { return "" + data + ''; + + "class='record-info-link' data-e2e='e2e-TL-invInventoryTR-Item-" + row.DT_RowId + "'>" + data + ''; } }, { // Added on column diff --git a/app/helpers/repositories_datatable_helper.rb b/app/helpers/repositories_datatable_helper.rb index ea05d2ff2..adf4a35d4 100644 --- a/app/helpers/repositories_datatable_helper.rb +++ b/app/helpers/repositories_datatable_helper.rb @@ -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 diff --git a/app/helpers/repository_datatable_helper.rb b/app/helpers/repository_datatable_helper.rb index 239a764b1..031ab57a0 100644 --- a/app/helpers/repository_datatable_helper.rb +++ b/app/helpers/repository_datatable_helper.rb @@ -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 diff --git a/app/javascript/vue/components/action_toolbar.vue b/app/javascript/vue/components/action_toolbar.vue index aa514b51a..9b3de995d 100644 --- a/app/javascript/vue/components/action_toolbar.vue +++ b/app/javascript/vue/components/action_toolbar.vue @@ -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);"> {{ groupAction.label }} @@ -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);"> {{ action.group_label }} @@ -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)"> {{ action.label }} diff --git a/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue b/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue index ba3d9c7ca..6fa3c3884 100644 --- a/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue +++ b/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue @@ -233,7 +233,7 @@ :class="{ 'pb-6': customColumns?.length }">
- diff --git a/app/javascript/vue/repository_print_modal/container.vue b/app/javascript/vue/repository_print_modal/container.vue index cd4e110ac..8f7c2a9dd 100644 --- a/app/javascript/vue/repository_print_modal/container.vue +++ b/app/javascript/vue/repository_print_modal/container.vue @@ -1,6 +1,6 @@