@lysaab/lysa-pep 0.13.0 → 0.14.1

package/src/pages/PepIsPepPage.tsx

@@ -2,14 +2,14 @@ import React, {
   FunctionComponent,
   useRef,
   useCallback,
-  useContext
+  useContext,
 } from "react";
 import {
   Form,
   RadioGroup,
   RequiredValidator,
   PrimaryButton,
-  LysaFormRef
+  LysaFormRef,
 } from "@lysaab/ui-2";
 import { PepType, PepContext, EntityType } from "./PepContext";
 import { LABELS } from "../model/PepTexts";
@@ -26,17 +26,17 @@ export const PepIsPepPage: FunctionComponent<Props> = ({ next }) => {
   const IsPepAlternatives = [
     {
       text: labels[entityType].GENERIC.IS_PEP[PepType.NOT_PEP],
-      value: PepType.NOT_PEP
+      value: PepType.NOT_PEP,
     },
     { text: labels[entityType].GENERIC.IS_PEP[PepType.ME], value: PepType.ME },
     {
       text: labels[entityType].GENERIC.IS_PEP[PepType.RELATIVE],
-      value: PepType.RELATIVE
+      value: PepType.RELATIVE,
     },
     {
       text: labels[entityType].GENERIC.IS_PEP[PepType.COLLEAGUE],
-      value: PepType.COLLEAGUE
-    }
+      value: PepType.COLLEAGUE,
+    },
   ];
 
   const nextPage = useCallback(() => {
@@ -61,7 +61,7 @@ export const PepIsPepPage: FunctionComponent<Props> = ({ next }) => {
       militaryRank: undefined,
       nameOfPEP: undefined,
       relationToPEP: undefined,
-      role: undefined
+      role: undefined,
     });
   }, [pepContext]);
 
