Page MenuHomePhorge
Files F85629851

No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/src/components/user_autosuggest/user_autosuggest.js b/src/components/user_autosuggest/user_autosuggest.js
index c8332e3469..75798b7e65 100644
--- a/src/components/user_autosuggest/user_autosuggest.js
+++ b/src/components/user_autosuggest/user_autosuggest.js
@@ -1,49 +1,54 @@
import reject from 'lodash/reject'
+import map from 'lodash/map'
import BlockCard from '../block_card/block_card.vue'
import userSearchApi from '../../services/new_api/user_search.js'
const debounceMilliseconds = 500
export default {
components: {
BlockCard
},
data () {
return {
query: '',
results: [],
timeout: null,
resultsVisible: false
}
},
+ computed: {
+ filtered () {
+ return reject(this.results, (userId) => {
+ const user = this.$store.getters.findUser(userId)
+ return !user || user.statusnet_blocking || user.id === this.$store.state.users.currentUser.id
+ })
+ }
+ },
watch: {
query (val) {
this.fetchResults(val)
}
},
methods: {
fetchResults (query) {
clearTimeout(this.timeout)
this.timeout = setTimeout(() => {
this.results = []
if (query) {
userSearchApi.search({query, store: this.$store})
.then((users) => {
- const filteredUsers = reject(users, (user) => {
- return user.statusnet_blocking || user.id === this.$store.state.users.currentUser.id
- })
- this.$store.dispatch('addNewUsers', filteredUsers)
- this.results = filteredUsers
- this.resultsVisible = true
+ this.$store.dispatch('addNewUsers', users)
+ this.results = map(users, 'id')
})
}
}, debounceMilliseconds)
},
onInputClick () {
this.resultsVisible = true
},
onClickOutside () {
this.resultsVisible = false
}
}
}
diff --git a/src/components/user_autosuggest/user_autosuggest.vue b/src/components/user_autosuggest/user_autosuggest.vue
index 6253ca6b7a..930216a7eb 100644
--- a/src/components/user_autosuggest/user_autosuggest.vue
+++ b/src/components/user_autosuggest/user_autosuggest.vue
@@ -1,45 +1,45 @@
<template>
<div class="user-autosuggest" v-click-outside="onClickOutside">
<input v-model="query" placeholder="Search whom you want to block" @click="onInputClick" class="user-autosuggest-input" />
- <div class="user-autosuggest-results" v-if="resultsVisible && results.length > 0">
- <BlockCard v-for="user in results" :key="user.id" :userId="user.id"/>
+ <div class="user-autosuggest-results" v-if="resultsVisible && filtered.length > 0">
+ <BlockCard v-for="userId in filtered" :key="userId" :userId="userId"/>
</div>
</div>
</template>
<script src="./user_autosuggest.js"></script>
<style lang="scss">
@import '../../_variables.scss';
.user-autosuggest {
position: relative;
&-input {
display: block;
width: 100%;
}
&-results {
position: absolute;
left: 0;
top: 100%;
right: 0;
max-height: 400px;
background-color: $fallback--lightBg;
background-color: var(--lightBg, $fallback--lightBg);
border-style: solid;
border-width: 1px;
border-color: $fallback--border;
border-color: var(--border, $fallback--border);
border-radius: $fallback--inputRadius;
border-radius: var(--inputRadius, $fallback--inputRadius);
border-top-left-radius: 0;
border-top-right-radius: 0;
box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.6);
box-shadow: var(--panelShadow);
overflow-y: auto;
z-index: 1;
}
}
</style>

File Metadata

Mime Type
text/x-diff
Expires
Sun, Aug 9, 6:32 AM (1 d, 16 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1724289
Default Alt Text
(3 KB)

Event Timeline