back-testing-react 2.1.10 → 2.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "back-testing-react",
-  "version": "2.1.10",
+  "version": "2.1.11",
   "type": "module",
   "description": "Parametric back testing application developed by NormanMax Insurance Solutions",
   "main": "dist/index.js",

package/src/components/back-testing-hub/back-testing-hub.tsx

@@ -40,8 +40,6 @@ function BackTestingHub(props: BackTestingHubProps){
     const eqPayoutResponse = useAppSelector(selectEQPayoutResponse);
     const [mapInstanceRef, setMapInstanceRef] = React.useState<React.MutableRefObject<mapboxgl.Map | undefined>>();
 
-    const [wizardPgas, updatePgas] = React.useState<PGA[]>([]);
-
     useEffect(() => {
         // initialize payout options
         let proxyPayouts = props.proxyPayoutOptions != undefined ? props.proxyPayoutOptions.map((option) => {return {key:option.key,value:option.value,refId:uuidv4()}}) : [];
@@ -71,48 +69,73 @@ function BackTestingHub(props: BackTestingHubProps){
                         }
                     }
                 })
-                updatePgas(pgas);
             }, (err) => {
                 console.error(err);
                 throw Error(err);
+            }).finally(() => {
+                dispatch(setAPIAccessToken(props.apiAccessToken));
+                dispatch(setAutoCalculatePayoutsEnabled(props.calculatePayouts));
+                dispatch(setInitialState({
+                    currentStep:props.currentStep,
+                    selectedWeatherEvent: props.weatherEvent,
+                    env: props.env,
+                    mapAccessToken: props.mapAccessToken,
+                    isSidebarDisplayed: props.displaySidebar,
+                    isSidePanelDisplayed: props.displaySidepanel,
+                    limit: props.limit,
+                    locations:locations,
+                    proxies:proxies,
+                    anemometers:anemometers,
+                    ciass:ciass,
+                    pgas:pgas,
+                    proxyPayoutOptions:proxyPayouts,
+                    anemometerPayoutOptions:anemometerPayouts,
+                    ciasPayoutOptions:ciasPayouts,
+                    pgaPayoutOptions:pgaPayouts,
+                    defaultProxyPayoutIndex:props.selectedProxyPayoutOptionIndex,
+                    defaultAnemometerPayoutIndex:props.selectedAnemometerPayoutOptionIndex,
+                    defaultCIASPayoutIndex:props.selectedCiacPayoutOptionIndex,
+                    defaultPGAPayoutIndex:props.selectedPgaPayoutOptionIndex,
+                    windstormEnabled:props.windstormEnabled,
+                    earthquakeEnabled:props.earthquakeEnabled,
+                    floodEnabled:props.floodEnabled,
+                    fireEnabled:props.fireEnabled,
+                    snowstormEnabled:props.snowstormEnabled
+                }))      
             })
+        } else {
+            dispatch(setAPIAccessToken(props.apiAccessToken));
+            dispatch(setAutoCalculatePayoutsEnabled(props.calculatePayouts));
+            dispatch(setInitialState({
+                currentStep:props.currentStep,
+                selectedWeatherEvent: props.weatherEvent,
+                env: props.env,
+                mapAccessToken: props.mapAccessToken,
+                isSidebarDisplayed: props.displaySidebar,
+                isSidePanelDisplayed: props.displaySidepanel,
+                limit: props.limit,
+                locations:locations,
+                proxies:proxies,
+                anemometers:anemometers,
+                ciass:ciass,
+                pgas:pgas,
+                proxyPayoutOptions:proxyPayouts,
+                anemometerPayoutOptions:anemometerPayouts,
+                ciasPayoutOptions:ciasPayouts,
+                pgaPayoutOptions:pgaPayouts,
+                defaultProxyPayoutIndex:props.selectedProxyPayoutOptionIndex,
+                defaultAnemometerPayoutIndex:props.selectedAnemometerPayoutOptionIndex,
+                defaultCIASPayoutIndex:props.selectedCiacPayoutOptionIndex,
+                defaultPGAPayoutIndex:props.selectedPgaPayoutOptionIndex,
+                windstormEnabled:props.windstormEnabled,
+                earthquakeEnabled:props.earthquakeEnabled,
+                floodEnabled:props.floodEnabled,
+                fireEnabled:props.fireEnabled,
+                snowstormEnabled:props.snowstormEnabled
+            }))      
         }
