Skip to content

A self-hosted media server and file management system

fix: nprogress bar should not trigger on interval requests

aminnausin5bf7a510bad0
diff --git a/resources/js/service/api.ts b/resources/js/service/api.ts
index bec7cfe9..ba108842 100644
--- a/resources/js/service/api.ts
+++ b/resources/js/service/api.ts
@@ -30,15 +30,20 @@ function flushQueue(success: boolean) {
queue = [];
}
+const completeNProgress = (force = false) => {
+ if (progressTimeout) {
+ clearTimeout(progressTimeout);
+ nProgress.done(force);
+ }
+};
+
const handleResponse = (response: any) => {
- clearTimeout(progressTimeout);
- nProgress.done(true);
+ completeNProgress();
return response;
};
const handleError = async (error: AxiosError<{ message?: string }>) => {
- clearTimeout(progressTimeout);
- nProgress.done(true);
+ completeNProgress();
const auth = useAuthStore();
const status = error.response?.status ?? 0;
@@ -128,10 +133,10 @@ API.interceptors.request.use((config) => {
const hideProgressBar = config?.headers?.['X-Skip-Progress'] === 'true';
- clearTimeout(progressTimeout);
- nProgress.done(true);
-
- if (!hideProgressBar) progressTimeout = setTimeout(() => nProgress.start(), 100);
+ if (!hideProgressBar) {
+ completeNProgress();
+ progressTimeout = setTimeout(() => nProgress.start(), 100);
+ }
if (guestToken) config.headers['X-Guest-Token'] = guestToken;
return config;