diff --git a/src/client/App.tsx b/src/client/App.tsx index 4ef1cb2e8..b2454f98a 100644 --- a/src/client/App.tsx +++ b/src/client/App.tsx @@ -83,7 +83,7 @@ import Search from './pages/Search/Search'; import { ToeristscheVerhuurThema } from './pages/ToeristischeVerhuur/ToeristischeVerhuur'; import { ToeristischeVerhuurDetail } from './pages/ToeristischeVerhuur/ToeristischeVerhuurDetail'; import { ToeristischeVerhuurVergunningen } from './pages/ToeristischeVerhuur/ToeristischeVerhuurVergunningenList'; -import Varen from './pages/Varen/Varen'; +import { Varen } from './pages/Varen/Varen'; import VergunningDetail from './pages/VergunningDetail/VergunningDetail'; import Vergunningen from './pages/Vergunningen/Vergunningen'; import VergunningV2Detail from './pages/VergunningenV2/VergunningDetail'; diff --git a/src/client/pages/Bodem/config.ts b/src/client/pages/Bodem/config.ts index c797dde38..cb908c7a9 100644 --- a/src/client/pages/Bodem/config.ts +++ b/src/client/pages/Bodem/config.ts @@ -1,13 +1,20 @@ import { generatePath } from 'react-router-dom'; import { LoodMetingFrontend } from '../../../server/services/bodem/types'; +import { VarenFrontend } from '../../../server/services/varen/config-and-types'; import { AppRoutes } from '../../../universal/config/routes'; import { dateSort } from '../../../universal/helpers/date'; import { LinkProps } from '../../../universal/types'; +import { + DisplayProps, + WithDetailLinkComponent, +} from '../../components/Table/TableV2'; -export const displayPropsAanvragen = { +export const displayPropsAanvragen: DisplayProps< + WithDetailLinkComponent +> = { detailLinkComponent: 'Adres', - datumAanvraagFormatted: 'Aangevraagd', + dateRequestFormatted: 'Aangevraagd', status: 'Status', }; diff --git a/src/client/pages/Varen/Varen.tsx b/src/client/pages/Varen/Varen.tsx index 90784b5f8..8acd3c8ad 100644 --- a/src/client/pages/Varen/Varen.tsx +++ b/src/client/pages/Varen/Varen.tsx @@ -23,22 +23,21 @@ function useVarenThemaData() { (item) => item.caseType === caseTypeVaren.VarenRederRegistratie ); - const span = 4; - const labelMap = { company: 'Bedrijfsnaam', email: 'E-mailadres', phone: 'Telefoonnummer', bsnkvk: 'KVK nummer', - adres: 'Adres', + address: 'Adres', }; const gegevensAanvrager: RowSet | null = varenRederRegistratie ? { - rows: entries(labelMap).map(([key, label]) => { - const content = varenRederRegistratie[key]; - return { label, content, span }; - }), + rows: entries(labelMap).map(([key, label]) => ({ + label, + content: varenRederRegistratie[key], + span: 4, + })), } : null; @@ -63,7 +62,7 @@ function useVarenThemaData() { }; } -export default function Varen() { +export function Varen() { const { gegevensAanvrager, tableItems, tableConfig, isLoading, isError } = useVarenThemaData(); diff --git a/src/server/services/varen/config-and-types.ts b/src/server/services/varen/config-and-types.ts index 5b48ed8db..959cc111d 100644 --- a/src/server/services/varen/config-and-types.ts +++ b/src/server/services/varen/config-and-types.ts @@ -15,8 +15,8 @@ export type VarenRegistratieRederType = DecosZaakBase & { decision: 'Verleend' | 'Ingetrokken'; company: string | null; bsnkvk: string | null; - adres: string | null; - postal: string | null; + address: string | null; + postalCode: string | null; city: string | null; phone: string | null; email: string | null; @@ -38,6 +38,7 @@ export interface VarenVergunningExploitatieType extends DecosZaakBase { | 'Aanvullende informatie gevraagd' | 'Nadere informatie nodig' | 'Besluit'; + // eslint-disable-next-line no-magic-numbers formAppearance: 1 | 2 | 3; segment: | 'Beeldbepalend groot' diff --git a/src/server/services/varen/decos-zaken.ts b/src/server/services/varen/decos-zaken.ts index 306d20bfe..2293808db 100644 --- a/src/server/services/varen/decos-zaken.ts +++ b/src/server/services/varen/decos-zaken.ts @@ -1,13 +1,14 @@ -import { - DecosZaakTransformer, - SELECT_FIELDS_TRANSFORM_BASE, -} from '../decos/decos-types'; import type { CaseTypeVaren, VarenRegistratieRederType, VarenVergunningExploitatieType, VarenVergunningLigplaatsType, } from './config-and-types'; +import { + DecosZaakBase, + DecosZaakTransformer, + SELECT_FIELDS_TRANSFORM_BASE, +} from '../decos/decos-types'; export const VarenRegistratieReder: DecosZaakTransformer = { @@ -25,8 +26,8 @@ export const VarenRegistratieReder: DecosZaakTransformer> // TODO: type key as varen casetype + {} as Record> );