diff --git a/src/components/version-dropdown.js b/src/components/version-dropdown.js
index 4e939a9c3df..920d3649870 100644
--- a/src/components/version-dropdown.js
+++ b/src/components/version-dropdown.js
@@ -3,10 +3,7 @@ import { Dropdown } from "react-bootstrap";
import { Link } from "./";
const DropdownItem = ({ to, active, children }) => (
-
+
{children}
);
diff --git a/src/pages/404.js b/src/pages/404.js
index f48e9cc8ad5..f1cd7bb008b 100644
--- a/src/pages/404.js
+++ b/src/pages/404.js
@@ -5,13 +5,15 @@ import {
InstantSearch,
Configure,
Hits,
- connectSearchBox,
- connectStateResults,
-} from "react-instantsearch-dom";
+ useSearchBox,
+ useInstantSearch,
+ useRefinementList,
+} from "react-instantsearch";
import { Footer, Layout, Link, MainContent } from "../components";
import Icon, { iconNames } from "../components/icon";
import useSiteMetadata from "../hooks/use-sitemetadata";
import usePathPrefix from "../hooks/use-path-prefix";
+import { products } from "../constants/products";
const searchClient = algoliasearch(
"HXNAF5X3I8",
@@ -19,34 +21,49 @@ const searchClient = algoliasearch(
);
const buildQuery = (pathname, pathPrefix) => {
- const tokens = pathname
- .replace("/edb-docs", "")
- .replace(/-/g, " ")
- .split("/");
-
- const productIndex = tokens.findIndex((token) => token.match(/edb\s/g));
-
- let product = null;
- let title = null;
- let version = null;
-
- if (productIndex >= 0) {
- product = tokens[productIndex];
- }
- if (productIndex + 2 < tokens.length - 1) {
- title = tokens[productIndex + 2];
- }
- if (productIndex + 3 < tokens.length - 1) {
- version = (tokens[productIndex + 3].match(/\d+/g) || [])[0];
+ // legacy URLs (Docs 1.0)
+ if (pathname.startsWith("/edb-docs")) {
+ const tokens = pathname
+ .replace("/edb-docs", "")
+ .replace(/-/g, " ")
+ .split("/");
+
+ const productIndex = tokens.findIndex((token) => token.match(/edb\s/g));
+
+ let product = null;
+ let title = null;
+ let version = null;
+
+ if (productIndex >= 0) {
+ product = tokens[productIndex];
+ }
+ if (productIndex + 2 < tokens.length - 1) {
+ title = tokens[productIndex + 2];
+ }
+ if (productIndex + 3 < tokens.length - 1) {
+ version = (tokens[productIndex + 3].match(/\d+/g) || [])[0];
+ }
+
+ if (product) {
+ return {
+ refinementList: { product: [product] },
+ query: `${title ? title : ""} ${version ? version : ""}`,
+ };
+ }
}
- if (product) {
- return `${product} ${title ? title : ""} ${version ? version : ""}`;
+ const cleanRegex = /-|\//g;
+
+ if (pathname.startsWith(pathPrefix)) pathname.replace(pathPrefix, "");
+ const segments = pathname.split("/");
+ if (products[segments[1]]) {
+ return {
+ refinementList: { product: [segments[1]] },
+ query: segments.slice(3).join(" ").replace(cleanRegex, " ").trim(),
+ };
}
- // eslint-disable-next-line no-useless-escape
- const regex = new RegExp(`\/${pathPrefix}\/|-|\/`, "g");
- return pathname.replace(regex, " ").trim();
+ return { query: pathname.replace(cleanRegex, " ").trim() };
};
const PageNotFound = ({ path }) => (
@@ -65,33 +82,40 @@ const Ascii404 = () => (
/>
);
-const SuggestedLinksSearch = ({ query }) => {
+const SuggestedLinksSearch = ({ queryParams }) => {
const { algoliaIndex } = useSiteMetadata();
return (
Not finding what you need?
- Try Search by Product
+ Try Advanced Search
);
};
-const SuggestedLinks = connectStateResults(({ searchResults }) => {
+const SuggestedLinks = () => {
+ const { results: searchResults } = useInstantSearch();
+ useSearchBox(); // ensures query is actually sent
+ useRefinementList({ attribute: "product" }); // ensures product refinement is actually sent
+
return (
<>
-
{searchResults && searchResults.nbHits > 0 && (
<>
Suggested links based on the requested URL:
@@ -103,12 +127,7 @@ const SuggestedLinks = connectStateResults(({ searchResults }) => {
)}
);
-});
-
-const HiddenSearchBox = connectSearchBox(({ currentRefinement }) => (
- // eslint-disable-next-line jsx-a11y/control-has-associated-label
-
-));
+};
const SuggestedHit = ({ hit }) => (
@@ -119,7 +138,7 @@ const SuggestedHit = ({ hit }) => (
const NotFound = (data) => {
const pathPrefix = usePathPrefix();
- const query = buildQuery(data.location.pathname, pathPrefix);
+ const queryParams = buildQuery(data.location.pathname, pathPrefix);
return (
@@ -129,7 +148,7 @@ const NotFound = (data) => {