feat(indexId): rely on indexId rather than indexName in SSR [PART-4]

packages/react-instantsearch-core/src/connectors/connectConfigure.js

@@ -1,6 +1,10 @@
 import { omit, difference, keys } from 'lodash';
 import createConnector from '../core/createConnector';
-import { hasMultipleIndex, getIndex, refineValue } from '../core/indexUtils';
+import {
+  refineValue,
+  getIndexId,
+  hasMultipleIndices,
+} from '../core/indexUtils';
 
 function getId() {
   return 'configure';
@@ -29,10 +33,10 @@ export default createConnector({
   },
   cleanUp(props, searchState) {
     const id = getId();
-    const index = getIndex(this.context);
+    const indexId = getIndexId(this.context);
     const subState =
-      hasMultipleIndex(this.context) && searchState.indices
-        ? searchState.indices[index]
+      hasMultipleIndices(this.context) && searchState.indices
+        ? searchState.indices[indexId]
         : searchState;
     const configureKeys =
       subState && subState[id] ? Object.keys(subState[id]) : [];

packages/react-instantsearch-core/src/connectors/connectGeoSearch.js

@@ -3,7 +3,7 @@ import createConnector from '../core/createConnector';
 import {
   getResults,
   getCurrentRefinementValue,
-  getIndex,
+  getIndexId,
   refineValue,
   cleanUpValue,
 } from '../core/indexUtils';
@@ -205,7 +205,7 @@ export default createConnector({
   getMetadata(props, searchState) {
     const items = [];
     const id = getBoundingBoxId();
-    const index = getIndex(this.context);
+    const index = getIndexId(this.context);
     const nextRefinement = {};
     const currentRefinement = getCurrentRefinement(
       props,

packages/react-instantsearch-core/src/connectors/connectHierarchicalMenu.js

@@ -3,7 +3,7 @@ import { SearchParameters } from 'algoliasearch-helper';
 import createConnector from '../core/createConnector';
 import {
   cleanUpValue,
-  getIndex,
+  getIndexId,
   refineValue,
   getCurrentRefinementValue,
   getResults,
@@ -270,7 +270,7 @@ export default createConnector({
 
     return {
       id,
-      index: getIndex(this.context),
+      index: getIndexId(this.context),
       items: !currentRefinement
         ? []
         : [

packages/react-instantsearch-core/src/connectors/connectMenu.js

@@ -2,7 +2,7 @@ import { orderBy } from 'lodash';
 import PropTypes from 'prop-types';
 import createConnector from '../core/createConnector';
 import {
-  getIndex,
+  getIndexId,
   cleanUpValue,
   refineValue,
   getCurrentRefinementValue,
@@ -222,7 +222,7 @@ export default createConnector({
     );
     return {
       id,
-      index: getIndex(this.context),
+      index: getIndexId(this.context),
       items:
         currentRefinement === null
           ? []

packages/react-instantsearch-core/src/connectors/connectNumericMenu.js

@@ -6,7 +6,7 @@ import {
   refineValue,
   getCurrentRefinementValue,
   getResults,
-  getIndex,
+  getIndexId,
 } from '../core/indexUtils';
 
 function stringifyItem(item) {
@@ -209,7 +209,7 @@ export default createConnector({
     const id = getId(props);
     const value = getCurrentRefinement(props, searchState, this.context);
     const items = [];
-    const index = getIndex(this.context);
+    const index = getIndexId(this.context);
     if (value !== '') {
       const { label } = find(
         props.items,

packages/react-instantsearch-core/src/connectors/connectRange.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import createConnector from '../core/createConnector';
 import {
   cleanUpValue,
-  getIndex,
+  getIndexId,
   refineValue,
   getCurrentRefinementValue,
   getResults,
@@ -332,7 +332,7 @@ export default createConnector({
 
     return {
       id: getId(props),
-      index: getIndex(this.context),
+      index: getIndexId(this.context),
       items,
     };
   },

packages/react-instantsearch-core/src/connectors/connectRefinementList.js

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import createConnector from '../core/createConnector';
 import {
   cleanUpValue,
-  getIndex,
+  getIndexId,
   refineValue,
   getCurrentRefinementValue,
   getResults,
@@ -226,7 +226,7 @@ export default createConnector({
     const context = this.context;
     return {
       id,
-      index: getIndex(this.context),
+      index: getIndexId(this.context),
       items:
         getCurrentRefinement(props, searchState, context).length > 0
           ? [

packages/react-instantsearch-core/src/connectors/connectScrollTo.js

@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import createConnector from '../core/createConnector';
 import {
   getCurrentRefinementValue,
-  hasMultipleIndex,
-  getIndex,
+  hasMultipleIndices,
+  getIndexId,
 } from '../core/indexUtils';
 import { shallowEqual } from '../core/utils';
 
@@ -44,9 +44,10 @@ export default createConnector({
     }
 
     /* Get the subpart of the state that interest us*/
-    if (hasMultipleIndex(this.context)) {
-      const index = getIndex(this.context);
-      searchState = searchState.indices ? searchState.indices[index] : {};
+    if (hasMultipleIndices(this.context)) {
+      searchState = searchState.indices
+        ? searchState.indices[getIndexId(this.context)]
+        : {};
     }
 
     /*

packages/react-instantsearch-core/src/connectors/connectSearchBox.js

@@ -4,7 +4,7 @@ import {
   cleanUpValue,
   refineValue,
   getCurrentRefinementValue,
-  getIndex,
+  getIndexId,
 } from '../core/indexUtils';
 
 function getId() {
@@ -86,7 +86,7 @@ export default createConnector({
     );
     return {
       id,
-      index: getIndex(this.context),
+      index: getIndexId(this.context),
       items:
         currentRefinement === null
           ? []

packages/react-instantsearch-core/src/connectors/connectToggleRefinement.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import createConnector from '../core/createConnector';
 import {
   cleanUpValue,
-  getIndex,
+  getIndexId,
   getResults,
   refineValue,
   getCurrentRefinementValue,
@@ -149,7 +149,7 @@ export default createConnector({
     const id = getId(props);
     const checked = getCurrentRefinement(props, searchState, this.context);
     const items = [];
-    const index = getIndex(this.context);
+    const index = getIndexId(this.context);
 
     if (checked) {
       items.push({

packages/react-instantsearch-core/src/core/createInstantSearchManager.js

@@ -3,9 +3,9 @@ import algoliasearchHelper from 'algoliasearch-helper';
 import createWidgetsManager from './createWidgetsManager';
 import createStore from './createStore';
 import { HIGHLIGHT_TAGS } from './highlight';
-import { hasMultipleIndex } from './indexUtils';
+import { hasMultipleIndices } from './indexUtils';
 
-const isMultiIndexContext = widget => hasMultipleIndex(widget.context);
+const isMultiIndexContext = widget => hasMultipleIndices(widget.context);
 const isTargetedIndexEqualIndex = (widget, indexId) =>
   widget.context.multiIndexContext.targetedIndex === indexId;