back-testing-react 2.1.9 → 2.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "back-testing-react",
-  "version": "2.1.9",
+  "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>
 }

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

@@ -8,8 +8,8 @@ import React, { useEffect } from "react";
 import * as XLSX from 'xlsx';
 import { PayoutWizardStepType } from "../back-testing-stepper/steps/step.types";
 import { useAppDispatch, useAppSelector } from "../../lib/hooks";
-import { isEarthquakeEnabled, isFireEnabled, isFloodEnabled, isSnowstormEnabled, isWindstormEnabled, selectProxyPayoutOptions, selectWeatherEvent, selectWizardStep, setWeatherEvent } from "../../lib/features/wizard/wizardSlice";
-import { isAppLoading, selectPDFOutput, selectWSPayoutRequest, selectWSPayoutResponse } from "../../lib/features/back-testing/backTestingSlice";
+import { isEarthquakeEnabled, isFireEnabled, isFloodEnabled, isSnowstormEnabled, isWindstormEnabled, selectProxyPayoutOptions, selectWeatherEvent, selectWizardStep, setWeatherEvent, updateWeatherEvent } from "../../lib/features/wizard/wizardSlice";
+import { isAppLoading, resetPayouts, selectPDFOutput, selectWSPayoutRequest, selectWSPayoutResponse, setEQPayoutResponse, setPDFOutput } from "../../lib/features/back-testing/backTestingSlice";
 
 const BackTestingSidebar = (props:BackTestingSidebarProps) => {
 
@@ -48,12 +48,23 @@ const BackTestingSidebar = (props:BackTestingSidebarProps) => {
         setAppActions(actions);
     },[pdfOutput,selectedWeatherEventOption])
 
