Bugfix: Broke functionality in previous commit

This commit is contained in:
Suven-p 2024-11-16 06:49:42 +05:45
parent 7901d7666e
commit 24ffef5d69

View file

@ -199,19 +199,22 @@ 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) {
return {
...to,
query: {
...to.query,
...from.query,
},
};
if (to.redirectedFrom) return;
// 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 };