@lysaab/lysa-pep 0.17.4 → 1.0.0-0

package/lib/pages/RolePage/RolePage.js

@@ -0,0 +1,214 @@
+import React, { useRef, useCallback, useContext } from "react";
+import { Form, PrimaryButton, RequiredValidator, TextInput, Select } from "@lysaab/ui-2";
+import { PepContext, Role, MilitaryRank, PepType, EntityType } from "../PepContext";
+import { CountrySelect } from "../../components/CountrySelect";
+import { useIntl, FormattedMessage } from "react-intl";
+import { roleMessages, ambassadorMessages, governmentCompanyMessages, intCompanyMessages, militaryMessages } from "./RoleMessages";
+export const RolePage = ({ next }) => {
+    const pepContext = useContext(PepContext);
+    const formRef = useRef();
+    const intl = useIntl();
+    const entityType = pepContext.state.legalEntityType || EntityType.PERSON;
+    const type = pepContext.state.type;
+    const roleAlternatives = getRoleAlts(intl);
+    const militaryAlternatives = getMilitaryAlts(intl);
+    const nextPage = useCallback(() => {
+        if (formRef.current && formRef.current.isValid) {
+            next();
+        }
+    }, [formRef, next]);
+    const resetRoleFields = useCallback(() => {
+        pepContext.setState({
+            ambassadorCountry: undefined,
+            governmentCompany: undefined,
+            governmentCompanyRole: undefined,
+            internationalOrganisation: undefined,
+            internationalOrganisationRole: undefined,
+            militaryRank: undefined
+        });
+    }, [pepContext]);
+    if (!type || type === PepType.NOT_PEP) {
+        return null;
+    }
+    console.log({
+        entityType,
+        pepType: type,
+        relation: pepContext.state.relationToPEP || pepContext.state.businessRelation
+    });
+    return (React.createElement(Form, { onSubmit: () => nextPage(), lysaFormRef: formRef },
+        React.createElement(Select, { label: intl.formatMessage(roleMessages.header, {
+                entityType,
+                pepType: type,
+                relation: pepContext.state.relationToPEP || pepContext.state.businessRelation,
+                name: pepContext.state.ownerName
+            }), placeholder: intl.formatMessage(roleMessages.placeholder), alternatives: roleAlternatives, value: roleAlternatives.find(alt => alt.value === pepContext.state.role), onChange: event => {
+                pepContext.setState({ role: event.value });
+                resetRoleFields();
+            }, validators: [
+                RequiredValidator(intl.formatMessage(roleMessages.required))
+            ] }),
+        pepContext.state.role && pepContext.state.role === Role.AMBASSADOR ? (React.createElement(CountrySelect, { label: intl.formatMessage(ambassadorMessages.header, {
+                entityType,
+                pepType: type,
+                relation: pepContext.state.relationToPEP ||
+                    pepContext.state.businessRelation,
+                name: pepContext.state.ownerName
+            }), onChange: event => pepContext.setState({
+                ambassadorCountry: event.value
+                    ? event.value.toString()
+                    : undefined
+            }), value: pepContext.state.ambassadorCountry, validators: [
+                RequiredValidator(intl.formatMessage(ambassadorMessages.required))
+            ] })) : null,
+        pepContext.state.role &&
+            pepContext.state.role === Role.GOVERNMENT_COMPANY ? (React.createElement(React.Fragment, null,
+            React.createElement(TextInput, { label: intl.formatMessage(governmentCompanyMessages.nameHeader, {
+                    entityType,
+                    pepType: type,
+                    relation: pepContext.state.relationToPEP ||
+                        pepContext.state.businessRelation,
+                    name: pepContext.state.ownerName
+                }), value: pepContext.state.governmentCompany || "", onChange: value => {
+                    pepContext.setState({ governmentCompany: value });
+                }, validators: [
+                    RequiredValidator(intl.formatMessage(governmentCompanyMessages.nameRequired))
+                ] }),
+            React.createElement(TextInput, { label: intl.formatMessage(governmentCompanyMessages.roleHeader, {
+                    entityType,
+                    pepType: type,
+                    relation: pepContext.state.relationToPEP ||
+                        pepContext.state.businessRelation,
+                    name: pepContext.state.ownerName
+                }), value: pepContext.state.governmentCompanyRole || "", onChange: value => {
+                    pepContext.setState({
+                        governmentCompanyRole: value
+                    });
+                }, validators: [
+                    RequiredValidator(intl.formatMessage(governmentCompanyMessages.roleRequired))
+                ] }))) : null,
+        pepContext.state.role &&
+            pepContext.state.role ===
+                Role.HIGH_RANKING_POSITION_INTERNALTIONAL_CORP ? (React.createElement(React.Fragment, null,
+            React.createElement(TextInput, { label: intl.formatMessage(intCompanyMessages.nameHeader, {
+                    entityType,
+                    pepType: type,
+                    relation: pepContext.state.relationToPEP ||
+                        pepContext.state.businessRelation,
+                    name: pepContext.state.ownerName
+                }), value: pepContext.state.internationalOrganisation || "", onChange: value => {
+                    pepContext.setState({ internationalOrganisation: value });
+                }, validators: [
+                    RequiredValidator(intl.formatMessage(intCompanyMessages.nameRequired))
+                ] }),
+            React.createElement(TextInput, { label: intl.formatMessage(intCompanyMessages.roleHeader, {
+                    entityType,
+                    pepType: type,
+                    relation: pepContext.state.relationToPEP ||
+                        pepContext.state.businessRelation,
+                    name: pepContext.state.ownerName
+                }), value: pepContext.state.internationalOrganisationRole || "", onChange: value => {
+                    pepContext.setState({
+                        internationalOrganisationRole: value
+                    });
+                }, validators: [
+                    RequiredValidator(intl.formatMessage(intCompanyMessages.roleRequired))
+                ] }))) : null,
+        pepContext.state.role &&
+            pepContext.state.role === Role.MILITARY_OFFICER ? (React.createElement(Select, { label: intl.formatMessage(militaryMessages.header, {
+                entityType,
+                pepType: type,
+                relation: pepContext.state.relationToPEP ||
+                    pepContext.state.businessRelation,
+                name: pepContext.state.ownerName
+            }), placeholder: intl.formatMessage(militaryMessages.placeholder), alternatives: militaryAlternatives, value: militaryAlternatives.find(alt => alt.value === pepContext.state.militaryRank), onChange: event => {
+                pepContext.setState({ militaryRank: event.value });
+            }, validators: [
+                RequiredValidator(intl.formatMessage(militaryMessages.required))
+            ] })) : null,
+        React.createElement(PrimaryButton, { type: "submit" },
+            React.createElement(FormattedMessage, { id: "pep.role.next", description: "Next button", defaultMessage: "G\u00E5 vidare" }))));
+};
+export function getRoleAlts(intl) {
+    return [
+        {
+            text: intl.formatMessage(roleMessages[Role.HEAD_OF_GOVERNMENT]),
+            value: Role.HEAD_OF_GOVERNMENT
+        },
+        {
+            text: intl.formatMessage(roleMessages[Role.MINISTER]),
+            value: Role.MINISTER
+        },
+        {
+            text: intl.formatMessage(roleMessages[Role.PARLIMENT_MEMBER]),
+            value: Role.PARLIMENT_MEMBER
+        },
+        {
+            text: intl.formatMessage(roleMessages[Role.CENTRAL_BANK_MEMBER]),
+            value: Role.CENTRAL_BANK_MEMBER
+        },
+        {
+            text: intl.formatMessage(roleMessages[Role.BOARD_MEMBER_POLITICAL_PARTY]),
+            value: Role.BOARD_MEMBER_POLITICAL_PARTY
+        },
+        {
+            text: intl.formatMessage(roleMessages[Role.JUDGE_SUPREME_COURT]),
+            value: Role.JUDGE_SUPREME_COURT
+        },
+        {
+            text: intl.formatMessage(roleMessages[Role.JUDGE_OTHER_HIGH_COURT]),
+            value: Role.JUDGE_OTHER_HIGH_COURT
+        },
+        {
+            text: intl.formatMessage(roleMessages[Role.REVISION_INSTITUTE]),
+            value: Role.REVISION_INSTITUTE
+        },
+        {
+            text: intl.formatMessage(roleMessages[Role.AMBASSADOR]),
+            value: Role.AMBASSADOR
+        },
+        {
+            text: intl.formatMessage(roleMessages[Role.MILITARY_OFFICER]),
+            value: Role.MILITARY_OFFICER
+        },
+        {
+            text: intl.formatMessage(roleMessages[Role.GOVERNMENT_COMPANY]),
+            value: Role.GOVERNMENT_COMPANY
+        },
+        {
+            text: intl.formatMessage(roleMessages[Role.EU_HIGH_RANKING_POSITION]),
+            value: Role.EU_HIGH_RANKING_POSITION
+        },
+        {
+            text: intl.formatMessage(roleMessages[Role.HIGH_RANKING_POSITION_INTERNALTIONAL_CORP]),
+            value: Role.HIGH_RANKING_POSITION_INTERNALTIONAL_CORP
+        }
+    ];
+}
+export function getMilitaryAlts(intl) {
+    return [
+        {
+            text: intl.formatMessage(militaryMessages[MilitaryRank.GENERAL]),
+            value: MilitaryRank.GENERAL
+        },
+        {
+            text: intl.formatMessage(militaryMessages[MilitaryRank.LIEUTENANT_GENERAL]),
+            value: MilitaryRank.LIEUTENANT_GENERAL
+        },
+        {
+            text: intl.formatMessage(militaryMessages[MilitaryRank.MAJOR_GENERAL]),
+            value: MilitaryRank.MAJOR_GENERAL
+        },
+        {
+            text: intl.formatMessage(militaryMessages[MilitaryRank.ADMIRAL]),
+            value: MilitaryRank.ADMIRAL
+        },
+        {
+            text: intl.formatMessage(militaryMessages[MilitaryRank.VICE_ADMIRAL]),
+            value: MilitaryRank.VICE_ADMIRAL
+        },
+        {
+            text: intl.formatMessage(militaryMessages[MilitaryRank.REAR_ADMIRAL]),
+            value: MilitaryRank.REAR_ADMIRAL
+        }
+    ];
+}

