Skip to content
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

Jump to bottom

fix(service-portal): Fix health overview display #14925

Merged
merged 1 commit into from
May 24, 2024
Merged

fix(service-portal): Fix health overview display #14925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions libs/api/domains/rights-portal/src/lib/overview/models/insuranceOverview.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ export class InsuranceOverview {
@Field({ nullable: true })
explanation?: string

@Field(() => Date)
from!: Date
@Field(() => Date, { nullable: true })
from?: Date | null

@Field(() => InsuranceStatus)
status!: InsuranceStatus

@Field(() => Int)
maximumPayment!: number
@Field(() => Int, { nullable: true })
maximumPayment?: number | null

@Field(() => Date, { nullable: true })
ehicCardExpiryDate?: Date
Expand Down
8 changes: 4 additions & 4 deletions libs/api/domains/rights-portal/src/lib/overview/models/insuranceStatus.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ registerEnumType(InsuranceStatusType, {

@ObjectType('RightsPortalInsuranceStatus')
export class InsuranceStatus {
@Field()
display!: string
@Field(() => String, { nullable: true })
display?: string | null

@Field(() => InsuranceStatusType)
code!: InsuranceStatusType
@Field(() => InsuranceStatusType, { nullable: true })
code?: string | null
}
34 changes: 9 additions & 25 deletions libs/api/domains/rights-portal/src/lib/overview/overview.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,12 @@ export class OverviewService {
}

if (!data.fileName || !data.contentType || !data.data) {
this.logger.warning('Missing data from external service', {
category: LOG_CATEGORY,
})
this.logger.warn(
'Missing data for getInsuranceConfirmation from external service',
{
category: LOG_CATEGORY,
},
)
return null
}

Expand All @@ -51,41 +54,22 @@ export class OverviewService {
if (!data) {
return null
}
if (
!data.isInsured ||
!data.from ||
!data.status?.display ||
!data.status?.code ||
!data.maximumPayment
) {
this.logger.warning('Missing data from external service', {
category: LOG_CATEGORY,
})
return null
}

const codeEnum: InsuranceStatusType | undefined =
data.status.code in InsuranceStatusType
data.status?.code && data.status.code in InsuranceStatusType
? InsuranceStatusType[
data.status.code as keyof typeof InsuranceStatusType
]
: undefined

if (!codeEnum) {
this.logger.warning('Invalid insurance status code provided', {
category: LOG_CATEGORY,
})
return null
}

return {
isInsured: data.isInsured,
isInsured: !!data.isInsured,
explanation: data.explanation ?? '',
from: data.from,
maximumPayment: data.maximumPayment,
ehicCardExpiryDate: data.ehicCardExpiryDate ?? undefined,
status: {
display: data.status.display,
display: data.status?.display,
code: codeEnum,
},
}
Expand Down
58 changes: 30 additions & 28 deletions libs/service-portal/health/src/screens/HealthOverview/HealthOverview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,31 +92,6 @@ export const HealthOverview = () => {
serviceProviderSlug={SJUKRATRYGGINGAR_SLUG}
serviceProviderTooltip={formatMessage(messages.healthTooltip)}
/>
<GridRow marginBottom={[1, 1, 1, 3]}>
<GridColumn span="12/12">
<Box
display="flex"
flexDirection="row"
flexWrap="wrap"
justifyContent="flexStart"
printHidden
>
<Box paddingRight={2} marginBottom={[1, 1, 1, 0]}>
<Button
variant="utility"
disabled={displayConfirmationErrorAlert}
size="small"
icon="fileTrayFull"
loading={confirmationLoading}
iconType="outline"
onClick={() => getInsuranceConfirmation()}
>
{formatMessage(messages.healthInsuranceConfirmation)}
</Button>
</Box>
</Box>
</GridColumn>
</GridRow>
</Box>
{error ? (
<Problem error={error} noBorder={false} />
Expand All @@ -135,13 +110,40 @@ export const HealthOverview = () => {
/>
) : (
<Stack space={5}>
<GridRow marginBottom={[1, 1, 1, 3]}>
<GridColumn span="12/12">
<Box
display="flex"
flexDirection="row"
flexWrap="wrap"
justifyContent="flexStart"
printHidden
>
<Box paddingRight={2} marginBottom={[1, 1, 1, 0]}>
<Button
variant="utility"
disabled={displayConfirmationErrorAlert}
size="small"
icon="fileTrayFull"
loading={confirmationLoading}
iconType="outline"
onClick={() => getInsuranceConfirmation()}
>
{formatMessage(messages.healthInsuranceConfirmation)}
</Button>
</Box>
</Box>
</GridColumn>
</GridRow>
<StackWithBottomDivider space={1}>
<UserInfoLine
title={formatMessage(messages.statusOfRights)}
label={formatMessage(messages.healthInsuranceStart)}
content={formatMessage(
formatDateFns(insurance.from, 'dd.MM.yyyy'),
)}
content={
insurance.from
? formatMessage(formatDateFns(insurance.from, 'dd.MM.yyyy'))
: ''
}
/>
<UserInfoLine
label={formatMessage(messages.status)}
Expand Down
Loading