[FIX] Spotlight returning duplicated entries (#2805)

* Update rocketchat.js

* Updated search function

* Minor improvements

* Remove atIndex

* Add remove logic to remove duplicate data from response

Co-authored-by: Diego Mello <diegolmello@gmail.com>

app/lib/rocketchat.js

@@ -627,8 +627,7 @@ const RocketChat = {
 					fname: sub.fname,
 					avatarETag: sub.avatarETag,
 					t: sub.t,
-					encrypted: sub.encrypted,
+					encrypted: sub.encrypted
-					search: true
 				};
 			}
 			return sub;
@@ -648,7 +647,7 @@ const RocketChat = {
 			return [];
 		}
 
-		let data = await this.localSearch({ text, filterUsers, filterRooms });
+		const data = await this.localSearch({ text, filterUsers, filterRooms });
 
 		const usernames = data.map(sub => sub.name);
 		try {
@@ -658,13 +657,18 @@ const RocketChat = {
 					new Promise((resolve, reject) => this.oldPromise = reject)
 				]);
 				if (filterUsers) {
-					data = data.concat(users.map(user => ({
+					users
-						...user,
+						.filter((item1, index) => users.findIndex(item2 => item2._id === item1._id) === index) // Remove duplicated data from response
-						rid: user.username,
+						.filter(user => !data.some(sub => user.username === sub.name)) // Make sure to remove users already on local database
-						name: user.username,
+						.forEach((user) => {
-						t: 'd',
+							data.push({
-						search: true
+								...user,
-					})));
+								rid: user.username,
+								name: user.username,
+								t: 'd',
+								search: true
+							});
+						});
 				}
 				if (filterRooms) {
 					rooms.forEach((room) => {

e2e/tests/assorted/05-joinpublicroom.spec.js

@@ -9,8 +9,8 @@ const room = data.channels.detoxpublic.name;
 
 async function navigateToRoom() {
 	await searchRoom(room);
-	await waitFor(element(by.id(`rooms-list-view-item-${ room }`)).atIndex(0)).toBeVisible().withTimeout(60000);
+	await waitFor(element(by.id(`rooms-list-view-item-${ room }`))).toBeVisible().withTimeout(60000);
-	await element(by.id(`rooms-list-view-item-${ room }`)).atIndex(0).tap();
+	await element(by.id(`rooms-list-view-item-${ room }`)).tap();
 	await waitFor(element(by.id('room-view'))).toBeVisible().withTimeout(5000);
 }
 

e2e/tests/assorted/08-joinprotectedroom.spec.js

@@ -10,8 +10,8 @@ const joinCode = data.channels.detoxpublicprotected.joinCode
 
 async function navigateToRoom() {
 	await searchRoom(room);
-	await waitFor(element(by.id(`rooms-list-view-item-${ room }`)).atIndex(0)).toBeVisible().withTimeout(60000);
+	await waitFor(element(by.id(`rooms-list-view-item-${ room }`))).toBeVisible().withTimeout(60000);
-	await element(by.id(`rooms-list-view-item-${ room }`)).atIndex(0).tap();
+	await element(by.id(`rooms-list-view-item-${ room }`)).tap();
 	await waitFor(element(by.id('room-view'))).toBeVisible().withTimeout(5000);
 }
 

e2e/tests/onboarding/06-roomslist.spec.js

@@ -18,7 +18,7 @@ describe('Rooms list screen', () => {
 		});
 
 		it('should have room item', async() => {
-			await expect(element(by.id('rooms-list-view-item-general')).atIndex(0)).toExist();
+			await expect(element(by.id('rooms-list-view-item-general'))).toExist();
 		});
 		
 		// Render - Header

e2e/tests/room/01-createroom.spec.js

@@ -67,12 +67,12 @@ describe('Create room screen', () => {
 
 		it('should select/unselect user', async() => {
 			// Spotlight issues
-			await element(by.id('select-users-view-item-rocket.cat')).atIndex(0).tap();
+			await element(by.id('select-users-view-item-rocket.cat')).tap();
 			await waitFor(element(by.id('selected-user-rocket.cat'))).toBeVisible().withTimeout(10000);
 			await element(by.id('selected-user-rocket.cat')).tap();
 			await waitFor(element(by.id('selected-user-rocket.cat'))).toBeNotVisible().withTimeout(10000);
 			// Spotlight issues
-			await element(by.id('select-users-view-item-rocket.cat')).atIndex(0).tap();
+			await element(by.id('select-users-view-item-rocket.cat')).tap();
 			await waitFor(element(by.id('selected-user-rocket.cat'))).toBeVisible().withTimeout(10000);
 		});
 

e2e/tests/room/03-roomactions.spec.js

@@ -13,8 +13,8 @@ async function navigateToRoomActions(type) {
 		room = data.groups.private.name;
 	}
 	await searchRoom(room);
-	await waitFor(element(by.id(`rooms-list-view-item-${ room }`)).atIndex(0)).toExist().withTimeout(60000);
+	await waitFor(element(by.id(`rooms-list-view-item-${ room }`))).toExist().withTimeout(60000);
-	await element(by.id(`rooms-list-view-item-${ room }`)).atIndex(0).tap();
+	await element(by.id(`rooms-list-view-item-${ room }`)).tap();
 	await waitFor(element(by.id('room-view'))).toExist().withTimeout(2000);
 	await element(by.id('room-view-header-actions')).tap();
 	await waitFor(element(by.id('room-actions-view'))).toExist().withTimeout(5000);

e2e/tests/room/04-roominfo.spec.js

@@ -14,8 +14,8 @@ async function navigateToRoomInfo(type) {
 		room = privateRoomName;
 	}
 	await searchRoom(room);
-	await waitFor(element(by.id(`rooms-list-view-item-${ room }`)).atIndex(0)).toExist().withTimeout(60000);
+	await waitFor(element(by.id(`rooms-list-view-item-${ room }`))).toExist().withTimeout(60000);
-	await element(by.id(`rooms-list-view-item-${ room }`)).atIndex(0).tap();
+	await element(by.id(`rooms-list-view-item-${ room }`)).tap();
 	await waitFor(element(by.id('room-view'))).toExist().withTimeout(2000);
 	await element(by.id('room-view-header-actions')).tap();
 	await waitFor(element(by.id('room-actions-view'))).toExist().withTimeout(5000);

package.json

@@ -193,7 +193,8 @@
         "build": "xcodebuild -workspace ios/RocketChatRN.xcworkspace -scheme RocketChatRN -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build",
         "type": "ios.simulator",
         "device": {
-          "type": "iPhone 11 Pro"
+          "type": "iPhone 11 Pro",
+          "os": "13.7"
         }
       },
       "ios.sim.release": {
@@ -201,7 +202,8 @@
         "build": "xcodebuild -workspace ios/RocketChatRN.xcworkspace -scheme RocketChatRN -configuration Release -sdk iphonesimulator -derivedDataPath ios/build",
         "type": "ios.simulator",
         "device": {
-          "type": "iPhone 11 Pro"
+          "type": "iPhone 11 Pro",
+          "os": "13.7"
         },
         "artifacts": {
           "plugins": {