From f57a2d550ac39a5a8e294a94d025855fea8cdf84 Mon Sep 17 00:00:00 2001 From: mvrazic <144342580+mvrazic@users.noreply.github.com> Date: Mon, 15 Jan 2024 16:59:05 +0100 Subject: [PATCH] e2e - added new tags at inventories section [SCI-9919] (#6858) --- app/javascript/vue/components/action_toolbar.vue | 8 ++++---- app/javascript/vue/repository_filter/container.vue | 6 +++--- app/javascript/vue/repository_filter/filter.vue | 4 ++-- .../repository_filter/filters/repositoryAssetValue.vue | 2 ++ .../filters/repositoryChecklistValue.vue | 2 ++ .../filters/repositoryDateRangeValue.vue | 5 +++-- .../filters/repositoryDateTimeRangeValue.vue | 5 +++-- .../repository_filter/filters/repositoryDateTimeValue.vue | 5 +++-- .../vue/repository_filter/filters/repositoryDateValue.vue | 5 +++-- .../vue/repository_filter/filters/repositoryListValue.vue | 2 ++ .../repository_filter/filters/repositoryMyModuleValue.vue | 2 ++ .../filters/repositoryNonEmptyTextValue.vue | 2 ++ .../repository_filter/filters/repositoryNumberValue.vue | 4 ++++ .../repository_filter/filters/repositoryStatusValue.vue | 2 ++ .../repository_filter/filters/repositoryStockValue.vue | 3 +++ .../vue/repository_filter/filters/repositoryTextValue.vue | 2 ++ .../filters/repositoryTimeRangeValue.vue | 5 +++-- .../vue/repository_filter/filters/repositoryTimeValue.vue | 5 +++-- .../vue/repository_filter/filters/repositoryUserValue.vue | 2 ++ app/views/repositories/_delete_repository_modal.html.erb | 6 +++--- app/views/repositories/show.html.erb | 2 +- app/views/shared/_inline_editing.html.erb | 1 - app/views/shared/_state_view_switch.html.erb | 6 +++--- 23 files changed, 57 insertions(+), 29 deletions(-) diff --git a/app/javascript/vue/components/action_toolbar.vue b/app/javascript/vue/components/action_toolbar.vue index 27c21148c..e1cec1ea9 100644 --- a/app/javascript/vue/components/action_toolbar.vue +++ b/app/javascript/vue/components/action_toolbar.vue @@ -2,7 +2,8 @@
+ :style="`width: ${width}px; bottom: ${bottomOffset}px; transform: translateX(${leftOffset}px)`" + :data-e2e="`e2e-CO-actionToolbar`">
@@ -12,7 +13,7 @@
-
-
@@ -45,10 +45,10 @@ />
- - diff --git a/app/javascript/vue/repository_filter/filter.vue b/app/javascript/vue/repository_filter/filter.vue index e56ac83eb..90d894cbc 100644 --- a/app/javascript/vue/repository_filter/filter.vue +++ b/app/javascript/vue/repository_filter/filter.vue @@ -1,5 +1,5 @@ diff --git a/app/javascript/vue/repository_filter/filters/repositoryDateTimeRangeValue.vue b/app/javascript/vue/repository_filter/filters/repositoryDateTimeRangeValue.vue index aef15de8a..e66a003cd 100644 --- a/app/javascript/vue/repository_filter/filters/repositoryDateTimeRangeValue.vue +++ b/app/javascript/vue/repository_filter/filters/repositoryDateTimeRangeValue.vue @@ -6,15 +6,16 @@ :options="operators" :selectorId="`OperatorSelector${filter.id}`" :selectedValue="operator" + :data-e2e="`e2e-DD-invInventoryFilterCO-option${this.filter.column.id}`" @dropdown:changed="updateOperator" />
- +
- +
diff --git a/app/javascript/vue/repository_filter/filters/repositoryDateTimeValue.vue b/app/javascript/vue/repository_filter/filters/repositoryDateTimeValue.vue index bfe01d201..941779be5 100644 --- a/app/javascript/vue/repository_filter/filters/repositoryDateTimeValue.vue +++ b/app/javascript/vue/repository_filter/filters/repositoryDateTimeValue.vue @@ -6,16 +6,17 @@ :options="operators" :selectorId="`OperatorSelector${filter.id}`" :selectedValue="operator" + :data-e2e="`e2e-DD-invInventoryFilterCO-option${this.filter.column.id}`" @dropdown:changed="updateOperator" /> diff --git a/app/javascript/vue/repository_filter/filters/repositoryDateValue.vue b/app/javascript/vue/repository_filter/filters/repositoryDateValue.vue index 19b663936..8c7b90322 100644 --- a/app/javascript/vue/repository_filter/filters/repositoryDateValue.vue +++ b/app/javascript/vue/repository_filter/filters/repositoryDateValue.vue @@ -6,15 +6,16 @@ :options="operators" :selectorId="`OperatorSelector${filter.id}`" :selectedValue="operator" + :data-e2e="`e2e-DD-invInventoryFilterCO-option${this.filter.column.id}`" @dropdown:changed="updateOperator" /> diff --git a/app/javascript/vue/repository_filter/filters/repositoryListValue.vue b/app/javascript/vue/repository_filter/filters/repositoryListValue.vue index 244a9ca00..35d786727 100644 --- a/app/javascript/vue/repository_filter/filters/repositoryListValue.vue +++ b/app/javascript/vue/repository_filter/filters/repositoryListValue.vue @@ -6,6 +6,7 @@ :options="this.operators" :selectedValue="this.operator" :selectorId="`OperatorSelector${this.filter.id}`" + :data-e2e="`e2e-DD-invInventoryFilterCO-option${this.filter.column.id}`" @dropdown:changed="updateOperator" /> @@ -21,6 +22,7 @@ :dataSelectMultipleAllSelected="this.i18n.t('repositories.show.repository_filter.filters.types.RepositoryListValue.all_selected')" :selectorId="`DropdownSelector${this.filter.id}`" :placeholder="this.i18n.t('repositories.show.repository_filter.filters.types.RepositoryListValue.select_placeholder', {name: this.filter.column.name})" + :data-e2e="`e2e-DC-invInventoryFilterCO-input${this.filter.column.id}`" @dropdown:changed="updateValue" /> diff --git a/app/javascript/vue/repository_filter/filters/repositoryMyModuleValue.vue b/app/javascript/vue/repository_filter/filters/repositoryMyModuleValue.vue index a10dc0c29..92f5ef0af 100644 --- a/app/javascript/vue/repository_filter/filters/repositoryMyModuleValue.vue +++ b/app/javascript/vue/repository_filter/filters/repositoryMyModuleValue.vue @@ -6,6 +6,7 @@ :options="this.operators" :selectedValue="this.operator" :selectorId="`OperatorSelector${this.filter.id}`" + :data-e2e="`e2e-DD-invInventoryFilterCO-option${this.filter.column.id}`" @dropdown:changed="updateOperator" /> @@ -23,6 +24,7 @@ :dataSelectMultipleAllSelected="this.i18n.t('repositories.show.repository_filter.filters.types.RepositoryMyModuleValue.all_selected')" :selectorId="`MyModulesSelector${this.filter.id}`" :placeholder="this.i18n.t('repositories.show.repository_filter.filters.types.RepositoryMyModuleValue.select_placeholder')" + :data-e2e="`e2e-DC-invInventoryFilterCO-input${this.filter.column.id}`" @dropdown:changed="updateValue" /> diff --git a/app/javascript/vue/repository_filter/filters/repositoryNonEmptyTextValue.vue b/app/javascript/vue/repository_filter/filters/repositoryNonEmptyTextValue.vue index 607a52375..e0e87f93c 100644 --- a/app/javascript/vue/repository_filter/filters/repositoryNonEmptyTextValue.vue +++ b/app/javascript/vue/repository_filter/filters/repositoryNonEmptyTextValue.vue @@ -6,6 +6,7 @@ :options="this.operators" :selectedValue="this.operator" :selectorId="`OperatorSelector${this.filter.id}`" + :data-e2e="`e2e-DD-invInventoryFilterCO-option${this.filter.column.id}`" @dropdown:changed="updateOperator" /> @@ -15,6 +16,7 @@ type="text" name="value" v-model="value" + :data-e2e="`e2e-IF-invInventoryFilterCO-input${this.filter.column.id}`" :placeholder= "this.i18n.t('repositories.show.repository_filter.filters.types.RepositoryNonEmptyTextValue.input_placeholder', {name: this.filter.column.name})" /> diff --git a/app/javascript/vue/repository_filter/filters/repositoryNumberValue.vue b/app/javascript/vue/repository_filter/filters/repositoryNumberValue.vue index e3f3e43ac..8b6dd6cc0 100644 --- a/app/javascript/vue/repository_filter/filters/repositoryNumberValue.vue +++ b/app/javascript/vue/repository_filter/filters/repositoryNumberValue.vue @@ -6,6 +6,7 @@ :options="this.operators" :selectedValue="this.operator" :selectorId="`OperatorSelector${this.filter.id}`" + :data-e2e="`e2e-DD-invInventoryFilterCO-option${this.filter.column.id}`" @dropdown:changed="updateOperator" /> @@ -15,6 +16,7 @@ type="text" name="value" v-model="value" + :data-e2e="`e2e-IF-invInventoryFilterCO-input${this.filter.column.id}`" :placeholder= "this.i18n.t('repositories.show.repository_filter.filters.types.RepositoryNumberValue.input_placeholder',{name: this.filter.column.name})" /> @@ -25,6 +27,7 @@ type="text" name="from" v-model="from" + :data-e2e="`e2e-IF-invInventoryFilterCO-inputFrom${this.filter.column.id}`" :placeholder= "this.i18n.t('repositories.show.repository_filter.filters.types.RepositoryNumberValue.from_placeholder')" /> @@ -35,6 +38,7 @@ type="text" name="to" v-model="to" + :data-e2e="`e2e-IF-invInventoryFilterCO-inputTo${this.filter.column.id}`" :placeholder= "this.i18n.t('repositories.show.repository_filter.filters.types.RepositoryNumberValue.to_placeholder')" /> diff --git a/app/javascript/vue/repository_filter/filters/repositoryStatusValue.vue b/app/javascript/vue/repository_filter/filters/repositoryStatusValue.vue index ede33b0d8..b03c51938 100644 --- a/app/javascript/vue/repository_filter/filters/repositoryStatusValue.vue +++ b/app/javascript/vue/repository_filter/filters/repositoryStatusValue.vue @@ -6,6 +6,7 @@ :options="this.operators" :selectedValue="this.operator" :selectorId="`OperatorSelector${this.filter.id}`" + :data-e2e="`e2e-DD-invInventoryFilterCO-option${this.filter.column.id}`" @dropdown:changed="updateOperator" /> @@ -21,6 +22,7 @@ :dataSelectMultipleAllSelected="this.i18n.t('repositories.show.repository_filter.filters.types.RepositoryStatusValue.all_selected')" :selectorId="`DropdownSelector${this.filter.id}`" :placeholder="this.i18n.t('repositories.show.repository_filter.filters.types.RepositoryStatusValue.select_placeholder', {name: this.filter.column.name})" + :data-e2e="`e2e-DC-invInventoryFilterCO-input${this.filter.column.id}`" @dropdown:changed="updateValue" /> diff --git a/app/javascript/vue/repository_filter/filters/repositoryStockValue.vue b/app/javascript/vue/repository_filter/filters/repositoryStockValue.vue index 594ba15d7..7a468cbe0 100644 --- a/app/javascript/vue/repository_filter/filters/repositoryStockValue.vue +++ b/app/javascript/vue/repository_filter/filters/repositoryStockValue.vue @@ -6,6 +6,7 @@ :options="this.operators" :selectedValue="this.operator" :selectorId="`OperatorSelector${this.filter.id}`" + :data-e2e="`e2e-DD-invInventoryFilterCO-option${this.filter.column.id}`" @dropdown:changed="updateOperator" /> @@ -15,6 +16,7 @@ type="text" name="value" v-model="value" + :data-e2e="`e2e-IF-invInventoryFilterCO-input${this.filter.column.id}`" :placeholder= "this.i18n.t('repositories.show.repository_filter.filters.types.RepositoryStockValue.input_placeholder')" /> @@ -46,6 +48,7 @@ :selectedValue="this.stock_unit" :options="this.prepareUnitOptions()" :selectorId="`StockUnitSelector${this.filter.id}`" + :data-e2e="`e2e-DD-invInventoryFilterCO-input${this.filter.column.id}`" @dropdown:changed="updateStockUnit" /> diff --git a/app/javascript/vue/repository_filter/filters/repositoryTextValue.vue b/app/javascript/vue/repository_filter/filters/repositoryTextValue.vue index 5ecfd6aaa..65892095d 100644 --- a/app/javascript/vue/repository_filter/filters/repositoryTextValue.vue +++ b/app/javascript/vue/repository_filter/filters/repositoryTextValue.vue @@ -6,6 +6,7 @@ :options="this.operators" :selectedValue="this.operator" :selectorId="`OperatorSelector${this.filter.id}`" + :data-e2e="`e2e-DD-invInventoryFilterCO-option${this.filter.column.id}`" @dropdown:changed="updateOperator" /> @@ -15,6 +16,7 @@ type="text" name="value" v-model="value" + :data-e2e="`e2e-IF-invInventoryFilterCO-input${this.filter.column.id}`" :placeholder= "this.i18n.t('repositories.show.repository_filter.filters.types.RepositoryTextValue.input_placeholder',{name: this.filter.column.name})" /> diff --git a/app/javascript/vue/repository_filter/filters/repositoryTimeRangeValue.vue b/app/javascript/vue/repository_filter/filters/repositoryTimeRangeValue.vue index 022ac655e..a094cbf70 100644 --- a/app/javascript/vue/repository_filter/filters/repositoryTimeRangeValue.vue +++ b/app/javascript/vue/repository_filter/filters/repositoryTimeRangeValue.vue @@ -6,14 +6,15 @@ :options="operators" :selectorId="`OperatorSelector${filter.id}`" :selectedValue="operator" + :data-e2e="`e2e-DD-invInventoryFilterCO-option${this.filter.column.id}`" @dropdown:changed="updateOperator" />
- +
- +
diff --git a/app/javascript/vue/repository_filter/filters/repositoryTimeValue.vue b/app/javascript/vue/repository_filter/filters/repositoryTimeValue.vue index 8e502c96c..9841e3d7a 100644 --- a/app/javascript/vue/repository_filter/filters/repositoryTimeValue.vue +++ b/app/javascript/vue/repository_filter/filters/repositoryTimeValue.vue @@ -6,15 +6,16 @@ :options="operators" :selectorId="`OperatorSelector${filter.id}`" :selectedValue="operator" + :data-e2e="`e2e-DD-invInventoryFilterCO-option${this.filter.column.id}`" @dropdown:changed="updateOperator" /> diff --git a/app/javascript/vue/repository_filter/filters/repositoryUserValue.vue b/app/javascript/vue/repository_filter/filters/repositoryUserValue.vue index a88e4da3f..ca45e2450 100644 --- a/app/javascript/vue/repository_filter/filters/repositoryUserValue.vue +++ b/app/javascript/vue/repository_filter/filters/repositoryUserValue.vue @@ -6,6 +6,7 @@ :options="this.operators" :selectedValue="this.operator" :selectorId="`OperatorSelector${this.filter.id}`" + :data-e2e="`e2e-DD-invInventoryFilterCO-option${this.filter.column.id}`" @dropdown:changed="updateOperator" /> @@ -23,6 +24,7 @@ :dataSelectMultipleAllSelected="this.i18n.t('repositories.show.repository_filter.filters.types.RepositoryUserValue.all_selected')" :selectorId="`UserSelector${this.filter.id}`" :placeholder="this.i18n.t('repositories.show.repository_filter.filters.types.RepositoryUserValue.select_placeholder')" + :data-e2e="`e2e-DC-invInventoryFilterCO-input${this.filter.column.id}`" @dropdown:changed="updateValue" /> diff --git a/app/views/repositories/_delete_repository_modal.html.erb b/app/views/repositories/_delete_repository_modal.html.erb index 92d062dea..25773af1c 100644 --- a/app/views/repositories/_delete_repository_modal.html.erb +++ b/app/views/repositories/_delete_repository_modal.html.erb @@ -1,8 +1,8 @@