From b42d06024eadf4c82f20ab895ac54e381a1c9eaa Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 20 Feb 2018 03:49:53 +0200 Subject: [PATCH 01/18] Convert spec to test #727 --- spec/factories/domain.rb | 5 --- .../admin/domains/force_delete_spec.rb | 33 ------------------- .../admin/domains/force_delete_test.rb | 32 ++++++++++++++++++ 3 files changed, 32 insertions(+), 38 deletions(-) delete mode 100644 spec/features/admin/domains/force_delete_spec.rb create mode 100644 test/integration/admin/domains/force_delete_test.rb diff --git a/spec/factories/domain.rb b/spec/factories/domain.rb index 191a8055c..fc4d3a97b 100644 --- a/spec/factories/domain.rb +++ b/spec/factories/domain.rb @@ -11,11 +11,6 @@ FactoryBot.define do domain.tech_domain_contacts << FactoryBot.build(:tech_domain_contact) end - factory :domain_without_force_delete do - force_delete_time nil - statuses [] - end - factory :domain_discarded do statuses [DomainStatus::DELETE_CANDIDATE] end diff --git a/spec/features/admin/domains/force_delete_spec.rb b/spec/features/admin/domains/force_delete_spec.rb deleted file mode 100644 index 1d3b926a6..000000000 --- a/spec/features/admin/domains/force_delete_spec.rb +++ /dev/null @@ -1,33 +0,0 @@ -require 'rails_helper' - -RSpec.feature 'Force delete' do - context 'when domain has no force delete procedure' do - given!(:domain) { create(:domain_without_force_delete) } - - scenario 'schedule' do - sign_in_to_admin_area - - visit edit_admin_domain_url(domain) - click_link_or_button 'Force delete domain' - - expect(page).to have_text('Force delete procedure has been scheduled') - end - end - - context 'when domain has force delete procedure' do - given!(:domain) { create(:domain_without_force_delete) } - - background do - domain.schedule_force_delete - end - - scenario 'cancel' do - sign_in_to_admin_area - - visit edit_admin_domain_url(domain) - click_link_or_button 'Cancel force delete' - - expect(page).to have_text('Force delete procedure has been cancelled') - end - end -end diff --git a/test/integration/admin/domains/force_delete_test.rb b/test/integration/admin/domains/force_delete_test.rb new file mode 100644 index 000000000..1459ea0df --- /dev/null +++ b/test/integration/admin/domains/force_delete_test.rb @@ -0,0 +1,32 @@ +require 'test_helper' + +class AdminAreaDomainForceDeleteTest < ActionDispatch::IntegrationTest + def setup + login_as users(:admin) + @domain = domains(:shop) + end + + def test_schedules_domain_force_delete + refute @domain.force_delete_scheduled? + + visit edit_admin_domain_url(@domain) + click_link_or_button 'Force delete domain' + @domain.reload + + assert @domain.force_delete_scheduled? + assert_equal 1, ActionMailer::Base.deliveries.size + assert_text 'Force delete procedure has been scheduled' + end + + def test_cancels_scheduled_domain_force_delete + @domain.update_attribute(:statuses, [DomainStatus::FORCE_DELETE]) + assert @domain.force_delete_scheduled? + + visit edit_admin_domain_url(@domain) + click_link_or_button 'Cancel force delete' + @domain.reload + + refute @domain.force_delete_scheduled? + assert_text 'Force delete procedure has been cancelled' + end +end From 198a19e4416f9ae743f35a4bfe9b7641fae86c77 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 24 Feb 2018 10:34:39 +0200 Subject: [PATCH 02/18] Fix test #727 --- test/integration/admin/domains/force_delete_test.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/admin/domains/force_delete_test.rb b/test/integration/admin/domains/force_delete_test.rb index 1459ea0df..179acd3cb 100644 --- a/test/integration/admin/domains/force_delete_test.rb +++ b/test/integration/admin/domains/force_delete_test.rb @@ -4,6 +4,7 @@ class AdminAreaDomainForceDeleteTest < ActionDispatch::IntegrationTest def setup login_as users(:admin) @domain = domains(:shop) + ActionMailer::Base.deliveries.clear end def test_schedules_domain_force_delete From ad75564e97445f5f63c32d46437d8dcfa0e87e02 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 24 Feb 2018 12:00:59 +0200 Subject: [PATCH 03/18] Use `_url` helper instead of `_path` #727 --- app/controllers/admin/domains_controller.rb | 4 ++-- test/integration/admin/domains/force_delete_test.rb | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb index 3a5005d32..fe183f15f 100644 --- a/app/controllers/admin/domains_controller.rb +++ b/app/controllers/admin/domains_controller.rb @@ -71,7 +71,7 @@ module Admin DomainDeleteForcedEmailJob.enqueue(@domain.id, params[:template_name]) end - redirect_to edit_admin_domain_path(@domain), notice: t('.scheduled') + redirect_to edit_admin_domain_url(@domain), notice: t('.scheduled') end def cancel_force_delete @@ -81,7 +81,7 @@ module Admin flash.now[:alert] = I18n.t('failed_to_update_domain') end - redirect_to edit_admin_domain_path(@domain) + redirect_to edit_admin_domain_url(@domain) end def versions diff --git a/test/integration/admin/domains/force_delete_test.rb b/test/integration/admin/domains/force_delete_test.rb index 179acd3cb..150b98d1c 100644 --- a/test/integration/admin/domains/force_delete_test.rb +++ b/test/integration/admin/domains/force_delete_test.rb @@ -16,6 +16,7 @@ class AdminAreaDomainForceDeleteTest < ActionDispatch::IntegrationTest assert @domain.force_delete_scheduled? assert_equal 1, ActionMailer::Base.deliveries.size + assert_current_path edit_admin_domain_path(@domain) assert_text 'Force delete procedure has been scheduled' end @@ -28,6 +29,7 @@ class AdminAreaDomainForceDeleteTest < ActionDispatch::IntegrationTest @domain.reload refute @domain.force_delete_scheduled? + assert_current_path edit_admin_domain_path(@domain) assert_text 'Force delete procedure has been cancelled' end end From a49b592facbfe77e30d2afdbbfdb47d3693666e2 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 24 Feb 2018 12:01:22 +0200 Subject: [PATCH 04/18] Add test #727 --- test/integration/admin/domains/force_delete_test.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/integration/admin/domains/force_delete_test.rb b/test/integration/admin/domains/force_delete_test.rb index 150b98d1c..838b342b7 100644 --- a/test/integration/admin/domains/force_delete_test.rb +++ b/test/integration/admin/domains/force_delete_test.rb @@ -11,7 +11,11 @@ class AdminAreaDomainForceDeleteTest < ActionDispatch::IntegrationTest refute @domain.force_delete_scheduled? visit edit_admin_domain_url(@domain) - click_link_or_button 'Force delete domain' + + assert_difference '@domain.registrar.messages.size' do + click_link_or_button 'Force delete domain' + end + @domain.reload assert @domain.force_delete_scheduled? From b5870d3eb5dc4fb534a58b51192fc4a6c9a0a45a Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 24 Feb 2018 13:05:04 +0200 Subject: [PATCH 05/18] Allow skipping email notification on domain force delete #727 --- app/controllers/admin/domains_controller.rb | 6 +++++- .../domains/_force_delete_dialog.html.erb | 11 +++++++++++ config/locales/admin/domains.en.yml | 1 + .../admin/domains/force_delete_test.rb | 18 +++++++++++++++++- 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb index fe183f15f..11af1af02 100644 --- a/app/controllers/admin/domains_controller.rb +++ b/app/controllers/admin/domains_controller.rb @@ -68,7 +68,7 @@ module Admin @domain.transaction do @domain.schedule_force_delete @domain.registrar.messages.create!(body: I18n.t('force_delete_set_on_domain', domain_name: @domain.name)) - DomainDeleteForcedEmailJob.enqueue(@domain.id, params[:template_name]) + DomainDeleteForcedEmailJob.enqueue(@domain.id, params[:template_name]) if notify_by_email? end redirect_to edit_admin_domain_url(@domain), notice: t('.scheduled') @@ -132,5 +132,9 @@ module Admin def force_delete_templates %w(removed_company death) end + + def notify_by_email? + ActiveRecord::Type::Boolean.new.type_cast_from_user(params[:notify_by_email]) + end end end diff --git a/app/views/admin/domains/_force_delete_dialog.html.erb b/app/views/admin/domains/_force_delete_dialog.html.erb index 3452883f2..d5863e0de 100644 --- a/app/views/admin/domains/_force_delete_dialog.html.erb +++ b/app/views/admin/domains/_force_delete_dialog.html.erb @@ -12,6 +12,17 @@
<%= form_tag schedule_force_delete_admin_domain_path, method: :patch, id: 'domain-force-delete-form', class: 'form-horizontal' do %> +
+
+
+ +
+
+
+
diff --git a/config/locales/admin/domains.en.yml b/config/locales/admin/domains.en.yml index be26a5542..f6f51eaa4 100644 --- a/config/locales/admin/domains.en.yml +++ b/config/locales/admin/domains.en.yml @@ -14,6 +14,7 @@ en: force_delete_dialog: title: Force delete + notify_by_email: Notify registrant and administrative contacts by email template: Template close_btn: Close dialog submit_btn: Force delete domain diff --git a/test/integration/admin/domains/force_delete_test.rb b/test/integration/admin/domains/force_delete_test.rb index 838b342b7..b52547ece 100644 --- a/test/integration/admin/domains/force_delete_test.rb +++ b/test/integration/admin/domains/force_delete_test.rb @@ -1,6 +1,8 @@ require 'test_helper' class AdminAreaDomainForceDeleteTest < ActionDispatch::IntegrationTest + include ActionMailer::TestHelper + def setup login_as users(:admin) @domain = domains(:shop) @@ -19,11 +21,25 @@ class AdminAreaDomainForceDeleteTest < ActionDispatch::IntegrationTest @domain.reload assert @domain.force_delete_scheduled? - assert_equal 1, ActionMailer::Base.deliveries.size assert_current_path edit_admin_domain_path(@domain) assert_text 'Force delete procedure has been scheduled' end + def test_notifies_registrant_and_admin_contacts_by_email_by_default + assert_emails 1 do + visit edit_admin_domain_url(@domain) + click_link_or_button 'Force delete domain' + end + end + + def test_allows_to_skip_notifying_registrant_and_admin_contacts_by_email + assert_no_emails do + visit edit_admin_domain_url(@domain) + uncheck 'notify_by_email' + click_link_or_button 'Force delete domain' + end + end + def test_cancels_scheduled_domain_force_delete @domain.update_attribute(:statuses, [DomainStatus::FORCE_DELETE]) assert @domain.force_delete_scheduled? From 8e0226f4fbc6e2475ce65e038a5e700f16da2963 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 24 Feb 2018 13:07:11 +0200 Subject: [PATCH 06/18] Remove spec #727 --- spec/routing/admin/domains_routing_spec.rb | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 spec/routing/admin/domains_routing_spec.rb diff --git a/spec/routing/admin/domains_routing_spec.rb b/spec/routing/admin/domains_routing_spec.rb deleted file mode 100644 index ce1da8d57..000000000 --- a/spec/routing/admin/domains_routing_spec.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'rails_helper' - -RSpec.describe Admin::DomainsController do - describe 'routing' do - it 'routes to #schedule_force_delete' do - expect(patch: '/admin/domains/1/schedule_force_delete').to route_to('admin/domains#schedule_force_delete', id: '1') - end - - it 'routes to #cancel_force_delete' do - expect(patch: '/admin/domains/1/cancel_force_delete').to route_to('admin/domains#cancel_force_delete', id: '1') - end - end -end From 6a7a705fa8a13e5bf3d5d257f42e0e4aae46dcac Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 24 Feb 2018 13:18:56 +0200 Subject: [PATCH 07/18] Do not use background job to send force delete email notification #727 --- .reek | 4 -- app/controllers/admin/domains_controller.rb | 8 +++- app/jobs/domain_delete_forced_email_job.rb | 23 ---------- .../domain_delete_forced_email_job_spec.rb | 42 ------------------- 4 files changed, 7 insertions(+), 70 deletions(-) delete mode 100644 app/jobs/domain_delete_forced_email_job.rb delete mode 100644 spec/jobs/domain_delete_forced_email_job_spec.rb diff --git a/.reek b/.reek index d9ea95353..117b97186 100644 --- a/.reek +++ b/.reek @@ -476,7 +476,6 @@ IrresponsibleModule: - Registrar::ApplicationHelper - DomainDeleteConfirmEmailJob - DomainDeleteConfirmJob - - DomainDeleteForcedEmailJob - DomainDeleteJob - DomainExpireEmailJob - DomainUpdateConfirmJob @@ -855,7 +854,6 @@ UtilityFunction: - ApplicationHelper#plain_username - ApplicationHelper#unstable_env - DomainDeleteConfirmEmailJob#logger - - DomainDeleteForcedEmailJob#logger - DomainExpireEmailJob#run - RegenerateRegistrarWhoisesJob#run - RegistrantChangeConfirmEmailJob#logger @@ -894,8 +892,6 @@ FeatureEnvy: - DomainDeleteConfirmEmailJob#run - DomainDeleteConfirmJob#raise_errors! - DomainDeleteConfirmJob#run - - DomainDeleteForcedEmailJob#log - - DomainDeleteForcedEmailJob#run - DomainDeleteJob#run - DomainUpdateConfirmJob#raise_errors! - DomainUpdateConfirmJob#run diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb index 11af1af02..66bc615c5 100644 --- a/app/controllers/admin/domains_controller.rb +++ b/app/controllers/admin/domains_controller.rb @@ -68,7 +68,13 @@ module Admin @domain.transaction do @domain.schedule_force_delete @domain.registrar.messages.create!(body: I18n.t('force_delete_set_on_domain', domain_name: @domain.name)) - DomainDeleteForcedEmailJob.enqueue(@domain.id, params[:template_name]) if notify_by_email? + + if notify_by_email? + DomainDeleteMailer.forced(domain: @domain, + registrar: @domain.registrar, + registrant: @domain.registrant, + template_name: params[:template_name]).deliver_now + end end redirect_to edit_admin_domain_url(@domain), notice: t('.scheduled') diff --git a/app/jobs/domain_delete_forced_email_job.rb b/app/jobs/domain_delete_forced_email_job.rb deleted file mode 100644 index c9ba13a6f..000000000 --- a/app/jobs/domain_delete_forced_email_job.rb +++ /dev/null @@ -1,23 +0,0 @@ -class DomainDeleteForcedEmailJob < Que::Job - def run(domain_id, template_name) - domain = Domain.find(domain_id) - - log(domain) - DomainDeleteMailer.forced(domain: domain, - registrar: domain.registrar, - registrant: domain.registrant, - template_name: template_name).deliver_now - end - - private - - def log(domain) - message = "Send DomainDeleteMailer#forced email for domain #{domain.name} (##{domain.id})" \ - " to #{domain.primary_contact_emails.join(', ')}" - logger.info(message) - end - - def logger - Rails.logger - end -end diff --git a/spec/jobs/domain_delete_forced_email_job_spec.rb b/spec/jobs/domain_delete_forced_email_job_spec.rb deleted file mode 100644 index 3d725b987..000000000 --- a/spec/jobs/domain_delete_forced_email_job_spec.rb +++ /dev/null @@ -1,42 +0,0 @@ -require 'rails_helper' - -RSpec.describe DomainDeleteForcedEmailJob do - describe '#run' do - let(:domain) { instance_double(Domain) } - let(:message) { instance_double(ActionMailer::MessageDelivery) } - - before :example do - expect(Domain).to receive(:find).and_return(domain) - allow(domain).to receive_messages( - id: 1, - name: 'test.com', - registrar: 'registrar', - registrant: 'registrant', - primary_contact_emails: %w(test@test.com test@test.com)) - end - - after :example do - domain_id = 1 - template_name = 'removed_company' - described_class.enqueue(domain_id, template_name) - end - - it 'creates log record' do - log_message = 'Send DomainDeleteMailer#forced email for domain test.com (#1) to test@test.com, test@test.com' - - allow(DomainDeleteMailer).to receive(:forced).and_return(message) - allow(message).to receive(:deliver_now) - - expect(Rails.logger).to receive(:info).with(log_message) - end - - it 'sends email' do - expect(DomainDeleteMailer).to receive(:forced).with(domain: domain, - registrar: 'registrar', - registrant: 'registrant', - template_name: 'removed_company') - .and_return(message) - expect(message).to receive(:deliver_now) - end - end -end From d2e8afdb5a9b3b940b00b60413b3c1ba128792ef Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 24 Feb 2018 13:32:43 +0200 Subject: [PATCH 08/18] Extract test #727 --- test/integration/admin/domains/force_delete_test.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/test/integration/admin/domains/force_delete_test.rb b/test/integration/admin/domains/force_delete_test.rb index b52547ece..731de151b 100644 --- a/test/integration/admin/domains/force_delete_test.rb +++ b/test/integration/admin/domains/force_delete_test.rb @@ -13,11 +13,7 @@ class AdminAreaDomainForceDeleteTest < ActionDispatch::IntegrationTest refute @domain.force_delete_scheduled? visit edit_admin_domain_url(@domain) - - assert_difference '@domain.registrar.messages.size' do - click_link_or_button 'Force delete domain' - end - + click_link_or_button 'Force delete domain' @domain.reload assert @domain.force_delete_scheduled? @@ -25,6 +21,13 @@ class AdminAreaDomainForceDeleteTest < ActionDispatch::IntegrationTest assert_text 'Force delete procedure has been scheduled' end + def test_notifies_registrar + assert_difference '@domain.registrar.messages.size' do + visit edit_admin_domain_url(@domain) + click_link_or_button 'Force delete domain' + end + end + def test_notifies_registrant_and_admin_contacts_by_email_by_default assert_emails 1 do visit edit_admin_domain_url(@domain) From cc55f1c9dc885774195a41b09eff90348dd05d3e Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 24 Feb 2018 18:41:40 +0200 Subject: [PATCH 09/18] Remove unused routes #727 --- config/routes.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index c49399573..047763943 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -200,8 +200,6 @@ Rails.application.routes.draw do resources :domains do resources :domain_versions, controller: 'domains', action: 'versions' - resources :pending_updates - resources :pending_deletes member do patch 'schedule_force_delete' From 880ce2ed626858006fdf23be75ca8369332f07e1 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 24 Feb 2018 19:18:16 +0200 Subject: [PATCH 10/18] Revert "Remove unused routes" This reverts commit cc55f1c9dc885774195a41b09eff90348dd05d3e. --- config/routes.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 047763943..c49399573 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -200,6 +200,8 @@ Rails.application.routes.draw do resources :domains do resources :domain_versions, controller: 'domains', action: 'versions' + resources :pending_updates + resources :pending_deletes member do patch 'schedule_force_delete' From e0960bcca42049e91bf0ce16f64a2b04668f2b82 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 24 Feb 2018 20:38:16 +0200 Subject: [PATCH 11/18] Extract class #727 --- .reek | 2 - .../admin/domains/force_delete_controller.rb | 39 +++++++++++++++++++ app/controllers/admin/domains_controller.rb | 32 --------------- app/presenters/domain_presenter.rb | 4 +- .../domains/_force_delete_dialog.html.erb | 4 +- app/views/admin/domains/edit.html.erb | 2 +- config/locales/admin/domains.en.yml | 6 --- .../locales/admin/domains/force_delete.en.yml | 9 +++++ config/routes.rb | 6 +-- spec/presenters/domain_presenter_spec.rb | 35 ----------------- 10 files changed, 54 insertions(+), 85 deletions(-) create mode 100644 app/controllers/admin/domains/force_delete_controller.rb create mode 100644 config/locales/admin/domains/force_delete.en.yml diff --git a/.reek b/.reek index 117b97186..aaf662290 100644 --- a/.reek +++ b/.reek @@ -145,7 +145,6 @@ DuplicateMethodCall: - Admin::DomainsController#build_associations - Admin::DomainsController#index - Admin::DomainsController#normalize_search_parameters - - Admin::DomainsController#schedule_force_delete - Admin::EppLogsController#index - Admin::EppLogsController#set_default_dates - Admin::LegalDocumentsController#show @@ -624,7 +623,6 @@ TooManyStatements: - Admin::DomainVersionsController#show - Admin::DomainsController#index - Admin::DomainsController#normalize_search_parameters - - Admin::DomainsController#schedule_force_delete - Admin::DomainsController#update - Admin::EppLogsController#index - Admin::InvoicesController#create diff --git a/app/controllers/admin/domains/force_delete_controller.rb b/app/controllers/admin/domains/force_delete_controller.rb new file mode 100644 index 000000000..5d72739d5 --- /dev/null +++ b/app/controllers/admin/domains/force_delete_controller.rb @@ -0,0 +1,39 @@ +module Admin + module Domains + class ForceDeleteController < BaseController + def create + authorize! :manage, domain + + domain.transaction do + domain.schedule_force_delete + domain.registrar.messages.create!(body: t('force_delete_set_on_domain', domain_name: domain.name)) + + if notify_by_email? + DomainDeleteMailer.forced(domain: domain, + registrar: domain.registrar, + registrant: domain.registrant, + template_name: params[:template_name]).deliver_now + end + end + + redirect_to edit_admin_domain_url(domain), notice: t('.scheduled') + end + + def destroy + authorize! :manage, domain + domain.cancel_force_delete + redirect_to edit_admin_domain_url(domain), notice: t('.cancelled') + end + + private + + def domain + @domain ||= Domain.find(params[:domain_id]) + end + + def notify_by_email? + ActiveRecord::Type::Boolean.new.type_cast_from_user(params[:notify_by_email]) + end + end + end +end diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb index 66bc615c5..576b5f8e1 100644 --- a/app/controllers/admin/domains_controller.rb +++ b/app/controllers/admin/domains_controller.rb @@ -62,34 +62,6 @@ module Admin end end - def schedule_force_delete - raise 'Template param cannot be empty' if params[:template_name].blank? - - @domain.transaction do - @domain.schedule_force_delete - @domain.registrar.messages.create!(body: I18n.t('force_delete_set_on_domain', domain_name: @domain.name)) - - if notify_by_email? - DomainDeleteMailer.forced(domain: @domain, - registrar: @domain.registrar, - registrant: @domain.registrant, - template_name: params[:template_name]).deliver_now - end - end - - redirect_to edit_admin_domain_url(@domain), notice: t('.scheduled') - end - - def cancel_force_delete - if @domain.cancel_force_delete - flash[:notice] = t('.cancelled') - else - flash.now[:alert] = I18n.t('failed_to_update_domain') - end - - redirect_to edit_admin_domain_url(@domain) - end - def versions @domain = Domain.where(id: params[:domain_id]).includes({ versions: :item }).first @versions = @domain.versions @@ -138,9 +110,5 @@ module Admin def force_delete_templates %w(removed_company death) end - - def notify_by_email? - ActiveRecord::Type::Boolean.new.type_cast_from_user(params[:notify_by_email]) - end end end diff --git a/app/presenters/domain_presenter.rb b/app/presenters/domain_presenter.rb index 11a066b7a..473155734 100644 --- a/app/presenters/domain_presenter.rb +++ b/app/presenters/domain_presenter.rb @@ -49,8 +49,8 @@ class DomainPresenter ) else view.link_to(view.t('admin.domains.force_delete_toggle_btn.cancel'), - view.cancel_force_delete_admin_domain_path(domain), - method: :patch, + view.admin_domain_force_delete_path(domain), + method: :delete, data: { confirm: view.t('admin.domains.force_delete_toggle_btn.cancel_confim') }, class: 'btn btn-primary') end diff --git a/app/views/admin/domains/_force_delete_dialog.html.erb b/app/views/admin/domains/_force_delete_dialog.html.erb index d5863e0de..4e68302f8 100644 --- a/app/views/admin/domains/_force_delete_dialog.html.erb +++ b/app/views/admin/domains/_force_delete_dialog.html.erb @@ -10,8 +10,8 @@
- <%= form_tag schedule_force_delete_admin_domain_path, method: :patch, - id: 'domain-force-delete-form', class: 'form-horizontal' do %> + <%= form_tag admin_domain_force_delete_path(domain), id: 'domain-force-delete-form', + class: 'form-horizontal' do %>
diff --git a/app/views/admin/domains/edit.html.erb b/app/views/admin/domains/edit.html.erb index 9c65c33d3..3f831e86b 100644 --- a/app/views/admin/domains/edit.html.erb +++ b/app/views/admin/domains/edit.html.erb @@ -17,4 +17,4 @@
<%= render 'form' %> -<%= render 'force_delete_dialog', templates: force_delete_templates %> +<%= render 'force_delete_dialog', domain: @domain, templates: force_delete_templates %> diff --git a/config/locales/admin/domains.en.yml b/config/locales/admin/domains.en.yml index f6f51eaa4..dc9eea9a3 100644 --- a/config/locales/admin/domains.en.yml +++ b/config/locales/admin/domains.en.yml @@ -19,12 +19,6 @@ en: close_btn: Close dialog submit_btn: Force delete domain - schedule_force_delete: - scheduled: Force delete procedure has been scheduled - - cancel_force_delete: - cancelled: Force delete procedure has been cancelled - versions: time: Time registrant: Registrant diff --git a/config/locales/admin/domains/force_delete.en.yml b/config/locales/admin/domains/force_delete.en.yml new file mode 100644 index 000000000..470a3cd3b --- /dev/null +++ b/config/locales/admin/domains/force_delete.en.yml @@ -0,0 +1,9 @@ +en: + admin: + domains: + force_delete: + create: + scheduled: Force delete procedure has been scheduled + + destroy: + cancelled: Force delete procedure has been cancelled diff --git a/config/routes.rb b/config/routes.rb index c49399573..ae2390dde 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -202,11 +202,7 @@ Rails.application.routes.draw do resources :domain_versions, controller: 'domains', action: 'versions' resources :pending_updates resources :pending_deletes - - member do - patch 'schedule_force_delete' - patch 'cancel_force_delete' - end + resource :force_delete, controller: 'domains/force_delete', only: %i[create destroy] end resources :domain_versions do diff --git a/spec/presenters/domain_presenter_spec.rb b/spec/presenters/domain_presenter_spec.rb index 65f5efc93..3726960b4 100644 --- a/spec/presenters/domain_presenter_spec.rb +++ b/spec/presenters/domain_presenter_spec.rb @@ -114,41 +114,6 @@ RSpec.describe DomainPresenter do end end - describe '#force_delete_toggle_btn' do - let(:domain) { build_stubbed(:domain) } - - context 'when force delete is not scheduled' do - before :example do - expect(domain).to receive(:force_delete_scheduled?).and_return(false) - end - - it 'returns schedule button' do - html = view.content_tag(:a, 'Schedule force delete', - class: 'btn btn-danger', - data: { - toggle: 'modal', - target: '.domain-edit-force-delete-dialog', - }) - expect(presenter.force_delete_toggle_btn).to eq(html) - end - end - - context 'when force delete is scheduled' do - before :example do - expect(domain).to receive(:force_delete_scheduled?).and_return(true) - end - - it 'returns cancel button' do - html = link_to('Cancel force delete', - view.cancel_force_delete_admin_domain_path(domain), - method: :patch, - data: { confirm: 'Are you sure you want cancel force delete procedure?' }, - class: 'btn btn-primary') - expect(presenter.force_delete_toggle_btn).to eq(html) - end - end - end - domain_delegatable_attributes = %i( name transfer_code From b2e6ee87d6280166705332ad777d895945720fcd Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 25 Feb 2018 08:53:56 +0200 Subject: [PATCH 12/18] Use default button style #727 --- app/presenters/domain_presenter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/presenters/domain_presenter.rb b/app/presenters/domain_presenter.rb index 473155734..a9563484d 100644 --- a/app/presenters/domain_presenter.rb +++ b/app/presenters/domain_presenter.rb @@ -41,7 +41,7 @@ class DomainPresenter def force_delete_toggle_btn if !domain.force_delete_scheduled? view.content_tag(:a, view.t('admin.domains.force_delete_toggle_btn.schedule'), - class: 'btn btn-danger', + class: 'btn btn-default', data: { toggle: 'modal', target: '.domain-edit-force-delete-dialog', From c61956827e4af33465345945c829e3c0be561225 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 25 Feb 2018 09:37:20 +0200 Subject: [PATCH 13/18] Improve translation #727 --- app/views/admin/domains/_force_delete_dialog.html.erb | 2 +- config/locales/admin/domains.en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admin/domains/_force_delete_dialog.html.erb b/app/views/admin/domains/_force_delete_dialog.html.erb index 4e68302f8..f3d9fc520 100644 --- a/app/views/admin/domains/_force_delete_dialog.html.erb +++ b/app/views/admin/domains/_force_delete_dialog.html.erb @@ -24,7 +24,7 @@
- +
<%= select_tag 'template_name', options_for_select(templates), class: 'form-control' %>
diff --git a/config/locales/admin/domains.en.yml b/config/locales/admin/domains.en.yml index dc9eea9a3..2001b0976 100644 --- a/config/locales/admin/domains.en.yml +++ b/config/locales/admin/domains.en.yml @@ -15,7 +15,7 @@ en: force_delete_dialog: title: Force delete notify_by_email: Notify registrant and administrative contacts by email - template: Template + email_template: Email template close_btn: Close dialog submit_btn: Force delete domain From 9819a3c21600262efea2be478e8120075b809786 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 25 Feb 2018 09:38:01 +0200 Subject: [PATCH 14/18] Fix HTML #727 --- .../domains/_force_delete_dialog.html.erb | 40 +++++++++---------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/app/views/admin/domains/_force_delete_dialog.html.erb b/app/views/admin/domains/_force_delete_dialog.html.erb index f3d9fc520..40f4dfb8c 100644 --- a/app/views/admin/domains/_force_delete_dialog.html.erb +++ b/app/views/admin/domains/_force_delete_dialog.html.erb @@ -8,30 +8,26 @@

<%= t '.title' %>

-
-
- <%= form_tag admin_domain_force_delete_path(domain), id: 'domain-force-delete-form', - class: 'form-horizontal' do %> -
-
-
- -
-
+ <%= form_tag admin_domain_force_delete_path(domain), id: 'domain-force-delete-form', + class: 'modal-body form-horizontal' do %> +
+
+
+
- -
- -
- <%= select_tag 'template_name', options_for_select(templates), class: 'form-control' %> -
-
- <% end %> +
-
+ +
+ +
+ <%= select_tag 'template_name', options_for_select(templates), class: 'form-control' %> +
+
+ <% end %>
From 1c5ab56b65a14a200b42e5e0c7004c3b9fc3b51f Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 25 Feb 2018 11:33:00 +0200 Subject: [PATCH 15/18] Improve domain force delete dialog UI #727 --- app/assets/javascripts/admin/domains/force_delete.js | 12 ++++++++++++ .../admin/domains/_force_delete_dialog.html.erb | 9 +++++---- 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 app/assets/javascripts/admin/domains/force_delete.js diff --git a/app/assets/javascripts/admin/domains/force_delete.js b/app/assets/javascripts/admin/domains/force_delete.js new file mode 100644 index 000000000..37f20cee3 --- /dev/null +++ b/app/assets/javascripts/admin/domains/force_delete.js @@ -0,0 +1,12 @@ +(function () { + let toggle = document.querySelector('.domain-edit-force-delete-dialog [data-dependent-content-toggle]'); + let dependentContent = document.querySelector('.domain-edit-force-delete-dialog .email-template-row'); + + if (!toggle) { + return; + } + + toggle.addEventListener('change', function () { + dependentContent.hidden = !this.checked; + }); +})(); diff --git a/app/views/admin/domains/_force_delete_dialog.html.erb b/app/views/admin/domains/_force_delete_dialog.html.erb index 40f4dfb8c..26edf3756 100644 --- a/app/views/admin/domains/_force_delete_dialog.html.erb +++ b/app/views/admin/domains/_force_delete_dialog.html.erb @@ -11,18 +11,19 @@ <%= form_tag admin_domain_force_delete_path(domain), id: 'domain-force-delete-form', class: 'modal-body form-horizontal' do %>
-
+
-
- +