Fix the sieve filters page which is duplicating the modal content (#1358

)

* Fix the sieve filters page which is duplicating the modal content

* Fix selenium tests: the navigation should be awaited only if the expected route isn't yet active

* Deal with flaky tests

modules/core/navigation/navigation.js

@@ -36,7 +36,10 @@ window.addEventListener('load', function() {
 $(document).on('click', 'a', function(event) {
     if ($(this).attr('href') !== "#" && $(this).attr('target') !== '_blank' && !$(this).data('external')) {
         event.preventDefault();
-        navigate($(this).attr('href'));
+        const currentPage = new URL(window.location.href).searchParams.toString();
+        if (currentPage !== $(this).attr('href').split('?')[1]) {
+            navigate($(this).attr('href'));
+        }
     }
 });
 

modules/core/site.js

@@ -303,9 +303,14 @@ function Hm_Modal(options) {
     };
 
     this.opts = { ...defaults, ...options };
+    this.modal = $(`#${this.opts.modalId}`);
 
     this.init = function () {
-        if (this.modal) {
+        if (this.modal.length) {
+            this.modalContent = this.modal.find('.modal-body');
+            this.modalTitle = this.modal.find('.modal-title');
+            this.modalFooter = this.modal.find('.modal-footer');
+            this.bsModal = bootstrap.Modal.getOrCreateInstance(this.modal[0]);
             return;
         }
 
@@ -338,6 +343,7 @@ function Hm_Modal(options) {
     };
 
     this.open = () => {
+        this.bsModal = bootstrap.Modal.getOrCreateInstance(this.modal[0]);
         this.bsModal.show();
     };
 

modules/sievefilters/js_modules/route_handlers.js

@@ -4,4 +4,8 @@ function applyBlockListPageHandlers() {
 
 function applySieveFiltersPageHandler() {
     sieveFiltersPageHandler();
+
+    return () => {
+        cleanUpSieveFiltersPage();
+    };
 }