Skip to content

fix: gracefully handle routes missing start/end times #607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
greatgitsby wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: gracefully handle routes missing start/end times #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6e7051
handle
greatgitsby Aug 31, 2025
d71892f
datestr
greatgitsby Aug 31, 2025
58df02b
cleanup
greatgitsby Aug 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/pages/dashboard/activities/RouteActivity.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ const RouteActivity: VoidComponent<RouteActivityProps> = (props) => {

const routeName = () => `${props.dongleId}|${props.dateStr}`
const [route] = createResource(routeName, getRoute)
const startTime = () => (route.latest ? dayjs(route().start_time).format('dddd, MMM D, YYYY') : '')

const startTime = () => (route.latest?.start_time ? dayjs(route().start_time).format('dddd, MMM D, YYYY') : props.dateStr)
const selection = () => ({ startTime: props.startTime, endTime: props.endTime })

// FIXME: generateTimelineStatistics is given different versions of TimelineEvents multiple times, leading to stuttering engaged % on switch
Expand Down
16 changes: 12 additions & 4 deletions src/pages/dashboard/components/RouteList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ interface RouteCardProps {
}

const RouteCard: VoidComponent<RouteCardProps> = (props) => {
const startTime = () => dayjs.utc(props.route.start_time).local()
const endTime = () => dayjs.utc(props.route.end_time).local()
const color = () => dateTimeToColorBetween(startTime().toDate(), endTime().toDate(), [30, 57, 138], [218, 161, 28])
const startTime = () => (props.route.start_time ? dayjs.utc(props.route.start_time).local() : undefined)
const endTime = () => (props.route.end_time ? dayjs.utc(props.route.end_time).local() : undefined)
const color = () =>
startTime() && endTime() ? dateTimeToColorBetween(startTime()!.toDate(), endTime()!.toDate(), [30, 57, 138], [218, 161, 28]) : '#000000'
const [statistics] = createResource(() => props.route, getRouteStatistics)
const [location] = createResource(async () => {
const startPos = [props.route.start_lng || 0, props.route.start_lat || 0]
Expand All @@ -34,10 +35,15 @@ const RouteCard: VoidComponent<RouteCardProps> = (props) => {
return `${startPlace} to ${endPlace}`
})

const getCardHeadline = () => {
if (!startTime() || !endTime()) return props.route.fullname.split('|')[1]
return `${startTime()!.format('h:mm A')} to ${endTime()!.format('h:mm A')}`
}

return (
<Card class="max-w-none" href={`/${props.route.dongle_id}/${props.route.fullname.slice(17)}`} activeClass="md:before:bg-primary">
<CardHeader
headline={`${startTime().format('h:mm A')} to ${endTime().format('h:mm A')}`}
headline={getCardHeadline()}
subhead={<Suspense fallback={<div class="h-[20px] w-auto skeleton-loader rounded-xs" />}>{location()}</Suspense>}
trailing={
<Suspense>
Expand Down Expand Up @@ -106,6 +112,8 @@ const RouteList: VoidComponent<{ dongleId: string }> = (props) => {
// Group and display headers for each day
let prevDayHeader: string | null = null
function getDayHeader(route: Route): string | null {
// group route without start or end time with the nearest day
if (route.start_time === null || route.end_time === null) return null
const date = dayjs.utc(route.start_time).local()
let dayHeader = null
if (date.isSame(dayjs(), 'day')) {
Expand Down