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

package/lib/pages/IsPep/IsPepMessages.js

@@ -2,8 +2,8 @@ import { defineMessages } from "react-intl";
 import { PepType } from "../PepContext";
 export const messages = defineMessages({
     header: {
-        id: 'pep.ispep.header',
-        description: 'Not pep',
+        id: "pep.ispep.header",
+        description: "Not pep",
         defaultMessage: `{ 
         entityType, select,
           PERSON {
@@ -12,29 +12,21 @@ export const messages = defineMessages({
           CORPORATION {
             Är {name} eller en närstående till {name} en person i politisk utsatt ställning? (PEP)
           }
-      }`
+      }`,
     },
     required: {
-        id: 'pep.ispep.header',
-        description: 'Not pep',
-        defaultMessage: `{ 
-        entityType, select,
-          PERSON {
-            Är du eller en närstående till dig en person i politisk utsatt ställning? (PEP)
-          }
-          CORPORATION {
-            Är {name} eller en närstående till {name} en person i politisk utsatt ställning? (PEP)
-          }
-      }`
+        id: "pep.ispep.required",
+        description: "Not pep",
+        defaultMessage: "Du måste välja ett alternativ",
     },
     [PepType.NOT_PEP]: {
-        id: 'pep.ispep.NOT_PEP',
-        description: 'Not pep',
-        defaultMessage: 'Nej'
+        id: "pep.ispep.NOT_PEP",
+        description: "Not pep",
+        defaultMessage: "Nej",
     },
     [PepType.ME]: {
-        id: 'pep.ispep.ME',
-        description: 'The person is pep',
+        id: "pep.ispep.ME",
+        description: "The person is pep",
         defaultMessage: `{ 
         entityType, select,
           PERSON {
@@ -43,11 +35,11 @@ export const messages = defineMessages({
           CORPORATION {
             På grund av sin funktion är {name} PEP
           }
-      }`
+      }`,
     },
     [PepType.RELATIVE]: {
-        id: 'pep.ispep.RELATIVE',
-        description: 'Jag har en relation med en person som är PEP',
+        id: "pep.ispep.RELATIVE",
+        description: "Jag har en relation med en person som är PEP",
         defaultMessage: `{ 
         entityType, select,
           PERSON {
@@ -56,11 +48,11 @@ export const messages = defineMessages({
           CORPORATION {
             {name} är medarbetare till, eller har en affärsrelation med, en person som är PEP
           }
-      }`
+      }`,
     },
     [PepType.COLLEAGUE]: {
-        id: 'pep.ispep.COLLEAGUE',
-        description: 'The person has a colleague that is pep',
+        id: "pep.ispep.COLLEAGUE",
+        description: "The person has a colleague that is pep",
         defaultMessage: `{ 
         entityType, select,
           PERSON {
@@ -69,6 +61,6 @@ export const messages = defineMessages({
           CORPORATION {
             På grund av sin funktion är {name} PEP
           }
-      }`
+      }`,
     },
 });

package/lib/pages/IsPep/IsPepPage.js

@@ -1,26 +1,46 @@
-import React, { useRef, useCallback, useContext } from "react";
-import { Form, RadioGroup, RequiredValidator, PrimaryButton } from "@lysaab/ui-2";
+import React, { useRef, useCallback, useContext, } from "react";
+import { Form, RadioGroup, RequiredValidator, PrimaryButton, } from "@lysaab/ui-2";
 import { PepType, PepContext, EntityType } from "../PepContext";
 import { useIntl, FormattedMessage } from "react-intl";
 import { messages } from "./IsPepMessages";
-export const IsPepRadioGroup = ({ ownerName, entityType, type, onChange }) => {
+export const IsPepRadioGroup = ({ ownerName, entityType, type, onChange, }) => {
     const intl = useIntl();
     const IsPepAlternatives = [
         {
-            text: intl.formatMessage(messages[PepType.NOT_PEP], { entityType, name: ownerName }),
-            value: PepType.NOT_PEP
+            text: intl.formatMessage(messages[PepType.NOT_PEP], {
+                entityType,
+                name: ownerName,
+            }),
+            value: PepType.NOT_PEP,
         },
-        { text: intl.formatMessage(messages[PepType.ME], { entityType, name: ownerName }), value: PepType.ME },
         {
-            text: intl.formatMessage(messages[PepType.RELATIVE], { entityType, name: ownerName }),
-            value: PepType.RELATIVE
+            text: intl.formatMessage(messages[PepType.ME], {
+                entityType,
+                name: ownerName,
+            }),
+            value: PepType.ME,
         },
         {
-            text: intl.formatMessage(messages[PepType.COLLEAGUE], { entityType, name: ownerName }),
-            value: PepType.COLLEAGUE
-        }
+            text: intl.formatMessage(messages[PepType.RELATIVE], {
+                entityType,
+                name: ownerName,
+            }),
+            value: PepType.RELATIVE,
+        },
+        {
+            text: intl.formatMessage(messages[PepType.COLLEAGUE], {
+                entityType,
+                name: ownerName,
+            }),
+            value: PepType.COLLEAGUE,
+        },
     ];
-    return (React.createElement(RadioGroup, { alternatives: IsPepAlternatives, onChange: alt => onChange(alt.value), value: IsPepAlternatives.find(alt => alt.value === type), header: intl.formatMessage(messages.header, { entityType, name: ownerName }), validators: [RequiredValidator(intl.formatMessage(messages.required))] }));
+    return (React.createElement(RadioGroup, { alternatives: IsPepAlternatives, onChange: (alt) => onChange(alt.value), value: IsPepAlternatives.find((alt) => alt.value === type), header: intl.formatMessage(messages.header, {
+            entityType,
+            name: ownerName,
+        }), validators: [
+            new RequiredValidator(intl.formatMessage(messages.required)),
+        ] }));
 };
 export const IsPepPage = ({ next }) => {
     const pepContext = useContext(PepContext);
@@ -31,9 +51,9 @@ export const IsPepPage = ({ next }) => {
         }
     }, [formRef, next]);
     return (React.createElement(Form, { onSubmit: nextPage, lysaFormRef: formRef },
-        React.createElement(IsPepRadioGroup, { entityType: pepContext.state.legalEntityType || EntityType.PERSON, ownerName: pepContext.state.ownerName || "", type: pepContext.state.type, onChange: type => {
+        React.createElement(IsPepRadioGroup, { entityType: pepContext.state.legalEntityType || EntityType.PERSON, ownerName: pepContext.state.ownerName || "", type: pepContext.state.type, onChange: (type) => {
                 pepContext.setState({ type });
             } }),
         React.createElement(PrimaryButton, { type: "submit" },
-            React.createElement(FormattedMessage, { id: "pep.ispep.next", description: "Next button", defaultMessage: 'G\u00E5 vidare' }))));
+            React.createElement(FormattedMessage, { id: "pep.ispep.next", description: "Next button", defaultMessage: "G\u00E5 vidare" }))));
 };

package/lib/pages/RelationPage/RelationMessages.js

@@ -12,43 +12,43 @@ export const relationMessages = defineMessages({
           CORPORATION {
             Vilken relation har {name} till personen i politiskt utsatt ställning?
           }
-      }`
+      }`,
     },
     required: {
         id: "pep.relation.relation.required",
         description: "Required error message",
-        defaultMessage: `Du måste välja ett alternativ`
+        defaultMessage: `Du måste välja ett alternativ`,
     },
     [Relation.MARRIED_PARTNER]: {
         id: "pep.relation.relation.MARRIED_PARTNER",
         description: "The person is married to someone who is pep",
-        defaultMessage: `Make/Maka till PEP`
+        defaultMessage: `Make/Maka till PEP`,
     },
     [Relation.COLIVING_PARTNER]: {
         id: "pep.relation.relation.COLIVING_PARTNER",
         description: "The person is married to someone who is pep",
-        defaultMessage: `Sambo till PEP`
+        defaultMessage: `Sambo till PEP`,
     },
     [Relation.CHILD]: {
         id: "pep.relation.relation.CHILD",
         description: "The person is married to someone who is pep",
-        defaultMessage: `Barn till PEP`
+        defaultMessage: `Barn till PEP`,
     },
     [Relation.PARENT]: {
         id: "pep.relation.relation.PARENT",
         description: "The person is married to someone who is pep",
-        defaultMessage: `Förälder till PEP`
+        defaultMessage: `Förälder till PEP`,
     },
     [Relation.CHILD_MARRIED_PARTNER]: {
         id: "pep.relation.relation.CHILD_MARRIED_PARTNER",
         description: "The person is married to someone who is pep",
-        defaultMessage: `Make/Maka till barn till PEP`
+        defaultMessage: `Make/Maka till barn till PEP`,
     },
     [Relation.CHILD_COLIVING_PARTNER]: {
         id: "pep.relation.relation.CHILD_COLIVING_PARTNER",
         description: "The person is married to someone who is pep",
-        defaultMessage: `Sambo till barn till PEP`
-    }
+        defaultMessage: `Sambo till barn till PEP`,
+    },
 });
 export const businessRelationMessages = defineMessages({
     header: {
@@ -62,12 +62,12 @@ export const businessRelationMessages = defineMessages({
           CORPORATION {
             Vilken relation har {name} till personen i politisk utsatt ställning?
           }
-      }`
+      }`,
     },
     required: {
         id: "pep.relation.businessrelation.required",
         description: "Required error message",
-        defaultMessage: `Du måste välja ett alternativ`
+        defaultMessage: `Du måste välja ett alternativ`,
     },
     [BusinessRelation.CO_OWNERSHIP]: {
         id: "pep.relation.businessrelation.alt.CO_OWNERSHIP",
@@ -78,9 +78,9 @@ export const businessRelationMessages = defineMessages({
             Jag är verklig huvudman till en juridisk person, eller juridiska konstruktioner, tillsammans med en PEP
           }
           CORPORATION {
-            Vilken relation har {name} till personen i politisk utsatt ställning?
+            {name} är verklig huvudman till en juridisk person, eller juridiska konstruktioner, tillsammans med en PEP
           }
-      }`
+      }`,
     },
     [BusinessRelation.CLOSE_CONNECTION]: {
         id: "pep.relation.businessrelation.alt.CLOSE_CONNECTION",
@@ -91,9 +91,9 @@ export const businessRelationMessages = defineMessages({
             Jag är en person som på annat sätt har eller har haft nära förbindelser med en PEP
           }
           CORPORATION {
-            Vilken relation har {name} till personen i politisk utsatt ställning?
+            {name} är en person som på annat sätt har eller har haft nära förbindelser med en PEP  
           }
-      }`
+      }`,
     },
     [BusinessRelation.COMPANY_FOR_PEP]: {
         id: "pep.relation.businessrelation.alt.COMPANY_FOR_PEP",
@@ -104,10 +104,11 @@ export const businessRelationMessages = defineMessages({
             Jag är verklig huvudman till en juridisk person, eller juridiska konstruktioner, tillsammans med en PEP
           }
           CORPORATION {
-            Vilken relation har {name} till personen i politisk utsatt ställning?
+            {name} är ensam verklig huvudman till en juridisk person eller konstruktion som har upprättats till förmån för en PEP
+  
           }
-      }`
-    }
+      }`,
+    },
 });
 export const relativeNameMessages = defineMessages({
     header: {
@@ -143,34 +144,34 @@ export const relativeNameMessages = defineMessages({
             {
               relation, select, 
                 MARRIED_PARTNER {
-                  Vad heter {name} make/maka?
+                  Vad heter {possessiveName} make/maka?
                 }
                 COLIVING_PARTNER {
-                  Vad heter {name} sambo?
+                  Vad heter {possessiveName} sambo?
                 }
                 CHILD {
-                  Vad heter {name} förälder?
+                  Vad heter {possessiveName} förälder?
                 }
                 PARENT {
-                  Vad heter {name} barn?
+                  Vad heter {possessiveName} barn?
                 }
                 CHILD_MARRIED_PARTNER {
-                  Vad heter föräldern till {name} make/maka?
+                  Vad heter föräldern till {possessiveName} make/maka?
                 }
                 CHILD_COLIVING_PARTNER {
-                  Vad heter föräldern till {name} sambo?
+                  Vad heter föräldern till {possessiveName} sambo?
                 }
                 other {}
             }
           }
           other {}
-      }`
+      }`,
     },
     required: {
         id: "pep.relation.relative.name.required",
         description: "Required error message",
-        defaultMessage: `Du måste välja ett alternativ`
-    }
+        defaultMessage: `Du måste välja ett alternativ`,
+    },
 });
 export const birthdayMessages = defineMessages({
     header: {
@@ -206,34 +207,34 @@ export const birthdayMessages = defineMessages({
             {
               relation, select, 
                 MARRIED_PARTNER {
-                  När är {name} make/maka född?
+                  När är {possessiveName} make/maka född?
                 }
                 COLIVING_PARTNER {
-                    När är {name} sambo född?
+                    När är {possessiveName} sambo född?
                 }
                 CHILD {
-                    När är {name} förälder född?
+                    När är {possessiveName} förälder född?
                 }
                 PARENT {
-                    När är {name} barn fött?
+                    När är {possessiveName} barn fött?
                 }
                 CHILD_MARRIED_PARTNER {
-                    När är föräldern till {name} make/maka född?
+                    När är föräldern till {possessiveName} make/maka född?
                 }
                 CHILD_COLIVING_PARTNER {
-                    När är föräldern till {name} sambo född?
+                    När är föräldern till {possessiveName} sambo född?
                 }
                 other {}
             }
           }
           other {}
-      }`
+      }`,
     },
     required: {
         id: "pep.relation.birthday.required",
         description: "Required error message",
-        defaultMessage: `Ange datum`
-    }
+        defaultMessage: `Ange datum`,
+    },
 });
 export const colleagueNameMessages = defineMessages({
     header: {
@@ -272,11 +273,11 @@ export const colleagueNameMessages = defineMessages({
             }
           }
           other {}
-      }`
+      }`,
     },
     required: {
         id: "pep.relation.colleague.name.required",
         description: "Required error message",
-        defaultMessage: `Du måste välja ett alternativ`
-    }
+        defaultMessage: `Du måste välja ett alternativ`,
+    },
 });

