-
-
-
-
- | Field Name |
- Data |
-
-
-
- {Object.entries(opportunity.data).map(([key, value]) => {
- if (key === "summary" && isSummary(value)) {
- return renderSummary(value);
- } else {
- return (
-
- | {key} |
- {JSON.stringify(value)} |
-
- );
- }
- })}
-
-
+
+
);
}
+
+export default withFeatureFlag(OpportunityListing, "showSearchV0");
diff --git a/frontend/src/app/[locale]/process/ProcessIntro.tsx b/frontend/src/app/[locale]/process/ProcessIntro.tsx
index f3b481318e..af6fb2c13f 100644
--- a/frontend/src/app/[locale]/process/ProcessIntro.tsx
+++ b/frontend/src/app/[locale]/process/ProcessIntro.tsx
@@ -1,6 +1,7 @@
-import { Grid } from "@trussworks/react-uswds";
-import { useTranslations, useMessages } from "next-intl";
+import { useMessages, useTranslations } from "next-intl";
+
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/page.tsx b/frontend/src/app/[locale]/process/page.tsx
index eb5050e43d..59f8055bd6 100644
--- a/frontend/src/app/[locale]/process/page.tsx
+++ b/frontend/src/app/[locale]/process/page.tsx
@@ -1,15 +1,14 @@
-import { PROCESS_CRUMBS } from "src/constants/breadcrumbs";
+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";
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 { useTranslations } from "next-intl";
-import { getTranslations, unstable_setRequestLocale } from "next-intl/server";
export async function generateMetadata() {
const t = await getTranslations({ locale: "en" });
diff --git a/frontend/src/app/api/BaseApi.ts b/frontend/src/app/api/BaseApi.ts
index bca7b683c9..0243b99f2a 100644
--- a/frontend/src/app/api/BaseApi.ts
+++ b/frontend/src/app/api/BaseApi.ts
@@ -17,7 +17,7 @@ import { compact, isEmpty } from "lodash";
import { QueryParamData } from "src/services/search/searchfetcher/SearchFetcher";
// TODO (#1682): replace search specific references (since this is a generic API file that any
// future page or different namespace could use)
-import { SearchAPIResponse } from "../../types/search/searchResponseTypes";
+import { APIResponse } from "src/types/apiResponseTypes";
export type ApiMethod = "DELETE" | "GET" | "PATCH" | "POST" | "PUT";
export interface JSONRequestBody {
@@ -108,10 +108,10 @@ export default abstract class BaseApi {
queryParamData?: QueryParamData,
) {
let response: Response;
- let responseBody: SearchAPIResponse;
+ let responseBody: APIResponse;
try {
response = await fetch(url, fetchOptions);
- responseBody = (await response.json()) as SearchAPIResponse;
+ responseBody = (await response.json()) as APIResponse;
} catch (error) {
// API most likely down, but also possibly an error setting up or sending a request
// or parsing the response.
@@ -196,7 +196,7 @@ export function fetchErrorToNetworkError(
}
function handleNotOkResponse(
- response: SearchAPIResponse,
+ response: APIResponse,
message: string,
status_code: number,
searchInputs?: QueryParamData,
diff --git a/frontend/src/app/api/OpportunityListingAPI.ts b/frontend/src/app/api/OpportunityListingAPI.ts
index 8f3628a1f6..9ac4e671bb 100644
--- a/frontend/src/app/api/OpportunityListingAPI.ts
+++ b/frontend/src/app/api/OpportunityListingAPI.ts
@@ -1,6 +1,6 @@
import "server-only";
-import { ApiResponse } from "../../types/opportunity/opportunityResponseTypes";
+import { OpportunityApiResponse } from "src/types/opportunity/opportunityResponseTypes";
import BaseApi from "./BaseApi";
export default class OpportunityListingAPI extends BaseApi {
@@ -16,14 +16,16 @@ export default class OpportunityListingAPI extends BaseApi {
return "opportunities";
}
- async getOpportunityById(opportunityId: number): Promise
{
+ async getOpportunityById(
+ opportunityId: number,
+ ): Promise {
const subPath = `${opportunityId}`;
- const response = await this.request(
+ const response = (await this.request(
"GET",
this.basePath,
this.namespace,
subPath,
- );
- return response as ApiResponse;
+ )) as OpportunityApiResponse;
+ return response;
}
}
diff --git a/frontend/src/components/opportunity/OpportunityAwardGridRow.tsx b/frontend/src/components/opportunity/OpportunityAwardGridRow.tsx
new file mode 100644
index 0000000000..dcec4b5fe9
--- /dev/null
+++ b/frontend/src/components/opportunity/OpportunityAwardGridRow.tsx
@@ -0,0 +1,26 @@
+import { useTranslations } from "next-intl";
+type Props = {
+ title: string | number;
+ content: string | number;
+};
+
+type TranslationKeys =
+ | "program_funding"
+ | "expected_awards"
+ | "award_ceiling"
+ | "award_floor";
+
+const OpportunityAwardGridRow = ({ title, content }: Props) => {
+ const t = useTranslations("OpportunityListing.award_info");
+
+ return (
+
+
{content}
+
+ {t(`${title as TranslationKeys}`)}
+
+
+ {formatStringReturnValue(content)}
+
+ );
+ case "object":
+ if (Array.isArray(content)) {
+ return content.length
+ ? content.map((content, index) => (
+
+ {formatStringReturnValue(content)}
+
+ ))
+ : "--";
+ }
+ return "--";
+ default:
+ return "--";
+ }
+ };
+
+ const awardGridInfo = {
+ program_funding: formatCurrency(
+ opportunityData.summary.estimated_total_program_funding,
+ ),
+ expected_awards: opportunityData.summary.expected_number_of_awards,
+ award_ceiling: formatCurrency(opportunityData.summary.award_ceiling),
+ award_floor: formatCurrency(opportunityData.summary.award_floor),
+ };
+
+ const awardSubInfo = {
+ cost_sharing: opportunityData.summary.is_cost_sharing,
+ funding_instrument: opportunityData.summary.funding_instruments,
+ opportunity_category: opportunityData.category,
+ opportunity_category_explanation: opportunityData.category_explanation,
+ funding_activity: opportunityData.summary.funding_categories,
+ category_explanation: opportunityData.summary.funding_category_description,
+ };
+
+ return (
+
+
Award
+
+ {Object.entries(awardGridInfo).map(([title, content], index) => (
+
+
+
+ ))}
+
+
+ {Object.entries(awardSubInfo).map(([title, content], index) => (
+
+
+ {t(`${title as TranslationKeys}`)}
+ {":"}
+
+
{formatSubContent(content)}
+
+ ))}
+
{ApplicantType[type as ApplicantTypeKey]}
;
+ }
+ return {type}
;
+ });
+};
+
+const OpportunityDescription = ({ opportunityData }: Props) => {
+ const t = useTranslations("OpportunityListing.description");
+ const agency_phone_number_stripped = opportunityData.summary
+ .agency_phone_number
+ ? opportunityData.summary.agency_phone_number.replace(/-/g, "")
+ : "";
+
+ const additionalInformationOnEligibility = opportunityData.summary
+ .applicant_eligibility_description
+ ? opportunityData.summary.applicant_eligibility_description
+ : "--";
+ return (
+ <>
+
+
+ );
+};
+
+export default OpportunityDescription;
diff --git a/frontend/src/components/opportunity/OpportunityHistory.tsx b/frontend/src/components/opportunity/OpportunityHistory.tsx
new file mode 100644
index 0000000000..252352355a
--- /dev/null
+++ b/frontend/src/components/opportunity/OpportunityHistory.tsx
@@ -0,0 +1,43 @@
+import { Opportunity } from "src/types/opportunity/opportunityResponseTypes";
+import { formatDate } from "src/utils/dateUtil";
+import { useTranslations } from "next-intl";
+
+type Props = {
+ opportunityData: Opportunity;
+};
+
+type TranslationKeys =
+ | "version"
+ | "posted_date"
+ | "closing_date"
+ | "archive_date";
+
+const formatHistorySubContent = (content: string | null) => {
+ return content === null ? "--" : formatDate(content);
+};
+
+const OpportunityHistory = ({ opportunityData }: Props) => {
+ const t = useTranslations("OpportunityListing.history");
+ const versionInfo = {
+ version: "--",
+ posted_date: opportunityData.summary.post_date,
+ closing_date: opportunityData.summary.close_date,
+ archive_date: opportunityData.summary.archive_date,
+ };
+ return (
+
+
History
+ {Object.entries(versionInfo).map(([title, content], index) => (
+
+
+ {t(`${title as TranslationKeys}`)}
+ {":"}
+
+
{formatHistorySubContent(content)}
+
+ ))}
+
{`${t("assistanceListings")} --`}
+ );
+
+ return opportunity_assistance_listings.map((listing, index) => (
+
+ {index === 0 && `${t("assistanceListings")}`}
+ {listing.assistance_listing_number}
+ {" -- "}
+ {listing.program_title}
+
+ ));
+ };
+
+ const lastUpdated = (updated_at: string) => {
+ if (updated_at === "") return `${t("lastUpdated")} --`;
+ else {
+ const date = new Date(updated_at);
+ const formattedDate = new Intl.DateTimeFormat("en-US", {
+ year: "numeric",
+ month: "long",
+ day: "numeric",
+ }).format(date);
+
+ return `${t("lastUpdated")} ${formattedDate}`;
+ }
+ };
+
+ return (
+
+
+
{`${t("agency")} ${agencyName}`}
+ {assistanceListings({
+ opportunity_assistance_listings:
+ opportunityData.opportunity_assistance_listings,
+ })}
+
+ {lastUpdated(opportunityData.updated_at)}
+
+
+
+ {t("archived")}
+ {formatDate(archiveDate)}
+
+
+
+ {t("closed")}
+ {formatDate(closeDate)}
+
+
+
+ {t("closing")}
+ {formatDate(closeDate)}
+
+
+
+ {t("forecasted")}
+
+
+ {statusTagFormatter(
+ opportunityStatus,
+ opportunityCloseDate,
+ opportunityArchiveDate,
+ )}
+
+ );
+};
+
+export default OpportunityStatusWidget;
diff --git a/frontend/src/components/search/SearchOpportunityStatus.tsx b/frontend/src/components/search/SearchOpportunityStatus.tsx
index c9bc65c8b5..043ee36b60 100644
--- a/frontend/src/components/search/SearchOpportunityStatus.tsx
+++ b/frontend/src/components/search/SearchOpportunityStatus.tsx
@@ -1,4 +1,5 @@
"use client";
+
import { Checkbox } from "@trussworks/react-uswds";
import { QueryContext } from "src/app/[locale]/search/QueryProvider";
import { useContext } from "react";
diff --git a/frontend/src/components/search/SearchResultsListItem.tsx b/frontend/src/components/search/SearchResultsListItem.tsx
index 301a6a68c5..3efcaacd2a 100644
--- a/frontend/src/components/search/SearchResultsListItem.tsx
+++ b/frontend/src/components/search/SearchResultsListItem.tsx
@@ -13,13 +13,6 @@ export default function SearchResultsListItem({
opportunity,
agencyNameLookup,
}: SearchResultsListItemProps) {
- // TODO: Confirm once deploying to lowers
- // relates to https://github.com/HHS/simpler-grants-gov/issues/1521
- const opportunityURL =
- process.env.NEXT_PUBLIC_ENVIRONMENT === "prod"
- ? "https://grants.gov"
- : "https://test.grants.gov";
-
const t = useTranslations("Search");
const metadataBorderClasses = `
@@ -49,7 +42,7 @@ export default function SearchResultsListItem({