vikunja
/
frontend
Archived
6
39
Fork 49
Code Issues 1 Pull Requests 4 Projects Releases 26 Activity

feat: defer everything until the api config is loaded #926

Merged
konrad merged 27 commits from feature/ready-state into main 2021-11-13 19:49:03 +00:00
Conversation 3 Commits 27 Files Changed 10 +4 -2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4ca53d77e2 - Show all commits

3
src/components/misc/api-config.vue
View File

@ -89,6 +89,7 @@ export default {
async setApiUrl() {
if (this.apiUrl === '') {
// Don't try to check and set an empty url
konrad marked this conversation as resolved Outdated
dpschen commented 2021-11-04 15:44:56 +00:00
Outdated
Review
Copy Link

Explain why we return here

Explain why we return here
konrad commented 2021-11-10 19:01:43 +00:00
Outdated
Review
Copy Link

Done.

Done.
this.errorMsg = this.$t('apiConfig.urlRequired')
konrad marked this conversation as resolved Outdated
dpschen commented 2021-11-10 20:45:01 +00:00
Outdated
Review
Copy Link

That seems like it should throw an error?

That seems like it should throw an error?
konrad commented 2021-11-10 21:17:14 +00:00
Outdated
Review
Copy Link

It does yeah. I've modified it so it shows an error with a "good" error message to the user instead of throwing one.

It does yeah. I've modified it so it shows an error with a "good" error message to the user instead of throwing one.
return
}
@ -97,7 +98,7 @@ export default {
konrad marked this conversation as resolved
dpschen commented 2021-11-04 15:45:07 +00:00
Review
Copy Link

Explain why we return here

Explain why we return here
if (url === '') {
// If the config setter function could not figure out a url
konrad marked this conversation as resolved Outdated
dpschen commented 2021-11-10 20:45:12 +00:00
Outdated
Review
Copy Link

That seems like it should throw an error? (2)

That seems like it should throw an error? (2)
return
throw new Error('URL cannot be empty.')
}
// Set it + save it to local storage to save us the hoops

3
src/i18n/lang/en.json
View File

@ -787,7 +787,8 @@
"change": "change",
"signInOn": "Sign in to your Vikunja account on {0}",
"error": "Could not find or use Vikunja installation at \"{domain}\". Please try a different url.",
"success": "Using Vikunja installation at \"{domain}\"."
"success": "Using Vikunja installation at \"{domain}\".",
"urlRequired": "A url is required."
},
"loadingError": {
"failed": "Loading failed, please {0}. If the error persists, please {1}.",