Merge 9b9233f192 into 8a432ac937

src/components/MonitorListFilter.vue

@@ -253,6 +253,8 @@ export default {
         clearFilters() {
             this.$emit("updateFilter", {
                 status: [],
+                active: [],
+                tags: [],
             });
         },
         getExistingTags(callback) {

src/router.js

@@ -199,19 +199,24 @@ const router = createRouter({
 });
 
 router.beforeEach((to, from) => {
-    // If the path is same, either the query or has has changed so avoid changing query params
-    // Without this check, modifying any query params will be blocked
     // Check if redirectedFrom is defined to check if this function has already been run
     // Without this check, the router will be stuck in an infinite loop
-    if (to.fullPath !== from.fullPath && !to.redirectedFrom) {
+    if (to.redirectedFrom) {
-        return {
+        return;
-            ...to,
-            query: {
-                ...to.query,
-                ...from.query,
-            },
-        };
     }
+
+    // If the user is navigating to same page but to.query is empty, they have clicked on the same link
+    // For example: Clicked on Add monitor twice
+    if (to.path === from.path && Object.keys(to.query).length !== 0) {
+        return;
+    }
+    return {
+        ...to,
+        query: {
+            ...to.query,
+            ...from.query,
+        },
+    };
 });
 
 export { router };