Merge branch '492' into 'develop'

Fix Follow/Mute/Block not functional issue in the user search page

Closes #492

See merge request pleroma/pleroma-fe!754

src/components/follow_card/follow_card.js

@@ -10,8 +10,7 @@ const FollowCard = {
   data () {
     return {
       inProgress: false,
-      requestSent: false,
+      requestSent: false
-      updated: false
     }
   },
   components: {
@@ -19,10 +18,8 @@ const FollowCard = {
     RemoteFollow
   },
   computed: {
-    isMe () { return this.$store.state.users.currentUser.id === this.user.id },
+    isMe () {
-    following () { return this.updated ? this.updated.following : this.user.following },
+      return this.$store.state.users.currentUser.id === this.user.id
-    showFollow () {
-      return !this.following || this.updated && !this.updated.following
     },
     loggedIn () {
       return this.$store.state.users.currentUser
@@ -31,17 +28,15 @@ const FollowCard = {
   methods: {
     followUser () {
       this.inProgress = true
-      requestFollow(this.user, this.$store).then(({ sent, updated }) => {
+      requestFollow(this.user, this.$store).then(({ sent }) => {
         this.inProgress = false
         this.requestSent = sent
-        this.updated = updated
       })
     },
     unfollowUser () {
       this.inProgress = true
-      requestUnfollow(this.user, this.$store).then(({ updated }) => {
+      requestUnfollow(this.user, this.$store).then(() => {
         this.inProgress = false
-        this.updated = updated
       })
     }
   }

src/components/follow_card/follow_card.vue

@@ -4,34 +4,38 @@
       <span class="faint" v-if="!noFollowsYou && user.follows_you">
         {{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }}
       </span>
-      <div class="follow-card-follow-button" v-if="showFollow && !loggedIn">
+      <template v-if="!loggedIn">
-        <RemoteFollow :user="user" />
+        <div class="follow-card-follow-button" v-if="!user.following">
-      </div>
+          <RemoteFollow :user="user" />
-      <button
+        </div>
-        v-if="showFollow && loggedIn"
+      </template>
-        class="btn btn-default follow-card-follow-button"
+      <template v-else>
-        @click="followUser"
+        <button
-        :disabled="inProgress"
+          v-if="!user.following"
-        :title="requestSent ? $t('user_card.follow_again') : ''"
+          class="btn btn-default follow-card-follow-button"
-      >
+          @click="followUser"
-        <template v-if="inProgress">
+          :disabled="inProgress"
-          {{ $t('user_card.follow_progress') }}
+          :title="requestSent ? $t('user_card.follow_again') : ''"
-        </template>
+        >
-        <template v-else-if="requestSent">
+          <template v-if="inProgress">
-          {{ $t('user_card.follow_sent') }}
+            {{ $t('user_card.follow_progress') }}
-        </template>
+          </template>
-        <template v-else>
+          <template v-else-if="requestSent">
-          {{ $t('user_card.follow') }}
+            {{ $t('user_card.follow_sent') }}
-        </template>
+          </template>
-      </button>
+          <template v-else>
-      <button v-if="following" class="btn btn-default follow-card-follow-button pressed" @click="unfollowUser" :disabled="inProgress">
+            {{ $t('user_card.follow') }}
-        <template v-if="inProgress">
+          </template>
-          {{ $t('user_card.follow_progress') }}
+        </button>
-        </template>
+        <button v-else class="btn btn-default follow-card-follow-button pressed" @click="unfollowUser" :disabled="inProgress">
-        <template v-else>
+          <template v-if="inProgress">
-          {{ $t('user_card.follow_unfollow') }}
+            {{ $t('user_card.follow_progress') }}
-        </template>
+          </template>
-      </button>
+          <template v-else>
+            {{ $t('user_card.follow_unfollow') }}
+          </template>
+        </button>
+      </template>
     </div>
   </basic-user-card>
 </template>

src/components/user_search/user_search.js

@@ -1,5 +1,6 @@
 import FollowCard from '../follow_card/follow_card.vue'
-import userSearchApi from '../../services/new_api/user_search.js'
+import map from 'lodash/map'
+
 const userSearch = {
   components: {
     FollowCard
@@ -10,10 +11,15 @@ const userSearch = {
   data () {
     return {
       username: '',
-      users: [],
+      userIds: [],
       loading: false
     }
   },
+  computed: {
+    users () {
+      return this.userIds.map(userId => this.$store.getters.findUser(userId))
+    }
+  },
   mounted () {
     this.search(this.query)
   },
@@ -33,10 +39,10 @@ const userSearch = {
         return
       }
       this.loading = true
-      userSearchApi.search({query, store: this.$store})
+      this.$store.dispatch('searchUsers', query)
         .then((res) => {
           this.loading = false
-          this.users = res
+          this.userIds = map(res, 'id')
         })
     }
   }

src/modules/users.js

@@ -1,4 +1,5 @@
 import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
+import userSearchApi from '../services/new_api/user_search.js'
 import { compact, map, each, merge, last, concat, uniq } from 'lodash'
 import { set } from 'vue'
 import { registerPushNotifications, unregisterPushNotifications } from '../services/push/push.js'
@@ -341,6 +342,14 @@ const users = {
         store.commit('setUserForNotification', notification)
       })
     },
+    searchUsers (store, query) {
+      // TODO: Move userSearch api into api.service
+      return userSearchApi.search({query, store: { state: store.rootState }})
+        .then((users) => {
+          store.commit('addNewUsers', users)
+          return users
+        })
+    },
     async signUp (store, userInfo) {
       store.commit('signUpPending')
 

src/services/follow_manipulate/follow_manipulate.js

@@ -23,18 +23,12 @@ export const requestFollow = (user, store) => new Promise((resolve, reject) => {
 
       // For locked users we just mark it that we sent the follow request
       if (updated.locked) {
-        resolve({
+        resolve({ sent: true })
-          sent: true,
-          updated
-        })
       }
 
       if (updated.following) {
         // If we get result immediately, just stop.
-        resolve({
+        resolve({ sent: false })
-          sent: false,
-          updated
-        })
       }
 
       // But usually we don't get result immediately, so we ask server
@@ -48,16 +42,10 @@ export const requestFollow = (user, store) => new Promise((resolve, reject) => {
         .then((following) => {
           if (following) {
             // We confirmed and everything's good.
-            resolve({
+            resolve({ sent: false })
-              sent: false,
-              updated
-            })
           } else {
             // If after all the tries, just treat it as if user is locked
-            resolve({
+            resolve({ sent: false })
-              sent: false,
-              updated
-            })
           }
         })
     })