package/lib/pages/StatusPage/StatusMessages.d.ts

@@ -0,0 +1,72 @@
+export declare const isOngoingMessages: {
+    header: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    required: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+};
+export declare const endedMessages: {
+    header: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    required: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+};
+export declare const isLocalCountryMessages: {
+    header: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    required: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+};
+export declare const countrySelectionMessages: {
+    header: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    required: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+};
+export declare const localCountryAltMessages: {
+    localCountry: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    otherCountry: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+};
+export declare const stateAltMessages: {
+    ONGOING: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    ENDED: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+};

package/lib/pages/StatusPage/StatusMessages.js

@@ -0,0 +1,74 @@
+import { defineMessages } from "react-intl";
+import { PepStatus } from "../PepContext";
+export const isOngoingMessages = defineMessages({
+    header: {
+        id: "pep.status.isongoing.header",
+        description: "Is ongoing header",
+        defaultMessage: "Är befattningen pågående eller avslutad?"
+    },
+    required: {
+        id: "pep.status.isongoing.required",
+        description: "Is ongoing required error",
+        defaultMessage: "Du måste välja ett alternativ"
+    }
+});
+export const endedMessages = defineMessages({
+    header: {
+        id: "pep.status.ended.header",
+        description: "When did it end header",
+        defaultMessage: "När avslutades uppdraget?"
+    },
+    required: {
+        id: "pep.status.ended.required",
+        description: "When did it end required error",
+        defaultMessage: "Du måste ange ett slutdatum"
+    }
+});
+export const isLocalCountryMessages = defineMessages({
+    header: {
+        id: "pep.status.localcountry.sweden.header",
+        description: "Is local country header",
+        defaultMessage: "I vilket land är befattningen?"
+    },
+    required: {
+        id: "pep.status.localcountry.required",
+        description: "Is local country required error",
+        defaultMessage: "Du måste välja ett alternativ"
+    }
+});
+export const countrySelectionMessages = defineMessages({
+    header: {
+        id: "pep.status.countryselecton.header",
+        description: "Country selection header",
+        defaultMessage: "Välj i vilket land befattningen är"
+    },
+    required: {
+        id: "pep.status.countryselecton.required",
+        description: "Country selection required error",
+        defaultMessage: "Du måste välja land"
+    }
+});
+export const localCountryAltMessages = defineMessages({
+    localCountry: {
+        id: "pep.status.localcountryalt.required",
+        description: "Local country name",
+        defaultMessage: "Sverige"
+    },
+    otherCountry: {
+        id: "pep.status.localcountryalt.required",
+        description: "Other country",
+        defaultMessage: "Annat"
+    }
+});
+export const stateAltMessages = defineMessages({
+    [PepStatus.ONGOING]: {
+        id: "pep.status.state.ONGOING",
+        description: "Ongoing alt",
+        defaultMessage: "Pågående"
+    },
+    [PepStatus.ENDED]: {
+        id: "pep.status.state.ENDED",
+        description: "Ended alt",
+        defaultMessage: "Avslutad"
+    }
+});

