From c112e9fe631dcec25ab54931aae9c42ad9252b57 Mon Sep 17 00:00:00 2001 From: Kat Date: Fri, 7 Jul 2023 08:51:09 +0100 Subject: [PATCH] Update success banner for deleting duplicates --- app/controllers/delete_logs_controller.rb | 8 ++++++-- config/locales/en.yml | 3 +++ spec/features/lettings_log_spec.rb | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/controllers/delete_logs_controller.rb b/app/controllers/delete_logs_controller.rb index 0b4dc3ba5..75828a2a6 100644 --- a/app/controllers/delete_logs_controller.rb +++ b/app/controllers/delete_logs_controller.rb @@ -26,8 +26,12 @@ class DeleteLogsController < ApplicationController def discard_lettings_logs logs = LettingsLog.find(params.require(:ids)) discard logs - - redirect_to lettings_logs_path, notice: I18n.t("notification.logs_deleted", count: logs.count) + if request.referer&.include?("delete-duplicates") + log_ids = logs.map { |log| "Log #{log.id}" }.join(", ") + redirect_to lettings_logs_path, notice: I18n.t("notification.duplicate_logs_deleted", count: logs.count, log_ids:) + else + redirect_to lettings_logs_path, notice: I18n.t("notification.logs_deleted", count: logs.count) + end end def delete_sales_logs diff --git a/config/locales/en.yml b/config/locales/en.yml index 1365fda3d..60e56e026 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -182,6 +182,9 @@ en: logs_deleted: one: "%{count} log has been deleted" other: "%{count} logs have been deleted" + duplicate_logs_deleted: + one: "%{log_ids} has been deleted" + other: "%{log_ids} have been deleted" validations: organisation: diff --git a/spec/features/lettings_log_spec.rb b/spec/features/lettings_log_spec.rb index da0520b98..bee9bea9c 100644 --- a/spec/features/lettings_log_spec.rb +++ b/spec/features/lettings_log_spec.rb @@ -404,6 +404,8 @@ RSpec.describe "Lettings Log Features" do click_button "Delete this log" duplicate_log.reload expect(duplicate_log.status).to eq("deleted") + expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success") + expect(page).to have_content("Log #{duplicate_log.id} has been deleted") end end end