display result by order

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

Author: ArtificialOwl

js/circles.app.js

@@ -60,6 +60,8 @@ var curr = {
 	allowed_linked_groups: 0,
 	allowed_federated_circles: 0,
 	allowed_circles: 0,
+	searchOrder: 0,
+	searchOrderDisplayed: 0,
 
 	defineCircle: function (data) {
 		curr.circle = data.circle_id;

js/circles.app.results.members.js

@@ -98,14 +98,19 @@ var resultMembers = {
 
 
 	searchMembersResult: function(response) {
-
-		elements.membersSearchResult.children().remove();
-
 		if (response === null) {
+			elements.membersSearchResult.children().remove();
 			elements.membersSearchResult.fadeOut(0);
 			return;
 		}
 
+		if (response.order < curr.searchOrderDisplayed) {
+			return;
+		}
+
+		elements.membersSearchResult.children().remove();
+		curr.searchOrderDisplayed = response.order;
+
 		var currSearch = response.search;
 		$.each(response.result, function(index, value) {
 			elements.membersSearchResult.append('<div class="members_search" data-type="' +

js/circles.v1.members.js

@@ -25,15 +25,18 @@
 
 /** global: OC */
 /** global: OCA */
+/** global: curr */
 
 var members = {
 
 	searchUsers: function(search, callback) {
+		curr.searchOrder++;
 		OCA.Circles.api.request({
 			method: 'GET',
 			url: OC.generateUrl('/apps/circles/v1/globalsearch'),
 			data: {
-				search: search
+				search: search,
+				order: curr.searchOrder
 			}
 		}, callback);
 	},

lib/Command/CirclesSync.php

@@ -86,7 +86,7 @@ public function __construct(
 	protected function configure() {
 		parent::configure();
 		$this->setName('circles:manage:sync')
-			 ->setDescription('sync circles in GlobalScale env');
+			 ->setDescription('sync circles and members');
 	}
 
 

lib/Controller/MembersController.php

@@ -235,14 +235,17 @@ public function removeMemberById(string $memberId) {
 	 * @NoAdminRequired
 	 *
 	 * @param string $search
+	 * @param int $order
 	 *
 	 * @return DataResponse
 	 */
-	public function searchGlobal($search) {
-
+	public function searchGlobal(string $search, int $order) {
 		try {
 			$this->mustHaveFrontEndEnabled();
 
+			if ($search === 't') {
+				sleep(5);
+			}
 			$result = $this->searchService->searchGlobal($search);
 		} catch (\Exception $e) {
 			return
@@ -264,7 +267,7 @@ function($data, $k) use ($search) {
 			);
 		}
 
-		return $this->success(['search' => $search, 'result' => $result]);
+		return $this->success(['search' => $search, 'result' => $result, 'order' => $order]);
 	}
 
 }