@lysaab/lysa-pep 0.14.0 → 0.14.1

package/lib/pages/PepRolePage.js

@@ -1,127 +1,127 @@
-import React, { useRef, useCallback, useContext } from "react";
-import { Form, PrimaryButton, RequiredValidator, TextInput, Select } from "@lysaab/ui-2";
-import { PepContext, Role, MilitaryRank, EntityType, PepType, } from "./PepContext";
-import { CountrySelect } from "../components/CountrySelect";
-import { getGovernmentCompanyNameLabel, getGovernmentCompanyRoleLabel, getHighRankingPositionIntCorpNameLabel, getHighRankingPositionIntCorpRoleLabel, getMilitaryRankLabel, getRoleLabel, getAmbassadorLabel } from "../model/PepTexts";
-export const roleAlternatives = [
-    { text: "Stats eller regeringschef", value: Role.HEAD_OF_GOVERNMENT },
-    { text: "Minister eller Vice/Biträdande minister", value: Role.MINISTER },
-    { text: "Ledamot i parlament eller riksdag", value: Role.PARLIMENT_MEMBER },
-    {
-        text: "Ledamot i centralbanks styrande organ",
-        value: Role.CENTRAL_BANK_MEMBER
-    },
-    {
-        text: "Ledamot för styrelsen i politiskt parti representerade i riksdagen",
-        value: Role.BOARD_MEMBER_POLITICAL_PARTY
-    },
-    { text: "Domare i högsta domstolen", value: Role.JUDGE_SUPREME_COURT },
-    {
-        text: "Domare i konstitutionell domstol eller annat rättsligt organ på hög nivå vars beslut endast undantagsvis kan överklagas",
-        value: Role.JUDGE_OTHER_HIGH_COURT
-    },
-    {
-        text: "Högre tjänsteman vid revisionsmyndighet",
-        value: Role.REVISION_INSTITUTE
-    },
-    { text: "Ambassadör eller bestickningschef", value: Role.AMBASSADOR },
-    { text: "Högre officer i försvarsmakt", value: Role.MILITARY_OFFICER },
-    {
-        text: "Person som ingår i statsägt företags förvaltnings-, lednings eller kontrollorgan",
-        value: Role.GOVERNMENT_COMPANY
-    },
-    {
-        text: "EU-parlamentariker",
-        value: Role.EU_HIGH_RANKING_POSITION
-    },
-    {
-        text: "Befattning på hög nivå i en internationell organisation",
-        value: Role.HIGH_RANKING_POSITION_INTERNALTIONAL_CORP
-    }
-];
-export const militaryAlternatives = [
-    {
-        text: "General",
-        value: MilitaryRank.GENERAL
-    },
-    {
-        text: "Generallöjtnant",
-        value: MilitaryRank.LIEUTENANT_GENERAL
-    },
-    {
-        text: "Generalmajor",
-        value: MilitaryRank.MAJOR_GENERAL
-    },
-    {
-        text: "Amiral",
-        value: MilitaryRank.ADMIRAL
-    },
-    {
-        text: "Viceamiral",
-        value: MilitaryRank.VICE_ADMIRAL
-    },
-    {
-        text: "Konteramiral",
-        value: MilitaryRank.REAR_ADMIRAL
-    }
-];
-export const PepRolePage = ({ next }) => {
-    const pepContext = useContext(PepContext);
-    const formRef = useRef();
-    const entityType = pepContext.state.legalEntityType || EntityType.PERSON;
-    const type = pepContext.state.type;
-    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;
-    }
-    return (React.createElement(Form, { onSubmit: () => nextPage(), lysaFormRef: formRef },
-        React.createElement(Select, { label: getRoleLabel(entityType, type, pepContext.state.relationToPEP, pepContext.state.businessRelation, pepContext.state.ownerName), placeholder: "V\u00E4lj en roll", alternatives: roleAlternatives, value: roleAlternatives.find(alt => alt.value === pepContext.state.role), onChange: event => {
-                pepContext.setState({ role: event.value });
-                resetRoleFields();
-            }, validators: [RequiredValidator("Du måste välja roll")] }),
-        pepContext.state.role && pepContext.state.role === Role.AMBASSADOR ? (React.createElement(CountrySelect, { label: getAmbassadorLabel(entityType, type, pepContext.state.relationToPEP, pepContext.state.businessRelation, pepContext.state.ownerName), onChange: event => pepContext.setState({
-                ambassadorCountry: event.value
-                    ? event.value.toString()
-                    : undefined
-            }), value: pepContext.state.ambassadorCountry, validators: [RequiredValidator("Du måste välja land")] })) : null,
-        pepContext.state.role &&
-            pepContext.state.role === Role.GOVERNMENT_COMPANY ? (React.createElement(React.Fragment, null,
-            React.createElement(TextInput, { label: getGovernmentCompanyNameLabel(entityType, type, pepContext.state.relationToPEP, pepContext.state.businessRelation, pepContext.state.ownerName), value: pepContext.state.governmentCompany || "", onChange: event => {
-                    pepContext.setState({ governmentCompany: event.value });
-                }, validators: [RequiredValidator("Du måste ange ett namn")] }),
-            React.createElement(TextInput, { label: getGovernmentCompanyRoleLabel(entityType, type, pepContext.state.relationToPEP, pepContext.state.businessRelation, pepContext.state.ownerName), value: pepContext.state.governmentCompanyRole || "", onChange: event => {
-                    pepContext.setState({
-                        governmentCompanyRole: event.value
-                    });
-                }, validators: [RequiredValidator("Du måste ange roll")] }))) : null,
-        pepContext.state.role &&
-            pepContext.state.role ===
-                Role.HIGH_RANKING_POSITION_INTERNALTIONAL_CORP ? (React.createElement(React.Fragment, null,
-            React.createElement(TextInput, { label: getHighRankingPositionIntCorpNameLabel(entityType, type, pepContext.state.relationToPEP, pepContext.state.businessRelation, pepContext.state.ownerName), value: pepContext.state.internationalOrganisation || "", onChange: event => {
-                    pepContext.setState({ internationalOrganisation: event.value });
-                }, validators: [RequiredValidator("Du måste ange ett namn")] }),
-            React.createElement(TextInput, { label: getHighRankingPositionIntCorpRoleLabel(entityType, type, pepContext.state.relationToPEP, pepContext.state.businessRelation, pepContext.state.ownerName), value: pepContext.state.internationalOrganisationRole || "", onChange: event => {
-                    pepContext.setState({
-                        internationalOrganisationRole: event.value
-                    });
-                }, validators: [RequiredValidator("Du måste ange roll")] }))) : null,
-        pepContext.state.role &&
-            pepContext.state.role === Role.MILITARY_OFFICER ? (React.createElement(Select, { label: getMilitaryRankLabel(entityType, type, pepContext.state.relationToPEP, pepContext.state.businessRelation, pepContext.state.ownerName), placeholder: "V\u00E4lj grad", alternatives: militaryAlternatives, value: militaryAlternatives.find(alt => alt.value === pepContext.state.militaryRank), onChange: event => {
-                pepContext.setState({ militaryRank: event.value });
-            }, validators: [RequiredValidator("Du måste ange en grad")] })) : null,
-        React.createElement(PrimaryButton, { type: "submit" }, "N\u00E4sta")));
-};
+import React, { useRef, useCallback, useContext, } from "react";
+import { Form, PrimaryButton, RequiredValidator, TextInput, Select, } from "@lysaab/ui-2";
+import { PepContext, Role, MilitaryRank, EntityType, PepType, } from "./PepContext";
+import { CountrySelect } from "../components/CountrySelect";
+import { getGovernmentCompanyNameLabel, getGovernmentCompanyRoleLabel, getHighRankingPositionIntCorpNameLabel, getHighRankingPositionIntCorpRoleLabel, getMilitaryRankLabel, getRoleLabel, getAmbassadorLabel, } from "../model/PepTexts";
+export const roleAlternatives = [
+    { text: "Stats eller regeringschef", value: Role.HEAD_OF_GOVERNMENT },
+    { text: "Minister eller Vice/Biträdande minister", value: Role.MINISTER },
+    { text: "Ledamot i parlament eller riksdag", value: Role.PARLIMENT_MEMBER },
+    {
+        text: "Ledamot i centralbanks styrande organ",
+        value: Role.CENTRAL_BANK_MEMBER,
+    },
+    {
+        text: "Ledamot för styrelsen i politiskt parti representerade i riksdagen",
+        value: Role.BOARD_MEMBER_POLITICAL_PARTY,
+    },
+    { text: "Domare i högsta domstolen", value: Role.JUDGE_SUPREME_COURT },
+    {
+        text: "Domare i konstitutionell domstol eller annat rättsligt organ på hög nivå vars beslut endast undantagsvis kan överklagas",
+        value: Role.JUDGE_OTHER_HIGH_COURT,
+    },
+    {
+        text: "Högre tjänsteman vid revisionsmyndighet",
+        value: Role.REVISION_INSTITUTE,
+    },
+    { text: "Ambassadör eller bestickningschef", value: Role.AMBASSADOR },
+    { text: "Högre officer i försvarsmakt", value: Role.MILITARY_OFFICER },
+    {
+        text: "Person som ingår i statsägt företags förvaltnings-, lednings eller kontrollorgan",
+        value: Role.GOVERNMENT_COMPANY,
+    },
+    {
+        text: "EU-parlamentariker",
+        value: Role.EU_HIGH_RANKING_POSITION,
+    },
+    {
+        text: "Befattning på hög nivå i en internationell organisation",
+        value: Role.HIGH_RANKING_POSITION_INTERNALTIONAL_CORP,
+    },
+];
+export const militaryAlternatives = [
+    {
+        text: "General",
+        value: MilitaryRank.GENERAL,
+    },
+    {
+        text: "Generallöjtnant",
+        value: MilitaryRank.LIEUTENANT_GENERAL,
+    },
+    {
+        text: "Generalmajor",
+        value: MilitaryRank.MAJOR_GENERAL,
+    },
+    {
+        text: "Amiral",
+        value: MilitaryRank.ADMIRAL,
+    },
+    {
+        text: "Viceamiral",
+        value: MilitaryRank.VICE_ADMIRAL,
+    },
+    {
+        text: "Konteramiral",
+        value: MilitaryRank.REAR_ADMIRAL,
+    },
+];
+export const PepRolePage = ({ next }) => {
+    const pepContext = useContext(PepContext);
+    const formRef = useRef();
+    const entityType = pepContext.state.legalEntityType || EntityType.PERSON;
+    const type = pepContext.state.type;
+    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;
+    }
+    return (React.createElement(Form, { onSubmit: () => nextPage(), lysaFormRef: formRef },
+        React.createElement(Select, { label: getRoleLabel(entityType, type, pepContext.state.relationToPEP, pepContext.state.businessRelation, pepContext.state.ownerName), placeholder: "V\u00E4lj en roll", alternatives: roleAlternatives, value: roleAlternatives.find(alt => alt.value === pepContext.state.role), onChange: event => {
+                pepContext.setState({ role: event.value });
+                resetRoleFields();
+            }, validators: [RequiredValidator("Du måste välja roll")] }),
+        pepContext.state.role && pepContext.state.role === Role.AMBASSADOR ? (React.createElement(CountrySelect, { label: getAmbassadorLabel(entityType, type, pepContext.state.relationToPEP, pepContext.state.businessRelation, pepContext.state.ownerName), onChange: event => pepContext.setState({
+                ambassadorCountry: event.value
+                    ? event.value.toString()
+                    : undefined,
+            }), value: pepContext.state.ambassadorCountry, validators: [RequiredValidator("Du måste välja land")] })) : null,
+        pepContext.state.role &&
+            pepContext.state.role === Role.GOVERNMENT_COMPANY ? (React.createElement(React.Fragment, null,
+            React.createElement(TextInput, { label: getGovernmentCompanyNameLabel(entityType, type, pepContext.state.relationToPEP, pepContext.state.businessRelation, pepContext.state.ownerName), value: pepContext.state.governmentCompany || "", onChange: value => {
+                    pepContext.setState({ governmentCompany: value });
+                }, validators: [RequiredValidator("Du måste ange ett namn")] }),
+            React.createElement(TextInput, { label: getGovernmentCompanyRoleLabel(entityType, type, pepContext.state.relationToPEP, pepContext.state.businessRelation, pepContext.state.ownerName), value: pepContext.state.governmentCompanyRole || "", onChange: value => {
+                    pepContext.setState({
+                        governmentCompanyRole: value,
+                    });
+                }, validators: [RequiredValidator("Du måste ange roll")] }))) : null,
+        pepContext.state.role &&
+            pepContext.state.role ===
+                Role.HIGH_RANKING_POSITION_INTERNALTIONAL_CORP ? (React.createElement(React.Fragment, null,
+            React.createElement(TextInput, { label: getHighRankingPositionIntCorpNameLabel(entityType, type, pepContext.state.relationToPEP, pepContext.state.businessRelation, pepContext.state.ownerName), value: pepContext.state.internationalOrganisation || "", onChange: value => {
+                    pepContext.setState({ internationalOrganisation: value });
+                }, validators: [RequiredValidator("Du måste ange ett namn")] }),
+            React.createElement(TextInput, { label: getHighRankingPositionIntCorpRoleLabel(entityType, type, pepContext.state.relationToPEP, pepContext.state.businessRelation, pepContext.state.ownerName), value: pepContext.state.internationalOrganisationRole || "", onChange: value => {
+                    pepContext.setState({
+                        internationalOrganisationRole: value,
+                    });
+                }, validators: [RequiredValidator("Du måste ange roll")] }))) : null,
+        pepContext.state.role &&
+            pepContext.state.role === Role.MILITARY_OFFICER ? (React.createElement(Select, { label: getMilitaryRankLabel(entityType, type, pepContext.state.relationToPEP, pepContext.state.businessRelation, pepContext.state.ownerName), placeholder: "V\u00E4lj grad", alternatives: militaryAlternatives, value: militaryAlternatives.find(alt => alt.value === pepContext.state.militaryRank), onChange: event => {
+                pepContext.setState({ militaryRank: event.value });
+            }, validators: [RequiredValidator("Du måste ange en grad")] })) : null,
+        React.createElement(PrimaryButton, { type: "submit" }, "N\u00E4sta")));
+};

