More hearing types (#2018)

* fix(hearing): Update hearing types - location can also sometimes be missing

* fix(yarn): Remove unneeded package-lock.json, add package-lock.json to gitignore (because we use yarn), and remove yarn from the package.json deps list

Author: Mephistic

.gitignore

@@ -5,6 +5,7 @@
 /.pnp
 .pnp.js
 .yarn*
+package-lock.json
 
 # testing
 /coverage

components/HearingsScheduled/HearingsScheduled.tsx

@@ -10,7 +10,7 @@ export type EventData = {
   type: "hearing" | "session"
   name: string
   id: number
-  location: string
+  location?: string
   fullDate: Date // TODO: Could be a timestamp
   year: string
   month: string
@@ -132,7 +132,7 @@ export const EventCard = ({
               )}
             </p>
             <p className={`lh-sm mb-3 ms-2 text-secondary`}>
-              {truncateEntry(location)}
+              {truncateEntry(location ?? "")}
             </p>
           </div>
         </div>

components/HearingsScheduled/calendarEvents.ts

@@ -44,7 +44,7 @@ export const useCalendarEvents = () => {
           type: e.type,
           name: e.content.Name ?? "Hearing",
           id: e.content.EventId,
-          location: e.content.Location.LocationName,
+          location: e.content.Location?.LocationName ?? undefined,
           fullDate: eventDate.toJSDate(),
           year: date.year,
           month: date.month,

functions/src/events/types.ts

@@ -54,12 +54,12 @@ export const Session = BaseEvent.extend({
 })
 export type HearingLocation = Static<typeof HearingLocation>
 export const HearingLocation = Record({
-  AddressLine1: String,
+  AddressLine1: Nullable(String),
   AddressLine2: Nullable(String),
-  City: String,
-  LocationName: String,
-  State: String,
-  ZipCode: String
+  City: Nullable(String),
+  LocationName: Nullable(String),
+  State: Nullable(String),
+  ZipCode: Nullable(String)
 })
 export type HearingContent = Static<typeof HearingContent>
 export const HearingContent = BaseEventContent.extend({

functions/src/hearings/search.ts

@@ -106,8 +106,8 @@ export const {
       year: schedule.year,
       committeeCode: content.HearingHost?.CommitteeCode ?? undefined,
       committeeName: committeeName ?? undefined,
-      locationName: content.Location?.LocationName,
-      locationCity: content.Location?.City,
+      locationName: content.Location?.LocationName ?? undefined,
+      locationCity: content.Location?.City ?? undefined,
       chairNames: hearing.committeeChairs ?? [],
       agendaTopics,
       billNumbers: dedupedBills.map(bill => bill.number),