mark rtfzs as optional

riteshsangwan · riteshsangwan · commit 62f2d2cecb00 · 2017-01-14T11:51:39.000+05:30
diff --git a/src/routes/MissionPlanner/components/MissionMap/MissionMap.jsx b/src/routes/MissionPlanner/components/MissionMap/MissionMap.jsx
@@ -47,7 +47,7 @@ export const MissionGoogleMap = withGoogleMap((props) => (
     ))}
     <Polyline {...polylineConfig} path={props.lineMarkerPositions} />
     {props.noFlyZones.map((zone) => <NoFlyZone key={zone.id} zone={zone} />)}
-    {props.rtfzs.filter((single) => single.show === true).map((rtfz) => <Rtfz key={rtfz._id} zone={rtfz} />)}
+    {props.rtfzs && props.rtfzs.filter((single) => single.show === true).map((rtfz) => <Rtfz key={rtfz._id} zone={rtfz} />)}
   </GoogleMap>
 ));
 
@@ -154,7 +154,7 @@ MissionMap.propTypes = {
   onMapClick: PropTypes.func,
   loadNfz: PropTypes.func.isRequired,
   noFlyZones: PropTypes.array.isRequired,
-  rtfzs: PropTypes.array.isRequired,
+  rtfzs: PropTypes.array,
 };
 
 export default CSSModules(MissionMap, styles);
diff --git a/src/routes/MissionPlanner/components/RTFZSidebar/RTFZSidebar.jsx b/src/routes/MissionPlanner/components/RTFZSidebar/RTFZSidebar.jsx
@@ -20,35 +20,37 @@ class RTFZSidebar extends React.Component {
   render() {
     const {rtfzs} = this.props;
     return (
-      <div styleName="rtfz-sidebar">
-        {rtfzs && rtfzs.length > 0 ? (
-            rtfzs.map((rtfz) => (
-              <Grid key={rtfz._id} styleName="sidebar-item">
-                <Row>
-                  <Col xs={6} md={6}>{rtfz.description}</Col>
-                  <Col xs={6} md={6}>
-                    <div styleName="toggle-wrapper">
-                      <ToggleButton
-                        value={rtfz.show}
-                        activeLabel="hide"
-                        inactiveLabel="show"
-                        onToggle={(value) => this.toggleRtfz(value, rtfz)}
-                      />
-                    </div>
-                  </Col>
-                </Row>
-              </Grid>
-            ))
-          ) : (
-            <div styleName="note">No region to flyzones defined</div>
-          )}
+      <div>
+        {(rtfzs && rtfzs.length > 0) && (
+          <div styleName="rtfz-sidebar">
+            {
+              rtfzs.map((rtfz) => (
+                <Grid key={rtfz._id} styleName="sidebar-item">
+                  <Row>
+                    <Col xs={6} md={6}>{rtfz.description}</Col>
+                    <Col xs={6} md={6}>
+                      <div styleName="toggle-wrapper">
+                        <ToggleButton
+                          value={rtfz.show}
+                          activeLabel="hide"
+                          inactiveLabel="show"
+                          onToggle={(value) => this.toggleRtfz(value, rtfz)}
+                        />
+                      </div>
+                    </Col>
+                  </Row>
+                </Grid>
+              ))
+            }
+          </div>
+        )}
       </div>
     );
   }
 }
 
 RTFZSidebar.propTypes = {
-  rtfzs: PropTypes.array.isRequired,
+  rtfzs: PropTypes.array,
   toggleRtfzHandler: PropTypes.func.isRequired,
 };
 
