Add a separate action for selecting search annotations

src/state/actions/action-types.js

@@ -67,6 +67,7 @@ const ActionTypes = {
   REMOVE_SEARCH: 'mirador/REMOVE_SEARCH',
 
   SELECT_CONTENT_SEARCH_ANNOTATION: 'mirador/SELECT_CONTENT_SEARCH_ANNOTATION',
+  SELECT_CONTENT_SEARCH_ANNOTATIONS: 'mirador/SELECT_CONTENT_SEARCH_ANNOTATIONS',
 
   UPDATE_LAYERS: 'mirador/UPDATE_LAYERS',
   ADD_RESOURCE: 'mirador/ADD_RESOURCE',

src/state/actions/search.js

@@ -139,3 +139,8 @@ export function selectContentSearchAnnotation(windowId, companionWindowId, annot
     });
   };
 }
+
+/** */
+export function selectContentSearchAnnotations(windowId, annotationsBySearch) {
+  return { annotationsBySearch, type: ActionTypes.SELECT_CONTENT_SEARCH_ANNOTATIONS, windowId };
+}

src/state/reducers/search.js

@@ -105,16 +105,14 @@ export const searchesReducer = (state = {}, action) => {
           },
         },
       };
-    case ActionTypes.SET_CANVAS:
-      if (Object.keys(action.searches).length === 0) return state;
-
+    case ActionTypes.SELECT_CONTENT_SEARCH_ANNOTATIONS:
       return {
         ...state,
         [action.windowId]: Object.keys(state[action.windowId]).reduce((object, key) => {
-          if (Object.keys(action.searches).includes(key)) {
+          if (Object.keys(action.annotationsBySearch).includes(key)) {
             object[key] = { // eslint-disable-line no-param-reassign
               ...state[action.windowId][key],
-              selectedContentSearchAnnotation: action.searches[key],
+              selectedContentSearchAnnotation: action.annotationsBySearch[key],
             };
           }
           return object;

src/state/reducers/windows.js

@@ -113,7 +113,7 @@ export const windowsReducer = (state = {}, action) => {
     case ActionTypes.SET_CANVAS:
       return updateIn(state, [action.windowId], orig => merge(orig, {
         canvasId: action.canvasId,
-        selectedContentSearchAnnotation: action.selectedContentSearchAnnotation,
+        visibleCanvases: action.visibleCanvases || [],
       }));
     case ActionTypes.ADD_COMPANION_WINDOW:
       return {
@@ -154,6 +154,14 @@ export const windowsReducer = (state = {}, action) => {
           selectedContentSearchAnnotation: action.annotationId,
         },
       };
+    case ActionTypes.SELECT_CONTENT_SEARCH_ANNOTATIONS:
+      return {
+        ...state,
+        [action.windowId]: {
+          ...state[action.windowId],
+          selectedContentSearchAnnotation: Object.values(action.annotationsBySearch)[0],
+        },
+      };
     case ActionTypes.SELECT_ANNOTATION:
       return {
         ...state,