From 946f63feb0e9a2e624c6c2ea12894e09db709c41 Mon Sep 17 00:00:00 2001 From: Chris Huynh Date: Thu, 6 Jun 2024 11:11:27 -0500 Subject: [PATCH] cleanup --- app/controllers/projects/samples_controller.rb | 4 ++-- ...og.html.erb => _delete_multiple_samples_dialog.html.erb} | 1 - .../projects/samples/deletions/create.turbo_stream.erb | 2 +- .../projects/samples/destroy_multiple.turbo_stream.erb | 2 +- config/locales/en.yml | 2 +- config/routes/project.rb | 2 +- test/system/projects/samples_test.rb | 6 +++--- 7 files changed, 9 insertions(+), 10 deletions(-) rename app/views/projects/samples/{_delete_samples_dialog.html.erb => _delete_multiple_samples_dialog.html.erb} (99%) diff --git a/app/controllers/projects/samples_controller.rb b/app/controllers/projects/samples_controller.rb index 5d12323f30..e19656ef7f 100644 --- a/app/controllers/projects/samples_controller.rb +++ b/app/controllers/projects/samples_controller.rb @@ -117,7 +117,7 @@ def destroy # rubocop:disable Metrics/AbcSize,Metrics/MethodLength def new_destroy_multiple authorize! @project, to: :destroy_sample? render turbo_stream: turbo_stream.update('samples_dialog', - partial: 'delete_samples_dialog', + partial: 'delete_multiple_samples_dialog', locals: { open: true }), status: :ok @@ -157,7 +157,7 @@ def destroy_multiple # rubocop:disable Metrics/AbcSize,Metrics/MethodLength render status: :multi_status, locals: { messages: } # All samples deleted successfully else - render status: :ok, locals: { type: :success, message: t('.success'), not_deleted_samples: nil } + render status: :ok, locals: { type: :success, message: t('.success') } end end diff --git a/app/views/projects/samples/_delete_samples_dialog.html.erb b/app/views/projects/samples/_delete_multiple_samples_dialog.html.erb similarity index 99% rename from app/views/projects/samples/_delete_samples_dialog.html.erb rename to app/views/projects/samples/_delete_multiple_samples_dialog.html.erb index a089743a85..cf816690f7 100644 --- a/app/views/projects/samples/_delete_samples_dialog.html.erb +++ b/app/views/projects/samples/_delete_multiple_samples_dialog.html.erb @@ -31,7 +31,6 @@ } %> - <% end %> <% end %> diff --git a/app/views/projects/samples/deletions/create.turbo_stream.erb b/app/views/projects/samples/deletions/create.turbo_stream.erb index d7fa7725b1..2e09754a11 100644 --- a/app/views/projects/samples/deletions/create.turbo_stream.erb +++ b/app/views/projects/samples/deletions/create.turbo_stream.erb @@ -1,5 +1,5 @@ <%= turbo_stream.update "samples_dialog", - partial: "delete_samples_dialog", + partial: "delete_multiple_samples_dialog", locals: { open: false, } %> diff --git a/app/views/projects/samples/destroy_multiple.turbo_stream.erb b/app/views/projects/samples/destroy_multiple.turbo_stream.erb index d031487974..6305c9ee48 100644 --- a/app/views/projects/samples/destroy_multiple.turbo_stream.erb +++ b/app/views/projects/samples/destroy_multiple.turbo_stream.erb @@ -1,6 +1,6 @@ <%= turbo_stream.update( "samples_dialog", - partial: "delete_samples_dialog", + partial: "delete_multiple_samples_dialog", locals: { open: false, }, diff --git a/config/locales/en.yml b/config/locales/en.yml index 439d810606..6c4eb49407 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1298,7 +1298,7 @@ en: description: 'Paste a list of , seperated sample names or identifiers' apply: Apply filter remove_tag: Remove - delete_samples_dialog: + delete_multiple_samples_dialog: description: "Samples selected for deletion:" id: ID name: Name diff --git a/config/routes/project.rb b/config/routes/project.rb index 845d81e5f1..7679c11139 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -42,7 +42,6 @@ resource :clone, only: %i[create new] resource :transfer, only: %i[create new] resource :file_import, module: :metadata, only: %i[create new] - resource :deletion, only: %i[new destroy] end end collection do @@ -70,6 +69,7 @@ end end end + get :view_history_version end diff --git a/test/system/projects/samples_test.rb b/test/system/projects/samples_test.rb index 13a5cacc71..5b8ffefb04 100644 --- a/test/system/projects/samples_test.rb +++ b/test/system/projects/samples_test.rb @@ -2039,12 +2039,12 @@ def retrieve_puids end click_link I18n.t('projects.samples.index.delete_samples_button'), match: :first within('span[data-controller-connected="true"] dialog') do - assert_text I18n.t('projects.samples.delete_samples_dialog.title') - assert_text I18n.t('projects.samples.delete_samples_dialog.description') + assert_text I18n.t('projects.samples.delete_multiple_samples_dialog.title') + assert_text I18n.t('projects.samples.delete_multiple_samples_dialog.description') assert_text @sample1.name assert_text @sample2.name assert_text @sample3.name - click_on I18n.t('projects.samples.delete_samples_dialog.submit_button') + click_on I18n.t('projects.samples.delete_multiple_samples_dialog.submit_button') end assert_text I18n.t('projects.samples.destroy_multiple.success')