@lysaab/lysa-pep 0.14.1 → 0.15.0

package/lib/Exports.d.ts

@@ -1,7 +1,7 @@
 export * from "./pages/PepContext";
 export * from "./model/PepModel";
 export * from "./model/PepTexts";
-export { PepIsPepPage } from "./pages/PepIsPepPage";
+export * from "./pages/PepIsPepPage";
 export { PepRelationPage } from "./pages/PepRelationPage";
 export { PepRolePage, militaryAlternatives, roleAlternatives } from "./pages/PepRolePage";
 export { PepStatusPage } from "./pages/PepStatusPage";

package/lib/Exports.js

@@ -1,7 +1,7 @@
 export * from "./pages/PepContext";
 export * from "./model/PepModel";
 export * from "./model/PepTexts";
-export { PepIsPepPage } from "./pages/PepIsPepPage";
+export * from "./pages/PepIsPepPage";
 export { PepRelationPage } from "./pages/PepRelationPage";
 export { PepRolePage, militaryAlternatives, roleAlternatives } from "./pages/PepRolePage";
 export { PepStatusPage } from "./pages/PepStatusPage";

package/lib/model/PepTexts.js

@@ -129,7 +129,7 @@ export const LABELS = (name) => {
                 },
                 ROLE_LABEL: {
                     [BusinessRelation.CO_OWNERSHIP]: `Ange tjänst/roll för personen i politisk utsatt ställning som du har en relation till`,
-                    [BusinessRelation.CLOSE_CONNECTION]: `AngeAnge tjänst/roll för personen i politisk utsatt ställning som du har en relation till`,
+                    [BusinessRelation.CLOSE_CONNECTION]: `Ange tjänst/roll för personen i politisk utsatt ställning som du har en relation till`,
                     [BusinessRelation.COMPANY_FOR_PEP]: `Ange tjänst/roll för personen i politisk utsatt ställning som du har en relation till`
                 },
                 AMBASSADOR_LABEL: {

package/lib/pages/PepContext.d.ts

@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from "react";
+import React from "react";
 export declare enum EntityType {
     PERSON = "PERSON",
     CORPORATION = "CORPORATION"
@@ -70,10 +70,11 @@ export interface PepState {
     isSweden?: string;
     ownerName?: string;
 }
+export declare const EMPTY_PEP_STATE: PepState;
 export interface PepContextProps {
     state: PepState;
     setState: (newState: Partial<PepState>) => void;
 }
 export declare const PepContext: React.Context<PepContextProps>;
 export declare const withPep: <P extends object>(Component: React.ComponentType<P>) => React.FC<Pick<P, Exclude<keyof P, "state" | "setState">>>;
-export declare const PepContextProvider: FunctionComponent;
+export declare const PepContextProvider: React.FC;

package/lib/pages/PepContext.js

@@ -56,6 +56,27 @@ export var MilitaryRank;
     MilitaryRank["VICE_ADMIRAL"] = "VICE_ADMIRAL";
     MilitaryRank["REAR_ADMIRAL"] = "REAR_ADMIRAL";
 })(MilitaryRank || (MilitaryRank = {}));