package/lib/pages/PepStatusPage.d.ts

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

package/lib/pages/PepStatusPage.js

@@ -1,57 +1,51 @@
-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";
-const stateAlternatives = [
-    {
-        text: "Pågående",
-        value: PepStatus.ONGOING
-    },
-    {
-        text: "Avslutad",
-        value: PepStatus.ENDED
-    }
-];
-const isSwedenAlternatives = [
-    { text: "Sverige", value: "sweden" },
-    { text: "Annat", value: "other" }
-];
-export const PepStatusPage = ({ next }) => {
-    const pepContext = useContext(PepContext);
-    const formRef = useRef();
-    const nextPage = useCallback(() => {
-        if (formRef.current && formRef.current.isValid) {
-            next();
-        }
-    }, [formRef, next]);
-    const updateIsSweden = useCallback((event) => {
-        pepContext.setState({
-            isSweden: event.value && event.value.value
-                ? event.value.value.toString()
-                : undefined
-        });
-        if (event.value && event.value.value === "other") {
-            pepContext.setState({ country: undefined });
-        }
-    }, [pepContext]);
-    const updateIsOngoing = useCallback((event) => {
-        pepContext.setState({
-            isOngoing: event.value && event.value.value
-                ? event.value.value
-                : undefined
-        });
-        if (event.value && event.value.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: "\u00C4r befattningen p\u00E5g\u00E5ende eller avslutad?", onChange: updateIsOngoing, value: stateAlternatives.find(alt => alt.value === pepContext.state.isOngoing), validators: [RequiredValidator("Du måste välja ett alternativ")] }),
-            pepContext.state.isOngoing &&
-                pepContext.state.isOngoing === PepStatus.ENDED ? (React.createElement(Datepicker, { label: "N\u00E4r avslutades uppdraget?", selected: pepContext.state.ended, onChange: event => pepContext.setState({ ended: event || undefined }), validators: [RequiredValidator("Du måste ange fördelsedag")], showMonthYearPicker: true, dateFormat: "yyyy-MM", maxDate: new Date() })) : null,
-            React.createElement(RadioGroup, { alternatives: isSwedenAlternatives, header: "I vilket land \u00E4r befattningen", onChange: updateIsSweden, value: isSwedenAlternatives.find(alt => alt.value === pepContext.state.isSweden), validators: [RequiredValidator("Du måste välja ett alternativ")] }),
-            pepContext.state.isSweden && pepContext.state.isSweden === "other" ? (React.createElement(CountrySelect, { label: "V\u00E4lj i vilket land befattningen \u00E4r", onChange: event => pepContext.setState({ country: event.value ? event.value.toString() : undefined }), validators: [RequiredValidator("Du måste välja land")], value: pepContext.state.country, removeSweden: true })) : null,
-            React.createElement(PrimaryButton, { type: "submit" }, "N\u00E4sta"))));
-};
+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";
+const stateAlternatives = [
+    {
+        text: "Pågående",
+        value: PepStatus.ONGOING,
+    },
+    {
+        text: "Avslutad",
+        value: PepStatus.ENDED,
+    },
+];
+const isSwedenAlternatives = [
+    { text: "Sverige", value: "sweden" },
+    { text: "Annat", value: "other" },
+];
+export const PepStatusPage = ({ next }) => {
+    const pepContext = useContext(PepContext);
+    const formRef = useRef();
+    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: "\u00C4r befattningen p\u00E5g\u00E5ende eller avslutad?", onChange: updateIsOngoing, value: stateAlternatives.find(alt => alt.value === pepContext.state.isOngoing), validators: [RequiredValidator("Du måste välja ett alternativ")] }),
+            pepContext.state.isOngoing &&
+                pepContext.state.isOngoing === PepStatus.ENDED ? (React.createElement(Datepicker, { label: "N\u00E4r avslutades uppdraget?", selected: pepContext.state.ended, onChange: event => pepContext.setState({ ended: event || undefined }), validators: [RequiredValidator("Du måste ange fördelsedag")], showMonthYearPicker: true, dateFormat: "yyyy-MM", maxDate: new Date() })) : null,
+            React.createElement(RadioGroup, { alternatives: isSwedenAlternatives, header: "I vilket land \u00E4r befattningen", onChange: updateIsSweden, value: isSwedenAlternatives.find(alt => alt.value === pepContext.state.isSweden), validators: [RequiredValidator("Du måste välja ett alternativ")] }),
+            pepContext.state.isSweden && pepContext.state.isSweden === "other" ? (React.createElement(CountrySelect, { label: "V\u00E4lj i vilket land befattningen \u00E4r", onChange: event => pepContext.setState({
+                    country: event.value ? event.value.toString() : undefined,
+                }), validators: [RequiredValidator("Du måste välja land")], value: pepContext.state.country, removeSweden: true })) : null,
+            React.createElement(PrimaryButton, { type: "submit" }, "N\u00E4sta"))));
+};

