@lysaab/lysa-pep 3.0.3 → 4.0.0

package/pages/StatusPage/StatusMessages.js

@@ -3,270 +3,48 @@ import { PepStatus } from "../PepContext";
 export const isOngoingMessages = defineMessages({
     header: {
         id: "pep.status.isongoing.header",
-        description: "Is ongoing header",
-        defaultMessage: `{ 
-      entityType, select,
-        PERSON {
-          { 
-            pepType, select, 
-              ME { 
-                Is your position ongoing or ended?
-              }
-              RELATIVE { 
-                {
-                  relation, select,
-                    MARRIED_PARTNER { 
-                      Is your spouse's position ongoing or ended?
-                    }
-                    COLIVING_PARTNER { 
-                      Is your partner's position ongoing or ended?
-                    }
-                    CHILD { 
-                      Is your parent's position ongoing or ended?
-                    }
-                    PARENT { 
-                      Is your child's position ongoing or ended?
-                    }
-                    CHILD_MARRIED_PARTNER { 
-                      Is your spouse's parent's position ongoing or ended?
-                    }
-                    CHILD_COLIVING_PARTNER { 
-                      Is your partner's parent's position ongoing or ended?
-                    }
-                    other {}
-                }
-              }
-              COLLEAGUE { 
-                {
-                  relation, select,
-                    CO_OWNERSHIP { 
-                      Is the position for the person in a politically exposed position, who is a beneficial owner in a company together with you, ongoing or ended?
-                    }
-                    CLOSE_CONNECTION { 
-                      Is the position for the person in a politically exposed position, who you have or have had a close relationship to, ongoing or ended?
-                    }
-                    COMPANY_FOR_PEP { 
-                      Is the position for the person in a politically exposed position, who you have a close relationship to, ongoing or ended?
-                    }
-                    other {}
-                }
-              }
-              other {}
-          }
-        }
-        CORPORATION {
-          { 
-            pepType, select, 
-              ME { 
-                Is the position of {name} ongoing or ended
-              }
-              RELATIVE { 
-                {
-                  relation, select,
-                    MARRIED_PARTNER { 
-                      Is the position of the spouse of {name} ongoing or ended?
-                    }
-                    COLIVING_PARTNER { 
-                      Is the position of the partner of {name} ongoing or ended?
-                    }
-                    CHILD { 
-                      Is the position of the parent of {name} ongoing or ended?
-                    }
-                    PARENT { 
-                      Is the position of the child of {name} ongoing or ended?
-                    }
-                    CHILD_MARRIED_PARTNER { 
-                      Is the position of the parent of the spouse of {name} ongoing or ended?
-                    }
-                    CHILD_COLIVING_PARTNER { 
-                      Is the position of the parent of the partner of {name} ongoing or ended?
-                    }
-                    other {}
-                }
-              }
-              COLLEAGUE { 
-                {
-                  relation, select,
-                    CO_OWNERSHIP { 
-                      Is the position of the person in a politically exposed position, who is the beneficial owner in a company together with {name}, ongoing or ended?
-                    }
-                    CLOSE_CONNECTION { 
-                      Is the position for the person in a politically exposed position, who {name} have or have had a close relationship to, ongoing or ended?
-                    }
-                    COMPANY_FOR_PEP { 
-                      Is the position for the person in a politically exposed position, who {name} have a close relationship to, ongoing or ended?
-                    }
-                    other {}
-                }
-              }
-              other {}
-          }
-        }
-        other {}
-    }`,
     },
     required: {
         id: "pep.status.isongoing.required",
-        description: "Is ongoing required error",
-        defaultMessage: "You need to choose an alternative",
     },
 });
 export const endedMessages = defineMessages({
     header: {
         id: "pep.status.ended.header",
-        description: "When did it end header",
-        defaultMessage: "When did the assignment end?",
     },
     required: {
         id: "pep.status.ended.required",
-        description: "When did it end required error",
-        defaultMessage: "You need to provide an end date",
     },
 });
 export const isLocalCountryMessages = defineMessages({
     header: {
         id: "pep.status.localcountry.header",
-        description: "What country header",
-        defaultMessage: "What country is the position in?",
     },
     required: {
         id: "pep.status.localcountry.required",
-        description: "Is local country required error",
-        defaultMessage: "You need to choose a country",
     },
 });
 export const countrySelectionMessages = defineMessages({
     header: {
         id: "pep.status.countryselecton.header",
-        description: "Country selection header",
-        defaultMessage: `{ 
-      entityType, select,
-        PERSON {
-          { 
-            pepType, select, 
-              ME { 
-                In what country is/was your position?
-              }
-              RELATIVE { 
-                {
-                  relation, select,
-                    MARRIED_PARTNER { 
-                      In what country is/was your spouse's position?
-                    }
-                    COLIVING_PARTNER { 
-                      In what country is/was your partner's position?
-                    }
-                    CHILD { 
-                      In what country is/was your parent's position?
-                    }
-                    PARENT { 
-                      In what country is/was your child's position?
-                    }
-                    CHILD_MARRIED_PARTNER { 
-                      In what country is/was your spouse's parent's position?
-                    }
-                    CHILD_COLIVING_PARTNER { 
-                      In what country is/was your partner's parent's position?
-                    }
-                    other {}
-                }
-              }
-              COLLEAGUE { 
-                {
-                  relation, select,
-                    CO_OWNERSHIP { 
-                      In what country is/was the position of the person in a politically exposed position you have or have had a relationship to?
-                    }
-                    CLOSE_CONNECTION { 
-                      In what country is/was the position of the person in a politically exposed position you have or have had a relationship to?
-                    }
-                    COMPANY_FOR_PEP { 
-                      In what country is/was the position of the person in a politically exposed position you have or have had a relationship to?
-                    }
-                    other {}
-                }
-              }
-              other {}
-          }
-        }
-        CORPORATION {
-          { 
-            pepType, select, 
-              ME { 
-                In what country is/was the position of {name}
-              }
-              RELATIVE { 
-                {
-                  relation, select,
-                    MARRIED_PARTNER { 
-                      In what country is/was the position of the spouse of {name}
-                    }
-                    COLIVING_PARTNER { 
-                      In what country is/was the position of the partner of {name}
-                    }
-                    CHILD { 
-                      In what country is/was the position of the parent of {name}
-                    }
-                    PARENT { 
-                      In what country is/was the position of the child of {name}
-                    }
-                    CHILD_MARRIED_PARTNER { 
-                      In what country is/was the position of the parent of the spouse of {name}
-                    }
-                    CHILD_COLIVING_PARTNER { 
-                      In what country is/was the position of the parent of the partner of {name}
-                    }
-                    other {}
-                }
-              }
-              COLLEAGUE { 
-                {
-                  relation, select,
-                    CO_OWNERSHIP { 
-                      In what country is/was the position of the beneficial owner that {name} has a relationship to?
-                    }
-                    CLOSE_CONNECTION { 
-                      In what country is/was the position of the person that {name} has/had a relationship to?
-                    }
-                    COMPANY_FOR_PEP { 
-                      In what country has/had the person in a politically exposed position, that {name} has a relationship to, his or her position?
-                    }
-                    other {}
-                }
-              }
-              other {}
-          }
-        }
-        other {}
-    }`,
     },
     required: {
         id: "pep.status.countryselecton.required",
-        description: "Country selection required error",
-        defaultMessage: "You have to choose a country",
     },
 });
 export const localCountryAltMessages = defineMessages({
     localCountry: {
         id: "pep.status.localcountryalt.local",
-        description: "Local country name",
-        defaultMessage: "{countryName}",
     },
     otherCountry: {
         id: "pep.status.othercountryalt.other",
-        description: "Other country",
-        defaultMessage: "Other",
     },
 });
 export const stateAltMessages = defineMessages({
     [PepStatus.ONGOING]: {
         id: "pep.status.state.ONGOING",
-        description: "Ongoing alt",
-        defaultMessage: "Ongoing",
     },
     [PepStatus.ENDED]: {
         id: "pep.status.state.ENDED",
-        description: "Ended alt",
-        defaultMessage: "Ended",
     },
 });

