cleanup

phac-nml · Jun 6, 2024 · 946f63f · 946f63f
1 parent 9a9bebb
commit 946f63f
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git 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/...s/samples/_delete_samples_dialog.html.erb → .../_delete_multiple_samples_dialog.html.erb b/...s/samples/_delete_samples_dialog.html.erb → .../_delete_multiple_samples_dialog.html.erb
@@ -31,7 +31,6 @@
                         } %>
           </div>
         </div>
-
       <% end %>
     </div>
   <% end %>

diff --git 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
@@ -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
@@ -1298,7 +1298,7 @@ en:
         description: 'Paste a list of <kbd>,</kbd> 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
@@ -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
@@ -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')