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

8231_testToMaster_2448 #997

Merged
alexm merged 400 commits from 8231_testToMaster_2448 into master 2024-11-26 06:28:29 +00:00
Conversation 2 Commits 400 Files Changed 268 +5 -3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 52981953f7 - Show all commits

5
src/boot/axios.js
View File

@ -3,6 +3,7 @@ import { useSession } from 'src/composables/useSession';
import { Router } from 'src/router'; import { Router } from 'src/router';
import useNotify from 'src/composables/useNotify.js'; import useNotify from 'src/composables/useNotify.js';
import { useStateQueryStore } from 'src/stores/useStateQueryStore'; import { useStateQueryStore } from 'src/stores/useStateQueryStore';
import { CanceledError } from 'axios';
const session = useSession(); const session = useSession();
const { notify } = useNotify(); const { notify } = useNotify();
@ -42,7 +43,7 @@ const onResponseError = (error) => {
let message = ''; let message = '';
const response = error.response; const response = error.response;
const responseData = response && response.data; const responseData = response?.data;
const responseError = responseData && response.data.error; const responseError = responseData && response.data.error;
if (responseError) { if (responseError) {
message = responseError.message; message = responseError.message;
@ -78,7 +79,7 @@ const onResponseError = (error) => {
return Promise.reject(error); return Promise.reject(error);
} }
notify(message, 'negative'); if (!(error instanceof CanceledError)) notify(message, 'negative');
return Promise.reject(error); return Promise.reject(error);
}; };

3
src/boot/quasar.js
View File

@ -3,6 +3,7 @@ import qFormMixin from './qformMixin';
import mainShortcutMixin from './mainShortcutMixin'; import mainShortcutMixin from './mainShortcutMixin';
import keyShortcut from './keyShortcut'; import keyShortcut from './keyShortcut';
import useNotify from 'src/composables/useNotify.js'; import useNotify from 'src/composables/useNotify.js';
import { CanceledError } from 'axios';
const { notify } = useNotify(); const { notify } = useNotify();
export default boot(({ app }) => { export default boot(({ app }) => {
@ -11,6 +12,6 @@ export default boot(({ app }) => {
app.directive('shortcut', keyShortcut); app.directive('shortcut', keyShortcut);
app.config.errorHandler = function (err) { app.config.errorHandler = function (err) {
console.error(err); console.error(err);
notify('globals.error', 'negative', 'error'); if (!(err instanceof CanceledError)) notify('globals.error', 'negative', 'error');
}; };
}); });