package/lib/pages/RelationPage/RelationPage.js

@@ -1,9 +1,10 @@
-import React, { useContext, useRef, useCallback } from "react";
-import { PepContext, PepType, BusinessRelation, Relation, EntityType } from "../PepContext";
-import { RadioGroup, Form, RequiredValidator, TextInput, Datepicker, PrimaryButton } from "@lysaab/ui-2";
+import React, { useContext, useRef, useCallback, } from "react";
+import { PepContext, PepType, BusinessRelation, Relation, EntityType, } from "../PepContext";
+import { RadioGroup, Form, RequiredValidator, TextInput, Datepicker, PrimaryButton, } from "@lysaab/ui-2";
 import { DateTime } from "luxon";
 import { useIntl, FormattedMessage } from "react-intl";
-import { relationMessages, businessRelationMessages, relativeNameMessages, birthdayMessages, colleagueNameMessages } from "./RelationMessages";
+import { relationMessages, businessRelationMessages, relativeNameMessages, birthdayMessages, colleagueNameMessages, } from "./RelationMessages";
+import { formatPossessive } from "../../utils/Possession";
 const DATEPICKER_START_DATE = DateTime.fromISO("1970-01-01").toJSDate();
 export const RelationPage = ({ next }) => {
     const intl = useIntl();
@@ -19,52 +20,62 @@ export const RelationPage = ({ next }) => {
         }
     }, [formRef, next]);
     return (React.createElement(Form, { onSubmit: () => nextPage(), lysaFormRef: formRef },
-        type === PepType.RELATIVE ? (React.createElement(RadioGroup, { alternatives: relationAlternatives, onChange: alternative => {
+        type === PepType.RELATIVE ? (React.createElement(RadioGroup, { alternatives: relationAlternatives, onChange: (alternative) => {
                 pepContext.setState({
-                    relationToPEP: alternative.value
+                    relationToPEP: alternative.value,
                 });
-            }, value: relationAlternatives.find(alt => alt.value === pepContext.state.relationToPEP), header: intl.formatMessage(relationMessages.header, {
+            }, value: relationAlternatives.find((alt) => alt.value === pepContext.state.relationToPEP), header: intl.formatMessage(relationMessages.header, {
                 entityType,
-                name: pepContext.state.ownerName
+                name: pepContext.state.ownerName,
+                possessiveName: formatPossessive(pepContext.state.ownerName, intl.locale),
             }), validators: [
-                RequiredValidator(intl.formatMessage(relationMessages.required))
+                new RequiredValidator(intl.formatMessage(relationMessages.required)),
             ] })) : null,
-        type === PepType.COLLEAGUE ? (React.createElement(RadioGroup, { alternatives: businessRelationAlternatives, onChange: alternative => {
+        type === PepType.COLLEAGUE ? (React.createElement(RadioGroup, { alternatives: businessRelationAlternatives, onChange: (alternative) => {
                 pepContext.setState({
-                    businessRelation: alternative.value
+                    businessRelation: alternative.value,
                 });
-            }, value: businessRelationAlternatives.find(alt => alt.value === pepContext.state.businessRelation), header: intl.formatMessage(businessRelationMessages.header, {
+            }, value: businessRelationAlternatives.find((alt) => alt.value === pepContext.state.businessRelation), header: intl.formatMessage(businessRelationMessages.header, {
                 entityType,
-                name: pepContext.state.ownerName
+                name: pepContext.state.ownerName,
             }), validators: [
-                RequiredValidator(intl.formatMessage(businessRelationMessages.required))
+                new RequiredValidator(intl.formatMessage(businessRelationMessages.required)),
             ] })) : null,
         pepContext.state.relationToPEP && type === PepType.RELATIVE ? (React.createElement(React.Fragment, null,
             React.createElement(TextInput, { label: intl.formatMessage(relativeNameMessages.header, {
                     entityType,
                     name: pepContext.state.ownerName,
-                    relation: pepContext.state.relationToPEP
-                }), value: pepContext.state.nameOfPEP || "", onChange: value => {
+                    relation: pepContext.state.type === PepType.COLLEAGUE
+                        ? pepContext.state.businessRelation
+                        : pepContext.state.relationToPEP,
+                    possessiveName: formatPossessive(pepContext.state.ownerName, intl.locale),
+                }), value: pepContext.state.nameOfPEP || "", onChange: (value) => {
                     pepContext.setState({ nameOfPEP: value });
                 }, validators: [
-                    RequiredValidator(intl.formatMessage(relativeNameMessages.required))
+                    new RequiredValidator(intl.formatMessage(relativeNameMessages.required)),
                 ] }),
             React.createElement(Datepicker, { label: intl.formatMessage(birthdayMessages.header, {
                     entityType,
                     name: pepContext.state.ownerName,
-                    relation: pepContext.state.relationToPEP
-                }), selected: pepContext.state.birthdayOfPEP, onChange: event => pepContext.setState({ birthdayOfPEP: event || undefined }), validators: [
-                    RequiredValidator(intl.formatMessage(birthdayMessages.required))
+                    relation: pepContext.state.type === PepType.COLLEAGUE
+                        ? pepContext.state.businessRelation
+                        : pepContext.state.relationToPEP,
+                    possessiveName: formatPossessive(pepContext.state.ownerName, intl.locale),
+                }), selected: pepContext.state.birthdayOfPEP, onChange: (event) => pepContext.setState({ birthdayOfPEP: event || undefined }), validators: [
+                    new RequiredValidator(intl.formatMessage(birthdayMessages.required)),
                 ], maxDate: new Date(), openToDate: pepContext.state.birthdayOfPEP || DATEPICKER_START_DATE }))) : null,
         pepContext.state.businessRelation && type === PepType.COLLEAGUE ? (React.createElement(React.Fragment, null,
             React.createElement(TextInput, { label: intl.formatMessage(colleagueNameMessages.header, {
                     entityType,
                     name: pepContext.state.ownerName,
-                    relation: pepContext.state.businessRelation
-                }), value: pepContext.state.nameOfPEP || "", onChange: value => {
+                    relation: pepContext.state.type === PepType.COLLEAGUE
+                        ? pepContext.state.businessRelation
+                        : pepContext.state.relationToPEP,
+                    possessiveName: formatPossessive(pepContext.state.ownerName, intl.locale),
+                }), value: pepContext.state.nameOfPEP || "", onChange: (value) => {
                     pepContext.setState({ nameOfPEP: value });
                 }, validators: [
-                    RequiredValidator(intl.formatMessage(colleagueNameMessages.required))
+                    new RequiredValidator(intl.formatMessage(colleagueNameMessages.required)),
                 ] }))) : null,
         React.createElement(PrimaryButton, { type: "submit" },
             React.createElement(FormattedMessage, { id: "pep.relation.next", description: "Next button", defaultMessage: "G\u00E5 vidare" }))));
@@ -74,45 +85,45 @@ function getRelationAlternatives(intl, entityType, pepContext) {
         {
             text: intl.formatMessage(relationMessages[Relation.MARRIED_PARTNER], {
                 entityType,
-                name: pepContext.state.ownerName
+                name: pepContext.state.ownerName,
             }),
-            value: Relation.MARRIED_PARTNER
+            value: Relation.MARRIED_PARTNER,
         },
         {
             text: intl.formatMessage(relationMessages[Relation.COLIVING_PARTNER], {
                 entityType,
-                name: pepContext.state.ownerName
+                name: pepContext.state.ownerName,
             }),
-            value: Relation.COLIVING_PARTNER
+            value: Relation.COLIVING_PARTNER,
         },
         {
             text: intl.formatMessage(relationMessages[Relation.CHILD], {
                 entityType,
-                name: pepContext.state.ownerName
+                name: pepContext.state.ownerName,
             }),
-            value: Relation.CHILD
+            value: Relation.CHILD,
         },
         {
             text: intl.formatMessage(relationMessages[Relation.PARENT], {
                 entityType,
-                name: pepContext.state.ownerName
+                name: pepContext.state.ownerName,
             }),
-            value: Relation.PARENT
+            value: Relation.PARENT,
         },
         {
             text: intl.formatMessage(relationMessages[Relation.CHILD_MARRIED_PARTNER], {
                 entityType,
-                name: pepContext.state.ownerName
+                name: pepContext.state.ownerName,
             }),
-            value: Relation.CHILD_MARRIED_PARTNER
+            value: Relation.CHILD_MARRIED_PARTNER,
         },
         {
             text: intl.formatMessage(relationMessages[Relation.CHILD_COLIVING_PARTNER], {
                 entityType,
-                name: pepContext.state.ownerName
+                name: pepContext.state.ownerName,
             }),
-            value: Relation.CHILD_COLIVING_PARTNER
-        }
+            value: Relation.CHILD_COLIVING_PARTNER,
+        },
     ];
 }
 function getBusinessRelationAlternatives(intl, entityType, pepContext) {
@@ -120,23 +131,23 @@ function getBusinessRelationAlternatives(intl, entityType, pepContext) {
         {
             text: intl.formatMessage(businessRelationMessages[BusinessRelation.CO_OWNERSHIP], {
                 entityType,
-                name: pepContext.state.ownerName
+                name: pepContext.state.ownerName,
             }),
-            value: BusinessRelation.CO_OWNERSHIP
+            value: BusinessRelation.CO_OWNERSHIP,
         },
         {
             text: intl.formatMessage(businessRelationMessages[BusinessRelation.CLOSE_CONNECTION], {
                 entityType,
-                name: pepContext.state.ownerName
+                name: pepContext.state.ownerName,
             }),
-            value: BusinessRelation.CLOSE_CONNECTION
+            value: BusinessRelation.CLOSE_CONNECTION,
         },
         {
             text: intl.formatMessage(businessRelationMessages[BusinessRelation.COMPANY_FOR_PEP], {
                 entityType,
-                name: pepContext.state.ownerName
+                name: pepContext.state.ownerName,
             }),
-            value: BusinessRelation.COMPANY_FOR_PEP
-        }
+            value: BusinessRelation.COMPANY_FOR_PEP,
+        },
     ];
 }