Skip to content

Commit f4efd64

Browse files
shalemanshaleman
committed
Update web ui for new rule attributes
1 parent bdddc79 commit f4efd64

File tree

3 files changed

+64
-34
lines changed

3 files changed

+64
-34
lines changed

‎www/dist/bundle.js

+32-17
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@
334334
React.createElement("td", null, network.networkName),
335335
React.createElement("td", null, network.encap),
336336
React.createElement("td", null, network.subnet),
337-
React.createElement("td", null, network.defaultGw)
337+
React.createElement("td", null, network.gateway)
338338

339339
)
340340
)
@@ -370,10 +370,8 @@
370370
React.createElement(Input, {type: "text", label: "Tenant Name", ref: "tenantName", defaultValue: obj.tenantName, placeholder: "Tenant Name"}),
371371
React.createElement(Input, {type: "text", label: "Network name", ref: "networkName", defaultValue: obj.networkName, placeholder: "Network name"}),
372372
React.createElement(Input, {type: "text", label: "Encapsulation", ref: "encap", defaultValue: obj.encap, placeholder: "Encapsulation"}),
373-
React.createElement(Input, {type: "text", label: "Private network", ref: "isPrivate", defaultValue: obj.isPrivate, placeholder: "Private network"}),
374-
React.createElement(Input, {type: "text", label: "Public network", ref: "isPublic", defaultValue: obj.isPublic, placeholder: "Public network"}),
375373
React.createElement(Input, {type: "text", label: "Subnet", ref: "subnet", defaultValue: obj.subnet, placeholder: "Subnet"}),
376-
React.createElement(Input, {type: "text", label: "Gateway", ref: "defaultGw", defaultValue: obj.defaultGw, placeholder: "Gateway"})
374+
React.createElement(Input, {type: "text", label: "Gateway", ref: "defaultGw", defaultValue: obj.gateway, placeholder: "Gateway"})
377375
),
378376
React.createElement("div", {className: "modal-footer"},
379377
React.createElement(Button, {onClick: this.props.onRequestHide}, "Close")
@@ -516,19 +514,36 @@
516514
if (rule.action == "deny") {
517515
action = "deny"
518516
}
519-
return (
520-
React.createElement(ModalTrigger, {modal: React.createElement(RuleModalView, {rule: rule })},
521-
React.createElement("tr", {key: rule.key, className: "info"},
522-
React.createElement("td", null, rule.ruleId),
523-
React.createElement("td", null, rule.priority),
524-
React.createElement("td", null, action ),
525-
React.createElement("td", null, rule.endpointGroup),
526-
React.createElement("td", null, rule.ipAddress),
527-
React.createElement("td", null, rule.protocol),
528-
React.createElement("td", null, rule.port)
529-
)
530-
)
531-
);
517+
if (self.props.direction == "out") {
518+
return (
519+
React.createElement(ModalTrigger, {modal: React.createElement(RuleModalView, {rule: rule })},
520+
React.createElement("tr", {key: rule.key, className: "info"},
521+
React.createElement("td", null, rule.ruleId),
522+
React.createElement("td", null, rule.priority),
523+
React.createElement("td", null, action ),
524+
React.createElement("td", null, rule.toEndpointGroup),
525+
React.createElement("td", null, rule.toIpAddress),
526+
React.createElement("td", null, rule.protocol),
527+
React.createElement("td", null, rule.port)
528+
)
529+
)
530+
);
531+
} else {
532+
return (
533+
React.createElement(ModalTrigger, {modal: React.createElement(RuleModalView, {rule: rule })},
534+
React.createElement("tr", {key: rule.key, className: "info"},
535+
React.createElement("td", null, rule.ruleId),
536+
React.createElement("td", null, rule.priority),
537+
React.createElement("td", null, action ),
538+
React.createElement("td", null, rule.fromEndpointGroup),
539+
React.createElement("td", null, rule.fromIpAddress),
540+
React.createElement("td", null, rule.protocol),
541+
React.createElement("td", null, rule.port)
542+
)
543+
)
544+
);
545+
}
546+
532547
});
533548

