Skip to content
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.

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

fix: redirect and alert language #3467

Merged
merged 4 commits into from
May 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions shared-helpers/src/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,7 @@
"listings.applicationOpenPeriod": "Solicitudes abiertas",
"listings.applicationPerApplicantAgeDescription": "por solicitante de 18 años o más",
"listings.applicationsClosed": "Solicitudes cerradas",
"listings.applicationsClosedRedirect": "Esta lista ya no acepta solicitudes.",
"listings.applications": "Solicitudes",
"listings.apply.applicationWillBeAvailableOn": "La solicitud podrá ser descargada y recogida el %{openDate}",
"listings.apply.applyOnline": "Haga su solicitud por Internet",
Expand Down
1 change: 1 addition & 0 deletions shared-helpers/src/locales/general.json
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,7 @@
"listings.applicationPerApplicantAgeDescription": "per applicant age 18 and over",
"listings.applications": "Applications",
"listings.applicationsClosed": "Applications Closed",
"listings.applicationsClosedRedirect": "This listing is no longer accepting applications.",
"listings.apply.applicationWillBeAvailableOn": "Application will be available for download and pick up on %{openDate}",
"listings.apply.applyOnline": "Apply Online",
"listings.apply.downloadApplication": "Download Application",
Expand Down
1 change: 1 addition & 0 deletions shared-helpers/src/locales/tl.json
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,7 @@
"listings.applicationOpenPeriod": "Mga bukas na application",
"listings.applicationPerApplicantAgeDescription": "bawat aplikante na edad 18 at mas matanda",
"listings.applicationsClosed": "Mga Isinarang Application",
"listings.applicationsClosedRedirect": "Ang listahang ito ay hindi na tumatanggap ng mga aplikasyon.",
"listings.applications": "Mga Application",
"listings.apply.applicationWillBeAvailableOn": "Magiging available ang application para i-download at kunin sa %{openDate}",
"listings.apply.applyOnline": "Mag-apply Online",
Expand Down
1 change: 1 addition & 0 deletions shared-helpers/src/locales/vi.json
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,7 @@
"listings.applicationOpenPeriod": "Bắt đầu nhận đơn Ghi danh",
"listings.applicationPerApplicantAgeDescription": "mỗi ứng viên từ 18 tuổi trở lên",
"listings.applicationsClosed": "Ngừng nhận Đơn ghi danh",
"listings.applicationsClosedRedirect": "Danh sách này không còn chấp nhận các ứng dụng.",
"listings.applications": "Đơn đăng ký",
"listings.apply.applicationWillBeAvailableOn": "Đơn ghi danh sẽ có sẵn để tải xuống và tới nhận vào %{openDate}",
"listings.apply.applyOnline": "Ghi danh Trực tuyến",
Expand Down
1 change: 1 addition & 0 deletions shared-helpers/src/locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,7 @@
"listings.applicationOpenPeriod": "接受申請期限",
"listings.applicationPerApplicantAgeDescription": "每位年滿 18 歲的申請人",
"listings.applicationsClosed": "申請期限已經結束",
"listings.applicationsClosedRedirect": "此房源不再接受申请。",
"listings.applications": "申請",
"listings.apply.applicationWillBeAvailableOn": "申請表將可供下載,亦可在 %{openDate} 領取",
"listings.apply.applyOnline": "線上申請",
Expand Down
2 changes: 2 additions & 0 deletions sites/public/src/components/listing/ListingView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import {
EventType,
StandardTableData,
ExpandableSection,
SiteAlert,
} from "@bloom-housing/ui-components"
import {
cloudinaryPdfFromId,
Expand Down Expand Up @@ -504,6 +505,7 @@ export const ListingView = (props: ListingProps) => {
return (
<article className="flex flex-wrap relative max-w-5xl m-auto">
<header className="image-card--leader">
<SiteAlert type="alert" dismissable />
<ImageCard
images={imageUrlFromListing(listing, parseInt(process.env.listingPhotoSize)).map(
(imageUrl: string) => {
Expand Down
10 changes: 10 additions & 0 deletions sites/public/src/pages/applications/review/summary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
ProgressNav,
Heading,
AlertBox,
setSiteAlertMessage,
} from "@bloom-housing/ui-components"
import FormsLayout from "../../../layouts/forms"
import { useForm } from "react-hook-form"
Expand All @@ -26,8 +27,10 @@ import {
} from "@bloom-housing/shared-helpers"
import { UserStatus } from "../../../lib/constants"
import { ApplicationReviewStatus, ApplicationSection } from "@bloom-housing/backend-core"
import { useRouter } from "next/router"

const ApplicationSummary = () => {
const router = useRouter()
const { profile, applicationsService } = useContext(AuthContext)
const [validationError, setValidationError] = useState(false)
const { conductor, application, listing } = useFormConductor("summary")
Expand All @@ -47,6 +50,13 @@ const ApplicationSummary = () => {
})
}, [profile])

useEffect(() => {
if (listing?.status === "closed") {
setSiteAlertMessage(t("listings.applicationsClosedRedirect"), "alert")
void router.push(`/${router.locale}/listing/${listing?.id}/${listing.urlSlug}`)
}
}, [listing, router])

const onSubmit = () => {
applicationsService
.submissionValidation({
Expand Down
8 changes: 8 additions & 0 deletions sites/public/src/pages/applications/start/choose-language.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
t,
Heading,
AppearanceSizeType,
setSiteAlertMessage,
} from "@bloom-housing/ui-components"
import {
imageUrlFromListing,
Expand Down Expand Up @@ -78,6 +79,13 @@ const ApplicationChooseLanguage = () => {
}
}, [router, conductor, context, listingId])

useEffect(() => {
if (listing?.status === "closed") {
setSiteAlertMessage(t("listings.applicationsClosedRedirect"), "alert")
void router.push(`/${router.locale}/listing/${listing?.id}/${listing.urlSlug}`)
}
}, [listing, router])

const currentPageSection = 1

const imageUrl = listing?.assets
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ const ApplicationWhatToExpect = () => {
default:
return { steps: "", finePrint: "" }
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [listing, router.locale])

useEffect(() => {
Expand Down