[Issue #2732] clear search input when clicking search nav link

frontend/package.json

@@ -6,6 +6,7 @@
     "node": ">=20.0.0"
   },
   "scripts": {
+    "all-checks": "npm run test && npm run lint && npm run ts:check && npm run build",
     "build": "next build",
     "dev": "next dev",
     "debug": "NODE_OPTIONS='--inspect' next dev",

frontend/src/components/Header.tsx

@@ -1,11 +1,11 @@
 "use client";
 
-import { useFeatureFlags } from "src/hooks/useFeatureFlags";
 import { assetPath } from "src/utils/assetPath";
 
 import { useTranslations } from "next-intl";
 import Link from "next/link";
-import { useEffect, useRef, useState } from "react";
+import { usePathname } from "next/navigation";
+import { useCallback, useMemo, useState } from "react";
 import {
   GovBanner,
   NavMenuButton,
@@ -14,47 +14,75 @@ import {
   Header as USWDSHeader,
 } from "@trussworks/react-uswds";
 
-type PrimaryLinks = {
-  i18nKey: string;
-  href: string;
-}[];
+type PrimaryLink = {
+  text?: string;
+  href?: string;
+};
 
 type Props = {
   logoPath?: string;
   locale?: string;
 };
 
-const Header = ({ logoPath, locale }: Props) => {
+const NavLinks = ({
+  mobileExpanded,
+  onToggleMobileNav,
+}: {
+  mobileExpanded: boolean;
+  onToggleMobileNav: () => unknown;
+}) => {
   const t = useTranslations("Header");
-  const [isMobileNavExpanded, setIsMobileNavExpanded] = useState(false);
-  const handleMobileNavToggle = () => {
-    setIsMobileNavExpanded(!isMobileNavExpanded);
-  };
+  const path = usePathname();
 
-  const primaryLinksRef = useRef<PrimaryLinks>([]);
-  const { featureFlagsManager } = useFeatureFlags();
+  const getSearchLink = useCallback(
+    (onSearch: boolean) => {
+      return {
+        text: t("nav_link_search"),
+        href: onSearch ? "/search?refresh=true" : "/search",
+      };
+    },
+    [t],
+  );
 
-  useEffect(() => {
-    primaryLinksRef.current = [
-      { i18nKey: t("nav_link_home"), href: "/" },
-      { i18nKey: t("nav_link_process"), href: "/process" },
-      { i18nKey: t("nav_link_research"), href: "/research" },
-      { i18nKey: t("nav_link_subscribe"), href: "/subscribe" },
+  const navLinkList = useMemo(() => {
+    return [
+      { text: t("nav_link_home"), href: "/" },
+      getSearchLink(path.includes("/search")),
+      { text: t("nav_link_process"), href: "/process" },
+      { text: t("nav_link_research"), href: "/research" },
+      { text: t("nav_link_subscribe"), href: "/subscribe" },
     ];
-    const searchNavLink = {
-      i18nKey: t("nav_link_search"),
-      href: "/search",
-    };
-    if (featureFlagsManager.isFeatureEnabled("showSearchV0")) {
-      primaryLinksRef.current.splice(1, 0, searchNavLink);
-    }
-  }, [featureFlagsManager, t]);
+  }, [t, path, getSearchLink]);
+
+  const navItems = useMemo(() => {
+    return navLinkList.map((link: PrimaryLink) => {
+      if (!link.text || !link.href) {
+        return <></>;
+      }
+      return (
+        <Link href={link.href} key={link.href}>
+          {link.text}
+        </Link>
+      );
+    });
+  }, [navLinkList]);
+
+  return (
+    <PrimaryNav
+      items={navItems}
+      mobileExpanded={mobileExpanded}
+      onToggleMobileNav={onToggleMobileNav}
+    ></PrimaryNav>
+  );
+};
 
-  const navItems = primaryLinksRef.current.map((link) => (
-    <Link href={link.href} key={link.href}>
-      {link.i18nKey}
-    </Link>
-  ));
+const Header = ({ logoPath, locale }: Props) => {
+  const t = useTranslations("Header");
+  const [isMobileNavExpanded, setIsMobileNavExpanded] =
+    useState<boolean>(false);
+  const handleMobileNavToggle = () => {
+    setIsMobileNavExpanded(!isMobileNavExpanded);
+  };
   const language = locale && locale.match("/^es/") ? "spanish" : "english";
 
   return (
@@ -85,11 +113,10 @@ const Header = ({ logoPath, locale }: Props) => {
               label={t("nav_menu_toggle")}
             />
           </div>
-          <PrimaryNav
-            items={navItems}
+          <NavLinks
             mobileExpanded={isMobileNavExpanded}
             onToggleMobileNav={handleMobileNavToggle}
-          ></PrimaryNav>
+          />
         </div>
       </USWDSHeader>
     </>

frontend/src/components/search/SearchBar.tsx

@@ -4,22 +4,38 @@ import { QueryContext } from "src/app/[locale]/search/QueryProvider";
 import { useSearchParamUpdater } from "src/hooks/useSearchParamUpdater";
 
 import { useTranslations } from "next-intl";
-import { useContext } from "react";
+import { useContext, useEffect, useRef } from "react";
 import { Icon } from "@trussworks/react-uswds";
 
 interface SearchBarProps {
   query: string | null | undefined;
 }
 
 export default function SearchBar({ query }: SearchBarProps) {
+  const inputRef = useRef<HTMLInputElement>(null);
   const { queryTerm, updateQueryTerm } = useContext(QueryContext);
-  const { updateQueryParams } = useSearchParamUpdater();
+  const { updateQueryParams, searchParams } = useSearchParamUpdater();
+  const t = useTranslations("Search");
 
   const handleSubmit = () => {
     updateQueryParams("", "query", queryTerm, false);
   };
 
-  const t = useTranslations("Search");
+  // if we have "refresh=true" query param, clear the input
+  // this supports the expected refresh of the input if the user clicks the search link while on the search page
+  useEffect(() => {
+    if (searchParams.get("refresh") && inputRef.current) {
+      updateQueryTerm("");
+      inputRef.current.value = "";
+    }
+  }, [searchParams, updateQueryTerm]);
+
+  // removes the "refresh" param once a user has dirtied the input
+  useEffect(() => {
+    if (searchParams.get("refresh") && inputRef.current?.value) {
+      updateQueryParams("", "refresh");
+    }
+  }, [searchParams, updateQueryParams]);
 
   return (
     <div className="margin-top-5 margin-bottom-2">
@@ -36,6 +52,7 @@ export default function SearchBar({ query }: SearchBarProps) {
       </label>
       <div className="usa-search usa-search--big" role="search">
         <input
+          ref={inputRef}
           className="usa-input maxw-none"
           id="query"
           type="search"

frontend/src/hooks/useSearchParamUpdater.ts

@@ -10,14 +10,15 @@ export function useSearchParamUpdater() {
   const router = useRouter();
   const params = new URLSearchParams(searchParams);
 
+  // note that providing an empty string as `queryParamValue` will remove the param
   const updateQueryParams = (
     // The parameter value that is not the query term. Query term is treated
     // separately because updates to it are captured, ie if a user updates the
     // search term and then clicks a facet, the updated term is used.
     queryParamValue: string | Set<string>,
     // Key of the parameter.
     key: string,
-    queryTerm: string | null | undefined,
+    queryTerm?: string | null,
     // Determines whether the state update scrolls the user to the top. This
     // is useful for components that are expected to be "under the fold."
     scroll = false,
@@ -49,6 +50,7 @@ export function useSearchParamUpdater() {
   };
 
   return {
+    searchParams,
     updateQueryParams,
   };
 }

frontend/tests/components/Header.test.tsx

@@ -1,22 +1,29 @@
 import userEvent from "@testing-library/user-event";
 import { render, screen } from "tests/react-utils";
 
+import { ReadonlyURLSearchParams } from "next/navigation";
+
 import Header from "src/components/Header";
 
 const props = {
   logoPath: "/img/logo.svg",
-  primaryLinks: [
-    {
-      i18nKey: "nav_link_home",
-      href: "/",
-    },
-    {
-      i18nKey: "nav_link_health",
-      href: "/health",
-    },
-  ],
+  locale: "en",
 };
 
+let mockedPath = "/fakepath";
+
+const getMockedPath = () => mockedPath;
+
+jest.mock("src/hooks/useSearchParamUpdater", () => ({
+  useSearchParamUpdater: () => ({
+    searchParams: new ReadonlyURLSearchParams(),
+  }),
+}));
+
+jest.mock("next/navigation", () => ({
+  usePathname: () => getMockedPath(),
+}));
+
 describe("Header", () => {
   it("toggles the mobile nav menu", async () => {
     render(<Header {...props} />);
@@ -50,4 +57,21 @@ describe("Header", () => {
 
     expect(govBanner).toHaveAttribute("aria-expanded", "true");
   });
+
+  it("displays a search link without refresh param if not currently on search page", () => {
+    render(<Header />);
+
+    const searchLink = screen.getByRole("link", { name: "Search" });
+    expect(searchLink).toBeInTheDocument();
+    expect(searchLink).toHaveAttribute("href", "/search");
+  });
+
+  it("displays a search link with refresh param if currently on search page", () => {
+    mockedPath = "/search";
+    render(<Header />);
+
+    const searchLink = screen.getByRole("link", { name: "Search" });
+    expect(searchLink).toBeInTheDocument();
+    expect(searchLink).toHaveAttribute("href", "/search?refresh=true");
+  });
 });

frontend/tests/components/search/SearchBar.test.tsx

@@ -5,6 +5,7 @@ import { axe } from "jest-axe";
 import QueryProvider from "src/app/[locale]/search/QueryProvider";
 import { render, screen } from "tests/react-utils";
 
+import { ReadonlyURLSearchParams } from "next/navigation";
 import React from "react";
 
 import SearchBar from "src/components/search/SearchBar";
@@ -15,6 +16,7 @@ const mockUpdateQueryParams = jest.fn();
 jest.mock("src/hooks/useSearchParamUpdater", () => ({
   useSearchParamUpdater: () => ({
     updateQueryParams: mockUpdateQueryParams,
+    searchParams: new ReadonlyURLSearchParams(),
   }),
 }));
 

frontend/tests/pages/search/page.test.tsx

@@ -4,6 +4,8 @@ import Search from "src/app/[locale]/search/page";
 import { SEARCH_NO_STATUS_VALUE } from "src/constants/search";
 import { useTranslationsMock } from "src/utils/testing/intlMocks";
 
+import { ReadonlyURLSearchParams } from "next/navigation";
+
 // test without feature flag functionality
 jest.mock("src/hoc/search/withFeatureFlag", () =>
   jest.fn((Component: React.Component) => Component),
@@ -18,6 +20,12 @@ jest.mock("next-intl", () => ({
   useTranslations: () => useTranslationsMock(),
 }));
 
+jest.mock("src/hooks/useSearchParamUpdater", () => ({
+  useSearchParamUpdater: () => ({
+    searchParams: new ReadonlyURLSearchParams(),
+  }),
+}));
+
 // // currently, with Suspense mocked out below to always show fallback content,
 // // the components making the fetch calls are never being rendered so we do not need to mock them out
 // // uncomment this if we figure out a way to properly test the underlying async components