534549
// Set appropriate heading based on direction

‎www/network.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var NetworkSummaryView = React.createClass({
3030
<td>{ network.networkName }</td>
3131
<td>{ network.encap }</td>
3232
<td>{ network.subnet }</td>
33-
<td>{ network.defaultGw }</td>
33+
<td>{ network.gateway }</td>
3434

3535
</tr>
3636
</ModalTrigger>
@@ -66,10 +66,8 @@ var NetworkModalView = React.createClass({
6666
<Input type='text' label='Tenant Name' ref='tenantName' defaultValue={obj.tenantName} placeholder='Tenant Name' />
6767
<Input type='text' label='Network name' ref='networkName' defaultValue={obj.networkName} placeholder='Network name' />
6868
<Input type='text' label='Encapsulation' ref='encap' defaultValue={obj.encap} placeholder='Encapsulation' />
69-
<Input type='text' label='Private network' ref='isPrivate' defaultValue={obj.isPrivate} placeholder='Private network' />
70-
<Input type='text' label='Public network' ref='isPublic' defaultValue={obj.isPublic} placeholder='Public network' />
7169
<Input type='text' label='Subnet' ref='subnet' defaultValue={obj.subnet} placeholder='Subnet' />
72-
<Input type='text' label='Gateway' ref='defaultGw' defaultValue={obj.defaultGw} placeholder='Gateway' />
70+
<Input type='text' label='Gateway' ref='defaultGw' defaultValue={obj.gateway} placeholder='Gateway' />
7371
</div>
7472
<div className='modal-footer'>
7573
<Button onClick={this.props.onRequestHide}>Close</Button>

‎www/policy.js

+30-13
Original file line numberDiff line numberDiff line change
@@ -94,19 +94,36 @@ var RuleSummaryView = React.createClass({
9494
if (rule.action == "deny") {
9595
action = "deny"
9696
}
97-
return (
98-
<ModalTrigger modal={<RuleModalView rule={ rule }/>}>
99-
<tr key={ rule.key } className="info">
100-
<td>{ rule.ruleId }</td>
101-
<td>{ rule.priority }</td>
102-
<td>{ action }</td>
103-
<td>{ rule.endpointGroup }</td>
104-
<td>{ rule.ipAddress }</td>
105-
<td>{ rule.protocol }</td>
106-
<td>{ rule.port }</td>
107-
</tr>
108-
</ModalTrigger>
109-
);
97+
if (self.props.direction == "out") {
98+
return (
99+
<ModalTrigger modal={<RuleModalView rule={ rule }/>}>
100+
<tr key={ rule.key } className="info">
101+
<td>{ rule.ruleId }</td>
102+
<td>{ rule.priority }</td>
103+
<td>{ action }</td>
104+
<td>{ rule.toEndpointGroup }</td>
105+
<td>{ rule.toIpAddress }</td>
106+
<td>{ rule.protocol }</td>
107+
<td>{ rule.port }</td>
108+
</tr>
109+
</ModalTrigger>
110+
);
111+
} else {
112+
return (
113+
<ModalTrigger modal={<RuleModalView rule={ rule }/>}>
114+
<tr key={ rule.key } className="info">
115+
<td>{ rule.ruleId }</td>
116+
<td>{ rule.priority }</td>
117+
<td>{ action }</td>
118+
<td>{ rule.fromEndpointGroup }</td>
119+
<td>{ rule.fromIpAddress }</td>
120+
<td>{ rule.protocol }</td>
121+
<td>{ rule.port }</td>
122+
</tr>
123+
</ModalTrigger>
124+
);
125+
}
126+
110127
});
111128

112129
// Set appropriate heading based on direction

0 commit comments

Comments
 (0)