From 739a060013afa3a15caea875a5448e176f17e79b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Thu, 29 Nov 2018 11:45:43 +0100
Subject: [PATCH] Fix search listing and loading indicator
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 src/components/Search.vue | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/components/Search.vue b/src/components/Search.vue
index 0cecb528..790040b4 100644
--- a/src/components/Search.vue
+++ b/src/components/Search.vue
@@ -22,15 +22,13 @@
 
 <template>
 	<div class="social__wrapper">
-		<div v-if="results.length < 1" id="emptycontent" :class="{'icon-loading': loading}"
-			class="">
-			<div class="icon-search" />
-			<h2>{{ t('social', 'No accounts found') }}</h2>
-			<p>No accounts found for {{ term }}</p>
+		<div v-if="results.length < 1" id="emptycontent" :class="{'icon-loading': loading}">
+			<div v-if="!loading" class="icon-search" />
+			<h2 v-if="!loading">{{ t('social', 'No accounts found') }}</h2>
+			<p v-if="!loading">No accounts found for {{ term }}</p>
 		</div>
 		<div v-if="match || results.length > 0">
 			<h3>{{ t('social', 'Search') }} {{ term }}</h3>
-			<UserEntry :item="match" />
 			<UserEntry v-for="result in results" :key="result.id" :item="result" />
 		</div>
 	</div>
@@ -63,22 +61,34 @@ export default {
 			match: null
 		}
 	},
+	beforeMount() {
+		this.search(this.term)
+	},
 	watch: {
 		term(val) {
+			// TODO: debounce
+			this.search(val)
+		}
+	},
+	methods: {
+		search(val) {
 			this.loading = true
-			this.accountSearch(val).then((response) => {
-				this.results = response.data.result.accounts
-				this.loading = false
-			})
 			const re = /@((\w+)(@[\w.]+)?)/g
 			if (val.match(re)) {
 				this.remoteSearch(val).then((response) => {
 					this.match = response.data.result.account
+					this.accountSearch(val).then((response) => {
+						this.results = response.data.result.accounts
+						this.loading = false
+					})
 				}).catch((e) => { this.match = null })
+			} else {
+				this.accountSearch(val).then((response) => {
+					this.results = response.data.result.accounts
+					this.loading = false
+				})
 			}
-		}
-	},
-	methods: {
+		},
 		accountSearch(term) {
 			this.loading = true
 			return axios.get(OC.generateUrl('apps/social/api/v1/accounts/search?search=' + term))