Merge pull request #2377 from target/ts-conversion-UserCalendarSubscr…

…iptionList ui/users: convert UserCalendarSubscriptionList file to typescript
target · May 12, 2022 · 3307d14 · 3307d14
2 parents 216b67b + bcd5547
commit 3307d14
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 23 deletions.
diff --git a/web/src/app/lists/FlatList.tsx b/web/src/app/lists/FlatList.tsx
@@ -82,7 +82,7 @@ const useStyles = makeStyles((theme: Theme) => ({
 
 export interface FlatListSub {
   id?: string
-  subHeader: string
+  subHeader: JSX.Element | string
 }
 
 export interface FlatListNotice extends Notice {

diff --git a/...app/users/UserCalendarSubscriptionList.js → ...pp/users/UserCalendarSubscriptionList.tsx b/...app/users/UserCalendarSubscriptionList.js → ...pp/users/UserCalendarSubscriptionList.tsx
@@ -1,9 +1,8 @@
 import React, { useState } from 'react'
 import { useQuery, gql } from '@apollo/client'
-import p from 'prop-types'
 import { useParams } from 'react-router-dom'
 import { Card, Alert } from '@mui/material'
-import FlatList from '../lists/FlatList'
+import FlatList, { FlatListListItem } from '../lists/FlatList'
 import OtherActions from '../util/OtherActions'
 import CreateFAB from '../lists/CreateFAB'
 import CalendarSubscribeCreateDialog from '../schedules/calendar-subscribe/CalendarSubscribeCreateDialog'
@@ -16,6 +15,7 @@ import Spinner from '../loading/components/Spinner'
 import { formatTimeSince } from '../util/timeFormat'
 import { useConfigValue } from '../util/RequireConfig'
 import AppLink from '../util/AppLink'
+import { UserCalendarSubscription } from '../../schema'
 
 export const calendarSubscriptionsQuery = gql`
   query calendarSubscriptions($id: ID!) {
@@ -36,15 +36,21 @@ export const calendarSubscriptionsQuery = gql`
   }
 `
 
-export default function UserCalendarSubscriptionList(props) {
+export default function UserCalendarSubscriptionList(props: {
+  userID: string
+}): JSX.Element {
   const { userID: _userID } = useParams()
   const userID = props.userID || _userID
   const [creationDisabled] = useConfigValue(
     'General.DisableCalendarSubscriptions',
   )
   const [showCreateDialog, setShowCreateDialog] = useState(false)
-  const [showEditDialogByID, setShowEditDialogByID] = useState(null)
-  const [showDeleteDialogByID, setShowDeleteDialogByID] = useState(null)
+  const [showEditDialogByID, setShowEditDialogByID] = useState<string | null>(
+    null,
+  )
+  const [showDeleteDialogByID, setShowDeleteDialogByID] = useState<
+    string | null
+  >(null)
 
   const { data, loading, error } = useQuery(calendarSubscriptionsQuery, {
     variables: {
@@ -56,18 +62,20 @@ export default function UserCalendarSubscriptionList(props) {
   if (!_.get(data, 'user.id')) return loading ? <Spinner /> : <ObjectNotFound />
 
   // sort by schedule names, then subscription names
-  const subs = data.user.calendarSubscriptions.slice().sort((a, b) => {
-    if (a.schedule.name < b.schedule.name) return -1
-    if (a.schedule.name > b.schedule.name) return 1
+  const subs: UserCalendarSubscription[] = data.user.calendarSubscriptions
+    .slice()
+    .sort((a: UserCalendarSubscription, b: UserCalendarSubscription) => {
+      if ((a?.schedule?.name ?? '') < (b?.schedule?.name ?? '')) return -1
+      if ((a?.schedule?.name ?? '') > (b?.schedule?.name ?? '')) return 1
 
-    if (a.name > b.name) return 1
-    if (a.name < b.name) return -1
-  })
+      if (a.name > b.name) return 1
+      if (a.name < b.name) return -1
+    })
 
-  const subheaderDict = {}
-  const items = []
+  const subheaderDict: { [key: string]: boolean } = {}
+  const items: FlatListListItem[] = []
 
-  function renderOtherActions(id) {
+  function renderOtherActions(id: string): JSX.Element {
     return (
       <OtherActions
         actions={[
@@ -85,13 +93,13 @@ export default function UserCalendarSubscriptionList(props) {
   }
 
   // push schedule names as subheaders now that the array is sorted
-  subs.forEach((sub) => {
-    if (!subheaderDict[sub.schedule.name]) {
-      subheaderDict[sub.schedule.name] = true
+  subs.forEach((sub: UserCalendarSubscription) => {
+    if (!subheaderDict[sub?.schedule?.name ?? '']) {
+      subheaderDict[sub?.schedule?.name ?? ''] = true
       items.push({
         subHeader: (
           <AppLink to={`/schedules/${sub.scheduleID}`}>
-            {sub.schedule.name}
+            {sub.schedule?.name}
           </AppLink>
         ),
       })
@@ -152,7 +160,3 @@ export default function UserCalendarSubscriptionList(props) {
     </React.Fragment>
   )
 }
-
-UserCalendarSubscriptionList.propTypes = {
-  userID: p.string,
-}