Revert "refactor(algolia): remove multi-index hack"

This reverts commit 25b9c04. See https://owid.slack.com/archives/C06UA61V85U/p1714772362766019 for the regression this commit caused.
owid · May 6, 2024 · dd17151 · dd17151
1 parent cce974b
commit dd17151
Showing 1 changed file with 51 additions and 42 deletions.
diff --git a/site/search/SearchPanel.tsx b/site/search/SearchPanel.tsx
@@ -626,51 +626,53 @@ const SearchResults = (props: SearchResultsProps) => {
             className="search-results"
             data-active-filter={activeCategoryFilter}
         >
-            <Index indexName={getIndexName(SearchIndexName.Pages)}>
-                <Configure
-                    hitsPerPage={40}
-                    distinct
-                    clickAnalytics={hasClickAnalyticsConsent}
-                    // If we detect a country/region name in the query, we don't run a fulltext search
-                    restrictSearchableAttributes={
-                        searchQueryRegionsMatches
-                            ? PAGES_ATTRIBUTES_TO_SEARCH_NO_FULLTEXT
-                            : undefined
-                    }
-                />
-                <NoResultsBoundary>
-                    <section className="search-results__pages">
-                        <header className="search-results__header-container">
-                            <div className="search-results__header">
-                                <h2 className="h2-bold search-results__section-title">
-                                    Research & Writing
-                                </h2>
-                                <ShowMore
-                                    category={SearchIndexName.Pages}
-                                    cutoffNumber={4}
-                                    activeCategoryFilter={activeCategoryFilter}
-                                    handleCategoryFilterClick={
-                                        handleCategoryFilterClick
-                                    }
-                                />
-                            </div>
-                        </header>
-                        <Hits
-                            classNames={{
-                                root: "search-results__list-container",
-                                list: "search-results__pages-list grid grid-cols-2 grid-sm-cols-1",
-                                item: "search-results__page-hit",
-                            }}
-                            hitComponent={PagesHit}
-                        />
-                    </section>
-                </NoResultsBoundary>
-            </Index>
+            {/* This is using the InstantSearch index specified in InstantSearchContainer */}
+            <Configure
+                hitsPerPage={40}
+                distinct
+                clickAnalytics={hasClickAnalyticsConsent}
+                // If we detect a country/region name in the query, we don't run a fulltext search
+                restrictSearchableAttributes={
+                    searchQueryRegionsMatches
+                        ? PAGES_ATTRIBUTES_TO_SEARCH_NO_FULLTEXT
+                        : undefined
+                }
+            />
+            <NoResultsBoundary>
+                <section className="search-results__pages">
+                    <header className="search-results__header-container">
+                        <div className="search-results__header">
+                            <h2 className="h2-bold search-results__section-title">
+                                Research & Writing
+                            </h2>
+                            <ShowMore
+                                category={SearchIndexName.Pages}
+                                cutoffNumber={4}
+                                activeCategoryFilter={activeCategoryFilter}
+                                handleCategoryFilterClick={
+                                    handleCategoryFilterClick
+                                }
+                            />
+                        </div>
+                    </header>
+                    <Hits
+                        classNames={{
+                            root: "search-results__list-container",
+                            list: "search-results__pages-list grid grid-cols-2 grid-sm-cols-1",
+                            item: "search-results__page-hit",
+                        }}
+                        hitComponent={PagesHit}
+                    />
+                </section>
+            </NoResultsBoundary>
             <Index indexName={getIndexName(SearchIndexName.Charts)}>
                 <Configure
                     hitsPerPage={40}
                     distinct
                     clickAnalytics={hasClickAnalyticsConsent}
+                    restrictSearchableAttributes={
+                        "" as any
+                    } /* Hack: This is the only way to _not_ send `restrictSearchableAttributes` along for this index */
                 />
                 <NoResultsBoundary>
                     <section className="search-results__charts">
@@ -703,7 +705,11 @@ const SearchResults = (props: SearchResultsProps) => {
             <Index indexName={getIndexName(SearchIndexName.ExplorerViews)}>
                 <Configure
                     hitsPerPage={20}
+                    distinct={4}
                     clickAnalytics={hasClickAnalyticsConsent}
+                    restrictSearchableAttributes={
+                        "" as any
+                    } /* Hack: This is the only way to _not_ send `restrictSearchableAttributes` along for this index */
                 />
                 <NoResultsBoundary>
                     <section className="search-results__explorers">
@@ -815,22 +821,25 @@ export class InstantSearchContainer extends React.Component {
                     // we're customizing it here to remove any filter / facet information so that it's just ?q=some+query
                     stateMapping: {
                         stateToRoute(uiState) {
-                            const query = uiState[""].query
+                            const query =
+                                uiState[getIndexName(SearchIndexName.Pages)]
+                                    .query
                             return {
                                 q: query,
                             }
                         },
                         routeToState(routeState) {
                             const query = routeState.q
                             return {
-                                "": {
+                                [getIndexName(SearchIndexName.Pages)]: {
                                     query: query,
                                 },
                             }
                         },
                     },
                 }}
                 searchClient={this.searchClient}
+                indexName={getIndexName(SearchIndexName.Pages)}
             >
                 <div className="search-panel">
                     <SearchBox