-
-        dispatch(setAPIAccessToken(props.apiAccessToken));
-        dispatch(setAutoCalculatePayoutsEnabled(props.calculatePayouts));
-        dispatch(setInitialState({
-            currentStep:props.currentStep,
-            selectedWeatherEvent: props.weatherEvent,
-            env: props.env,
-            mapAccessToken: props.mapAccessToken,
-            isSidebarDisplayed: props.displaySidebar,
-            isSidePanelDisplayed: props.displaySidepanel,
-            limit: props.limit,
-            locations:locations,
-            proxies:proxies,
-            anemometers:anemometers,
-            ciass:ciass,
-            pgas:undefined,
-            proxyPayoutOptions:proxyPayouts,
-            anemometerPayoutOptions:anemometerPayouts,
-            ciasPayoutOptions:ciasPayouts,
-            pgaPayoutOptions:pgaPayouts,
-            defaultProxyPayoutIndex:props.selectedProxyPayoutOptionIndex,
-            defaultAnemometerPayoutIndex:props.selectedAnemometerPayoutOptionIndex,
-            defaultCIASPayoutIndex:props.selectedCiacPayoutOptionIndex,
-            defaultPGAPayoutIndex:props.selectedPgaPayoutOptionIndex,
-            windstormEnabled:props.windstormEnabled,
-            earthquakeEnabled:props.earthquakeEnabled,
-            floodEnabled:props.floodEnabled,
-            fireEnabled:props.fireEnabled,
-            snowstormEnabled:props.snowstormEnabled
-        }))      
     },[])
 