+    useEffect(() => {
+        switch(selectedWeatherEventOption){
+            case WeatherEventOption.WINDSTORM:
+                dispatch(setEQPayoutResponse(undefined))
+                dispatch(setPDFOutput())
+        }
+    })
+
     function isWeatherEventOptionSelected(option: WeatherOption) : boolean {
         return selectedWeatherEventOption == (option.action);
     }
 
     const selectWeatherEventOption = (option: WeatherOption) => {
-        dispatch(setWeatherEvent(option.action));
+        if(option.action != selectedWeatherEventOption){
+            dispatch(updateWeatherEvent(option.action));
+            dispatch(resetPayouts())
+        }
     }
 
     const HtmlTooltip = styled(({ className, ...props }: TooltipProps) => (

package/src/components/back-testing-stepper/inputs/number-input/number-input.tsx

@@ -16,7 +16,7 @@ function NumberInput(props: NumberInputProps){
         if(Number.isNaN(e)){
             setInputValue("")
             if(props.onChange){
-                props.onChange(0)
+                props.onChange(undefined)
             }
         }else{
             setInputValue(e)

package/src/components/back-testing-stepper/inputs/number-input/number-input.types.ts

@@ -9,7 +9,7 @@ export interface NumberInputProps{
     step?: number,
     value?: number | string,
     readOnly?: boolean,
-    onChange?: (e: number) => void
+    onChange?: (e: number|undefined) => void
     placeholder?: string
     size?: 'xs' | 'sm' | 'md' | 'lg' | 'xl'
     className?: string

package/src/components/back-testing-stepper/steps/input-anemometer/input-anemometer.tsx

@@ -187,13 +187,13 @@ const InputAnemometerStep = forwardRef<WizardStep, InputAnemometerStepProps>((pr
             const anemometer = cloneDeep(wizardAnemometers[i]);
             let isAnemometerChoiceError = (anemometer.anemometerChoice == RadioChoice.CUSTOM && anemometer.customPayouts == undefined)
             if(isAnemometerChoiceError){
-                fileError = true;
                 anemometer.fileError = true
                 anemometer.fileErrorMsg = FILE_ERROR;
                 if(!fileError){
                     setExpanded('panel'+(anemometer.refId));
                     setSelectedAnemometer(anemometer);
                 }
+                fileError = true;
             } else{
                 anemometer.fileError = false
                 anemometer.fileErrorMsg = "";

package/src/components/back-testing-stepper/steps/input-cias/input-cias.tsx

@@ -206,7 +206,11 @@ const InputCIASStep = forwardRef<WizardStep, InputCIASStepProps>((props,ref) =>
         let location = locations.find((location) => location.refId == id)
         if(location){
             clonedCircle.latitude = location.latitude;
+            clonedCircle.latError = false;
+            clonedCircle.latErrorMsg = "";
             clonedCircle.longitude = location.longitude;
+            clonedCircle.lngError = false;
+            clonedCircle.lngErrorMsg = "";
         }
         clonedCIAS.circle = clonedCircle;
         updateCIAS(clonedCIAS,onLoad);
@@ -252,14 +256,14 @@ const InputCIASStep = forwardRef<WizardStep, InputCIASStepProps>((props,ref) =>
         updateShape(clonedCIAS,clonedPolygon);
     }
 
-    function updatePolygonCoordinateLat(cias: CIAS, polygon:CATPolygon,index:number,value:number){
+    function updatePolygonCoordinateLat(cias: CIAS, polygon:CATPolygon,index:number,value:number|undefined){
         let clonedCIAS = cloneDeep(cias);
         let clonedPolygon = cloneDeep(polygon);
         clonedPolygon.coords[index].latitude = value;
         updateShape(clonedCIAS,clonedPolygon);
     }
 
-    function updatePolygonCoordinateLng(cias: CIAS, polygon:CATPolygon,index:number,value:number){
+    function updatePolygonCoordinateLng(cias: CIAS, polygon:CATPolygon,index:number,value:number|undefined){
         let clonedCIAS = cloneDeep(cias);
         let clonedPolygon = cloneDeep(polygon);
         clonedPolygon.coords[index].longitude = value;
@@ -308,13 +312,13 @@ const InputCIASStep = forwardRef<WizardStep, InputCIASStepProps>((props,ref) =>
                 let circle = cias.circle;
                 let latError = circle.latitude == undefined || Number.isNaN(circle.latitude) || circle.latitude < -90;
                 if(latError){
-                    latitudeError = true;
                     circle.latError = true
                     circle.latErrorMsg = LAT_ERROR;
                     if(!fileError && !latitudeError && !longitudeError){
                         setExpanded('panel'+(cias.refId));
                         setSelectedCIAS(cias);
                     }
+                    latitudeError = true;
                 } else{
                     circle.latError = false
                     circle.latErrorMsg = "";
@@ -325,18 +329,18 @@ const InputCIASStep = forwardRef<WizardStep, InputCIASStepProps>((props,ref) =>
 
         // perform circle longitude validations
         for(var i = 0; i < ciasList.length; i++){
-            const cias = cloneDeep(ciasList[i]);
+            const cias = ciasList[i];
             if(cias.shapeType == CATShapeType.CIRCLE){
                 let circle = cias.circle;
                 let lngError = circle.longitude == undefined || Number.isNaN(circle.longitude) || circle.longitude < -180;
                 if(lngError){
-                    longitudeError = true;
                     circle.lngError = true
                     circle.lngErrorMsg = LNG_ERROR;
                     if(!fileError && !latitudeError && !longitudeError){
                         setExpanded('panel'+(cias.refId));
                         setSelectedCIAS(cias);
                     }
+                    longitudeError = true;
                 } else{
                     circle.lngError = false
                     circle.lngErrorMsg = "";
@@ -346,18 +350,18 @@ const InputCIASStep = forwardRef<WizardStep, InputCIASStepProps>((props,ref) =>
 
         // perform circle longitude validations
         for(var i = 0; i < ciasList.length; i++){
-            const cias = cloneDeep(ciasList[i]);
+            const cias = ciasList[i];
             if(cias.shapeType == CATShapeType.CIRCLE){
                 let circle = cias.circle;
                 let lngError = circle.longitude == undefined || Number.isNaN(circle.longitude) || circle.longitude < -180;
                 if(lngError){
-                    longitudeError = true;
                     circle.lngError = true
                     circle.lngErrorMsg = LNG_ERROR;
                     if(!fileError && !latitudeError && !longitudeError){
                         setExpanded('panel'+(cias.refId));
                         setSelectedCIAS(cias);
                     }
+                    longitudeError = true;
                 } else{
                     circle.lngError = false
                     circle.lngErrorMsg = "";
@@ -367,18 +371,18 @@ const InputCIASStep = forwardRef<WizardStep, InputCIASStepProps>((props,ref) =>
 
         // perform payout file validations
         for(var i = 0; i < ciasList.length; i++){
-            const cias = cloneDeep(ciasList[i]);
+            const cias = ciasList[i];
             if(cias.shapeType == CATShapeType.CIRCLE){
                 let circle = cias.circle;
                 let isCIACChoiceError = (circle.ciasChoice == RadioChoice.CUSTOM && circle.customPayouts == undefined)
                 if(isCIACChoiceError){
-                    fileError = true;
                     circle.fileError = true
                     circle.fileErrorMsg = FILE_ERROR;
                     if(!fileError && !latitudeError && !longitudeError){
                         setExpanded('panel'+(cias.refId));
                         setSelectedCIAS(cias);
                     }
+                    fileError = true;
                 } else {
                     circle.fileError = false
                     circle.fileErrorMsg = "";
@@ -387,13 +391,13 @@ const InputCIASStep = forwardRef<WizardStep, InputCIASStepProps>((props,ref) =>
                 let polygon = cias.polygon;
                 let isCIACChoiceError = (polygon.ciasChoice == RadioChoice.CUSTOM && polygon.customPayouts == undefined)
                 if(isCIACChoiceError){
-                    fileError = true;
                     polygon.fileError = true
                     polygon.fileErrorMsg = FILE_ERROR;
                     if(!fileError && !latitudeError && !longitudeError){
                         setExpanded('panel'+(cias.refId));
                         setSelectedCIAS(cias);
                     }
+                    fileError = true;
                 } else {
                     polygon.fileError = false
                     polygon.fileErrorMsg = "";

package/src/components/back-testing-stepper/steps/input-location/input-location.tsx

@@ -212,13 +212,14 @@ const InputLocationStep = forwardRef<WizardStep, InputLocationStepProps>((props,
             let location = cloneDeep(wizardLocations[i]);
             let latError = location.latitude == undefined || Number.isNaN(location.latitude) || location.latitude < -90;
             if(latError){
-                latitudeError = true;
                 location.latError = true
                 location.latErrorMsg = LAT_ERROR;
                 if(!latitudeError && !longitudeError){
                     setExpanded('panel'+(location.refId));
                     setSelectedLocation(location);
                 }
+                latitudeError = true;
+
             } else{
                 location.latError = false
                 location.latErrorMsg = "";
@@ -227,16 +228,16 @@ const InputLocationStep = forwardRef<WizardStep, InputLocationStepProps>((props,
         }
 
         for(var i = 0; i < locationsList.length; i++){
-            let location = cloneDeep(locationsList[i]);
+            let location = locationsList[i];
             let lngError = location.longitude == undefined || Number.isNaN(location.longitude) || location.longitude < -180;
             if(lngError){
-                longitudeError = true;
                 location.lngError = true
                 location.lngErrorMsg = LNG_ERROR;
                 if(!latitudeError && !longitudeError){
                     setExpanded('panel'+(location.refId));
                     setSelectedLocation(location);
                 }
+                longitudeError = true;
             } else{
                 location.lngError = false
                 location.lngErrorMsg = "";

package/src/components/back-testing-stepper/steps/input-pga/input-pga.tsx

@@ -269,7 +269,11 @@ const InputPGAStep = forwardRef<WizardStep, InputPGAStepProps>((props,ref) => {
         let location = locations.find((location) => location.refId == id)
         if(location){
             clonedCircle.latitude = location.latitude;
+            clonedCircle.latError = false;
+            clonedCircle.latErrorMsg = "";
             clonedCircle.longitude = location.longitude;
+            clonedCircle.lngError = false;
+            clonedCircle.lngErrorMsg = "";
         }
         clonedPGA.circle = clonedCircle;
         updatePGA(clonedPGA,onLoad);
@@ -311,13 +315,13 @@ const InputPGAStep = forwardRef<WizardStep, InputPGAStepProps>((props,ref) => {
         updateShape(pga,clonedPolygon);
     }
 
-    function updatePolygonCoordinateLat(pga: PGA, polygon:CATPolygon,index:number,value:number){
+    function updatePolygonCoordinateLat(pga: PGA, polygon:CATPolygon,index:number,value:number|undefined){
         const clonedPolygon = cloneDeep(polygon);
         clonedPolygon.coords[index].latitude = value;
         updateShape(pga,clonedPolygon);
     }
 
-    function updatePolygonCoordinateLng(pga: PGA, polygon:CATPolygon,index:number,value:number){
+    function updatePolygonCoordinateLng(pga: PGA, polygon:CATPolygon,index:number,value:number|undefined){
         const clonedPolygon = cloneDeep(polygon);
         clonedPolygon.coords[index].longitude = value;
         updateShape(pga,clonedPolygon);
@@ -404,13 +408,13 @@ const InputPGAStep = forwardRef<WizardStep, InputPGAStepProps>((props,ref) => {
                 let county = pga.county;
                 let countyError = county.countyFIPSCode == undefined || county.geometry == undefined;
                 if(countyError){
-                    usCountyError = true;
                     county.countyError = true
                     county.countyErrorMsg = COUNTY_ERROR;
                     if(!fileError && !latitudeError && !longitudeError && !usCountyError){
                         setExpanded('panel'+(pga.refId));
                         setSelectedPGA(pga);
                     }
+                    usCountyError = true;
                 } else{
                     county.countyError = false
                     county.countyErrorMsg = "";
@@ -422,18 +426,18 @@ const InputPGAStep = forwardRef<WizardStep, InputPGAStepProps>((props,ref) => {
 
         // perform circle latitude validations
         for(var i = 0; i < pgaList.length; i++){
-            const pga = cloneDeep(pgaList[i]);
+            const pga = pgaList[i];
             if(pga.shapeType == CATShapeType.CIRCLE){
                 let circle = pga.circle;
                 let latError = circle.latitude == undefined || Number.isNaN(circle.latitude) || circle.latitude < -90;
                 if(latError){
-                    latitudeError = true;
                     circle.latError = true
                     circle.latErrorMsg = LAT_ERROR;
                     if(!fileError && !latitudeError && !longitudeError && !usCountyError){
                         setExpanded('panel'+(pga.refId));
                         setSelectedPGA(pga);
                     }
+                    latitudeError = true;
                 } else{
                     circle.latError = false
                     circle.latErrorMsg = "";
@@ -443,18 +447,18 @@ const InputPGAStep = forwardRef<WizardStep, InputPGAStepProps>((props,ref) => {
 
         // perform circle longitude validations
         for(var i = 0; i < pgaList.length; i++){
-            const pga = cloneDeep(pgaList[i]);
+            const pga = pgaList[i];
             if(pga.shapeType == CATShapeType.CIRCLE){
                 let circle = pga.circle;
                 let lngError = circle.longitude == undefined || Number.isNaN(circle.longitude) || circle.longitude < -180;
                 if(lngError){
-                    longitudeError = true;
                     circle.lngError = true
                     circle.lngErrorMsg = LNG_ERROR;
                     if(!fileError && !latitudeError && !longitudeError && !usCountyError){
                         setExpanded('panel'+(pga.refId));
                         setSelectedPGA(pga);
                     }
+                    longitudeError = true;
                 } else{
                     circle.lngError = false
                     circle.lngErrorMsg = "";
@@ -464,18 +468,18 @@ const InputPGAStep = forwardRef<WizardStep, InputPGAStepProps>((props,ref) => {
 
         // perform circle longitude validations
         for(var i = 0; i < pgaList.length; i++){
-            const pga = cloneDeep(pgaList[i]);
+            const pga = pgaList[i];
             if(pga.shapeType == CATShapeType.CIRCLE){
                 let circle = pga.circle;
                 let lngError = circle.longitude == undefined || Number.isNaN(circle.longitude) || circle.longitude < -180;
                 if(lngError){
-                    longitudeError = true;
                     circle.lngError = true
                     circle.lngErrorMsg = LNG_ERROR;
                     if(!fileError && !latitudeError && !longitudeError && !usCountyError){
                         setExpanded('panel'+(pga.refId));
                         setSelectedPGA(pga);
                     }
+                    longitudeError = true;
                 } else{
                     circle.lngError = false
                     circle.lngErrorMsg = "";
@@ -486,18 +490,18 @@ const InputPGAStep = forwardRef<WizardStep, InputPGAStepProps>((props,ref) => {
 
         // perform payout file validations
         for(var i = 0; i < pgaList.length; i++){
-            const pga = cloneDeep(pgaList[i]);
+            const pga = pgaList[i];
             if(pga.shapeType == CATShapeType.CIRCLE){
                 let circle = pga.circle;
                 let isCIACChoiceError = (circle.ciasChoice == RadioChoice.CUSTOM && circle.customPayouts == undefined)
                 if(isCIACChoiceError){
-                    fileError = true;
                     circle.fileError = true
                     circle.fileErrorMsg = FILE_ERROR;
                     if(!fileError && !latitudeError && !longitudeError && !usCountyError){
                         setExpanded('panel'+(pga.refId));
                         setSelectedPGA(pga);
                     }
+                    fileError = true;
                 } else {
                     circle.fileError = false
                     circle.fileErrorMsg = "";
@@ -506,13 +510,13 @@ const InputPGAStep = forwardRef<WizardStep, InputPGAStepProps>((props,ref) => {
                 let polygon = pga.polygon;
                 let isCIACChoiceError = (polygon.ciasChoice == RadioChoice.CUSTOM && polygon.customPayouts == undefined)
                 if(isCIACChoiceError){
-                    fileError = true;
                     polygon.fileError = true
                     polygon.fileErrorMsg = FILE_ERROR;
                     if(!fileError && !latitudeError && !longitudeError && !usCountyError){
                         setExpanded('panel'+(pga.refId));
                         setSelectedPGA(pga);
                     }
+                    fileError = true;
                 } else {
                     polygon.fileError = false
                     polygon.fileErrorMsg = "";
@@ -521,13 +525,13 @@ const InputPGAStep = forwardRef<WizardStep, InputPGAStepProps>((props,ref) => {
                 let county = pga.county;
                 let isCIACChoiceError = (county.ciasChoice == RadioChoice.CUSTOM && county.customPayouts == undefined)
                 if(isCIACChoiceError){
-                    fileError = true;
                     county.fileError = true
                     county.fileErrorMsg = FILE_ERROR;
                     if(!fileError && !latitudeError && !longitudeError && !usCountyError){
                         setExpanded('panel'+(pga.refId));
                         setSelectedPGA(pga);
                     }
+                    fileError = true;
                 } else {
                     county.fileError = false
                     county.fileErrorMsg = "";

package/src/components/back-testing-stepper/steps/input-pga/input-pga.types.ts

@@ -15,7 +15,7 @@ export interface PGA {
 export function generateNewPGA(shapeType:CATShapeType|undefined, latitude: number|undefined, longitude: number|undefined, radius:number|undefined, coords: Coordinate[]|undefined,  fipsCode:string|undefined, payoutOption:string | undefined) : PGA {
     const pga : PGA = {
         refId: uuidv4(),
-        shapeType: shapeType || CATShapeType.CIRCLE,
+        shapeType: shapeType || CATShapeType.COUNTY,
         circle: generateNewCATCircle(latitude,longitude,radius,payoutOption),
         polygon: generateNewCATPolygon(coords,payoutOption),
         county: generateNewCATCounty(fipsCode,payoutOption)