followers/following fixes/improvements

Author: Resul Avan

src/components/profile/header/ProfileFollow.vue

@@ -15,14 +15,29 @@
 
       <div class="control">
         <b-taglist attached>
-          <a class="tag" @click="showFollowers">{{$t('profile.follow.followers')}}</a>
+          <a class="tag" @click="showFollowers">
+            <b-icon
+              class="has-margin-right-5"
+              icon="account-arrow-left"
+              size="is-small">
+            </b-icon>
+
+            {{$t('profile.follow.followers')}}
+          </a>
           <a class="tag is-primary" @click="showFollowers">{{followerCount}}</a>
         </b-taglist>
       </div>
 
       <div class="control">
         <b-taglist attached>
-          <a class="tag" @click="showFollowings">{{$t('profile.follow.following')}}</a>
+          <a class="tag" @click="showFollowings">
+            <b-icon
+              class="has-margin-right-5"
+              icon="account-arrow-right"
+              size="is-small">
+            </b-icon>
+            {{$t('profile.follow.following')}}
+          </a>
           <a class="tag is-primary" @click="showFollowings">{{followingCount}}</a>
         </b-taglist>
       </div>
@@ -42,7 +57,7 @@
     getFollowingByFollowerAndFollowing,
     saveFollowing
   } from '~/service/firebase/firestore/following-service';
-  import { sendDangerNotification, showInfoToaster } from '~/service/notification-service';
+  import { sendDangerNotification, showErrorToaster, showInfoToaster } from '~/service/notification-service';
   import { showProfileModule } from '~/service/rx-service';
 
   @Component({
@@ -83,7 +98,10 @@
           this.followingCount = followingCount
 
         })
-        .catch(() => sendDangerNotification(this.$store.dispatch, this.$t('notification.follow.canNotLoadFollowing')))
+        .catch((error) => {
+          console.log(error)
+          showErrorToaster(this.$t('notification.follow.canNotLoadFollowing'))
+        })
 
       this.width = window.innerWidth
       window.addEventListener('resize', this.handleResize);

src/components/profile/module/ProfileModule.vue

@@ -61,13 +61,13 @@
       },
       {
         moduleType: ModuleType.ProfileFollowers,
-        icon: 'link-variant',
+        icon: 'account-arrow-left',
         module: ProfileFollowers,
         private: true
       },
       {
         moduleType: ModuleType.ProfileFollowings,
-        icon: 'link-variant',
+        icon: 'account-arrow-right',
         module: ProfileFollowings,
         private: true
       },

src/service/firebase/firestore/following-service.ts

@@ -3,7 +3,6 @@ import {
   CollectionField,
   FirebaseQueryOperator,
   Following,
-  orderByName,
   PagingResponse,
   SearchData,
   User,
@@ -13,7 +12,6 @@ import {
   deleteModel,
   getCountByWhereClauses,
   getModelsByWhereClauses,
-  getModelsByWhereClausesAndOrderBy,
   saveModel
 } from '~/service/firebase/firestore/firestore-service'
 import { getUser, toSearchDataPagingResponse, userIncludes } from '~/service/firebase/firestore/user-service'
@@ -53,7 +51,7 @@ export const getFollowingByFollowerAndFollowing = async (follower: string, follo
     operator: FirebaseQueryOperator.EQ,
     value: following
   }
-  const followingList: Following[] = await getModelsByWhereClausesAndOrderBy(collection.FOLLOWING, orderByName, wcFollower, wcFollowing)
+  const followingList: Following[] = await getModelsByWhereClauses(collection.FOLLOWING, wcFollower, wcFollowing)
 
   return followingList.find((fllwng) => fllwng.following === following && fllwng.follower === follower)
 }
@@ -72,9 +70,9 @@ export const getCountOfFollowing = (user: User) => {
 
 export const searchFollowers = async (user: User, query: string, page: number, limit: number): Promise<PagingResponse<SearchData>> => {
   const queryLower = query?.toLocaleString()
-  const whereClause = followingWhereClause(user)
+  const whereClauseForFollowings = followingWhereClause(user)
 
-  const followingList = await getModelsByWhereClauses(collection.FOLLOWING, whereClause) as Following[]
+  const followingList = await getModelsByWhereClauses(collection.FOLLOWING, whereClauseForFollowings) as Following[]
 
   const users: User[] = [];
 
@@ -96,9 +94,9 @@ export const searchFollowers = async (user: User, query: string, page: number, l
 
 export const searchFollowings = async (user: User, query: string, page: number, limit: number): Promise<PagingResponse<SearchData>> => {
   const queryLower = query?.toLocaleString()
-  const whereClause = followersWhereClause(user)
+  const whereClauseForFollowers = followersWhereClause(user)
 
-  const followingList = await getModelsByWhereClauses(collection.FOLLOWING, whereClause) as Following[]
+  const followingList = await getModelsByWhereClauses(collection.FOLLOWING, whereClauseForFollowers) as Following[]
 
   const users: User[] = [];
 

src/service/firebase/firestore/user-service.ts

@@ -69,6 +69,9 @@ export const searchUsers = async (query: string, page: number, limit: number): P
 };
 
 export const userIncludes = (user: User, query: string) => {
+  if (!query) {
+    return true
+  }
   return user.username?.toLowerCase().includes(query)
     || user.name?.toLowerCase().includes(query)
     || user.surname?.toLowerCase().includes(query)