Compare commits

..

No commits in common. "9b9233f192cbb76388023aaa7629d4b4bd83cc75" and "986b5979b94609c7b38fbd0e1ac51c4b08e04215" have entirely different histories.

2 changed files with 10 additions and 17 deletions

View file

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

View file

@ -199,24 +199,19 @@ 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.redirectedFrom) {
return;
if (to.fullPath !== from.fullPath && !to.redirectedFrom) {
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 };