package/pages/StatusPage/StatusPage.d.ts

@@ -1,7 +1,9 @@
 import { FunctionComponent } from "react";
+import { Language } from "@lysaab/ui-2";
 interface Props {
     countryName: string;
     countryCode: string;
+    language: Language;
     next: () => void;
 }
 export declare const StatusPage: FunctionComponent<Props>;

package/pages/StatusPage/StatusPage.js

@@ -1,11 +1,10 @@
 import React, { useRef, useCallback, useContext, } from "react";
-import { Form, RadioGroup, RequiredValidator, PrimaryButton, Datepicker, Card, } from "@lysaab/ui-2";
+import { Form, RadioGroup, RequiredValidator, PrimaryButton, Datepicker, Card, CountrySelect, } from "@lysaab/ui-2";
 import { PepContext, PepStatus, EntityType, PepType } from "../PepContext";
-import { CountrySelect } from "../../components/CountrySelect";
 import { useIntl, FormattedMessage } from "react-intl";
 import { isOngoingMessages, endedMessages, isLocalCountryMessages, countrySelectionMessages, localCountryAltMessages, stateAltMessages, } from "./StatusMessages";
 import { formatPossessive } from "../../utils/Possession";
-export const StatusPage = ({ countryName, countryCode, next, }) => {
+export const StatusPage = ({ countryName, countryCode, language, next, }) => {
     const pepContext = useContext(PepContext);
     const formRef = useRef();
     const intl = useIntl();
@@ -73,9 +72,9 @@ export const StatusPage = ({ countryName, countryCode, next, }) => {
                         country: event.value ? event.value.toString() : undefined,
                     }), validators: [
                         new RequiredValidator(intl.formatMessage(countrySelectionMessages.required)),
-                    ], value: pepContext.state.country, omitCountries: [countryCode] })) : null),
+                    ], value: pepContext.state.country, omitList: [countryCode], language: language })) : null),
             React.createElement(PrimaryButton, { block: true, type: "submit" },
-                React.createElement(FormattedMessage, { id: "pep.status.next", description: "Next button", defaultMessage: "Next" })))));
+                React.createElement(FormattedMessage, { id: "pep.status.next" })))));
 };
 function getIsLocalCountryAlternatives(intl, countryName) {
     return [

package/components/CountrySelect.d.ts

@@ -1,11 +0,0 @@
-/// <reference types="react" />
-import { Alternative } from "@lysaab/ui-2";
-import { ValidationProps } from "@lysaab/ui-2/hooks/useValidation";
-interface Props extends ValidationProps {
-    value?: string;
-    onChange?(value: Alternative<string>): void;
-    label: string;
-    omitCountries?: string[];
-}
-export declare const CountrySelect: ({ value, omitCountries, ...props }: Props) => JSX.Element;
-export {};

package/components/CountrySelect.js

@@ -1,41 +0,0 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-import React, { useState, useEffect } from "react";
-import { Select } from "@lysaab/ui-2";
-import countries from "@lysaab/countries";
-import { defineMessages, useIntl } from "react-intl";
-const messages = defineMessages({
-    placeholder: {
-        id: "component.select.country",
-        description: "Select a country placeholder",
-        defaultMessage: "Select a country",
-    },
-});
-function getCountries(lang, omitCountries) {
-    return (countries[lang] || countries["en"])
-        .filter((country) => !omitCountries.includes(country.value))
-        .map((country) => ({
-        text: country.label,
-        value: country.value,
-    }));
-}
-const EMPTY_OMIT_COUNTRIES = [];
-export const CountrySelect = (_a) => {
-    var { value, omitCountries = EMPTY_OMIT_COUNTRIES } = _a, props = __rest(_a, ["value", "omitCountries"]);
-    const intl = useIntl();
-    const lang = intl.locale.slice(0, 2);
-    const [countryAlternatives, setCountryAlternatives] = useState(getCountries(lang, omitCountries));
-    useEffect(() => {
-        setCountryAlternatives(getCountries(lang, omitCountries));
-    }, [lang, omitCountries]);
-    return (React.createElement(Select, Object.assign({ alternatives: countryAlternatives, placeholder: intl.formatMessage(messages.placeholder), value: countryAlternatives.find((country) => country.value === value) }, props)));
-};

package/messages/src/components/CountrySelect.json

@@ -1 +0,0 @@
-[{"id":"component.select.country","description":"Select a country placeholder","defaultMessage":"Select a country"}]

package/model/Countries.d.ts

@@ -1,4 +0,0 @@
-export declare const countries: {
-    label: string;
-    value: string;
-}[];