Merge branch 'main' into renovate/infra

HHS · Sep 19, 2024 · 1d59d1f · 1d59d1f
2 parents b46658c + 879264f
commit 1d59d1f
Show file tree

Hide file tree

Showing 118 changed files with 318 additions and 231 deletions.
diff --git a/frontend/.prettierrc.js b/frontend/.prettierrc.js
@@ -23,5 +23,6 @@ module.exports = {
     "^(src/)?components/(.*)$",
     "^[./]",
   ],
+  plugins: ["@ianvs/prettier-plugin-sort-imports"],
   importOrderTypeScriptVersion: "5.0.0",
 };
diff --git a/frontend/src/app/[locale]/dev/feature-flags/FeatureFlagsTable.tsx b/frontend/src/app/[locale]/dev/feature-flags/FeatureFlagsTable.tsx
@@ -1,4 +1,5 @@
 "use client";
+
 import { useFeatureFlags } from "src/hooks/useFeatureFlags";
 
 import React from "react";

diff --git a/frontend/src/app/[locale]/dev/feature-flags/page.tsx b/frontend/src/app/[locale]/dev/feature-flags/page.tsx
@@ -2,6 +2,7 @@ import { Metadata } from "next";
 
 import Head from "next/head";
 import React from "react";
+
 import FeatureFlagsTable from "./FeatureFlagsTable";
 
 export function generateMetadata() {

diff --git a/frontend/src/app/[locale]/layout.tsx b/frontend/src/app/[locale]/layout.tsx
@@ -1,16 +1,15 @@
-import { NextIntlClientProvider } from "next-intl";
-import { getMessages, unstable_setRequestLocale } from "next-intl/server";
-
 import { GoogleAnalytics } from "@next/third-parties/google";
-import { PUBLIC_ENV } from "src/constants/environments";
-
-import Layout from "src/components/Layout";
-
 /**
  * Root layout component, wraps all pages.
  * @see https://nextjs.org/docs/app/api-reference/file-conventions/layout
  */
 import { Metadata } from "next";
+import { PUBLIC_ENV } from "src/constants/environments";
+
+import { NextIntlClientProvider } from "next-intl";
+import { getMessages, unstable_setRequestLocale } from "next-intl/server";
+
+import Layout from "src/components/Layout";
 
 export const metadata: Metadata = {
   icons: [`${process.env.NEXT_PUBLIC_BASE_PATH ?? ""}/img/favicon.ico`],

diff --git a/frontend/src/app/[locale]/newsletter/NewsletterForm.tsx b/frontend/src/app/[locale]/newsletter/NewsletterForm.tsx
@@ -1,7 +1,10 @@
 "use client";
+
 import { NEWSLETTER_CONFIRMATION } from "src/constants/breadcrumbs";
 import { ExternalRoutes } from "src/constants/routes";
+import { Data } from "src/pages/api/subscribe";
 
+import { useTranslations } from "next-intl";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import {
@@ -13,9 +16,6 @@ import {
   TextInput,
 } from "@trussworks/react-uswds";
 
-import { Data } from "src/pages/api/subscribe";
-import { useTranslations } from "next-intl";
-
 export default function NewsletterForm() {
   const t = useTranslations("Newsletter");
 

diff --git a/frontend/src/app/[locale]/newsletter/confirmation/page.tsx b/frontend/src/app/[locale]/newsletter/confirmation/page.tsx
@@ -1,14 +1,14 @@
+import { Metadata } from "next";
 import { NEWSLETTER_CONFIRMATION_CRUMBS } from "src/constants/breadcrumbs";
 
+import { useTranslations } from "next-intl";
+import { getTranslations, unstable_setRequestLocale } from "next-intl/server";
 import Link from "next/link";
 import { Grid, GridContainer } from "@trussworks/react-uswds";
 
+import BetaAlert from "src/components/BetaAlert";
 import Breadcrumbs from "src/components/Breadcrumbs";
 import PageSEO from "src/components/PageSEO";
-import BetaAlert from "src/components/BetaAlert";
-import { useTranslations } from "next-intl";
-import { Metadata } from "next";
-import { getTranslations, unstable_setRequestLocale } from "next-intl/server";
 
 export async function generateMetadata() {
   const t = await getTranslations({ locale: "en" });

diff --git a/frontend/src/app/[locale]/newsletter/page.tsx b/frontend/src/app/[locale]/newsletter/page.tsx
@@ -1,18 +1,19 @@
-import { NEWSLETTER_CRUMBS } from "src/constants/breadcrumbs";
-
-import { Grid, GridContainer } from "@trussworks/react-uswds";
 import pick from "lodash/pick";
-import Breadcrumbs from "src/components/Breadcrumbs";
-import PageSEO from "src/components/PageSEO";
-import BetaAlert from "src/components/BetaAlert";
-import NewsletterForm from "src/app/[locale]/newsletter/NewsletterForm";
 import { Metadata } from "next";
-import { getTranslations, unstable_setRequestLocale } from "next-intl/server";
+import NewsletterForm from "src/app/[locale]/newsletter/NewsletterForm";
+import { NEWSLETTER_CRUMBS } from "src/constants/breadcrumbs";
+
 import {
-  useTranslations,
-  useMessages,
   NextIntlClientProvider,
+  useMessages,
+  useTranslations,
 } from "next-intl";
+import { getTranslations, unstable_setRequestLocale } from "next-intl/server";
+import { Grid, GridContainer } from "@trussworks/react-uswds";
+
+import BetaAlert from "src/components/BetaAlert";
+import Breadcrumbs from "src/components/Breadcrumbs";
+import PageSEO from "src/components/PageSEO";
 
 export async function generateMetadata() {
   const t = await getTranslations({ locale: "en" });

diff --git a/frontend/src/app/[locale]/newsletter/unsubscribe/page.tsx b/frontend/src/app/[locale]/newsletter/unsubscribe/page.tsx
@@ -1,14 +1,14 @@
+import { Metadata } from "next";
 import { NEWSLETTER_UNSUBSCRIBE_CRUMBS } from "src/constants/breadcrumbs";
 
+import { useTranslations } from "next-intl";
+import { getTranslations, unstable_setRequestLocale } from "next-intl/server";
 import Link from "next/link";
 import { Grid, GridContainer } from "@trussworks/react-uswds";
 
+import BetaAlert from "src/components/BetaAlert";
 import Breadcrumbs from "src/components/Breadcrumbs";
 import PageSEO from "src/components/PageSEO";
-import BetaAlert from "src/components/BetaAlert";
-import { useTranslations } from "next-intl";
-import { Metadata } from "next";
-import { getTranslations, unstable_setRequestLocale } from "next-intl/server";
 
 export async function generateMetadata() {
   const t = await getTranslations({ locale: "en" });

diff --git a/frontend/src/app/[locale]/not-found.tsx b/frontend/src/app/[locale]/not-found.tsx
@@ -1,9 +1,11 @@
-import BetaAlert from "src/components/BetaAlert";
-import { GridContainer } from "@trussworks/react-uswds";
-import Link from "next/link";
+import { Metadata } from "next";
+
 import { useTranslations } from "next-intl";
 import { getTranslations, unstable_setRequestLocale } from "next-intl/server";
-import { Metadata } from "next";
+import Link from "next/link";
+import { GridContainer } from "@trussworks/react-uswds";
+
+import BetaAlert from "src/components/BetaAlert";
 
 export async function generateMetadata() {
   const t = await getTranslations({ locale: "en" });

diff --git a/frontend/src/app/[locale]/opportunity/[id]/page.tsx b/frontend/src/app/[locale]/opportunity/[id]/page.tsx
@@ -1,23 +1,24 @@
+import { Metadata } from "next";
+import { OPPORTUNITY_CRUMBS } from "src/constants/breadcrumbs";
+import withFeatureFlag from "src/hoc/search/withFeatureFlag";
 import {
-  OpportunityApiResponse,
   Opportunity,
+  OpportunityApiResponse,
 } from "src/types/opportunity/opportunityResponseTypes";
 
+import { getTranslations } from "next-intl/server";
+import { GridContainer } from "@trussworks/react-uswds";
+
 import BetaAlert from "src/components/BetaAlert";
 import Breadcrumbs from "src/components/Breadcrumbs";
-import { GridContainer } from "@trussworks/react-uswds";
-import { Metadata } from "next";
-import NotFound from "../../../not-found";
-import { OPPORTUNITY_CRUMBS } from "src/constants/breadcrumbs";
 import OpportunityAwardInfo from "src/components/opportunity/OpportunityAwardInfo";
 import OpportunityDescription from "src/components/opportunity/OpportunityDescription";
 import OpportunityHistory from "src/components/opportunity/OpportunityHistory";
 import OpportunityIntro from "src/components/opportunity/OpportunityIntro";
 import OpportunityLink from "src/components/opportunity/OpportunityLink";
-import OpportunityListingAPI from "../../../api/OpportunityListingAPI";
 import OpportunityStatusWidget from "src/components/opportunity/OpportunityStatusWidget";
-import { getTranslations } from "next-intl/server";
-import withFeatureFlag from "src/hoc/search/withFeatureFlag";
+import OpportunityListingAPI from "../../../api/OpportunityListingAPI";
+import NotFound from "../../../not-found";
 
 export async function generateMetadata() {
   const t = await getTranslations({ locale: "en" });

diff --git a/frontend/src/app/[locale]/page.tsx b/frontend/src/app/[locale]/page.tsx
@@ -1,12 +1,14 @@
-import BetaAlert from "src/components/BetaAlert";
-import PageSEO from "src/components/PageSEO";
-import Hero from "src/components/Hero";
-import IndexGoalContent from "src/components/content/IndexGoalContent";
-import ProcessAndResearchContent from "src/components/content/ProcessAndResearchContent";
 import { Metadata } from "next";
+
 import { useTranslations } from "next-intl";
 import { getTranslations, unstable_setRequestLocale } from "next-intl/server";
 
+import BetaAlert from "src/components/BetaAlert";
+import IndexGoalContent from "src/components/content/IndexGoalContent";
+import ProcessAndResearchContent from "src/components/content/ProcessAndResearchContent";
+import Hero from "src/components/Hero";
+import PageSEO from "src/components/PageSEO";
+
 export async function generateMetadata() {
   const t = await getTranslations({ locale: "en" });
   const meta: Metadata = {

diff --git a/frontend/src/app/[locale]/process/ProcessIntro.tsx b/frontend/src/app/[locale]/process/ProcessIntro.tsx
@@ -1,7 +1,7 @@
 import { useMessages, useTranslations } from "next-intl";
+import { Grid } from "@trussworks/react-uswds";
 
 import ContentLayout from "src/components/ContentLayout";
-import { Grid } from "@trussworks/react-uswds";
 
 const ProcessIntro = () => {
   const t = useTranslations("Process");

diff --git a/frontend/src/app/[locale]/process/ProcessMilestones.tsx b/frontend/src/app/[locale]/process/ProcessMilestones.tsx
@@ -1,8 +1,8 @@
 import { ExternalRoutes } from "src/constants/routes";
-import React from "react";
 
-import { useTranslations, useMessages } from "next-intl";
+import { useMessages, useTranslations } from "next-intl";
 import Link from "next/link";
+import React from "react";
 import {
   Button,
   Grid,
@@ -12,9 +12,9 @@ import {
   IconListItem,
   IconListTitle,
 } from "@trussworks/react-uswds";
-import { USWDSIcon } from "src/components/USWDSIcon";
 
 import ContentLayout from "src/components/ContentLayout";
+import { USWDSIcon } from "src/components/USWDSIcon";
 
 const ProcessMilestones = () => {
   const t = useTranslations("Process");

diff --git a/frontend/src/app/[locale]/process/page.tsx b/frontend/src/app/[locale]/process/page.tsx
@@ -1,14 +1,15 @@
-import { getTranslations, unstable_setRequestLocale } from "next-intl/server";
-
-import BetaAlert from "src/components/BetaAlert";
-import Breadcrumbs from "src/components/Breadcrumbs";
 import { Metadata } from "next";
-import { PROCESS_CRUMBS } from "src/constants/breadcrumbs";
-import PageSEO from "src/components/PageSEO";
 import ProcessIntro from "src/app/[locale]/process/ProcessIntro";
 import ProcessInvolved from "src/app/[locale]/process/ProcessInvolved";
 import ProcessMilestones from "src/app/[locale]/process/ProcessMilestones";
+import { PROCESS_CRUMBS } from "src/constants/breadcrumbs";
+
 import { useTranslations } from "next-intl";
+import { getTranslations, unstable_setRequestLocale } from "next-intl/server";
+
+import BetaAlert from "src/components/BetaAlert";
+import Breadcrumbs from "src/components/Breadcrumbs";
+import PageSEO from "src/components/PageSEO";
 
 export async function generateMetadata() {
   const t = await getTranslations({ locale: "en" });

diff --git a/frontend/src/app/[locale]/research/ResearchArchetypes.tsx b/frontend/src/app/[locale]/research/ResearchArchetypes.tsx
@@ -1,12 +1,14 @@
-import Image from "next/image";
-import { Grid } from "@trussworks/react-uswds";
-import { useTranslations } from "next-intl";
-import ContentLayout from "src/components/ContentLayout";
 import embarrassed from "public/img/noun-embarrassed.svg";
 import goal from "public/img/noun-goal.svg";
 import hiring from "public/img/noun-hiring.svg";
 import leadership from "public/img/noun-leadership.svg";
 
+import { useTranslations } from "next-intl";
+import Image from "next/image";
+import { Grid } from "@trussworks/react-uswds";
+
+import ContentLayout from "src/components/ContentLayout";
+
 const ResearchArchetypes = () => {
   const t = useTranslations("Research");
 

diff --git a/frontend/src/app/[locale]/research/ResearchImpact.tsx b/frontend/src/app/[locale]/research/ResearchImpact.tsx
@@ -1,6 +1,6 @@
 import { ExternalRoutes } from "src/constants/routes";
-import { useMessages, useTranslations } from "next-intl";
 
+import { useMessages, useTranslations } from "next-intl";
 import { Grid } from "@trussworks/react-uswds";
 
 import ContentLayout from "src/components/ContentLayout";

diff --git a/frontend/src/app/[locale]/research/ResearchMethodology.tsx b/frontend/src/app/[locale]/research/ResearchMethodology.tsx
@@ -1,9 +1,9 @@
 import { useTranslations } from "next-intl";
 import Link from "next/link";
 import { Button, Grid } from "@trussworks/react-uswds";
-import { USWDSIcon } from "src/components/USWDSIcon";
 
 import ContentLayout from "src/components/ContentLayout";
+import { USWDSIcon } from "src/components/USWDSIcon";
 
 const ResearchMethodology = () => {
   const t = useTranslations("Research");

diff --git a/frontend/src/app/[locale]/research/page.tsx b/frontend/src/app/[locale]/research/page.tsx
@@ -1,17 +1,18 @@
-import { RESEARCH_CRUMBS } from "src/constants/breadcrumbs";
-import ResearchIntro from "src/app/[locale]/research/ResearchIntro";
-
-import Breadcrumbs from "src/components/Breadcrumbs";
-import PageSEO from "src/components/PageSEO";
-import BetaAlert from "src/components/BetaAlert";
+import { Metadata } from "next";
 import ResearchArchetypes from "src/app/[locale]/research/ResearchArchetypes";
 import ResearchImpact from "src/app/[locale]/research/ResearchImpact";
+import ResearchIntro from "src/app/[locale]/research/ResearchIntro";
 import ResearchMethodology from "src/app/[locale]/research/ResearchMethodology";
 import ResearchThemes from "src/app/[locale]/research/ResearchThemes";
-import { Metadata } from "next";
+import { RESEARCH_CRUMBS } from "src/constants/breadcrumbs";
+
 import { useTranslations } from "next-intl";
 import { getTranslations, unstable_setRequestLocale } from "next-intl/server";
 
+import BetaAlert from "src/components/BetaAlert";
+import Breadcrumbs from "src/components/Breadcrumbs";
+import PageSEO from "src/components/PageSEO";
+
 export async function generateMetadata() {
   const t = await getTranslations({ locale: "en" });
   const meta: Metadata = {

diff --git a/frontend/src/app/[locale]/search/QueryProvider.tsx b/frontend/src/app/[locale]/search/QueryProvider.tsx
@@ -1,6 +1,7 @@
 "use client";
-import { createContext, useCallback, useMemo, useState } from "react";
+
 import { useSearchParams } from "next/navigation";
+import { createContext, useCallback, useMemo, useState } from "react";
 
 interface QueryContextParams {
   queryTerm: string | null | undefined;

diff --git a/frontend/src/app/[locale]/search/error.tsx b/frontend/src/app/[locale]/search/error.tsx
@@ -1,23 +1,27 @@
-"use client"; // Error components must be Client Components
+"use client";
+
+// Error components must be Client Components
+import QueryProvider from "src/app/[locale]/search/QueryProvider";
+import { SEARCH_CRUMBS } from "src/constants/breadcrumbs";
+import { QueryParamData } from "src/services/search/searchfetcher/SearchFetcher";
+
+import { useEffect } from "react";
+
 import BetaAlert from "src/components/BetaAlert";
 import Breadcrumbs from "src/components/Breadcrumbs";
 import PageSEO from "src/components/PageSEO";
-import QueryProvider from "src/app/[locale]/search/QueryProvider";
+import SearchErrorAlert from "src/components/search/error/SearchErrorAlert";
 import SearchBar from "src/components/search/SearchBar";
 import SearchCallToAction from "src/components/search/SearchCallToAction";
 import SearchFilterAccordion from "src/components/search/SearchFilterAccordion/SearchFilterAccordion";
-import SearchOpportunityStatus from "src/components/search/SearchOpportunityStatus";
-import SearchResultsHeader from "src/components/search/SearchResultsHeader";
 import {
   agencyOptions,
   categoryOptions,
   eligibilityOptions,
   fundingOptions,
 } from "src/components/search/SearchFilterAccordion/SearchFilterOptions";
-import { SEARCH_CRUMBS } from "src/constants/breadcrumbs";
-import { QueryParamData } from "src/services/search/searchfetcher/SearchFetcher";
-import { useEffect } from "react";
-import SearchErrorAlert from "src/components/search/error/SearchErrorAlert";
+import SearchOpportunityStatus from "src/components/search/SearchOpportunityStatus";
+import SearchResultsHeader from "src/components/search/SearchResultsHeader";
 
 interface ErrorProps {
   // Next's error boundary also includes a reset function as a prop for retries,

diff --git a/frontend/src/app/[locale]/search/loading.tsx b/frontend/src/app/[locale]/search/loading.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+
 import Spinner from "src/components/Spinner";
 
 export default function Loading() {