+export const EMPTY_PEP_STATE = {
+    legalEntityType: undefined,
+    type: undefined,
+    role: undefined,
+    country: undefined,
+    ended: undefined,
+    ambassadorCountry: undefined,
+    militaryRank: undefined,
+    governmentCompany: undefined,
+    governmentCompanyRole: undefined,
+    internationalOrganisation: undefined,
+    internationalOrganisationRole: undefined,
+    relationToPEP: undefined,
+    nameOfPEP: undefined,
+    birthdayOfPEP: undefined,
+    tin: undefined,
+    businessRelation: undefined,
+    isOngoing: undefined,
+    isSweden: undefined,
+    ownerName: undefined,
+};
 export const PepContext = React.createContext({});
 export const withPep = (Component) => props => (React.createElement(PepContext.Consumer, null, contextProps => React.createElement(Component, Object.assign({}, props, contextProps))));
 function stateReducer(state, newState) {

package/lib/pages/PepIsPepPage.d.ts

@@ -1,6 +1,14 @@
 import { FunctionComponent } from "react";
+import { PepType, EntityType } from "./PepContext";
+export interface ExternalIsPepState {
+    ownerName: string;
+    entityType: EntityType;
+    type?: PepType;
+    onChange: (type: PepType) => void;
+}
 interface Props {
-    next: () => void;
+    next?: () => void;
+    external?: ExternalIsPepState;
 }
 export declare const PepIsPepPage: FunctionComponent<Props>;
 export {};

package/lib/pages/PepIsPepPage.js

@@ -2,11 +2,12 @@ import React, { useRef, useCallback, useContext, } from "react";
 import { Form, RadioGroup, RequiredValidator, PrimaryButton, } from "@lysaab/ui-2";
 import { PepType, PepContext, EntityType } from "./PepContext";
 import { LABELS } from "../model/PepTexts";
-export const PepIsPepPage = ({ next }) => {
+export const PepIsPepPage = ({ next, external }) => {
+    var _a, _b;
     const pepContext = useContext(PepContext);
     const formRef = useRef();
-    const entityType = pepContext.state.legalEntityType || EntityType.PERSON;
-    const labels = LABELS(pepContext.state.ownerName);
+    const entityType = ((_a = external) === null || _a === void 0 ? void 0 : _a.entityType) || pepContext.state.legalEntityType || EntityType.PERSON;
+    const labels = LABELS(((_b = external) === null || _b === void 0 ? void 0 : _b.ownerName) || pepContext.state.ownerName);
     const IsPepAlternatives = [
         {
             text: labels[entityType].GENERIC.IS_PEP[PepType.NOT_PEP],
@@ -23,7 +24,7 @@ export const PepIsPepPage = ({ next }) => {
         },
     ];
     const nextPage = useCallback(() => {
-        if (formRef.current && formRef.current.isValid) {
+        if (formRef.current && formRef.current.isValid && next) {
             next();
         }
     }, [formRef, next]);
@@ -46,10 +47,15 @@ export const PepIsPepPage = ({ next }) => {
             role: undefined,
         });
     }, [pepContext]);
-    return (React.createElement(Form, { onSubmit: () => nextPage(), lysaFormRef: formRef },
+    return (React.createElement(Form, { onSubmit: nextPage, lysaFormRef: formRef },
         React.createElement(RadioGroup, { alternatives: IsPepAlternatives, onChange: alternative => {
-                pepContext.setState({ type: alternative.value });
-                resetValues();
-            }, 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")] }),
-        React.createElement(PrimaryButton, { type: "submit" }, "N\u00E4sta")));
+                if (external) {
+                    external.onChange(alternative.value);
+                }
+                else {
+                    pepContext.setState({ type: alternative.value });
+                    resetValues();
+                }
+            }, value: IsPepAlternatives.find(alt => { var _a; return alt.value === (((_a = external) === null || _a === void 0 ? void 0 : _a.type) || pepContext.state.type); }), header: labels[entityType].GENERIC.IS_PEP_HEADER, validators: [RequiredValidator("Du måste välja ett alternativ")] }),
+        next && React.createElement(PrimaryButton, { type: "submit" }, "N\u00E4sta")));
 };

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "@lysaab/lysa-pep",
   "author": "Lysa AB",
-  "version": "0.14.1",
+  "version": "0.15.0",
   "main": "./lib/Exports.js",
   "dependencies": {
     "@types/luxon": "^1.15.2",
     "luxon": "^1.21.1"
   },
   "devDependencies": {
-    "@lysaab/ui-2": "^16.3.2",
     "@types/jest": "24.0.20",
     "@types/luxon": "^1.15.2",
     "@types/node": "12.11.7",
@@ -21,6 +20,9 @@
     "react-scripts": "3.2.0",
     "typescript": "^3.7.2"
   },
+  "peerDependencies": {
+    "@lysaab/ui-2": "^16.3.2"
+  },
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",

package/src/Exports.ts

