verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 90 Releases Wiki Activity

fix: refs #8534 update stateQueryGuard to check route changes and improve loading state handling
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details

This commit is contained in:
Alex Moreno 2025-03-26 15:01:23 +01:00
parent b3661c1674
commit d63c35192d
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/router/hooks.js
View File

@ -38,9 +38,11 @@ export async function navigationGuard(to, from, next, Router, state) {
next();
}
export async function stateQueryGuard(next) {
const stateQuery = useStateQueryStore();
await waitUntilFalse(stateQuery.isLoading());
export async function stateQueryGuard(to, from, next) {
if (to.name !== from.name) {
const stateQuery = useStateQueryStore();
await waitUntilFalse(stateQuery.isLoading());
}
next();
}
@ -82,6 +84,7 @@ function waitUntilFalse(ref) {
const stop = watch(
ref,
(val) => {
console.log('val: ', val);
if (!val) {
stop();
resolve();

2
src/router/index.js
View File

@ -23,7 +23,7 @@ export { Router };
export default defineRouter(() => {
const state = useState();
Router.beforeEach((to, from, next) => navigationGuard(to, from, next, Router, state));
Router.beforeEach((to, from, next) => stateQueryGuard(next));
Router.beforeEach((to, from, next) => stateQueryGuard(to, from, next));
Router.afterEach((to) => setPageTitle(to));
Router.onError(({ message }) => {