From bcd7b6bbd11ca7758d175d11091d9e482173e65e Mon Sep 17 00:00:00 2001 From: florent <flavelle@neogeo.fr> Date: Mon, 7 Feb 2022 10:45:23 +0100 Subject: [PATCH] fix loader on search --- src/components/Projects/SearchProjects.vue | 3 ++ src/store/modules/projects.store.js | 32 ++++++++++------------ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/components/Projects/SearchProjects.vue b/src/components/Projects/SearchProjects.vue index 15136e99..25d04fdd 100644 --- a/src/components/Projects/SearchProjects.vue +++ b/src/components/Projects/SearchProjects.vue @@ -35,6 +35,9 @@ export default { this.searchFunction(newValue) .then(() => { this.$emit('loading', false); + }) + .catch((err) => { + if (err.message) this.$emit('loading', false); }); }, 100) }, diff --git a/src/store/modules/projects.store.js b/src/store/modules/projects.store.js index 5b0bee88..e6229cff 100644 --- a/src/store/modules/projects.store.js +++ b/src/store/modules/projects.store.js @@ -153,25 +153,21 @@ const projects = { } } - try { - const response = await axios.get( - filteredUrl ? filteredUrl : url, - { - cancelToken: cancelToken.token, - } - ); - if (response.status === 200) { - const projects = response.data; - if (projects) { - commit('SET_PROJECTS', projects); - commit('SET_PROJECTS_SEARCH_STATE', { - isSearched: true, - text: text - }); - } + const response = await axios.get( + filteredUrl ? filteredUrl : url, + { + cancelToken: cancelToken.token, + } + ); + if (response.status === 200) { + const projects = response.data; + if (projects) { + commit('SET_PROJECTS', projects); + commit('SET_PROJECTS_SEARCH_STATE', { + isSearched: true, + text: text + }); } - } catch(err) { - console.error(err); } }, } -- GitLab