fix: handle nullable expiry values from a db

This commit is contained in:
Aarnav Tale 2024-10-10 10:06:52 -04:00
parent dd479d4117
commit d165264876
No known key found for this signature in database
3 changed files with 8 additions and 2 deletions

View File

@ -56,6 +56,7 @@ export default function Page() {
const expired = machine.expiry === '0001-01-01 00:00:00' const expired = machine.expiry === '0001-01-01 00:00:00'
|| machine.expiry === '0001-01-01T00:00:00Z' || machine.expiry === '0001-01-01T00:00:00Z'
|| machine.expiry === null
? false ? false
: new Date(machine.expiry).getTime() < Date.now() : new Date(machine.expiry).getTime() < Date.now()
@ -134,7 +135,10 @@ export default function Page() {
/> />
<Attribute <Attribute
name="Expiry" name="Expiry"
value={new Date(machine.expiry).toLocaleString()} value={expired
? new Date(machine.expiry).toLocaleString()
: 'Never'
}
/> />
{magic {magic
? ( ? (

View File

@ -4,7 +4,7 @@ import { Link } from '@remix-run/react'
import Menu from '~/components/Menu' import Menu from '~/components/Menu'
import StatusCircle from '~/components/StatusCircle' import StatusCircle from '~/components/StatusCircle'
import { toast } from '~/components/Toaster' import { toast } from '~/components/Toaster'
import { type Machine, type Route, User } from '~/types' import { Machine, Route, User } from '~/types'
import { cn } from '~/utils/cn' import { cn } from '~/utils/cn'
import MenuOptions from './menu' import MenuOptions from './menu'
@ -19,6 +19,7 @@ interface Props {
export default function MachineRow({ machine, routes, magic, users }: Props) { export default function MachineRow({ machine, routes, magic, users }: Props) {
const expired = machine.expiry === '0001-01-01 00:00:00' const expired = machine.expiry === '0001-01-01 00:00:00'
|| machine.expiry === '0001-01-01T00:00:00Z' || machine.expiry === '0001-01-01T00:00:00Z'
|| machine.expiry === null
? false ? false
: new Date(machine.expiry).getTime() < Date.now() : new Date(machine.expiry).getTime() < Date.now()

View File

@ -29,6 +29,7 @@ export default function Menu({ machine, routes, magic, users }: MenuProps) {
const expired = machine.expiry === '0001-01-01 00:00:00' const expired = machine.expiry === '0001-01-01 00:00:00'
|| machine.expiry === '0001-01-01T00:00:00Z' || machine.expiry === '0001-01-01T00:00:00Z'
|| machine.expiry === null
? false ? false
: new Date(machine.expiry).getTime() < Date.now() : new Date(machine.expiry).getTime() < Date.now()