-    useEffect(() => {
-        dispatch(setPgas(wizardPgas))
-    }, [wizardPgas])
-
     useEffect(() => {
         if(mapInstanceRef != undefined && mapInstanceRef?.current != undefined && wsPayoutResponse != undefined && wsPayoutResponse.payouts != undefined){
             dispatch(setPDFOutput(undefined));

package/src/components/back-testing-map/back-testing-map.tsx

@@ -131,6 +131,57 @@ const BackTestingMap = forwardRef<BackTestingActions, BackTestingMapProps>((prop
       return true;
     }
 
+    function validatePGAs(pgas: PGA[]) : boolean {
+      for(var i = 0; i < pgas.length; i++){
+        const pga = pgas[i];
+        switch(pga.shapeType){
+          case CATShapeType.CIRCLE:
+            if(pga.circle.latitude == undefined || pga.circle.longitude == undefined || pga.circle.radius){
+              return false;
+            }
+            if(pga.circle.ciasChoice == RadioChoice.CUSTOM && pga.circle.customPayouts == undefined){
+              return false;
+            }
+            if(pga.circle.ciasChoice == RadioChoice.DEFAULT && (pga.circle.payoutTableRefId == undefined || pgaPayoutOption == undefined)){
+              return false;
+            }
+            if(pga.circle.ciasChoice == RadioChoice.DEFAULT && pgaPayoutOption?.find((option) => { return option.refId == pga.circle.payoutTableRefId}) == undefined){
+              return false;
+            }
+          break;
+          case CATShapeType.POLYGON:
+            if(pga.polygon.coords.length < 3 || pga.polygon.coords.find((coord) => {return coord.latitude == undefined}) != undefined || pga.polygon.coords.find((coord) => {return coord.longitude == undefined}) != undefined){
+              return false;
+            }
+            if(pga.polygon.ciasChoice == RadioChoice.CUSTOM && pga.polygon.customPayouts == undefined){
+              return false;
+            }
+            if(pga.polygon.ciasChoice == RadioChoice.DEFAULT && (pga.polygon.payoutTableRefId == undefined || pgaPayoutOption == undefined)){
+              return false;
+            }
+            if(pga.polygon.ciasChoice == RadioChoice.DEFAULT && pgaPayoutOption?.find((option) => { return option.refId == pga.polygon.payoutTableRefId}) == undefined){
+              return false;
+            }
+          break;
+          case CATShapeType.COUNTY:
+            if(pga.county.geometry == undefined){
+              return false;
+            }
+            if(pga.county.ciasChoice == RadioChoice.CUSTOM && pga.county.customPayouts == undefined){
+              return false;
+            }
+            if(pga.county.ciasChoice == RadioChoice.DEFAULT && (pga.county.payoutTableRefId == undefined || pgaPayoutOption == undefined)){
+              return false;
+            }
+            if(pga.county.ciasChoice == RadioChoice.DEFAULT && pgaPayoutOption?.find((option) => { return option.refId == pga.county.payoutTableRefId}) == undefined){
+              return false;
+            }
+          break;
+        }
+      }
+      return true;
+    }
+
     function generateCATRequest(shapes:CIAS[]) : CIASRequest[]{
       let retVal : CIASRequest[] = []
       for(var i = 0; i < shapes.length; i++){
@@ -256,6 +307,10 @@ const BackTestingMap = forwardRef<BackTestingActions, BackTestingMapProps>((prop
     }
 
     function fetchEQPayouts(){
+      if(!validatePGAs(pgas)){
+        console.log("PGAs failed validation checks")
+        return;
+      }
       const request : EQPayoutsRequest = {
         type:'EQ',
         limit: insuranceLimit,
@@ -1023,7 +1078,7 @@ const BackTestingMap = forwardRef<BackTestingActions, BackTestingMapProps>((prop
             </ToggleButtonGroup>
             {selectedMapView == MapView.STORMS && <BackTestingStormLegend stormTracks={wsPayoutResponse?.payouts || []} mapInstanceRef={mapInstanceRef}/>}
             </>}
-            {selectedWeatherEvent == WeatherEventOption.EARTHQUAKE && <BackTestingQuakeLegend quakeEvents={eqPayoutResponse?.payouts} mapInstanceRef={mapInstanceRef}/>}
+            {selectedWeatherEvent == WeatherEventOption.EARTHQUAKE && <BackTestingQuakeLegend mapInstanceRef={mapInstanceRef}/>}
             <BackTestingTag tagline={tagline} taglineColor="rgb(30, 39, 88)" opacity={0.7}></BackTestingTag>
             <div ref={mapContainerRef} className="map__container" />
         </div>

package/src/components/back-testing-quake-legend/back-testing-quake-legend.tsx

@@ -1,24 +1,29 @@
 import { BackTestingQuakeLegendProps } from "./back-testing-quake-legend.types";
 import './back-testing-quake-legend.css'
 import { EQPayoutDTO } from "../../lib/features/back-testing/backTestingAPISlice";
+import { useAppSelector } from "../../lib/hooks";
+import { selectEQPayoutResponse } from "../../lib/features/back-testing/backTestingSlice";
 
 const BackTestingQuakeLegend = (props: BackTestingQuakeLegendProps,) => {
+
+    const eqPayoutResponse = useAppSelector(selectEQPayoutResponse);
+
     return (
         <div>
-            {props.quakeEvents &&
+            {eqPayoutResponse?.payouts &&
             <div className={props.className + " storm-legend"} style={{overflow:'auto',borderRadius:'3px',paddingLeft:'16px',paddingRight:'16px',paddingBottom:'16px',position:'absolute',zIndex:10,right:20,backgroundColor:'rgba(255,255,255,0.6)',maxHeight:'calc(100% - 80px)'}}>
                 <div style={{padding:'0'}}>
                 <div style={{ color: 'gray', fontSize:'16px', fontWeight:700, paddingBottom:'16px',paddingTop:'16px', textAlign:'center' }}>
                     Earthquake Legend
                 </div>
                 <div>
-                {props.quakeEvents && props.quakeEvents.map((quake: EQPayoutDTO) => (
+                {eqPayoutResponse.payouts && eqPayoutResponse.payouts.map((quake: EQPayoutDTO) => (
                     <div key={quake.evid}>
                     <span style={{ width:'20px', height:'20px', backgroundColor:quake.color, display:'inline-block', marginRight:'10px',marginLeft:'10px' }}></span>
                     <span style={{ position:'relative', height:'25px', top:-5, display:'inline-block' }}>{quake.place}</span>
                     </div>
                 ))}
-                {props.quakeEvents.length == 0 &&
+                {eqPayoutResponse.payouts.length == 0 &&
                 <div style={{ fontSize:'11px' }}>
                     <em>...no earthquake events found</em>
                 </div>

package/src/components/back-testing-quake-legend/back-testing-quake-legend.types.ts

@@ -2,6 +2,5 @@ import { EQPayoutDTO } from "../../lib/features/back-testing/backTestingAPISlice
 
 export interface BackTestingQuakeLegendProps {
     className?: string,
-    quakeEvents?: EQPayoutDTO[],
     mapInstanceRef : React.MutableRefObject<any>
 }