Skip to content

[Issue #8863] Improve Application breadcrumbs #9027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
andycochran wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[Issue #8863] Improve Application breadcrumbs #9027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions frontend/src/app/[locale]/(base)/applications/[applicationId]/form/[appFormId]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import withFeatureFlag from "src/services/featureFlags/withFeatureFlag";
import { getApplicationDetails } from "src/services/fetch/fetchers/applicationFetcher";
import getFormData from "src/utils/getFormData";

import { getTranslations } from "next-intl/server";
import { redirect } from "next/navigation";
import { GridContainer } from "@trussworks/react-uswds";

Expand Down Expand Up @@ -46,6 +47,7 @@ async function FormPage({ params }: formPageProps) {
const { applicationId, appFormId } = await params;
const { data, error } = await getFormData({ applicationId, appFormId });
const userSession = await getSession();
const t = await getTranslations("Application");

if (!userSession || !userSession.token) {
return <TopLevelError />;
Expand Down Expand Up @@ -105,7 +107,14 @@ async function FormPage({ params }: formPageProps) {
<GridContainer>
<Breadcrumbs
breadcrumbList={[
{ title: "home", path: "/" },
{
title: `${t("breadcrumbWorkspace")}`,
path: `/dashboard`,
},
{
title: `${t("breadcrumbApplications")}`,
path: `/applications`,
},
{
title: applicationName,
path: `/applications/${applicationId}`,
Expand All @@ -116,7 +125,7 @@ async function FormPage({ params }: formPageProps) {
},
]}
/>
<h1>{formName}</h1>
<h1 className="margin-top-0">{formName}</h1>
<ApplyForm
applicationId={applicationId}
validationWarnings={warnings || null}
Expand Down
19 changes: 18 additions & 1 deletion frontend/src/app/[locale]/(base)/applications/[applicationId]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { GridContainer } from "@trussworks/react-uswds";
import ApplicationContainer from "src/components/application/ApplicationContainer";
import { ApplicationHistoryCardProps } from "src/components/application/ApplicationHistoryTable";
import { ApplicationDetailsCardProps } from "src/components/application/InformationCard";
import Breadcrumbs from "src/components/Breadcrumbs";

export const dynamic = "force-dynamic";

Expand Down Expand Up @@ -110,7 +111,23 @@ async function ApplicationLandingPage({ params }: ApplicationLandingPageProps) {
return (
<>
<GridContainer>
<h1 className="margin-top-9 margin-bottom-7">{t("title")}</h1>
<Breadcrumbs
breadcrumbList={[
{
title: `${t("breadcrumbWorkspace")}`,
path: `/dashboard`,
},
{
title: `${t("breadcrumbApplications")}`,
path: `/applications`,
},
{
title: details.application_name,
path: `/applications`, // not used, can be whatever
},
]}
/>
<h1 className="margin-top-0 margin-bottom-7">{t("title")}</h1>
<ApplicationContainer
applicationDetails={details}
opportunity={opportunity}
Expand Down
15 changes: 14 additions & 1 deletion frontend/src/app/[locale]/(base)/applications/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { setRequestLocale } from "next-intl/server";
import { PropsWithChildren } from "react";
import { Alert, GridContainer } from "@trussworks/react-uswds";

import Breadcrumbs from "src/components/Breadcrumbs";
import {
TableCellData,
TableWithResponsiveHeader,
Expand All @@ -21,7 +22,19 @@ const ApplicationsPageWrapper = ({ children }: PropsWithChildren) => {
const t = useTranslations("Applications");
return (
<GridContainer>
<h1 className="margin-top-9 margin-bottom-7">{t("pageTitle")}</h1>
<Breadcrumbs
breadcrumbList={[
{
title: `${t("breadcrumbWorkspace")}`,
path: `/dashboard`,
},
{
title: `${t("breadcrumbApplications")}`,
path: `/saved-search-queries`,
},
]}
/>
<h1 className="margin-top-0 margin-bottom-7">{t("pageTitle")}</h1>
{children}
</GridContainer>
);
Expand Down
4 changes: 4 additions & 0 deletions frontend/src/i18n/messages/en/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,8 @@ export const messages = {
},
Application: {
title: "Application",
breadcrumbWorkspace: "Workspace",
breadcrumbApplications: "Applications",
submissionValidationError: {
title: "Your application could not be submitted",
description:
Expand Down Expand Up @@ -1788,6 +1790,8 @@ export const messages = {
},
pageHeading: "Applications",
pageTitle: "Applications",
breadcrumbWorkspace: "Workspace",
breadcrumbApplications: "Applications",
tableContents: {
agency: "Agency: ",
draft: "Draft",
Expand Down
Loading