package/lib/pages/{PepRelationPage.d.ts → StatusPage/StatusPage.d.ts}

@@ -1,6 +1,6 @@
-import { FunctionComponent } from "react";
-interface Props {
-    next: () => void;
-}
-export declare const PepRelationPage: FunctionComponent<Props>;
-export {};
+import { FunctionComponent } from "react";
+interface Props {
+    next: () => void;
+}
+export declare const StatusPage: FunctionComponent<Props>;
+export {};

package/lib/pages/StatusPage/StatusPage.js

@@ -0,0 +1,75 @@
+import React, { useRef, useCallback, useContext } from "react";
+import { Form, RadioGroup, RequiredValidator, PrimaryButton, Datepicker } from "@lysaab/ui-2";
+import { PepContext, PepStatus } from "../PepContext";
+import { CountrySelect } from "../../components/CountrySelect";
+import { useIntl, FormattedMessage } from "react-intl";
+import { isOngoingMessages, endedMessages, isLocalCountryMessages, countrySelectionMessages, localCountryAltMessages, stateAltMessages } from "./StatusMessages";
+export const StatusPage = ({ next }) => {
+    const pepContext = useContext(PepContext);
+    const formRef = useRef();
+    const intl = useIntl();
+    const stateAlternatives = getStateAlternatives(intl);
+    const isSwedenAlternatives = getIsLocalCountryAlternatives(intl);
+    const nextPage = useCallback(() => {
+        if (formRef.current && formRef.current.isValid) {
+            next();
+        }
+    }, [formRef, next]);
+    const updateIsSweden = useCallback((alternative) => {
+        pepContext.setState({ isSweden: alternative.value });
+        if (alternative.value === "other") {
+            pepContext.setState({ country: undefined });
+        }
+    }, [pepContext]);
+    const updateIsOngoing = useCallback((alternative) => {
+        pepContext.setState({ isOngoing: alternative.value });
+        if (alternative.value === PepStatus.ONGOING) {
+            pepContext.setState({ ended: undefined });
+        }
+    }, [pepContext]);
+    return (React.createElement("div", null,
+        React.createElement(Form, { lysaFormRef: formRef, onSubmit: () => {
+                nextPage();
+            } },
+            React.createElement(RadioGroup, { alternatives: stateAlternatives, header: intl.formatMessage(isOngoingMessages.header), onChange: updateIsOngoing, value: stateAlternatives.find(alt => alt.value === pepContext.state.isOngoing), validators: [
+                    RequiredValidator(intl.formatMessage(isOngoingMessages.required))
+                ] }),
+            pepContext.state.isOngoing &&
+                pepContext.state.isOngoing === PepStatus.ENDED ? (React.createElement(Datepicker, { label: intl.formatMessage(endedMessages.header), selected: pepContext.state.ended, onChange: event => pepContext.setState({ ended: event || undefined }), validators: [
+                    RequiredValidator(intl.formatMessage(isOngoingMessages.required))
+                ], showMonthYearPicker: true, dateFormat: "yyyy-MM", maxDate: new Date() })) : null,
+            React.createElement(RadioGroup, { alternatives: isSwedenAlternatives, header: intl.formatMessage(isLocalCountryMessages.header), onChange: updateIsSweden, value: isSwedenAlternatives.find(alt => alt.value === pepContext.state.isSweden), validators: [
+                    RequiredValidator(intl.formatMessage(isLocalCountryMessages.required))
+                ] }),
+            pepContext.state.isSweden && pepContext.state.isSweden === "other" ? (React.createElement(CountrySelect, { label: intl.formatMessage(countrySelectionMessages.header), onChange: event => pepContext.setState({
+                    country: event.value ? event.value.toString() : undefined
+                }), validators: [
+                    RequiredValidator(intl.formatMessage(countrySelectionMessages.required))
+                ], value: pepContext.state.country, omitCountries: ["SE"] })) : null,
+            React.createElement(PrimaryButton, { type: "submit" },
+                React.createElement(FormattedMessage, { id: "pep.status.next", description: "Next button", defaultMessage: "G\u00E5 vidare" })))));
+};
+function getIsLocalCountryAlternatives(intl) {
+    return [
+        {
+            text: intl.formatMessage(localCountryAltMessages.localCountry),
+            value: "sweden"
+        },
+        {
+            text: intl.formatMessage(localCountryAltMessages.otherCountry),
+            value: "other"
+        }
+    ];
+}
+function getStateAlternatives(intl) {
+    return [
+        {
+            text: intl.formatMessage(stateAltMessages[PepStatus.ONGOING]),
+            value: PepStatus.ONGOING
+        },
+        {
+            text: intl.formatMessage(stateAltMessages[PepStatus.ENDED]),
+            value: PepStatus.ENDED
+        }
+    ];
+}