package/package.json

@@ -1,15 +1,14 @@
 {
   "name": "@lysaab/lysa-pep",
   "author": "Lysa AB",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "main": "./lib/Exports.js",
   "dependencies": {
-    "@lysaab/ui-2": "^8.7.0",
     "@types/luxon": "^1.15.2",
     "luxon": "^1.21.1"
   },
   "devDependencies": {
-    "@lysaab/ui-2": "^8.7.0",
+    "@lysaab/ui-2": "^16.3.2",
     "@types/jest": "24.0.20",
     "@types/luxon": "^1.15.2",
     "@types/node": "12.11.7",

package/src/components/CountrySelect.tsx

@@ -16,7 +16,7 @@ export interface Country {
 
 interface Props extends ValidationProps {
   value?: string;
-  onChange?(value: Alternative): void;
+  onChange?(value: Alternative<string>): void;
   label: string;
   removeSweden?: boolean;
 }
@@ -29,11 +29,7 @@ export const CountrySelect: FunctionComponent<Props> = ({
   const [countryAlternatives] = useState(
     countries
       .filter(country => !(removeSweden && country.value === "SE"))
-      .map(
-        (country): Alternative => {
-          return { text: country.label, value: country.value };
-        }
-      )
+      .map(country => ({ text: country.label, value: country.value }))
   );
 
   return (

package/src/components/PepAnswers.scss

@@ -1,7 +1,7 @@
-.static-input {
-  margin-bottom: 8px;
-
-  .label {
-    font-weight: bold;
-  }
-}
+.static-input {
+  margin-bottom: 8px;
+
+  .label {
+    font-weight: bold;
+  }
+}