therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor user search api, better api error response handling

Browse source
This commit is contained in:
Tae Hoon 2019-07-10 16:58:49 +00:00 • committed by Shpuld Shpludson
parent 2f87540612
commit 532b76eb64
7 changed files with 31 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/user_search/user_search.js
View file

@ -35,15 +35,13 @@ const userSearch = {
},
search (query) {
if (!query) {
this.users = []
return
}
this.loading = true
this.userIds = []
this.$store.dispatch('searchUsers', query)
.then((res) => {
this.loading = false
this.userIds = map(res, 'id')
})
.then((res) => { this.userIds = map(res, 'id') })
.finally(() => { this.loading = false })
}
}
}

8
src/components/user_settings/user_settings.js
View file

@ -17,7 +17,6 @@ import Autosuggest from '../autosuggest/autosuggest.vue'
import Importer from '../importer/importer.vue'
import Exporter from '../exporter/exporter.vue'
import withSubscription from '../../hocs/with_subscription/with_subscription'
import userSearchApi from '../../services/new_api/user_search.js'
import Mfa from './mfa.vue'
const BlockList = withSubscription({
@ -322,11 +321,8 @@ const UserSettings = {
})
},
queryUserIds (query) {
return userSearchApi.search({ query, store: this.$store })
.then((users) => {
this.$store.dispatch('addNewUsers', users)
return map(users, 'id')
})
return this.$store.dispatch('searchUsers', query)
.then((users) => map(users, 'id'))
},
blockUsers (ids) {
return this.$store.dispatch('blockUsers', ids)