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 +5 -8
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1cd5b41c96 - Show all commits

8
src/components/misc/ready.vue
View File

@ -44,8 +44,7 @@ import ApiConfig from '@/components/misc/api-config'
import NoAuthWrapper from '@/components/misc/no-auth-wrapper'
import {mapState} from 'vuex'
import {ONLINE} from '@/store/mutation-types'
const ERROR_NO_API_URL = 'noApiUrlProvided'
import {ERROR_NO_API_URL} from '@/helpers/checkAndSetApiUrl'
export default {
name: 'ready',
@ -76,11 +75,6 @@ export default {
},
konrad marked this conversation as resolved Outdated
dpschen commented 2021-11-10 19:28:47 +00:00
Outdated
Review
Copy Link

ONLINE is no mutation type. It's a state.

`ONLINE` is no mutation type. It's a state.
konrad commented 2021-11-10 19:53:07 +00:00
Outdated
Review
Copy Link

Right, fixed.

Right, fixed.
methods: {
load() {
if (window.API_URL === '') {
this.error = ERROR_NO_API_URL
return
}
this.$store.dispatch('loadApp')
.catch(e => {
this.error = e

5
src/helpers/checkAndSetApiUrl.ts
View File

@ -1,5 +1,7 @@
const API_DEFAULT_PORT = '3456'
export const ERROR_NO_API_URL = 'noApiUrlProvided'
export const checkAndSetApiUrl = (url: string, updateConfig: () => Promise<void>): Promise<string> => {
konrad marked this conversation as resolved Outdated
dpschen commented 2021-11-10 20:53:09 +00:00
Outdated
Review
Copy Link

Since updateConfig is always () => dispatch('config/update'):
Shouldn't we just import he store in this file and call dispatch('config/update') directly?

Since `updateConfig` is always `() => dispatch('config/update')`: Shouldn't we just import he store in this file and call `dispatch('config/update')` directly?
konrad commented 2021-11-10 20:54:52 +00:00
Outdated
Review
Copy Link

Will that work outside of a vue component?

Will that work outside of a vue component?
dpschen commented 2021-11-10 21:32:13 +00:00
Outdated
Review
Copy Link

If you import the store with:

import {store} from '@/store'

// then you can

store.dispatch('config/update')

Because it's JS ™️ (trying to steal reacts claim here)

If you import the store with: ``` import {store} from '@/store' // then you can store.dispatch('config/update') ``` Because it's JS ™️ (trying to steal reacts claim here)
konrad commented 2021-11-13 16:24:43 +00:00
Outdated
Review
Copy Link

That seems like a nice way to solve it. Done.

That seems like a nice way to solve it. Done.
👍 1
// Check if the url has an http prefix
if (
@ -106,6 +108,7 @@ export const checkAndSetApiUrl = (url: string, updateConfig: () => Promise<void>
localStorage.setItem('API_URL', window.API_URL)
return window.API_URL
}
return ''
throw new Error(ERROR_NO_API_URL)
})
}