Skip to content

Commit

Permalink
Add error boundary to prior notification card
Browse files Browse the repository at this point in the history
  • Loading branch information
ivangabriele committed Apr 8, 2024
1 parent fa2ad95 commit de7e839
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 20 deletions.
6 changes: 3 additions & 3 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { CustomGlobalStyle } from '@components/CustomGlobalStyle'
import { FrontendErrorBoundary } from '@components/FrontendErrorBoundary'
import { useGetUserAuthorization } from '@hooks/authorization/useGetUserAuthorization'
import { GlobalStyle, THEME, ThemeProvider } from '@mtes-mct/monitor-ui'
import { LandingPage } from '@pages/LandingPage'
Expand All @@ -14,15 +15,14 @@ import rsuiteFrFr from 'rsuite/locales/fr_FR'

import { AuthorizationContext } from './context/AuthorizationContext'
import { router } from './router'
import { FrontendErrorBoundary } from './ui/FrontendErrorBoundary'

import type { AuthContextProps } from 'react-oidc-context'

countries.registerLocale(COUNTRIES_FR)

type AppProps = {
type AppProps = Readonly<{
auth?: AuthContextProps | undefined
}
}>
export function App({ auth }: AppProps) {
const userAuthorization = useGetUserAuthorization()

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/* eslint-disable no-console */

import { FrontendError } from '@libs/FrontendError'
import { Component } from 'react'

import { FrontendError } from '../libs/FrontendError'

import type { ErrorInfo, ReactNode } from 'react'

export type FrontendErrorBoundaryProps = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { FrontendErrorBoundary } from '@components/FrontendErrorBoundary'
import { MissionAction } from '@features/Mission/missionAction.types'
import { memo } from 'react'
import styled from 'styled-components'
import { FrontendErrorBoundary } from 'ui/FrontendErrorBoundary'

import { AirControlForm } from './AirControlForm'
import { AirSurveillanceForm } from './AirSurveillanceForm'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { FrontendErrorBoundary } from '@components/FrontendErrorBoundary'
import { FrontendError } from '@libs/FrontendError'
import { Accent, Button, Icon } from '@mtes-mct/monitor-ui'
import { useFormikContext } from 'formik'
import { find } from 'lodash'
import { remove as ramdaRemove, update as ramdaUpdate } from 'ramda'
import { Fragment, useCallback, useMemo, useState } from 'react'
import styled from 'styled-components'
import { FrontendErrorBoundary } from 'ui/FrontendErrorBoundary'

import { Infraction } from './Infraction'
import { InfractionForm } from './InfractionForm'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { FrontendErrorBoundary } from '@components/FrontendErrorBoundary'
import { ActionCard } from '@features/Mission/components/MissionForm/ActionList/ActionCard'
import { EnvActionCard } from '@features/Mission/components/MissionForm/ActionList/EnvActionCard'
import { EnvMissionAction } from '@features/Mission/envMissionAction.types'
Expand All @@ -8,7 +9,6 @@ import { Dropdown, Icon } from '@mtes-mct/monitor-ui'
import { skipToken } from '@reduxjs/toolkit/dist/query'
import { useMemo } from 'react'
import styled from 'styled-components'
import { FrontendErrorBoundary } from 'ui/FrontendErrorBoundary'

import { FishActionCard } from './FishActionCard'
import { FormBody } from '../shared/FormBody'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
useDeleteMissionActionMutation,
useUpdateMissionActionMutation
} from '@api/missionAction'
import { FrontendErrorBoundary } from '@components/FrontendErrorBoundary'
import { Mission } from '@features/Mission/mission.types'
import { autoSaveMission } from '@features/Mission/useCases/autoSaveMission'
import { autoSaveMissionAction } from '@features/Mission/useCases/autoSaveMissionAction'
Expand All @@ -28,7 +29,6 @@ import { getMissionStatus } from 'domain/entities/mission/utils'
import { SideWindowMenuKey } from 'domain/entities/sideWindow/constants'
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import styled from 'styled-components'
import { FrontendErrorBoundary } from 'ui/FrontendErrorBoundary'
import { NoRsuiteOverrideWrapper } from 'ui/NoRsuiteOverrideWrapper'
import { useDebouncedCallback } from 'use-debounce'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { FrontendErrorBoundary } from '@components/FrontendErrorBoundary'
import { LogbookMessage } from '@features/Logbook/components/VesselLogbook/LogbookMessages/messages/LogbookMessage'
import { priorNotificationActions } from '@features/PriorNotification/slice'
import { useMainAppDispatch } from '@hooks/useMainAppDispatch'
Expand Down Expand Up @@ -45,17 +46,19 @@ export function PriorNotificationCard({ priorNotificationId }: PriorNotification
<Background onClick={close} />

<Card>
<Header onClose={close} priorNotificationDetail={priorNotificationDetail} />
<FrontendErrorBoundary>
<Header onClose={close} priorNotificationDetail={priorNotificationDetail} />

<Body>
<LogbookMessage isFirst logbookMessage={priorNotificationDetail.logbookMessage} />
</Body>
<Body>
<LogbookMessage isFirst logbookMessage={priorNotificationDetail.logbookMessage} />
</Body>

<Footer>
<Button accent={Accent.TERTIARY} onClick={close}>
Fermer
</Button>
</Footer>
<Footer>
<Button accent={Accent.TERTIARY} onClick={close}>
Fermer
</Button>
</Footer>
</FrontendErrorBoundary>
</Card>
</Wrapper>
)
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/features/SideWindow/index.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { FrontendErrorBoundary } from '@components/FrontendErrorBoundary'
import { MissionForm } from '@features/Mission/components/MissionForm'
import { useListenToAllMissionEventsUpdates } from '@features/Mission/components/MissionForm/hooks/useListenToAllMissionEventsUpdates'
import { THEME, type NewWindowContextValue, NewWindowContext, Notifier } from '@mtes-mct/monitor-ui'
Expand Down Expand Up @@ -28,7 +29,6 @@ import getAllGearCodes from '../../domain/use_cases/gearCode/getAllGearCodes'
import { getInfractions } from '../../domain/use_cases/infraction/getInfractions'
import { useMainAppDispatch } from '../../hooks/useMainAppDispatch'
import { useMainAppSelector } from '../../hooks/useMainAppSelector'
import { FrontendErrorBoundary } from '../../ui/FrontendErrorBoundary'
import { Loader as MissionFormLoader } from '../Mission/components/MissionForm/Loader'
import { MissionList } from '../Mission/components/MissionList'
import { PriorNotificationList } from '../PriorNotification/components/PriorNotificationList'
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/features/map/Map.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { FrontendErrorBoundary } from '@components/FrontendErrorBoundary'
import { Feature } from 'ol'
import { useState } from 'react'

Expand Down Expand Up @@ -29,7 +30,6 @@ import VesselTrackOverlay from './overlays/VesselTrackOverlay'
import { useIsSuperUser } from '../../hooks/authorization/useIsSuperUser'
import { useMainAppSelector } from '../../hooks/useMainAppSelector'
import { FeatureWithCodeAndEntityId } from '../../libs/FeatureWithCodeAndEntityId'
import { FrontendErrorBoundary } from '../../ui/FrontendErrorBoundary'
import { AdministrativeLayers } from '../AdministrativeZone/layers/AdministrativeLayers'
import { BaseLayer } from '../BaseMap/layers/BaseLayer'
import { DrawLayer } from '../Draw/layer'
Expand Down

0 comments on commit de7e839

Please sign in to comment.