@lysaab/lysa-pep 0.7.0 → 0.8.0

package/lib/Exports.d.ts

@@ -3,5 +3,5 @@ export * from './model/PepModel';
 export * from './model/PepTexts';
 export { PepIsPepPage } from './pages/PepIsPepPage';
 export { PepRelationPage } from './pages/PepRelationPage';
-export { PepRolePage } from './pages/PepRolePage';
+export { PepRolePage, militaryAlternatives, roleAlternatives } from './pages/PepRolePage';
 export { PepStatusPage } from './pages/PepStatusPage';

package/lib/Exports.js

@@ -3,5 +3,5 @@ export * from './model/PepModel';
 export * from './model/PepTexts';
 export { PepIsPepPage } from './pages/PepIsPepPage';
 export { PepRelationPage } from './pages/PepRelationPage';
-export { PepRolePage } from './pages/PepRolePage';
+export { PepRolePage, militaryAlternatives, roleAlternatives } from './pages/PepRolePage';
 export { PepStatusPage } from './pages/PepStatusPage';

package/lib/model/PepTexts.js

@@ -1,7 +1,7 @@
 import { PepType, EntityType, BusinessRelation, Relation } from "../pages/PepContext";
 export const LABELS = (name) => {
     let possessiveName = name;
-    if (possessiveName && possessiveName[possessiveName.length - 1] !== "s") {
+    if (possessiveName && possessiveName[possessiveName.length - 1] !== "s" && possessiveName[possessiveName.length - 1] !== "z" && possessiveName[possessiveName.length - 1] !== "x") {
         possessiveName += "s";
     }
     return {

package/lib/pages/PepRolePage.d.ts

@@ -1,6 +1,9 @@
 import { FunctionComponent } from "react";
+import { Alternative } from "@lysaab/ui-2/components/input/InputAPI";
 interface Props {
     next: () => void;
 }
+export declare const roleAlternatives: Alternative[];
+export declare const militaryAlternatives: Alternative[];
 export declare const PepRolePage: FunctionComponent<Props>;
 export {};

package/lib/pages/PepRolePage.js

@@ -3,7 +3,7 @@ import { Form, PrimaryButton, RequiredValidator, TextInput, Select } from "@lysa
 import { PepContext, Role, MilitaryRank, EntityType, PepType, } from "./PepContext";
 import { CountrySelect } from "../components/CountrySelect";
 import { getGovernmentCompanyNameLabel, getGovernmentCompanyRoleLabel, getHighRankingPositionIntCorpNameLabel, getHighRankingPositionIntCorpRoleLabel, getMilitaryRankLabel, getRoleLabel, getAmbassadorLabel } from "../model/PepTexts";
-const roleAlternatives = [
+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 },
@@ -39,7 +39,7 @@ const roleAlternatives = [
         value: Role.HIGH_RANKING_POSITION_INTERNALTIONAL_CORP
     }
 ];
-const militaryAlternatives = [
+export const militaryAlternatives = [
     {
         text: "General",
         value: MilitaryRank.GENERAL

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lysaab/lysa-pep",
   "author": "Lysa AB",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "main": "./lib/Exports.js",
   "dependencies": {
     "@lysaab/ui-2": "^8.7.0",

package/src/Exports.ts

@@ -4,5 +4,5 @@ export * from './model/PepTexts';
 
 export { PepIsPepPage } from './pages/PepIsPepPage';
 export { PepRelationPage } from './pages/PepRelationPage';
-export { PepRolePage } from './pages/PepRolePage';
+export { PepRolePage, militaryAlternatives, roleAlternatives } from './pages/PepRolePage';
 export { PepStatusPage } from './pages/PepStatusPage';

package/src/demo/Done.tsx

@@ -1,6 +1,6 @@
 import React, { useContext } from "react";
 import { PepContext } from "../pages/PepContext";
-import { formatServerRequest } from "../model/PepModel";
+import { stateToRequest } from "../model/PepModel";
 
 export function Done() {
   const pepContext = useContext(PepContext);
@@ -8,7 +8,7 @@ export function Done() {
     <div>
       <h2>Taco hej!</h2>
       <p>Leverpastej!</p>
-      <pre>{JSON.stringify(formatServerRequest(pepContext.state), null, 2)}</pre>
+      <pre>{JSON.stringify(stateToRequest(pepContext.state), null, 2)}</pre>
     </div>
   );
 }

package/src/model/PepTexts.ts

@@ -7,7 +7,7 @@ import {
 
 export const LABELS = (name?: string) => {
   let possessiveName = name;
-  if (possessiveName && possessiveName[possessiveName.length - 1] !== "s") {
+  if (possessiveName && possessiveName[possessiveName.length - 1] !== "s" && possessiveName[possessiveName.length - 1] !== "z" && possessiveName[possessiveName.length - 1] !== "x") {
     possessiveName += "s";
   }
 

package/src/pages/PepRolePage.tsx

@@ -27,7 +27,7 @@ interface Props {
   next: () => void;
 }
 
-const roleAlternatives: Alternative[] = [
+export const roleAlternatives: Alternative[] = [
   { 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 },
@@ -66,7 +66,7 @@ const roleAlternatives: Alternative[] = [
   }
 ];
 
-const militaryAlternatives: Alternative[] = [
+export const militaryAlternatives: Alternative[] = [
   {
     text: "General",
     value: MilitaryRank.GENERAL

package/src/pages/PepStatusPage.tsx

@@ -1,142 +1,142 @@
-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}
-            />
-        ) : 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,
+  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}
+            />
+        ) : null}
+
+        <PrimaryButton type="submit">Nästa</PrimaryButton>
+      </Form>
+    </div>
+  );
+};