Skip to content

Commit

Permalink
fix(application-hid): Display rejection reason from client (#14947)
Browse files Browse the repository at this point in the history
* Update rights-portal client

* Add additional information to application

* Rename function -> status

* clean up

* chore: nx format:write update dirty files

---------

Co-authored-by: andes-it <builders@andes.is>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
  • Loading branch information
3 people authored May 28, 2024
1 parent 559d57e commit 059edf1
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 55 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ export class HealthInsuranceDeclarationService extends BaseTemplateApiService {
return this.insuranceStatementApi.withMiddleware(new AuthMiddleware(Auth))
}

async canApply(application: TemplateApiModuleActionProps): Promise<boolean> {
async status(application: TemplateApiModuleActionProps) {
const response = await this.insuranceStatementsApiWithAuth(
application.auth,
).getInsuranceStatementStatus({
applicantNationalId: application.auth.nationalId,
})
return !!response.canApply
return response
}

async continents(application: TemplateApiModuleActionProps) {
Expand All @@ -53,12 +53,12 @@ export class HealthInsuranceDeclarationService extends BaseTemplateApiService {
}

async getInsuranceStatementData(application: TemplateApiModuleActionProps) {
const canApply = await this.canApply(application)
const status = await this.status(application)
const continents = await this.continents(application)
const countries = await this.countries(application)

return {
canApply: canApply,
...status,
continents: continents,
countries: countries,
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import * as m from '../lib/messages'
import Logo from '../assets/Logo'
import {
getChildrenAsOptions,
getCommentFromExternalData,
getContinentNameFromCode,
getContinentsAsOption,
getCountriesAsOption,
Expand Down Expand Up @@ -156,6 +157,12 @@ export const HealthInsuranceDeclarationForm: Form = buildForm({
application: HealthInsuranceDeclarationApplication,
) => getInsuranceStatus(application.externalData),
}),
buildHiddenInput({
id: 'isHealthInsuredComment',
defaultValue: (
application: HealthInsuranceDeclarationApplication,
) => getCommentFromExternalData(application.externalData),
}),
],
}),
],
Expand All @@ -174,6 +181,16 @@ export const HealthInsuranceDeclarationForm: Form = buildForm({
description:
m.application.notHealthInusred.descriptionFieldDescription,
}),
buildAlertMessageField({
id: 'notHealthInsuredAlertMessage',
title: '',
alertType: 'warning',
message: ({ externalData }) =>
getCommentFromExternalData(externalData),
condition: (answers) => {
return (answers?.isHealthInsuredComment as string)?.length > 0
},
}),
buildCheckboxField({
id: 'notHealthInsuredCheckboxField',
title: '',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ export type HealthInsuranceContinents = {

export type InsuranceStatementData = {
canApply: boolean
comment?: string
isInsured: boolean
countries: HealthInsuranceCountry[]
continents: HealthInsuranceContinents[]
}
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,12 @@ export const getContinentsFromExternalData = (
)
}

export const getCommentFromExternalData = (
externalData: ExternalData,
): string => {
return getInsuranceStatementDataFromExternalData(externalData).comment ?? ''
}

export const getContinentsAsOption = (externalData: ExternalData): Option[] => {
const continents = getContinentsFromExternalData(externalData)
if (continents && continents.length) {
Expand Down
Loading

0 comments on commit 059edf1

Please sign in to comment.