Close modals when turbo navigates

opf · Sep 17, 2024 · 396f824 · 396f824
1 parent f4bc2d4
commit 396f824
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/frontend/src/app/core/augmenting/openproject-augmenting.module.ts b/frontend/src/app/core/augmenting/openproject-augmenting.module.ts
@@ -37,5 +37,9 @@ export class OpenprojectAugmentingModule {
   constructor(modalWrapper:OpModalWrapperAugmentService) {
     // Setup augmenting services
     modalWrapper.setupListener();
+
+    document.addEventListener('turbo:load', () => {
+      modalWrapper.setupListener();
+    });
   }
 }
diff --git a/frontend/src/app/shared/components/modal/modal-wrapper-augment.service.ts b/frontend/src/app/shared/components/modal/modal-wrapper-augment.service.ts
@@ -43,7 +43,9 @@ export class OpModalWrapperAugmentService {
     @Inject(DOCUMENT) protected documentElement:Document,
     protected injector:Injector,
     protected opModalService:OpModalService,
-  ) {}
+  ) {
+    documentElement.addEventListener('turbo:before-render', () => opModalService.close());
+  }
 
   /**
    * Create initial listeners for Rails-rendered modals

diff --git a/modules/two_factor_authentication/spec/features/account_activation_spec.rb b/modules/two_factor_authentication/spec/features/account_activation_spec.rb
@@ -1,7 +1,9 @@
 require_relative "../spec_helper"
 require_relative "shared_2fa_examples"
 
-RSpec.describe "activating an invited account", :js,
+RSpec.describe "activating an invited account",
+               :js,
+               :with_cuprite,
                with_settings: {
                  plugin_openproject_two_factor_authentication: { "active_strategies" => [:developer] }
                } do
@@ -49,12 +51,11 @@ def activate!
       # rubocop:enable RSpec/AnyInstance
 
       activate!
-
       expect(page).to have_css(".op-toast.-success", text: "Developer strategy generated the following one-time password:")
 
-      SeleniumHubWaiter.wait
       fill_in I18n.t(:field_otp), with: sms_token
       click_button I18n.t(:button_login)
+      wait_for_network_idle
 
       visit my_account_path
       expect(page).to have_css(".form--field-container", text: user.login)

diff --git a/modules/two_factor_authentication/spec/features/shared_2fa_examples.rb b/modules/two_factor_authentication/spec/features/shared_2fa_examples.rb
@@ -44,19 +44,20 @@ def expect_not_logged_in
     SeleniumHubWaiter.wait
     fill_in "device_phone_number", with: "invalid"
     click_on "Continue"
+    wait_for_network_idle
 
     # Expect error on invalid phone
     expect(page).to have_css("#errorExplanation", text: "Phone number must be of format +XX XXXXXXXXX")
 
     SeleniumHubWaiter.wait
     fill_in "device_phone_number", with: "+49 123456789"
     click_on "Continue"
+    wait_for_network_idle
 
     # Confirm page
     expect(page).to have_css("h2", text: I18n.t("two_factor_authentication.devices.confirm_device"))
     expect(page).to have_css("input#otp")
 
-    SeleniumHubWaiter.wait
     # Fill in wrong token
     fill_in "otp", with: "whatever"