From f054a4e191cfda5c8dab20a024a8911fdd09726d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Zi=C4=99cina?= Date: Tue, 9 May 2023 20:49:15 +0200 Subject: [PATCH] fix: remove application due date question (#613) --- .../cypress/integration/03-listing.spec.ts | 2 -- .../sections/DetailRankingsAndResults.tsx | 7 ------ .../sections/ApplicationDates.tsx | 18 ++------------ .../sections/RankingsAndResults.tsx | 24 ------------------- .../locale_overrides/general.json | 1 - 5 files changed, 2 insertions(+), 50 deletions(-) diff --git a/sites/partners/cypress/integration/03-listing.spec.ts b/sites/partners/cypress/integration/03-listing.spec.ts index 4cc09aae5b..47abe62fcb 100644 --- a/sites/partners/cypress/integration/03-listing.spec.ts +++ b/sites/partners/cypress/integration/03-listing.spec.ts @@ -83,7 +83,6 @@ describe("Listing Management Tests", () => { cy.getByID("specialNotes").type(listing["specialNotes"]) cy.get(".text-right > .button").contains("Application Process").click() cy.get("#reviewOrderFCFS").check() - cy.get("#dueDateQuestionNo").check() cy.get("#waitlistOpenNo").check() cy.getByID("leasingAgentName").type(listing["leasingAgentName"]) cy.getByID("leasingAgentEmail").type(listing["leasingAgentEmail"]) @@ -197,7 +196,6 @@ describe("Listing Management Tests", () => { cy.get("#programRules").contains(listing["programRules"]) cy.get("#specialNotes").contains(listing["specialNotes"]) cy.get("#reviewOrderQuestion").contains("First come first serve") - cy.get("#dueDateQuestion").contains("No") cy.get("#leasingAgentName").contains(listing["leasingAgentName"]) cy.get("#leasingAgentEmail").contains(listing["leasingAgentEmail"].toLowerCase()) cy.get("#leasingAgentPhone").contains("(520) 245-8811") diff --git a/sites/partners/src/components/listings/PaperListingDetails/sections/DetailRankingsAndResults.tsx b/sites/partners/src/components/listings/PaperListingDetails/sections/DetailRankingsAndResults.tsx index 64cfb9b673..dbaf09a121 100644 --- a/sites/partners/src/components/listings/PaperListingDetails/sections/DetailRankingsAndResults.tsx +++ b/sites/partners/src/components/listings/PaperListingDetails/sections/DetailRankingsAndResults.tsx @@ -55,13 +55,6 @@ const DetailRankingsAndResults = () => { )} - {getReviewOrderType() === ListingReviewOrder.firstComeFirstServe && ( - - - {listing.applicationDueDate ? t("t.yes") : t("t.no")} - - - )} {listing.reviewOrderType === ListingReviewOrder.waitlist && ( <> diff --git a/sites/partners/src/components/listings/PaperListingForm/sections/ApplicationDates.tsx b/sites/partners/src/components/listings/PaperListingForm/sections/ApplicationDates.tsx index b9a96cbfd2..486a8555b6 100644 --- a/sites/partners/src/components/listings/PaperListingForm/sections/ApplicationDates.tsx +++ b/sites/partners/src/components/listings/PaperListingForm/sections/ApplicationDates.tsx @@ -1,6 +1,5 @@ import React, { useState, useMemo } from "react" -import { useWatch, useFormContext } from "react-hook-form" -import { YesNoAnswer } from "../../../../lib/helpers" +import { useFormContext } from "react-hook-form" import { getDetailFieldDate, getDetailFieldTime } from "../../PaperListingDetails/sections/helpers" import dayjs from "dayjs" @@ -85,12 +84,7 @@ const ApplicationDates = ({ const formMethods = useFormContext() // eslint-disable-next-line @typescript-eslint/unbound-method - const { register, watch, control } = formMethods - - const enableDueDate = useWatch({ - control, - name: "dueDateQuestion", - }) + const { register, watch } = formMethods const [drawerOpenHouse, setDrawerOpenHouse] = useState(false) const [modalDeleteOpenHouse, setModalDeleteOpenHouse] = useState(null) @@ -131,7 +125,6 @@ const ApplicationDates = ({ register={register} watch={watch} note={t("listings.whenApplicationsClose")} - disabled={enableDueDate === YesNoAnswer.No} defaultDate={{ month: listing?.applicationDueDate ? dayjs(new Date(listing?.applicationDueDate)).format("MM") @@ -150,22 +143,15 @@ const ApplicationDates = ({ id={"applicationDueTimeField"} register={register} watch={watch} - disabled={enableDueDate === YesNoAnswer.No} defaultValues={{ hours: listing?.applicationDueDate ? dayjs(new Date(listing?.applicationDueDate)).format("hh") - : enableDueDate === YesNoAnswer.No - ? null : "05", minutes: listing?.applicationDueDate ? dayjs(new Date(listing?.applicationDueDate)).format("mm") - : enableDueDate === YesNoAnswer.No - ? null : "00", seconds: listing?.applicationDueDate ? dayjs(new Date(listing?.applicationDueDate)).format("ss") - : enableDueDate === YesNoAnswer.No - ? null : "00", period: listing?.applicationDueDate ? new Date(listing?.applicationDueDate).getHours() >= 12 diff --git a/sites/partners/src/components/listings/PaperListingForm/sections/RankingsAndResults.tsx b/sites/partners/src/components/listings/PaperListingForm/sections/RankingsAndResults.tsx index 11a75ba534..b39b174a6a 100644 --- a/sites/partners/src/components/listings/PaperListingForm/sections/RankingsAndResults.tsx +++ b/sites/partners/src/components/listings/PaperListingForm/sections/RankingsAndResults.tsx @@ -99,30 +99,6 @@ const RankingsAndResults = ({ listing }: RankingsAndResultsProps) => { )} - {reviewOrder === "reviewOrderFCFS" && ( - - -

{t("listings.dueDateQuestion")}

- - - - )} {reviewOrder === "reviewOrderLottery" && ( <> diff --git a/sites/partners/src/page_content/locale_overrides/general.json b/sites/partners/src/page_content/locale_overrides/general.json index 71f514f807..78c14f2e12 100644 --- a/sites/partners/src/page_content/locale_overrides/general.json +++ b/sites/partners/src/page_content/locale_overrides/general.json @@ -167,7 +167,6 @@ "listings.details.updatedDate": "Date Updated", "listings.developer": "Housing Developer", "listings.dropOffAddress": "Drop Off Address", - "listings.dueDateQuestion": "Is there an application due date?", "listings.editPreferences": "Edit Preferences", "listings.events.deleteConf": "Do you really want to delete this event?", "listings.events.deleteThisEvent": "Delete this event",