@@ -69,15 +69,13 @@ export const PepIsPepPage: FunctionComponent<Props> = ({ next }) => {
     <Form onSubmit={() => nextPage()} lysaFormRef={formRef}>
       <RadioGroup
         alternatives={IsPepAlternatives}
-        onChange={event => {
-          pepContext.setState({
-            type: event.value ? (event.value.value as PepType) : undefined
-          });
+        onChange={alternative => {
+          pepContext.setState({ type: alternative.value });
           resetValues();
         }}
-        value={
-          IsPepAlternatives.find(alt => alt.value === pepContext.state.type)
-        }
+        value={IsPepAlternatives.find(
+          alt => alt.value === pepContext.state.type
+        )}
         header={labels[entityType].GENERIC.IS_PEP_HEADER}
         validators={[RequiredValidator("Du måste välja ett alternativ")]}
       />

package/src/pages/PepRelationPage.tsx

@@ -2,14 +2,14 @@ import React, {
   useContext,
   useRef,
   useCallback,
-  FunctionComponent
+  FunctionComponent,
 } from "react";
 import {
   PepContext,
   PepType,
   BusinessRelation,
   Relation,
-  EntityType
+  EntityType,
 } from "./PepContext";
 import {
   LysaFormRef,
@@ -19,7 +19,7 @@ import {
   RequiredValidator,
   TextInput,
   Datepicker,
-  PrimaryButton
+  PrimaryButton,
 } from "@lysaab/ui-2";
 import { LABELS } from "../model/PepTexts";
 import { DateTime } from "luxon";
@@ -37,65 +37,65 @@ export const PepRelationPage: FunctionComponent<Props> = ({ next }) => {
   const type = pepContext.state.type;
   const labels = LABELS(pepContext.state.ownerName);
 
-  const businessRelationAlternatives: Alternative[] = [
+  const businessRelationAlternatives: Alternative<BusinessRelation>[] = [
     {
       text:
         labels[entityType][PepType.COLLEAGUE].BUSINESS_RELATION[
           BusinessRelation.CO_OWNERSHIP
         ],
-      value: BusinessRelation.CO_OWNERSHIP
+      value: BusinessRelation.CO_OWNERSHIP,
     },
     {
       text:
         labels[entityType][PepType.COLLEAGUE].BUSINESS_RELATION[
           BusinessRelation.CLOSE_CONNECTION
         ],
-      value: BusinessRelation.CLOSE_CONNECTION
+      value: BusinessRelation.CLOSE_CONNECTION,
     },
     {
       text:
         labels[entityType][PepType.COLLEAGUE].BUSINESS_RELATION[
           BusinessRelation.COMPANY_FOR_PEP
         ],
-      value: BusinessRelation.COMPANY_FOR_PEP
-    }
+      value: BusinessRelation.COMPANY_FOR_PEP,
+    },
   ];
 
-  const relationAlternatives: Alternative[] = [
+  const relationAlternatives: Alternative<Relation>[] = [
     {
       text:
         labels[entityType][PepType.RELATIVE].RELATION[Relation.MARRIED_PARTNER],
-      value: Relation.MARRIED_PARTNER
+      value: Relation.MARRIED_PARTNER,
     },
     {
       text:
         labels[entityType][PepType.RELATIVE].RELATION[
           Relation.COLIVING_PARTNER
         ],
-      value: Relation.COLIVING_PARTNER
+      value: Relation.COLIVING_PARTNER,
     },
     {
       text: labels[entityType][PepType.RELATIVE].RELATION[Relation.CHILD],
-      value: Relation.CHILD
+      value: Relation.CHILD,
     },
     {
       text: labels[entityType][PepType.RELATIVE].RELATION[Relation.PARENT],
-      value: Relation.PARENT
+      value: Relation.PARENT,
     },
     {
       text:
         labels[entityType][PepType.RELATIVE].RELATION[
           Relation.CHILD_MARRIED_PARTNER
         ],
-      value: Relation.CHILD_MARRIED_PARTNER
+      value: Relation.CHILD_MARRIED_PARTNER,
     },
     {
       text:
         labels[entityType][PepType.RELATIVE].RELATION[
           Relation.CHILD_COLIVING_PARTNER
         ],
-      value: Relation.CHILD_COLIVING_PARTNER
-    }
+      value: Relation.CHILD_COLIVING_PARTNER,
+    },
   ];
 
   const nextPage = useCallback(() => {
@@ -108,11 +108,9 @@ export const PepRelationPage: FunctionComponent<Props> = ({ next }) => {
       {type === PepType.RELATIVE ? (
         <RadioGroup
           alternatives={relationAlternatives}
-          onChange={event => {
+          onChange={alternative => {
             pepContext.setState({
-              relationToPEP: event.value
-                ? (event.value.value as Relation)
-                : undefined
+              relationToPEP: alternative.value,
             });
           }}
           value={relationAlternatives.find(
@@ -125,11 +123,9 @@ export const PepRelationPage: FunctionComponent<Props> = ({ next }) => {
       {type === PepType.COLLEAGUE ? (
         <RadioGroup
           alternatives={businessRelationAlternatives}
-          onChange={event => {
+          onChange={alternative => {
             pepContext.setState({
-              businessRelation: event.value
-                ? (event.value.value as BusinessRelation)
-                : undefined
+              businessRelation: alternative.value,
             });
           }}
           value={businessRelationAlternatives.find(
@@ -148,8 +144,8 @@ export const PepRelationPage: FunctionComponent<Props> = ({ next }) => {
               ]
             }
             value={pepContext.state.nameOfPEP || ""}
-            onChange={event => {
-              pepContext.setState({ nameOfPEP: event.value });
+            onChange={value => {
+              pepContext.setState({ nameOfPEP: value });
             }}
             validators={[RequiredValidator("Du måste ange namn")]}
           />
@@ -179,8 +175,8 @@ export const PepRelationPage: FunctionComponent<Props> = ({ next }) => {
               ]
             }
             value={pepContext.state.nameOfPEP || ""}
-            onChange={event => {
-              pepContext.setState({ nameOfPEP: event.value });
+            onChange={value => {
+              pepContext.setState({ nameOfPEP: value });
             }}
             validators={[RequiredValidator("Du måste ange namn")]}
           />

package/src/pages/PepRolePage.tsx

@@ -2,7 +2,7 @@ import React, {
   FunctionComponent,
   useRef,
   useCallback,
-  useContext
+  useContext,
 } from "react";
 import { Alternative } from "@lysaab/ui-2/components/input/InputAPI";
 import {
@@ -11,7 +11,7 @@ import {
   PrimaryButton,
   RequiredValidator,
   TextInput,
-  Select
+  Select,
 } from "@lysaab/ui-2";
 import {
   PepContext,
@@ -21,76 +21,84 @@ import {
   PepType,
 } from "./PepContext";
 import { CountrySelect } from "../components/CountrySelect";
-import { getGovernmentCompanyNameLabel, getGovernmentCompanyRoleLabel, getHighRankingPositionIntCorpNameLabel, getHighRankingPositionIntCorpRoleLabel, getMilitaryRankLabel, getRoleLabel, getAmbassadorLabel } from "../model/PepTexts";
+import {
+  getGovernmentCompanyNameLabel,
+  getGovernmentCompanyRoleLabel,
+  getHighRankingPositionIntCorpNameLabel,
+  getHighRankingPositionIntCorpRoleLabel,
+  getMilitaryRankLabel,
+  getRoleLabel,
+  getAmbassadorLabel,
+} from "../model/PepTexts";
 
 interface Props {
   next: () => void;
 }
 
-export const roleAlternatives: Alternative[] = [
+export const roleAlternatives: Alternative<Role>[] = [
   { 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
+    value: Role.CENTRAL_BANK_MEMBER,
   },
   {
     text: "Ledamot för styrelsen i politiskt parti representerade i riksdagen",
-    value: Role.BOARD_MEMBER_POLITICAL_PARTY
+    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
+    value: Role.JUDGE_OTHER_HIGH_COURT,
   },
   {
     text: "Högre tjänsteman vid revisionsmyndighet",
-    value: Role.REVISION_INSTITUTE
+    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
+    value: Role.GOVERNMENT_COMPANY,
   },
   {
     text: "EU-parlamentariker",
-    value: Role.EU_HIGH_RANKING_POSITION
+    value: Role.EU_HIGH_RANKING_POSITION,
   },
   {
     text: "Befattning på hög nivå i en internationell organisation",
-    value: Role.HIGH_RANKING_POSITION_INTERNALTIONAL_CORP
-  }
+    value: Role.HIGH_RANKING_POSITION_INTERNALTIONAL_CORP,
+  },
 ];
 
-export const militaryAlternatives: Alternative[] = [
+export const militaryAlternatives: Alternative<MilitaryRank>[] = [
   {
     text: "General",
-    value: MilitaryRank.GENERAL
+    value: MilitaryRank.GENERAL,
   },
   {
     text: "Generallöjtnant",
-    value: MilitaryRank.LIEUTENANT_GENERAL
+    value: MilitaryRank.LIEUTENANT_GENERAL,
   },
   {
     text: "Generalmajor",
-    value: MilitaryRank.MAJOR_GENERAL
+    value: MilitaryRank.MAJOR_GENERAL,
   },
   {
     text: "Amiral",
-    value: MilitaryRank.ADMIRAL
+    value: MilitaryRank.ADMIRAL,
   },
   {
     text: "Viceamiral",
-    value: MilitaryRank.VICE_ADMIRAL
+    value: MilitaryRank.VICE_ADMIRAL,
   },
   {
     text: "Konteramiral",
-    value: MilitaryRank.REAR_ADMIRAL
-  }
+    value: MilitaryRank.REAR_ADMIRAL,
+  },
 ];
 
 export const PepRolePage: FunctionComponent<Props> = ({ next }) => {
@@ -112,7 +120,7 @@ export const PepRolePage: FunctionComponent<Props> = ({ next }) => {
       governmentCompanyRole: undefined,
       internationalOrganisation: undefined,
       internationalOrganisationRole: undefined,
-      militaryRank: undefined
+      militaryRank: undefined,
     });
   }, [pepContext]);
 
@@ -155,7 +163,7 @@ export const PepRolePage: FunctionComponent<Props> = ({ next }) => {
             pepContext.setState({
               ambassadorCountry: event.value
                 ? event.value.toString()
-                : undefined
+                : undefined,
             })
           }
           value={pepContext.state.ambassadorCountry}
@@ -175,8 +183,8 @@ export const PepRolePage: FunctionComponent<Props> = ({ next }) => {
               pepContext.state.ownerName
             )}
             value={pepContext.state.governmentCompany || ""}
-            onChange={event => {
-              pepContext.setState({ governmentCompany: event.value });
+            onChange={value => {
+              pepContext.setState({ governmentCompany: value });
             }}
             validators={[RequiredValidator("Du måste ange ett namn")]}
           />
@@ -189,9 +197,9 @@ export const PepRolePage: FunctionComponent<Props> = ({ next }) => {
               pepContext.state.ownerName
             )}
             value={pepContext.state.governmentCompanyRole || ""}
-            onChange={event => {
+            onChange={value => {
               pepContext.setState({
-                governmentCompanyRole: event.value
+                governmentCompanyRole: value,
               });
             }}
             validators={[RequiredValidator("Du måste ange roll")]}
@@ -212,8 +220,8 @@ export const PepRolePage: FunctionComponent<Props> = ({ next }) => {
               pepContext.state.ownerName
             )}
             value={pepContext.state.internationalOrganisation || ""}
-            onChange={event => {
-              pepContext.setState({ internationalOrganisation: event.value });
+            onChange={value => {
+              pepContext.setState({ internationalOrganisation: value });
             }}
             validators={[RequiredValidator("Du måste ange ett namn")]}
           />
@@ -226,9 +234,9 @@ export const PepRolePage: FunctionComponent<Props> = ({ next }) => {
               pepContext.state.ownerName
             )}
             value={pepContext.state.internationalOrganisationRole || ""}
-            onChange={event => {
+            onChange={value => {
               pepContext.setState({
-                internationalOrganisationRole: event.value
+                internationalOrganisationRole: value,
               });
             }}
             validators={[RequiredValidator("Du måste ange roll")]}

package/src/pages/PepStatusPage.tsx

@@ -1,143 +1,132 @@
-import React, {
-  FunctionComponent,
-  useRef,
-  useCallback,
-  useContext
-} from "react";
-import {
-  Form,
-  RadioGroup,
-  RequiredValidator,
-  PrimaryButton,
-  LysaFormRef,
-  Datepicker
-} from "@lysaab/ui-2";
-import {
-  Alternative,
-  InputEvent
-} from "@lysaab/ui-2/components/input/InputAPI";
-import { PepContext, PepStatus } from "./PepContext";
-import { CountrySelect } from "../components/CountrySelect";
-
-const stateAlternatives: Alternative[] = [
-  {
-    text: "Pågående",
-    value: PepStatus.ONGOING
-  },
-  {
-    text: "Avslutad",
-    value: PepStatus.ENDED
-  }
-];
-
-const isSwedenAlternatives: Alternative[] = [
-  { text: "Sverige", value: "sweden" },
-  { text: "Annat", value: "other" }
-];
-
-interface Props {
-  next: () => void;
-}
-
-export const PepStatusPage: FunctionComponent<Props> = ({ next }) => {
-  const pepContext = useContext(PepContext);
-  const formRef = useRef<LysaFormRef>();
-
-  const nextPage = useCallback(() => {
-    if (formRef.current && formRef.current.isValid) {
-      next();
-    }
-  }, [formRef, next]);
-
-  const updateIsSweden = useCallback(
-    (event: InputEvent<Alternative>) => {
-      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: InputEvent<Alternative>) => {
-      pepContext.setState({
-        isOngoing:
-          event.value && event.value.value
-            ? (event.value.value as PepStatus)
-            : undefined
-      });
-      if (event.value && event.value.value === PepStatus.ONGOING) {
-        pepContext.setState({ ended: undefined });
-      }
-    },
-    [pepContext]
-  );
-
-  return (
-    <div>
-      <Form
-        lysaFormRef={formRef}
-        onSubmit={() => {
-          nextPage();
-        }}
-      >
-        <RadioGroup
-          alternatives={stateAlternatives}
-          header="Är befattningen pågående 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 ? (
-          <Datepicker
-            label="När avslutades uppdraget?"
-            selected={pepContext.state.ended}
-            onChange={event =>
-              pepContext.setState({ ended: event || undefined })
-            }
-            validators={[RequiredValidator("Du måste ange fördelsedag")]}
-            showMonthYearPicker
-            dateFormat="yyyy-MM"
-            maxDate={new Date()}
-          />
-        ) : null}
-
-        <RadioGroup
-          alternatives={isSwedenAlternatives}
-          header="I vilket land är 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" ? (
-          <CountrySelect
-            label="Välj i vilket land befattningen är" 
-            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}
-
-        <PrimaryButton type="submit">Nästa</PrimaryButton>
-      </Form>
-    </div>
-  );
-};
+import React, {
+  FunctionComponent,
+  useRef,
+  useCallback,
+  useContext,
+} from "react";
+import {
+  Form,
+  RadioGroup,
+  RequiredValidator,
+  PrimaryButton,
+  LysaFormRef,
+  Datepicker,
+} from "@lysaab/ui-2";
+import { Alternative } from "@lysaab/ui-2/components/input/InputAPI";
+import { PepContext, PepStatus } from "./PepContext";
+import { CountrySelect } from "../components/CountrySelect";
+
+const stateAlternatives: Alternative<PepStatus>[] = [
+  {
+    text: "Pågående",
+    value: PepStatus.ONGOING,
+  },
+  {
+    text: "Avslutad",
+    value: PepStatus.ENDED,
+  },
+];
+
+const isSwedenAlternatives: Alternative<string>[] = [
+  { text: "Sverige", value: "sweden" },
+  { text: "Annat", value: "other" },
+];
+
+interface Props {
+  next: () => void;
+}
+
+export const PepStatusPage: FunctionComponent<Props> = ({ next }) => {
+  const pepContext = useContext(PepContext);
+  const formRef = useRef<LysaFormRef>();
+
+  const nextPage = useCallback(() => {
+    if (formRef.current && formRef.current.isValid) {
+      next();
+    }
+  }, [formRef, next]);
+
+  const updateIsSweden = useCallback(
+    (alternative: Alternative<string>) => {
+      pepContext.setState({ isSweden: alternative.value });
+
+      if (alternative.value === "other") {
+        pepContext.setState({ country: undefined });
+      }
+    },
+    [pepContext]
+  );
+
+  const updateIsOngoing = useCallback(
+    (alternative: Alternative<PepStatus>) => {
+      pepContext.setState({ isOngoing: alternative.value });
+
+      if (alternative.value === PepStatus.ONGOING) {
+        pepContext.setState({ ended: undefined });
+      }
+    },
+    [pepContext]
+  );
+
+  return (
+    <div>
+      <Form
+        lysaFormRef={formRef}
+        onSubmit={() => {
+          nextPage();
+        }}
+      >
+        <RadioGroup
+          alternatives={stateAlternatives}
+          header="Är befattningen pågående 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 ? (
+          <Datepicker
+            label="När avslutades uppdraget?"
+            selected={pepContext.state.ended}
+            onChange={event =>
+              pepContext.setState({ ended: event || undefined })
+            }
+            validators={[RequiredValidator("Du måste ange fördelsedag")]}
+            showMonthYearPicker
+            dateFormat="yyyy-MM"
+            maxDate={new Date()}
+          />
+        ) : null}
+
+        <RadioGroup
+          alternatives={isSwedenAlternatives}
+          header="I vilket land är 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" ? (
+          <CountrySelect
+            label="Välj i vilket land befattningen är"
+            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}
+
+        <PrimaryButton type="submit">Nästa</PrimaryButton>
+      </Form>
+    </div>
+  );
+};