package/package.json

@@ -1,24 +1,26 @@
 {
   "name": "@lysaab/lysa-pep",
   "author": "Lysa AB",
-  "version": "0.17.4",
+  "version": "1.0.0-0",
   "main": "./lib/Exports.js",
   "dependencies": {
     "@types/luxon": "^1.15.2",
-    "luxon": "^1.21.1"
+    "@types/react-intl": "^3.0.0",
+    "luxon": "^1.21.1",
+    "react-intl": "^4.1.1"
   },
   "devDependencies": {
-    "@lysaab/ui-2": "^16.13.1",
+    "@lysaab/ui-2": "^16.11.1",
     "@types/jest": "24.0.20",
     "@types/luxon": "^1.15.2",
     "@types/node": "12.11.7",
-    "@types/react": "16.9.11",
-    "@types/react-dom": "16.9.3",
+    "@types/react": "^16.9.23",
+    "@types/react-dom": "^16.9.5",
     "copyfiles": "^2.1.1",
     "luxon": "^1.21.1",
-    "react": "^16.11.0",
-    "react-dom": "^16.11.0",
-    "react-scripts": "^3.4.1",
+    "react": "^16.13.0",
+    "react-dom": "^16.13.0",
+    "react-scripts": "^3.4.0",
     "typescript": "^3.7.2"
   },
   "peerDependencies": {
@@ -33,7 +35,8 @@
     "copyscss": "copyfiles -u 1 \"src/components/**/*.scss\" lib/",
     "release:patch": "npm run build:lib && npm run copyscss && npm version patch && npm publish",
     "release:minor": "npm run build:lib && npm run copyscss && npm version minor && npm publish",
-    "release:major": "npm run build:lib && npm run copyscss && npm version major && npm publish"
+    "release:major": "npm run build:lib && npm run copyscss && npm version major && npm publish",
+    "release:premajor": "npm run build:lib && npm run copyscss && npm version premajor && npm publish"
   },
   "eslintConfig": {
     "extends": "react-app"

package/src/Exports.ts

@@ -1,13 +1,12 @@
 export * from "./pages/PepContext";
 export * from "./model/PepModel";
-export * from "./model/PepTexts";
-export * from "./pages/PepIsPepPage";
-export { PepRelationPage } from "./pages/PepRelationPage";
+export * from "./pages/IsPep/IsPepPage";
+export { RelationPage } from "./pages/RelationPage/RelationPage";
 export {
-  PepRolePage,
-  militaryAlternatives,
-  roleAlternatives
-} from "./pages/PepRolePage";
-export { PepStatusPage } from "./pages/PepStatusPage";
+  RolePage as PepRolePage,
+  getMilitaryAlts,
+  getRoleAlts
+} from "./pages/RolePage/RolePage";
+export { StatusPage as PepStatusPage } from "./pages/StatusPage/StatusPage";
 
 export { PepAnswers } from "./components/PepAnswers";

package/src/components/CountrySelect.tsx

@@ -2,12 +2,7 @@ import React, { useState, FunctionComponent } from "react";
 import { Alternative, Select } from "@lysaab/ui-2";
 import { ValidationProps } from "@lysaab/ui-2/hooks/useValidation";
 import { countries } from "../model/Countries";
-
-declare global {
-  interface Window {
-    lysa: { contentPath: string };
-  }
-}
+import { defineMessages, useIntl } from "react-intl";
 
 export interface Country {
   label: string;
@@ -18,24 +13,33 @@ interface Props extends ValidationProps {
   value?: string;
   onChange?(value: Alternative<string>): void;
   label: string;
-  removeSweden?: boolean;
+  omitCountries?: string[];
 }
 
+const messages = defineMessages({
+  placeholder: {
+    id: 'component.select.country',
+    description: 'Select a country placeholder',
+    defaultMessage: 'Välj ett land'
+  }
+})
+
 export const CountrySelect: FunctionComponent<Props> = ({
   value,
-  removeSweden = false,
+  omitCountries = [],
   ...props
 }) => {
+  const intl = useIntl();
   const [countryAlternatives] = useState(
     countries
-      .filter(country => !(removeSweden && country.value === "SE"))
+      .filter(country => !omitCountries.includes(country.value))
       .map(country => ({ text: country.label, value: country.value }))
   );
 
   return (
     <Select
       alternatives={countryAlternatives}
-      placeholder={"Välj ett land"}
+      placeholder={intl.formatMessage(messages.placeholder)}
       value={countryAlternatives.find(country => country.value === value)}
       {...props}
     />