Merge branch 'development' into production

Author: blackjackkent

src/infrastructure/selectors/common/__tests__/buildThreadDataByPredicate.spec.js

@@ -106,4 +106,39 @@ describe('behavior', () => {
 			status: null
 		});
 	});
+	it('should skip statuses with no matching thread', () => {
+		const threads = getThreads();
+		const statuses = getStatuses();
+		statuses.push({
+			threadId: 'f',
+			postId: 6,
+			isCallingCharactersTurn: true
+		});
+		const result = buildThreadDataByPredicate(
+			threads, statuses, s => s.isCallingCharactersTurn, false
+		);
+		expect(result).toHaveLength(2);
+		expect(result[0]).toEqual({
+			thread: {
+				threadId: 'a',
+				postId: 1
+			},
+			status: {
+				threadId: 'a',
+				postId: 1,
+				isCallingCharactersTurn: true
+			}
+		});
+		expect(result[1]).toEqual({
+			thread: {
+				threadId: 'b',
+				postId: 2
+			},
+			status: {
+				threadId: 'b',
+				postId: 2,
+				isCallingCharactersTurn: true
+			}
+		});
+	});
 });

src/infrastructure/selectors/common/buildThreadDataByPredicate.js

@@ -1,10 +1,12 @@
 export default (threads, threadsStatus, predicate, includeNullStatus) => {
-	let results = [];
 	const statuses = threadsStatus.filter(predicate);
-	results = results.concat(statuses.map((s) => {
-		const thread = threads.find(t => t.postId === s.postId && t.threadId === s.threadId);
-		return { thread, status: s };
-	}));
+	let results = statuses.reduce((result, status) => {
+		const thread = threads.find(t => t.postId === status.postId && t.threadId === status.threadId);
+		if (thread) {
+			result.push({ thread, status });
+		}
+		return result;
+	}, []);
 	if (includeNullStatus) {
 		results = results.concat(threads.filter(t => !t.postId)
 			.map(t => ({ thread: t, status: null })));