diff --git a/ee/app/views/admin/application_settings/_elasticsearch_form.html.haml b/ee/app/views/admin/application_settings/_elasticsearch_form.html.haml index f509398be6b8fb9253dd1127764dbbad3d471a67..08acdf18b4fdb2d4c730e20d135380077a650deb 100644 --- a/ee/app/views/admin/application_settings/_elasticsearch_form.html.haml +++ b/ee/app/views/admin/application_settings/_elasticsearch_form.html.haml @@ -240,7 +240,7 @@ - processed_documents = subtask.documents_count_target %p= _('Expected documents: %{expected_documents}') % { expected_documents: expected_documents } - if processed_documents && expected_documents - - percentage = ((processed_documents / expected_documents.to_f) * 100).round(2) + - percentage = expected_documents > 0 ? ((processed_documents / expected_documents.to_f) * 100).round(2) : 100 %p= _('Documents reindexed: %{processed_documents} (%{percentage}%%)') % { processed_documents: processed_documents, percentage: percentage } .progress .progress-bar{ "aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => percentage, :role => "progressbar", :style => "width: #{percentage}%" } diff --git a/ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb b/ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb index f0938e7c02b1c8fdd99b9eee0aa3e492c4c68f84..f6dc61f3488985226ee5c50718b5ffe989ab0335 100644 --- a/ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb +++ b/ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb @@ -177,6 +177,18 @@ expect(rendered).not_to include("Documents reindexed:") end end + + context 'when there are 0 documents expected' do + let_it_be(:task) { create(:elastic_reindexing_task, state: :reindexing) } + let_it_be(:subtask) { create(:elastic_reindexing_subtask, elastic_reindexing_task: task, documents_count_target: 0, documents_count: 0) } + + it 'renders 100% completed progress' do + render + + expect(rendered).to include('Expected documents: 0') + expect(rendered).to include('Documents reindexed: 0 (100%)') + end + end end context 'when there are elasticsearch indexed namespaces' do