handle null required prop - "url"

ref #467
collinbarrett · Sep 11, 2018 · 4d3bf6e · 4d3bf6e
1 parent 8d8d082
commit 4d3bf6e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 24 deletions.
diff --git a/src/FilterLists.Web/ClientApp/components/SubscribeButtonGroup.tsx b/src/FilterLists.Web/ClientApp/components/SubscribeButtonGroup.tsx
@@ -7,18 +7,20 @@ export default class SubscribeButtonGroup extends React.Component<ISubscribeButt
     }
 
     render() {
-        return this.props.urlMirror1
-            ? (<div className="btn-group-vertical fl-btn-details-action" role="group">
-                   <button id="btnGroupDropSubscribe" type="button" className="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                       Subscribe
-                   </button>
-                   <div className="dropdown-menu" aria-labelledby="btnGroupDropSubscribe">
-                       <SubscribeButton name={this.props.name} url={this.props.url} text="Original" isOriginal={true}/>
-                       <SubscribeButton name={this.props.name} url={this.props.urlMirror1} text="Mirror 1" isOriginal={false}/>
-                       <SubscribeButton name={this.props.name} url={this.props.urlMirror2} text="Mirror 2" isOriginal={false}/>
-                   </div>
-               </div>)
-            : <SubscribeButton name={this.props.name} url={this.props.url} text="Subscribe" isOriginal={true}/>;
+        return this.props.url
+            ? this.props.urlMirror1
+                ? (<div className="btn-group-vertical fl-btn-details-action" role="group">
+                       <button id="btnGroupDropSubscribe" type="button" className="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                           Subscribe
+                       </button>
+                       <div className="dropdown-menu" aria-labelledby="btnGroupDropSubscribe">
+                           <SubscribeButton name={this.props.name} url={this.props.url} text="Original" isOriginal={true}/>
+                           <SubscribeButton name={this.props.name} url={this.props.urlMirror1} text="Mirror 1" isOriginal={false}/>
+                           <SubscribeButton name={this.props.name} url={this.props.urlMirror2} text="Mirror 2" isOriginal={false}/>
+                       </div>
+                   </div>)
+                : <SubscribeButton name={this.props.name} url={this.props.url} text="Subscribe" isOriginal={true}/>
+            : null;
     }
 }
 

diff --git a/src/FilterLists.Web/ClientApp/components/ViewButtonGroup.tsx b/src/FilterLists.Web/ClientApp/components/ViewButtonGroup.tsx
@@ -7,18 +7,20 @@ export default class ViewButtonGroup extends React.Component<IViewButtonGroupPro
     }
 
     render() {
-        return this.props.urlMirror1
-            ? (<div className="btn-group-vertical fl-btn-details-action" role="group">
-                   <button id="btnGroupDropView" type="button" className="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                       View
-                   </button>
-                   <div className="dropdown-menu" aria-labelledby="btnGroupDropView">
-                       <ViewButton name={this.props.name} url={this.props.url} text="Original" isOriginal={true}/>
-                       <ViewButton name={this.props.name} url={this.props.urlMirror1} text="Mirror 1" isOriginal={false}/>
-                       <ViewButton name={this.props.name} url={this.props.urlMirror2} text="Mirror 2" isOriginal={false}/>
-                   </div>
-               </div>)
-            : <ViewButton name={this.props.name} url={this.props.url} text="View" isOriginal={true}/>;
+        return this.props.url
+            ? this.props.urlMirror1
+                ? (<div className="btn-group-vertical fl-btn-details-action" role="group">
+                       <button id="btnGroupDropView" type="button" className="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                           View
+                       </button>
+                       <div className="dropdown-menu" aria-labelledby="btnGroupDropView">
+                           <ViewButton name={this.props.name} url={this.props.url} text="Original" isOriginal={true}/>
+                           <ViewButton name={this.props.name} url={this.props.urlMirror1} text="Mirror 1" isOriginal={false}/>
+                           <ViewButton name={this.props.name} url={this.props.urlMirror2} text="Mirror 2" isOriginal={false}/>
+                       </div>
+                   </div>)
+                : <ViewButton name={this.props.name} url={this.props.url} text="View" isOriginal={true}/>
+            : null;
     }
 }