fix: rebuilds/-styles (and -names) application (pre)view component #1452
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,86 +1,88 @@ | ||
| import React from "react"; | ||
| import { useTranslation } from "next-i18next"; | ||
| import { ApplicantTypeChoice, type ApplicationQuery } from "@gql/gql-types"; | ||
| import { | ||
| ApplicationInfoContainer, | ||
| InfoItemContainer, | ||
| InfoItem, | ||
| } from "./styled"; | ||
|
|
||
| const LabelValue = ({ | ||
| label, | ||
| value, | ||
| }: { | ||
| label: string; | ||
| value?: string | number | null; | ||
| }) => { | ||
| return ( | ||
| <InfoItemContainer | ||
| className={ | ||
| label === "preview.organisation.billingAddress" ? "fullWidth" : "" | ||
| } | ||
| > | ||
| <InfoItem> | ||
| <h4 className="info-label">{label}</h4> | ||
|
|
||
| <p>{value}</p> | ||
| </InfoItem> | ||
| </InfoItemContainer> | ||
| ); | ||
| }; | ||
| type Node = NonNullable<ApplicationQuery["application"]>; | ||
| export function ApplicantInfoPreview({ | ||
| application, | ||
| }: { | ||
| application: Node; | ||
| }): JSX.Element { | ||
| const { t } = useTranslation(); | ||
| const applicant = { | ||
| firstName: application.contactPerson?.firstName, | ||
| lastName: application.contactPerson?.lastName, | ||
| email: application.contactPerson?.email, | ||
| phoneNumber: application.contactPerson?.phoneNumber, | ||
| }; | ||
| const contactPersonName = `${applicant.firstName} ${applicant.lastName}`; | ||
| const contactInfo = `${applicant.phoneNumber} / ${applicant.email}`; | ||
| const addressString = `${application.organisation?.address?.streetAddressFi}, ${application.organisation?.address?.postCode} ${application.organisation?.address?.cityFi}`; | ||
| const billingAddressString = `${application.billingAddress?.streetAddressFi}, ${application.billingAddress?.postCode} ${application.billingAddress?.cityFi}`; | ||
|
Comment on lines
+45
to
+46
There was a problem hiding this comment. this doesn't look correct. how does it make sure these are not
also how is the billing address checked if it exists? turning it into string with no null checks makes it impossible to check later |
||
| return ( | ||
| <ApplicationInfoContainer> | ||
| {application.applicantType == null ? ( | ||
| // TODO translate (though this is more a system error than a user error) | ||
| <div style={{ gridColumn: "1 / -1" }}>ERROR: applicantType is null</div> | ||
| ) : application.applicantType !== ApplicantTypeChoice.Individual ? ( | ||
| <> | ||
| <LabelValue | ||
| label={t("application:preview.organisation.name")} | ||
| value={application.organisation?.nameFi} | ||
| /> | ||
| <LabelValue | ||
| label={t("application:preview.organisation.coreBusiness")} | ||
| value={application.organisation?.coreBusinessFi} | ||
| /> | ||
| <LabelValue | ||
| label={t("application:preview.organisation.registrationNumber")} | ||
| value={application.organisation?.identifier} | ||
| /> | ||
| </> | ||
| ) : null} | ||
| <LabelValue | ||
| label={t("application:preview.contactPerson")} | ||
| value={contactPersonName} | ||
| /> | ||
| <LabelValue | ||
| label={t("application:preview.contactInfo")} | ||
| value={contactInfo} | ||
| /> | ||
| <LabelValue | ||
| label={t("application:preview.address")} | ||
| value={addressString} | ||
| /> | ||
| {application.billingAddress && ( | ||
| <LabelValue | ||
| label={t("application:preview.organisation.billingAddress")} | ||
| value={billingAddressString} | ||
| /> | ||
| )} | ||
| </ApplicationInfoContainer> | ||
| ); | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this not a styled parameter? why use a CSS class?