@lysaab/lysa-pep 1.0.1-0 → 1.0.2-0

package/src/pages/StatusPage/StatusPage.tsx

@@ -2,7 +2,7 @@ import React, {
   FunctionComponent,
   useRef,
   useCallback,
-  useContext
+  useContext,
 } from "react";
 import {
   Form,
@@ -10,10 +10,10 @@ import {
   RequiredValidator,
   PrimaryButton,
   LysaFormRef,
-  Datepicker
+  Datepicker,
 } from "@lysaab/ui-2";
 import { Alternative } from "@lysaab/ui-2/components/input/InputAPI";
-import { PepContext, PepStatus } from "../PepContext";
+import { PepContext, PepStatus, EntityType, PepType } from "../PepContext";
 import { CountrySelect } from "../../components/CountrySelect";
 import { useIntl, FormattedMessage, IntlShape } from "react-intl";
 import {
@@ -22,8 +22,9 @@ import {
   isLocalCountryMessages,
   countrySelectionMessages,
   localCountryAltMessages,
-  stateAltMessages
+  stateAltMessages,
 } from "./StatusMessages";
+import { formatPossessive } from "../../utils/Possession";
 
 interface Props {
   next: () => void;
@@ -35,6 +36,7 @@ export const StatusPage: FunctionComponent<Props> = ({ next }) => {
   const intl = useIntl();
   const stateAlternatives = getStateAlternatives(intl);
   const isSwedenAlternatives = getIsLocalCountryAlternatives(intl);
+  const entityType = pepContext.state.legalEntityType || EntityType.PERSON;
 
   const nextPage = useCallback(() => {
     if (formRef.current && formRef.current.isValid) {
@@ -74,13 +76,27 @@ export const StatusPage: FunctionComponent<Props> = ({ next }) => {
       >
         <RadioGroup
           alternatives={stateAlternatives}
-          header={intl.formatMessage(isOngoingMessages.header)}
+          header={intl.formatMessage(isOngoingMessages.header, {
+            entityType,
+            name: pepContext.state.ownerName,
+            possessiveName: formatPossessive(
+              pepContext.state.ownerName,
+              intl.locale
+            ),
+            relation:
+              pepContext.state.type === PepType.COLLEAGUE
+                ? pepContext.state.businessRelation
+                : pepContext.state.relationToPEP,
+            pepType: pepContext.state.type,
+          })}
           onChange={updateIsOngoing}
           value={stateAlternatives.find(
-            alt => alt.value === pepContext.state.isOngoing
+            (alt) => alt.value === pepContext.state.isOngoing
           )}
           validators={[
-            RequiredValidator(intl.formatMessage(isOngoingMessages.required))
+            new RequiredValidator(
+              intl.formatMessage(isOngoingMessages.required)
+            ),
           ]}
         />
 
@@ -89,11 +105,13 @@ export const StatusPage: FunctionComponent<Props> = ({ next }) => {
           <Datepicker
             label={intl.formatMessage(endedMessages.header)}
             selected={pepContext.state.ended}
-            onChange={event =>
+            onChange={(event) =>
               pepContext.setState({ ended: event || undefined })
             }
             validators={[
-              RequiredValidator(intl.formatMessage(isOngoingMessages.required))
+              new RequiredValidator(
+                intl.formatMessage(isOngoingMessages.required)
+              ),
             ]}
             showMonthYearPicker
             dateFormat="yyyy-MM"
@@ -103,30 +121,47 @@ export const StatusPage: FunctionComponent<Props> = ({ next }) => {
 
         <RadioGroup
           alternatives={isSwedenAlternatives}
-          header={intl.formatMessage(isLocalCountryMessages.header)}
+          header={intl.formatMessage(isLocalCountryMessages.header, {
+            possessiveName: formatPossessive(
+              pepContext.state.ownerName,
+              intl.locale
+            ),
+          })}
           onChange={updateIsSweden}
           value={isSwedenAlternatives.find(
-            alt => alt.value === pepContext.state.isSweden
+            (alt) => alt.value === pepContext.state.isSweden
           )}
           validators={[
-            RequiredValidator(
+            new RequiredValidator(
               intl.formatMessage(isLocalCountryMessages.required)
-            )
+            ),
           ]}
         />
 
         {pepContext.state.isSweden && pepContext.state.isSweden === "other" ? (
           <CountrySelect
-            label={intl.formatMessage(countrySelectionMessages.header)}
-            onChange={event =>
+            label={intl.formatMessage(countrySelectionMessages.header, {
+              entityType,
+              name: pepContext.state.ownerName,
+              possessiveName: formatPossessive(
+                pepContext.state.ownerName,
+                intl.locale
+              ),
+              relation:
+                pepContext.state.type === PepType.COLLEAGUE
+                  ? pepContext.state.businessRelation
+                  : pepContext.state.relationToPEP,
+              pepType: pepContext.state.type,
+            })}
+            onChange={(event) =>
               pepContext.setState({
-                country: event.value ? event.value.toString() : undefined
+                country: event.value ? event.value.toString() : undefined,
               })
             }
             validators={[
-              RequiredValidator(
+              new RequiredValidator(
                 intl.formatMessage(countrySelectionMessages.required)
-              )
+              ),
             ]}
             value={pepContext.state.country}
             omitCountries={["SE"]}
@@ -149,12 +184,12 @@ function getIsLocalCountryAlternatives(intl: IntlShape): Alternative<string>[] {
   return [
     {
       text: intl.formatMessage(localCountryAltMessages.localCountry),
-      value: "sweden"
+      value: "sweden",
     },
     {
       text: intl.formatMessage(localCountryAltMessages.otherCountry),
-      value: "other"
-    }
+      value: "other",
+    },
   ];
 }
 
@@ -162,11 +197,11 @@ function getStateAlternatives(intl: IntlShape): Alternative<PepStatus>[] {
   return [
     {
       text: intl.formatMessage(stateAltMessages[PepStatus.ONGOING]),
-      value: PepStatus.ONGOING
+      value: PepStatus.ONGOING,
     },
     {
       text: intl.formatMessage(stateAltMessages[PepStatus.ENDED]),
-      value: PepStatus.ENDED
-    }
+      value: PepStatus.ENDED,
+    },
   ];
 }

package/src/utils/Possession.ts

@@ -0,0 +1,21 @@
+export function formatPossessive(text: string | undefined, locale: string) {
+  if (!text) {
+    return;
+  }
+  const language = locale.substr(0, 2);
+  if (language === "sv") {
+    return formatSwedish(text);
+  }
+  return text;
+}
+
+function formatSwedish(text: string) {
+  if (
+    text[text.length - 1] !== "s" &&
+    text[text.length - 1] !== "z" &&
+    text[text.length - 1] !== "x"
+  ) {
+    text += "s";
+  }
+  return text;
+}