Improve result rendering for small result sets

Ensure that the result pausing timeout is always reset while there are still not yet enough results to render a full set.

src/actions/search-results.js

@@ -57,8 +57,11 @@ export function receiveRelatedResult (items) {
 
 export function setSearchComplete (result = 'timeout') {
   return (dispatch, getState) => {
-    const { search: { resultId } } = getState();
+    const { search: { resultId, displayedItems } } = getState();
     if (result === 'timeout' || result.graphql.searchId === resultId) { // check result corresponds to the current search
+      if (displayedItems.length === 0) {
+        dispatch(loadMoreItemsIntoFeed());
+      }
       return dispatch({ type: SEARCH_COMPLETE });
     }
   };
@@ -161,8 +164,6 @@ export function startSearch (a) {
   };
 }
 
-let renderTimer, fallbackTimer;
-
 export function saveSearchResult (result) {
   return (dispatch, getState) => {
     const { search: { resultId } } = getState();
@@ -178,22 +179,16 @@ export function saveSearchResult (result) {
   };
 }
 
+let renderTimer;
 export function loadInitialData () {
   return (dispatch, getState) => {
     const { search: { displayedItems, items, initialPageSize } } = getState();
     // if there is enough data to render the first page of results, do so immediately and clear any timers
     if (displayedItems.length < initialPageSize && items.length > initialPageSize) {
       if (renderTimer) timers.clearTimeout(renderTimer);
-      if (fallbackTimer) timers.clearTimeout(fallbackTimer);
       dispatch(loadMoreItemsIntoFeed());
-    // wait up to 3s for results before rendering anyway
-    } else if (displayedItems.length === 0) {
-      if (renderTimer) timers.clearTimeout(renderTimer);
-      fallbackTimer = timers.setTimeout(() => {
-        dispatch(loadMoreItemsIntoFeed());
-      }, 3000);
-    // otherwise if no results are received for 1s then push what we have
-    } else {
+    } else if (displayedItems.length < initialPageSize) {
+      // otherwise if no results are received for 1s then push what we have
       if (renderTimer) timers.clearTimeout(renderTimer);
       renderTimer = timers.setTimeout(() => {
         dispatch(loadMoreItemsIntoFeed());

src/reducers/search.js

@@ -21,7 +21,7 @@ import {
   UPDATE_DISPLAYED_ITEMS,
   RECEIVE_RELATED_RESULT,
   SEARCH_COMPLETE,
-  UPDATE_TILE_RANKING,
+  UPDATE_TILE_RANKING
 } from '../constants/actionTypes';
 
 import DEFAULT_TAG from '../constants/default-tag.js';