Update formatBirthplaceCountryOrState logic

Author: kydecker

web/src/constants/jurisdictions.ts

@@ -79,6 +79,9 @@ export const JURISDICTIONS = {
 /** Lowercase state/territory abbreviation, matching content collection jurisdiction IDs. */
 export type JurisdictionId = keyof typeof JURISDICTIONS;
 
+export const isJurisdictionId = (id: string): id is JurisdictionId =>
+  id in JURISDICTIONS;
+
 /** `{ label, value }` options for jurisdiction selects/comboboxes. */
 export const JURISDICTION_OPTIONS = Object.entries(JURISDICTIONS).map(
   ([id, jurisdiction]) => ({

web/src/lib/utils/__tests__/formatBirthplaceCountryOrState.test.ts

@@ -5,7 +5,7 @@ import { formatBirthplaceCountryOrState } from "../formatBirthplaceCountryOrStat
 
 describe("formatBirthplaceCountryOrState", () => {
   it("returns state name when valid state is provided", () => {
-    expect(formatBirthplaceCountryOrState(undefined, "CA")).toBe(
+    expect(formatBirthplaceCountryOrState(undefined, "ca")).toBe(
       JURISDICTIONS.ca.name,
     );
   });
@@ -19,7 +19,7 @@ describe("formatBirthplaceCountryOrState", () => {
   });
 
   it("returns state name when both country and state are provided and country is the US", () => {
-    expect(formatBirthplaceCountryOrState("US", "NY")).toBe(
+    expect(formatBirthplaceCountryOrState("US", "ny")).toBe(
       JURISDICTIONS.ny.name,
     );
   });

web/src/lib/utils/formatBirthplaceCountryOrState.ts

@@ -1,5 +1,5 @@
 import { COUNTRIES } from "#constants/countries";
-import { JURISDICTIONS, type JurisdictionId } from "#constants/jurisdictions";
+import { isJurisdictionId, JURISDICTIONS } from "#constants/jurisdictions";
 
 /**
  * Given a birthplace country and/or state, return the country name
@@ -8,7 +8,7 @@ import { JURISDICTIONS, type JurisdictionId } from "#constants/jurisdictions";
  * @example
  * formatBirthplaceCountryOrState("MX")
  * // "Mexico"
- * formatBirthplaceCountryOrState("US", "MA")
+ * formatBirthplaceCountryOrState("US", "ma")
  * // "Massachusetts"
  */
 export const formatBirthplaceCountryOrState = (
@@ -18,8 +18,8 @@ export const formatBirthplaceCountryOrState = (
   if (birthplaceCountry && birthplaceCountry !== "US") {
     return COUNTRIES[birthplaceCountry];
   }
-  if (birthplaceState) {
-    return JURISDICTIONS[birthplaceState.toLowerCase() as JurisdictionId]?.name;
+  if (birthplaceState && isJurisdictionId(birthplaceState)) {
+    return JURISDICTIONS[birthplaceState].name;
   }
   return "";
 };