@@ -1,8 +1,7 @@
 export * from "./pages/PepContext";
 export * from "./model/PepModel";
 export * from "./model/PepTexts";
-
-export { PepIsPepPage } from "./pages/PepIsPepPage";
+export * from "./pages/PepIsPepPage";
 export { PepRelationPage } from "./pages/PepRelationPage";
 export {
   PepRolePage,

package/src/model/PepModel.ts

@@ -8,8 +8,8 @@ export interface PepRequest
 }
 
 /**
- *
- * Do some minor preprocessing before we are ready to sen everything to the server
+ * Do some minor preprocessing before we are ready to send everything to the
+ * server
  */
 export function stateToRequest(pepData: PepState): PepRequest {
   const data = { ...pepData };

package/src/model/PepTexts.ts

@@ -138,7 +138,7 @@ export const LABELS = (name?: string) => {
         },
         ROLE_LABEL: {
           [BusinessRelation.CO_OWNERSHIP]: `Ange tjänst/roll för personen i politisk utsatt ställning som du har en relation till`,
-          [BusinessRelation.CLOSE_CONNECTION]: `AngeAnge tjänst/roll för personen i politisk utsatt ställning som du har en relation till`,
+          [BusinessRelation.CLOSE_CONNECTION]: `Ange tjänst/roll för personen i politisk utsatt ställning som du har en relation till`,
           [BusinessRelation.COMPANY_FOR_PEP]: `Ange tjänst/roll för personen i politisk utsatt ställning som du har en relation till`
         },
         AMBASSADOR_LABEL: {

package/src/pages/PepContext.tsx

@@ -1,20 +1,20 @@
-import React, { FunctionComponent, useReducer } from "react";
+import React, { useReducer } from "react";
 
 export enum EntityType {
   PERSON = "PERSON",
-  CORPORATION = "CORPORATION"
+  CORPORATION = "CORPORATION",
 }
 
 export enum PepType {
   NOT_PEP = "NOT_PEP",
   ME = "ME",
   RELATIVE = "RELATIVE",
-  COLLEAGUE = "COLLEAGUE"
+  COLLEAGUE = "COLLEAGUE",
 }
 
 export enum PepStatus {
   ONGOING = "ONGOING",
-  ENDED = "ENDED"
+  ENDED = "ENDED",
 }
 
 export enum Role {
@@ -30,7 +30,7 @@ export enum Role {
   MILITARY_OFFICER = "MILITARY_OFFICER",
   GOVERNMENT_COMPANY = "GOVERNMENT_COMPANY",
   EU_HIGH_RANKING_POSITION = "EU_HIGH_RANKING_POSITION",
-  HIGH_RANKING_POSITION_INTERNALTIONAL_CORP = "HIGH_RANKING_POSITION_INTERNALTIONAL_CORP"
+  HIGH_RANKING_POSITION_INTERNALTIONAL_CORP = "HIGH_RANKING_POSITION_INTERNALTIONAL_CORP",
 }
 
 export enum Relation {
@@ -39,13 +39,13 @@ export enum Relation {
   CHILD = "CHILD",
   PARENT = "PARENT",
   CHILD_MARRIED_PARTNER = "CHILD_MARRIED_PARTNER",
-  CHILD_COLIVING_PARTNER = "CHILD_COLIVING_PARTNER"
+  CHILD_COLIVING_PARTNER = "CHILD_COLIVING_PARTNER",
 }
 
 export enum BusinessRelation {
   CO_OWNERSHIP = "CO_OWNERSHIP",
   CLOSE_CONNECTION = "CLOSE_CONNECTION",
-  COMPANY_FOR_PEP = "COMPANY_FOR_PEP"
+  COMPANY_FOR_PEP = "COMPANY_FOR_PEP",
 }
 
 export enum MilitaryRank {
@@ -54,7 +54,7 @@ export enum MilitaryRank {
   MAJOR_GENERAL = "MAJOR_GENERAL",
   ADMIRAL = "ADMIRAL",
   VICE_ADMIRAL = "VICE_ADMIRAL",
-  REAR_ADMIRAL = "REAR_ADMIRAL"
+  REAR_ADMIRAL = "REAR_ADMIRAL",
 }
 
 // Types for the state
@@ -81,6 +81,29 @@ export interface PepState {
   ownerName?: string;
 }
 
+export const EMPTY_PEP_STATE: PepState = {
+  legalEntityType: undefined,
+  type: undefined,
+  role: undefined,
+  country: undefined,
+  ended: undefined,
+  ambassadorCountry: undefined,
+  militaryRank: undefined,
+  governmentCompany: undefined,
+  governmentCompanyRole: undefined,
+  internationalOrganisation: undefined,
+  internationalOrganisationRole: undefined,
+  relationToPEP: undefined,
+  nameOfPEP: undefined,
+  birthdayOfPEP: undefined,
+  tin: undefined,
+  businessRelation: undefined,
+
+  isOngoing: undefined,
+  isSweden: undefined,
+  ownerName: undefined,
+};
+
 // All types for the context. This includes setter methods
 export interface PepContextProps {
   state: PepState;
@@ -110,7 +133,7 @@ function stateReducer(state: PepState, newState: Partial<PepState>) {
   return { ...state, ...newState };
 }
 
-export const PepContextProvider: FunctionComponent = ({ children }) => {
+export const PepContextProvider: React.FC = ({ children }) => {
   const [pep, setPep] = useReducer(stateReducer, {});
 
   return (

package/src/pages/PepIsPepPage.tsx

@@ -14,14 +14,24 @@ import {
 import { PepType, PepContext, EntityType } from "./PepContext";
 import { LABELS } from "../model/PepTexts";
 
+export interface ExternalIsPepState {
+  ownerName: string;
+  entityType: EntityType;
+  type?: PepType;
+  onChange: (type: PepType) => void;
+}
+
 interface Props {
-  next: () => void;
+  next?: () => void;
+  external?: ExternalIsPepState;
 }
-export const PepIsPepPage: FunctionComponent<Props> = ({ next }) => {
+
+export const PepIsPepPage: FunctionComponent<Props> = ({ next, external }) => {
   const pepContext = useContext(PepContext);
   const formRef = useRef<LysaFormRef>();
-  const entityType = pepContext.state.legalEntityType || EntityType.PERSON;
-  const labels = LABELS(pepContext.state.ownerName);
+  const entityType =
+    external?.entityType || pepContext.state.legalEntityType || EntityType.PERSON;
+  const labels = LABELS(external?.ownerName || pepContext.state.ownerName);
 
   const IsPepAlternatives = [
     {
@@ -40,7 +50,7 @@ export const PepIsPepPage: FunctionComponent<Props> = ({ next }) => {
   ];
 
   const nextPage = useCallback(() => {
-    if (formRef.current && formRef.current.isValid) {
+    if (formRef.current && formRef.current.isValid && next) {
       next();
     }
   }, [formRef, next]);
@@ -66,21 +76,25 @@ export const PepIsPepPage: FunctionComponent<Props> = ({ next }) => {
   }, [pepContext]);
 
   return (
-    <Form onSubmit={() => nextPage()} lysaFormRef={formRef}>
+    <Form onSubmit={nextPage} lysaFormRef={formRef}>
       <RadioGroup
         alternatives={IsPepAlternatives}
         onChange={alternative => {
-          pepContext.setState({ type: alternative.value });
-          resetValues();
+          if (external) {
+            external.onChange(alternative.value);
+          } else {
+            pepContext.setState({ type: alternative.value });
+            resetValues();
+          }
         }}
         value={IsPepAlternatives.find(
-          alt => alt.value === pepContext.state.type
+          alt => alt.value === (external?.type || pepContext.state.type)
         )}
         header={labels[entityType].GENERIC.IS_PEP_HEADER}
         validators={[RequiredValidator("Du måste välja ett alternativ")]}
       />
 
-      <PrimaryButton type="submit">Nästa</PrimaryButton>
+      {next && <PrimaryButton type="submit">Nästa</PrimaryButton>}
     </Form>
   );
 };