Skip to content
Snippets Groups Projects
Commit f915d23a authored by Ole Voldsæter's avatar Ole Voldsæter
Browse files

re meta#244 feilhåndtering i frontend ifm. ajax-kall

parent a01bfd8f
No related branches found
No related tags found
No related merge requests found
...@@ -114,6 +114,26 @@ function navigate_to_search(self, query) { ...@@ -114,6 +114,26 @@ function navigate_to_search(self, query) {
error: "Vi fant ingen resultater for '" + decodeURIComponent(query) + "'. (Søkeforlag kommer i en senere oppatering av Ordbøkene)" error: "Vi fant ingen resultater for '" + decodeURIComponent(query) + "'. (Søkeforlag kommer i en senere oppatering av Ordbøkene)"
} }
} }
})
.catch(function(error){
if (error.response && error.response.status == 400) {
self.article = {
lemmas: [],
error: "Søkeuttrykket inneholder feil"
}
} else if (error.response) {
self.article = {
lemmas: [],
error: "Noe gikk galt på serversiden"
}
} else {
self.article = {
lemmas: [],
error: "Nettverksproblemer, prøv igjen"
}
}
})
.then(function(_){
self.waiting_for_articles = false self.waiting_for_articles = false
history.replaceState({article: self.article, search_results: self.search_results, lang: self.lang}, '') history.replaceState({article: self.article, search_results: self.search_results, lang: self.lang}, '')
}) })
...@@ -123,6 +143,27 @@ function navigate_to_word(self, word) { ...@@ -123,6 +143,27 @@ function navigate_to_word(self, word) {
axios.get(self.api_pref + 'suggest?q=' + word) axios.get(self.api_pref + 'suggest?q=' + word)
.then(function(response){ .then(function(response){
self.search_results = response.data.filter(result => result.match.length == word.length) self.search_results = response.data.filter(result => result.match.length == word.length)
if (! self.search_results.length) {
self.article = {
lemmas: [],
error: "Ordet '" + decodeURIComponent(word) + "' finnes ikke i ordbøkene"
}
}
})
.catch(function(error){
if (error.response) {
self.article = {
lemmas: [],
error: "Noe gikk galt på serversiden"
}
} else {
self.article = {
lemmas: [],
error: "Nettverksproblemer, prøv igjen"
}
}
})
.then(function(_){
self.waiting_for_articles = false self.waiting_for_articles = false
history.replaceState({article: self.article, search_results: self.search_results, lang: self.lang}, '') history.replaceState({article: self.article, search_results: self.search_results, lang: self.lang}, '')
}) })
...@@ -223,6 +264,13 @@ export default { ...@@ -223,6 +264,13 @@ export default {
axios.get(api_endpoint + '/nob/article/78569').then(function(response){ axios.get(api_endpoint + '/nob/article/78569').then(function(response){
self.monthly_nn = Object.assign(response.data, {dictionary: 'nob'}) self.monthly_nn = Object.assign(response.data, {dictionary: 'nob'})
}) })
}).catch(function(_){
self.article = {
lemmas: [],
error: "Et nettverksproblem hindret lasting av siden. Prøv å laste siden på nytt"
}
self.waiting_for_metadata = false
self.waiting_for_articles = false
}) })
}, },
watch: { watch: {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment