@bloom-housing/ui-components 3.0.1-alpha.23 → 3.0.1-alpha.27

package/CHANGELOG.md

@@ -3,6 +3,50 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.0.1-alpha.27](https://github.com/bloom-housing/bloom/compare/@bloom-housing/ui-components@3.0.1-alpha.26...@bloom-housing/ui-components@3.0.1-alpha.27) (2021-12-01)
+
+**Note:** Version bump only for package @bloom-housing/ui-components
+
+
+
+
+
+## [3.0.1-alpha.26](https://github.com/bloom-housing/bloom/compare/@bloom-housing/ui-components@3.0.1-alpha.25...@bloom-housing/ui-components@3.0.1-alpha.26) (2021-12-01)
+
+**Note:** Version bump only for package @bloom-housing/ui-components
+
+
+
+
+
+## [3.0.1-alpha.25](https://github.com/bloom-housing/bloom/compare/@bloom-housing/ui-components@3.0.1-alpha.24...@bloom-housing/ui-components@3.0.1-alpha.25) (2021-11-30)
+
+**Note:** Version bump only for package @bloom-housing/ui-components
+
+
+
+
+
+## [3.0.1-alpha.24](https://github.com/bloom-housing/bloom/compare/@bloom-housing/ui-components@3.0.1-alpha.23...@bloom-housing/ui-components@3.0.1-alpha.24) (2021-11-29)
+
+
+### Bug Fixes
+
+* guard against 0 output ([0ea9012](https://github.com/bloom-housing/bloom/commit/0ea9012fdac02fb1cb4357abec2ec69633902654))
+* remove bold style from current waitlist size ([2e2f414](https://github.com/bloom-housing/bloom/commit/2e2f4141e62c8544c0828b29de0b99bb97abb201))
+* show waitlist values even if they're zero ([6a35e67](https://github.com/bloom-housing/bloom/commit/6a35e679f142105e40719e89bda3d957e3200e1d))
+* simpler conditionals ([f3e588d](https://github.com/bloom-housing/bloom/commit/f3e588d5e6dd0a39d1aed99ef6eba0054540ed14))
+* waitlist: handle both null and undefined ([90fd369](https://github.com/bloom-housing/bloom/commit/90fd369b471c7f9baa0a1d58f452159449fe6fcf))
+
+
+### Features
+
+* simplify Waitlist component and use more flexible schema ([96df149](https://github.com/bloom-housing/bloom/commit/96df1496f377ddfa6f0e6c016c84954b6a43ff4a))
+
+
+
+
+
 ## [3.0.1-alpha.23](https://github.com/bloom-housing/bloom/compare/@bloom-housing/ui-components@3.0.1-alpha.22...@bloom-housing/ui-components@3.0.1-alpha.23) (2021-11-29)
 
 **Note:** Version bump only for package @bloom-housing/ui-components

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bloom-housing/ui-components",
-  "version": "3.0.1-alpha.23",
+  "version": "3.0.1-alpha.27",
   "author": "Sean Albert <sean.albert@exygy.com>",
   "description": "Shared user interface components for Bloom affordable housing system",
   "homepage": "https://github.com/bloom-housing/bloom/tree/master/shared/ui-components",
@@ -69,7 +69,7 @@
     "webpack": "^4.44.2"
   },
   "dependencies": {
-    "@bloom-housing/backend-core": "^3.0.1-alpha.25",
+    "@bloom-housing/backend-core": "^3.0.1-alpha.28",
     "@mapbox/mapbox-sdk": "^0.13.0",
     "@types/body-scroll-lock": "^2.6.1",
     "@types/jwt-decode": "^2.2.1",
@@ -100,5 +100,5 @@
     "tailwindcss": "2.2.10",
     "typesafe-actions": "^5.1.0"
   },
-  "gitHead": "546a941a8e75bd05d3bbecfcb5fa4be13f8931cb"
+  "gitHead": "28ba129acbb39974b1ec5c95a7fbdbf85db545bf"
 }

package/src/helpers/unitTypes.ts

@@ -5,7 +5,7 @@ type GetUnitTypeNamesReturn = {
   name: string
 }
 
-export const UnitTypeSort = ["studio", "oneBdrm", "twoBdrm", "threeBdrm", "fourBdrm"]
+export const UnitTypeSort = ["SRO", "studio", "oneBdrm", "twoBdrm", "threeBdrm", "fourBdrm"]
 
 export const sortUnitTypes = (units: UnitType[] | GetUnitTypeNamesReturn[]) => {
   if (!units) return []

package/src/locales/general.json

@@ -309,6 +309,7 @@
         "legend": "Preferred unit type",
         "optionsLabel": "Check all that apply:",
         "options": {
+          "SRO": "SRO",
           "studio": "Studio",
           "oneBdrm": "1 Bedroom",
           "twoBdrm": "2 Bedroom",
@@ -1106,6 +1107,7 @@
       "header": "Public Lottery",
       "seeVideo": "See Video"
     },
+    "recommended": "Recommended",
     "referralContactPhone": "Referral Contact Phone",
     "referralSummary": "Referral Summary",
     "remainingUnitsAfterPreferenceConsideration": "After all preference holders have been considered, any remaining units will be available to other qualified applicants.",
@@ -1198,7 +1200,7 @@
     "selectionCriteria": "Selection Criteria",
     "selectPreferences": "Select Preferences",
     "showClosedListings": "Show Closed Listings",
-    "singleRoomOccupancy": "Single Room Occupancy",
+    "singleRoomOccupancy": "SRO",
     "singleRoomOccupancyDescription": "This property offers single rooms for one person only. Tenants may share bathrooms, and sometimes kitchen facilities.",
     "specialNotes": "Special Notes",
     "streetAddressOrPOBox": "Street Address or PO Box",
@@ -1209,7 +1211,7 @@
       "threeBdrm": "3 BR",
       "fourBdrm": "4 BR",
       "studio": "Studio",
-      "SRO": "Single Room Occupancy"
+      "SRO": "SRO"
     },
     "unitsAreFor": "These units are for %{type}.",
     "unitsHaveAccessibilityFeaturesFor": "These units have accessibility features for people with %{type}.",
@@ -1231,7 +1233,7 @@
       "maxSize": "Maximum Waitlist Size",
       "maxSizeQuestion": "What is the maximum size of the waitlist?",
       "open": "Open Waitlist",
-      "openQuestion": "Is the waitlist open?",
+      "openQuestion": "Do you want to show a waitlist?",
       "openSize": "Number of Openings",
       "openSizeQuestion": "How many spots are open on the list?",
       "openSlots": "Open Waitlist Slots",
@@ -1304,7 +1306,7 @@
         "twoBdrm": "Two Bedroom",
         "threeBdrm": "Three Bedroom",
         "fourBdrm": "Four Bedroom",
-        "SRO": "Single Room Occupancy"
+        "SRO": "SRO"
       }
     },
     "events": {

package/src/page_components/listing/listing_sidebar/Waitlist.tsx

@@ -1,77 +1,46 @@
 import * as React from "react"
 import { t } from "../../../helpers/translator"
 
-const WaitlistItem = (props: { className?: string; value: number; text: string }) => {
-  return props.value ? (
-    <li className={`uppercase text-gray-800 text-tiny ${props.className}`}>
-      <span className="text-right w-12 inline-block pr-2">{props.value}</span>
-      <span>{props.text}</span>
-    </li>
-  ) : null
-}
-
 export interface WaitlistProps {
   isWaitlistOpen: boolean
-  waitlistMaxSize: number
-  waitlistCurrentSize: number
-  waitlistOpenSpots: number
-  unitsAvailable: number
+  waitlistMaxSize?: number | null
+  waitlistCurrentSize?: number | null
+  waitlistOpenSpots?: number | null
 }
 
+const WaitlistItem = (props: { className?: string; value: number; text: string }) => (
+  <li className={`uppercase text-gray-800 text-tiny ${props.className}`}>
+    <span className="text-right w-12 inline-block pr-2">{props.value}</span>
+    <span>{props.text}</span>
+  </li>
+)
+
 const Waitlist = (props: WaitlistProps) => {
-  let header, subheader, waitlistItems
-  if (!props.isWaitlistOpen && !props.waitlistCurrentSize) return <></>
-  if (props.unitsAvailable && props.unitsAvailable > 0 && props.isWaitlistOpen) {
-    header = t("listings.waitlist.unitsAndWaitlist")
-    subheader = t("listings.waitlist.submitAnApplication")
-    waitlistItems = (
-      <>
-        <WaitlistItem
-          value={props.unitsAvailable}
-          text={t("listings.availableUnits")}
-          className={"font-semibold"}
-        />
-        {props.waitlistOpenSpots && (
-          <WaitlistItem
-            value={props.waitlistOpenSpots}
-            text={t("listings.waitlist.openSlots")}
-            className={"font-semibold"}
-          />
-        )}
-      </>
-    )
-  } else {
-    if (props.isWaitlistOpen) {
-      header = t("listings.waitlist.isOpen")
-      subheader = t("listings.waitlist.submitForWaitlist")
-    } else {
-      header = t("listings.waitlist.closed")
-      subheader = null
-    }
-    waitlistItems = (
-      <>
-        <WaitlistItem
-          value={props.waitlistCurrentSize || 0}
-          text={t("listings.waitlist.currentSize")}
-        />
-        {props.waitlistOpenSpots && (
-          <WaitlistItem
-            value={props.waitlistOpenSpots}
-            text={t("listings.waitlist.openSlots")}
-            className={"font-semibold"}
-          />
-        )}
-        <WaitlistItem value={props.waitlistMaxSize || 0} text={t("listings.waitlist.finalSize")} />
-      </>
-    )
-  }
+  if (!props.isWaitlistOpen) return <></>
 
   return (
     <section className="aside-block is-tinted">
-      <h4 className="text-caps-tiny">{header}</h4>
+      <h4 className="text-caps-tiny">{t("listings.waitlist.unitsAndWaitlist")}</h4>
       <div>
-        {subheader && <p className="text-tiny text-gray-800 pb-3">{subheader}</p>}
-        {<ul>{waitlistItems}</ul>}
+        <p className="text-tiny text-gray-800 pb-3">{t("listings.waitlist.submitAnApplication")}</p>
+        <ul>
+          {props.waitlistCurrentSize !== null && props.waitlistCurrentSize !== undefined && (
+            <WaitlistItem
+              value={props.waitlistCurrentSize}
+              text={t("listings.waitlist.currentSize")}
+            />
+          )}
+          {props.waitlistOpenSpots !== null && props.waitlistOpenSpots !== undefined && (
+            <WaitlistItem
+              value={props.waitlistOpenSpots}
+              text={t("listings.waitlist.openSlots")}
+              className={"font-semibold"}
+            />
+          )}
+          {props.waitlistMaxSize != null && (
+            <WaitlistItem value={props.waitlistMaxSize} text={t("listings.waitlist.finalSize")} />
+          )}
+        </ul>
       </div>
     </section>
   )