chore: 2022-10-06 release (#504) (#505)

housingbayarea · Oct 18, 2022 · 77965ed · 77965ed
1 parent 06fa80e
commit 77965ed
Show file tree

Hide file tree

Showing 74 changed files with 1,142 additions and 244 deletions.
diff --git a/shared-helpers/src/multiselectQuestions.tsx b/shared-helpers/src/multiselectQuestions.tsx
@@ -122,7 +122,7 @@ export const getRadioFields = (
   return (
     <fieldset>
       {applicationSection === ApplicationSection.preferences && (
-        <legend className="field-label--caps mb-4">{question?.text}</legend>
+        <legend className="text__caps-spaced mb-4">{question?.text}</legend>
       )}
       <p className="field-note mb-8">{question?.description}</p>
       <FieldGroup

diff --git a/sites/partners/page_content/locale_overrides/general.json b/sites/partners/page_content/locale_overrides/general.json
@@ -58,6 +58,8 @@
   "applications.duplicates.validApplications": "Valid Applications",
   "applications.duplicates.duplicateGroup": "Duplicate group",
   "applications.duplicates.primaryApplicant": "Primary applicant",
+  "applications.duplicates.set": "Set",
+  "applications.duplicates.sets": "Sets",
   "applications.namedob": "Name + DOB",
   "applications.newApplication": "New Application",
   "applications.pending": "Pending",

diff --git a/sites/partners/pages/listings/[id]/applications/pending/index.tsx b/sites/partners/pages/listings/[id]/applications/pending/index.tsx
@@ -175,7 +175,10 @@ const ApplicationsList = () => {
                   config={{
                     gridComponents,
                     columns,
-                    totalItemsLabel: t("applications.totalApplications"),
+                    totalItemsLabel:
+                      flaggedAppsData?.meta?.totalItems === 1
+                        ? t("applications.duplicates.set")
+                        : t("applications.duplicates.sets"),
                   }}
                   data={{
                     items: flaggedAppsData?.items ?? [],

diff --git a/sites/partners/pages/listings/[id]/applications/resolved/index.tsx b/sites/partners/pages/listings/[id]/applications/resolved/index.tsx
@@ -128,7 +128,10 @@ const ApplicationsList = () => {
               config={{
                 gridComponents: { formatLinkCell: getLinkCellFormatter(router) },
                 columns: columns,
-                totalItemsLabel: t("applications.totalApplications"),
+                totalItemsLabel:
+                  flaggedAppsData?.meta?.totalItems === 1
+                    ? t("applications.duplicates.set")
+                    : t("applications.duplicates.sets"),
               }}
               data={{
                 items: flaggedAppsData?.items ?? [],

diff --git a/sites/partners/src/applications/PaperApplicationForm/sections/FormApplicationData.tsx b/sites/partners/src/applications/PaperApplicationForm/sections/FormApplicationData.tsx
@@ -47,7 +47,7 @@ const FormApplicationData = () => {
             readerOnly
             errorMessage={t("errors.dateError")}
             required={!!isDateRequired}
-            labelClass={"field-label--caps"}
+            labelClass={"text__caps-spaced"}
           />
         </ViewItem>
 
@@ -62,7 +62,7 @@ const FormApplicationData = () => {
             readerOnly
             disabled={!isDateFilled}
             required={!!isDateFilled}
-            labelClass={"field-label--caps"}
+            labelClass={"text__caps-spaced"}
           />
         </ViewItem>
 

diff --git a/sites/partners/src/users/FormUserConfirm.tsx b/sites/partners/src/users/FormUserConfirm.tsx
@@ -131,7 +131,7 @@ const FormUserConfirm = () => {
         <Form id="update-password" onSubmit={handleSubmit(onSubmit)}>
           <div className="form-card__group is-borderless">
             <fieldset>
-              <legend className="field-label--caps">
+              <legend className="text__caps-spaced">
                 {t("authentication.createAccount.password")}
               </legend>
               <p className="field-note mb-4">{t("users.makeNote")}</p>

diff --git a/sites/public/lib/helpers.tsx b/sites/public/lib/helpers.tsx
@@ -5,7 +5,6 @@ import {
   ListingReviewOrder,
   UnitsSummarized,
   ListingStatus,
-  ListingAvailability,
 } from "@bloom-housing/backend-core/types"
 import {
   t,
@@ -52,10 +51,10 @@ const getListingCardSubtitle = (address: Address) => {
 
 const getListingTableData = (
   unitsSummarized: UnitsSummarized,
-  listingAvailability: ListingAvailability
+  listingReviewOrder: ListingReviewOrder
 ) => {
   return unitsSummarized !== undefined
-    ? getSummariesTable(unitsSummarized.byUnitTypeAndRent, listingAvailability)
+    ? getSummariesTable(unitsSummarized.byUnitTypeAndRent, listingReviewOrder)
     : []
 }
 
@@ -113,10 +112,18 @@ export const getListings = (listings) => {
   }
 
   const generateTableSubHeader = (listing) => {
-    if (listing.listingAvailability === ListingAvailability.availableUnits) {
-      return { content: t("listings.availableUnits"), styleType: AppearanceStyleType.success }
-    } else if (listing.listingAvailability === ListingAvailability.openWaitlist) {
-      return { content: t("listings.waitlist.open"), styleType: AppearanceStyleType.primary }
+    if (listing.reviewOrderType !== ListingReviewOrder.waitlist) {
+      return {
+        content: t("listings.availableUnits"),
+        styleType: AppearanceStyleType.success,
+        isPillType: true,
+      }
+    } else if (listing.reviewOrderType === ListingReviewOrder.waitlist) {
+      return {
+        content: t("listings.waitlist.open"),
+        styleType: AppearanceStyleType.primary,
+        isPillType: true,
+      }
     }
     return null
   }
@@ -139,7 +146,7 @@ export const getListings = (listings) => {
         }}
         tableProps={{
           headers: unitSummariesHeaders,
-          data: getListingTableData(listing.unitsSummarized, listing.listingAvailability),
+          data: getListingTableData(listing.unitsSummarized, listing.reviewOrderType),
           responsiveCollapse: true,
           cellClassName: "px-5 py-3",
         }}

diff --git a/sites/public/pages/_app.tsx b/sites/public/pages/_app.tsx
@@ -71,7 +71,7 @@ function BloomApp({ Component, router, pageProps }: AppProps) {
     if (process.env.NODE_ENV !== "production") {
       // eslint-disable-next-line @typescript-eslint/no-var-requires
       const axe = require("@axe-core/react")
-      void axe(React, ReactDOM, 1000)
+      void axe(React, ReactDOM, 5000)
     }
   }, [])
 

diff --git a/sites/public/pages/account/edit.tsx b/sites/public/pages/account/edit.tsx
@@ -162,7 +162,7 @@ const Edit = () => {
               </AlertBox>
             )}
             <div className="form-card__group border-b">
-              <label className="field-label--caps" htmlFor="firstName">
+              <label className="text__caps-spaced" htmlFor="firstName">
                 {t("application.name.yourName")}
               </label>
 
@@ -269,7 +269,7 @@ const Edit = () => {
             )}
             <div className="form-card__group border-b">
               <fieldset>
-                <legend className="field-label--caps">
+                <legend className="text__caps-spaced">
                   {t("authentication.createAccount.password")}
                 </legend>
                 <p className="field-note mb-4">{t("account.settings.passwordRemember")}</p>

diff --git a/sites/public/pages/additional-resources.tsx b/sites/public/pages/additional-resources.tsx
@@ -80,7 +80,7 @@ const AdditionalResources = () => {
                   overrides: {
                     h4: {
                       component: ({ children, ...props }) => (
-                        <h4 {...props} className="text-caps-underline">
+                        <h4 {...props} className={"text__caps_underline"}>
                           {children}
                         </h4>
                       ),

diff --git a/sites/public/pages/applications/contact/address.tsx b/sites/public/pages/applications/contact/address.tsx
@@ -288,7 +288,7 @@ const ApplicationAddress = () => {
             <div className="form-card__group border-b">
               <fieldset>
                 <legend
-                  className={`field-label--caps ${errors.applicant?.address ? "text-alert" : ""}`}
+                  className={`text__caps-spaced ${errors.applicant?.address ? "text-alert" : ""}`}
                 >
                   {t("application.contact.address")}
                 </legend>
@@ -378,7 +378,7 @@ const ApplicationAddress = () => {
             {clientLoaded && (sendMailToMailingAddress || application.sendMailToMailingAddress) && (
               <div className="form-card__group border-b">
                 <fieldset>
-                  <legend className="field-label--caps">
+                  <legend className="text__caps-spaced">
                     {t("application.contact.mailingAddress")}
                   </legend>
 
@@ -456,7 +456,7 @@ const ApplicationAddress = () => {
             <div className="form-card__group border-b">
               <fieldset>
                 <legend
-                  className={`field-label--caps ${errors?.contactPreferences ? "text-alert" : ""}`}
+                  className={`text__caps-spaced ${errors?.contactPreferences ? "text-alert" : ""}`}
                 >
                   {t("application.contact.contactPreference")}
                 </legend>
@@ -476,7 +476,7 @@ const ApplicationAddress = () => {
             <div className="form-card__group">
               <fieldset>
                 <legend
-                  className={`field-label--caps ${
+                  className={`text__caps-spaced ${
                     errors?.applicant?.workInRegion ? "text-alert" : ""
                   }`}
                 >
@@ -529,7 +529,7 @@ const ApplicationAddress = () => {
                 (!workInRegion && application.applicant.workInRegion == "yes")) && (
                 <div className="form-card__group mx-0 px-0 mt-2">
                   <fieldset>
-                    <legend className="field-label--caps">
+                    <legend className="text__caps-spaced">
                       {t("application.contact.workAddress")}
                     </legend>
 

diff --git a/sites/public/pages/applications/contact/alternate-contact-contact.tsx b/sites/public/pages/applications/contact/alternate-contact-contact.tsx
@@ -102,7 +102,7 @@ export default () => {
           onSubmit={handleSubmit(onSubmit, onError)}
         >
           <div className="form-card__group border-b">
-            <label className="field-label--caps" htmlFor="phoneNumber">
+            <label className="text__caps-spaced" htmlFor="phoneNumber">
               {t("application.alternateContact.contact.phoneNumberFormLabel")}
             </label>
             <PhoneField
@@ -120,7 +120,7 @@ export default () => {
             />
           </div>
           <div className="form-card__group border-b">
-            <h3 className="field-label--caps">
+            <h3 className="text__caps-spaced">
               {t("application.alternateContact.contact.emailAddressFormLabel")}
             </h3>
             <Field
@@ -140,7 +140,7 @@ export default () => {
           </div>
           <div className="form-card__group">
             <fieldset>
-              <legend className="field-label--caps">
+              <legend className="text__caps-spaced">
                 {t("application.alternateContact.contact.contactMailingAddressLabel")}
               </legend>
               <p className="field-note mb-4">

diff --git a/sites/public/pages/applications/contact/alternate-contact-name.tsx b/sites/public/pages/applications/contact/alternate-contact-name.tsx
@@ -85,7 +85,7 @@ export default () => {
         <Form id="applications-contact-alternate-name" onSubmit={handleSubmit(onSubmit, onError)}>
           <div className="form-card__group">
             <fieldset>
-              <legend className="field-label--caps">
+              <legend className="text__caps-spaced">
                 {t("application.alternateContact.name.alternateContactFormLabel")}
               </legend>
               <Field

diff --git a/sites/public/pages/applications/contact/alternate-contact-type.tsx b/sites/public/pages/applications/contact/alternate-contact-type.tsx
@@ -96,7 +96,7 @@ const ApplicationAlternateContactType = () => {
         <Form id="applications-contact-alternate-type" onSubmit={handleSubmit(onSubmit, onError)}>
           <div className="form-card__group">
             <fieldset>
-              <legend className={`field-label--caps ${errors?.type ? "text-alert" : ""}`}>
+              <legend className={`text__caps-spaced ${errors?.type ? "text-alert" : ""}`}>
                 {t("application.alternateContact.type.label")}
               </legend>
               <p className="field-note mb-4">{t("t.pleaseSelectOne")}</p>

diff --git a/sites/public/pages/applications/contact/name.tsx b/sites/public/pages/applications/contact/name.tsx
@@ -101,7 +101,7 @@ const ApplicationName = () => {
           <div className="form-card__group border-b" data-test-id={"application-initial-page"}>
             <fieldset>
               <legend
-                className={`field-label--caps ${errors.applicant?.firstName ? "text-alert" : ""}`}
+                className={`text__caps-spaced ${errors.applicant?.firstName ? "text-alert" : ""}`}
               >
                 {t("application.name.yourName")}
                 <LockIcon />
@@ -175,7 +175,7 @@ const ApplicationName = () => {
 
           <div className="form-card__group">
             <legend
-              className={`field-label--caps ${errors.applicant?.emailAddress ? "text-alert" : ""}`}
+              className={`text__caps-spaced ${errors.applicant?.emailAddress ? "text-alert" : ""}`}
             >
               {t("application.name.yourEmailAddress")}
               <LockIcon />

diff --git a/sites/public/pages/applications/household/member.tsx b/sites/public/pages/applications/household/member.tsx
@@ -148,7 +148,7 @@ const ApplicationMember = () => {
             <Form onSubmit={handleSubmit(onSubmit, onError)}>
               <div className="form-card__group border-b">
                 <fieldset>
-                  <legend className="field-label--caps">
+                  <legend className="text__caps-spaced">
                     {t("application.household.member.name")}
                   </legend>
 
@@ -211,7 +211,7 @@ const ApplicationMember = () => {
 
               <div className="form-card__group border-b">
                 <fieldset>
-                  <legend className="field-label--caps">
+                  <legend className="text__caps-spaced">
                     {t("application.household.member.haveSameAddress")}
                   </legend>
                   <FieldGroup
@@ -230,7 +230,7 @@ const ApplicationMember = () => {
 
                 {(sameAddress == "no" || (!sameAddress && member.sameAddress == "no")) && (
                   <fieldset className="mt-8">
-                    <legend className="field-label--caps">
+                    <legend className="text__caps-spaced">
                       {t("application.contact.address")}
                     </legend>
 
@@ -306,7 +306,7 @@ const ApplicationMember = () => {
 
               <div className="form-card__group border-b">
                 <fieldset>
-                  <legend className="field-label--caps">
+                  <legend className="text__caps-spaced">
                     {t("application.household.member.workInRegion", {
                       county: listing?.countyCode,
                     })}
@@ -328,7 +328,7 @@ const ApplicationMember = () => {
 
                 {(workInRegion == "yes" || (!workInRegion && member.workInRegion == "yes")) && (
                   <fieldset className="mt-8">
-                    <legend className="field-label--caps">
+                    <legend className="text__caps-spaced">
                       {t("application.contact.address")}
                     </legend>
 
@@ -402,7 +402,7 @@ const ApplicationMember = () => {
 
               <div className="form-card__group">
                 <div className={"field " + (errors.relationship ? "error" : "")}>
-                  <label className="field-label--caps" htmlFor="relationship">
+                  <label className="text__caps-spaced" htmlFor="relationship">
                     {t("application.household.member.whatIsTheirRelationship")}
                   </label>
                   <div className="control">

diff --git a/sites/public/pages/applications/review/demographics.tsx b/sites/public/pages/applications/review/demographics.tsx
@@ -109,7 +109,7 @@ const ApplicationDemographics = () => {
         <Form onSubmit={handleSubmit(onSubmit)}>
           <div className="form-card__group border-b">
             <fieldset>
-              <legend className="field-label--caps">
+              <legend className="text__caps-spaced">
                 {t("application.review.demographics.raceLabel")}
               </legend>
               <FieldGroup
@@ -140,7 +140,7 @@ const ApplicationDemographics = () => {
                 label={t("application.review.demographics.ethnicityLabel")}
                 placeholder={t("t.selectOne")}
                 register={register}
-                labelClassName="field-label--caps mb-3"
+                labelClassName="text__caps-spaced mb-3"
                 controlClassName="control"
                 options={ethnicityKeys}
                 keyPrefix="application.review.demographics.ethnicityOptions"
@@ -151,7 +151,7 @@ const ApplicationDemographics = () => {
 
           <div className="form-card__group is-borderless">
             <fieldset>
-              <legend className="field-label--caps">
+              <legend className="text__caps-spaced">
                 {t("application.review.demographics.howDidYouHearLabel")}
               </legend>
               <FieldGroup

diff --git a/sites/public/pages/applications/start/choose-language.tsx b/sites/public/pages/applications/start/choose-language.tsx
@@ -139,7 +139,7 @@ const ApplicationChooseLanguage = () => {
             {listing?.applicationConfig.languages.length > 1 && (
               <>
                 <div className="w-full">
-                  <Heading style="sidebarHeader">
+                  <Heading styleType="underlineWeighted">
                     {t("application.chooseLanguage.chooseYourLanguage")}
                   </Heading>
                 </div>

diff --git a/sites/public/pages/create-account.tsx b/sites/public/pages/create-account.tsx
@@ -89,7 +89,7 @@ export default () => {
 
         <Form id="create-account" onSubmit={handleSubmit(onSubmit)}>
           <div className="form-card__group border-b">
-            <label className="field-label--caps" htmlFor="firstName">
+            <label className="text__caps-spaced" htmlFor="firstName">
               {t("application.name.yourName")}
             </label>
 

diff --git a/sites/public/src/ApplicationMultiselectQuestionStep.tsx b/sites/public/src/ApplicationMultiselectQuestionStep.tsx
@@ -188,7 +188,7 @@ const ApplicationMultiselectQuestionStep = ({
             <div className={`form-card__group`}>
               {questionSetInputType === "checkbox" ? (
                 <fieldset>
-                  <legend className="field-label--caps mb-4">{question?.text}</legend>
+                  <legend className="text__caps-spaced mb-4">{question?.text}</legend>
                   <p className="field-note mb-8">{question?.description}</p>
 
                   {allOptions.map((option) => {

diff --git a/sites/public/src/ListingView.tsx b/sites/public/src/ListingView.tsx
@@ -513,10 +513,10 @@ export const ListingView = (props: ListingProps) => {
           description={listing.name}
         />
         <div className="py-3 mx-3 flex flex-col items-center md:items-start text-center md:text-left">
-          <Heading priority={1} style={"cardHeader"} className={"text-black"}>
+          <Heading priority={1} styleType={"largePrimary"} className={"text-black"}>
             {listing.name}
           </Heading>
-          <Heading priority={2} style={"cardSubheader"} className={"mb-1"}>
+          <Heading priority={2} styleType={"mediumNormal"} className={"mb-1"}>
             {oneLineAddress}
           </Heading>
           <p className="text-gray-750 text-base mb-1">{listing.developer}</p>