janis/aes67-daemon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set of enhancements to the WebUI Browser tab:

Browse Source 
- added display of domain parameter for the remote sources discovered via mDNS
- the list of remote sources is ordered by name
This commit is contained in:
Andrea Bondavalli 2020-04-08 11:25:16 -07:00
parent 9898c9fac0
commit 28579de590
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
webui/src/RemoteSources.js
View File

@ -32,6 +32,7 @@ class RemoteSourceEntry extends Component {
source: PropTypes.string.isRequired, source: PropTypes.string.isRequired,
id: PropTypes.string.isRequired, id: PropTypes.string.isRequired,
name: PropTypes.string.isRequired, name: PropTypes.string.isRequired,
domain: PropTypes.string.isRequired,
address: PropTypes.string.isRequired, address: PropTypes.string.isRequired,
sdp: PropTypes.string.isRequired, sdp: PropTypes.string.isRequired,
last_seen: PropTypes.number.isRequired, last_seen: PropTypes.number.isRequired,
@ -65,6 +66,7 @@ class RemoteSourceEntry extends Component {
<td> <label>{this.props.source}</label> </td> <td> <label>{this.props.source}</label> </td>
<td> <label>{this.props.address}</label> </td> <td> <label>{this.props.address}</label> </td>
<td> <label>{this.props.name}</label> </td> <td> <label>{this.props.name}</label> </td>
<td> <label>{this.props.source=='mDNS' ? this.props.domain : 'N/A'}</label> </td>
<td> <label>{this.state.rtp_address}</label> </td> <td> <label>{this.state.rtp_address}</label> </td>
<td align='center'> <label>{this.state.port}</label> </td> <td align='center'> <label>{this.state.port}</label> </td>
<td align='center'> <label>{this.props.last_seen}</label> </td> <td align='center'> <label>{this.props.last_seen}</label> </td>
@ -94,6 +96,7 @@ class RemoteSourceList extends Component {
<th>Source</th> <th>Source</th>
<th>Address</th> <th>Address</th>
<th>Name</th> <th>Name</th>
<th>Domain</th>
<th>RTP Address</th> <th>RTP Address</th>
<th>Port</th> <th>Port</th>
<th>Seen</th> <th>Seen</th>
@ -160,13 +163,14 @@ class RemoteSources extends Component {
} }
render() { render() {
this.state.sources.sort((a, b) => (a.id > b.id) ? 1 : -1); //this.state.sources.sort((a, b) => (a.id > b.id) ? 1 : -1);
const sources = this.state.sources.map((source) => ( const sources = this.state.sources.map((source) => (
<RemoteSourceEntry key={source.id} <RemoteSourceEntry key={source.id}
source={source.source} source={source.source}
id={source.id} id={source.id}
address={source.address} address={source.address}
name={source.name} name={source.name}
domain={source.domain}
sdp={source.sdp} sdp={source.sdp}
last_seen={source.last_seen} last_seen={source.last_seen}
period={source.announce_period} period={source.announce_period}
@ -186,6 +190,7 @@ class RemoteSources extends Component {
id={this.state.source.id} id={this.state.source.id}
source={this.state.source.source} source={this.state.source.source}
name={this.state.source.name} name={this.state.source.name}
domain={this.state.source.domain}
sdp={this.state.source.sdp} /> sdp={this.state.source.sdp} />
: undefined } : undefined }
</div> </div>

7
webui/src/SourceInfo.js
View File

@ -40,6 +40,7 @@ class SourceInfo extends Component {
id: PropTypes.string.isRequired, id: PropTypes.string.isRequired,
source: PropTypes.string.isRequired, source: PropTypes.string.isRequired,
name: PropTypes.string.isRequired, name: PropTypes.string.isRequired,
domain: PropTypes.string.isRequired,
sdp: PropTypes.string.isRequired, sdp: PropTypes.string.isRequired,
closeInfo: PropTypes.func.isRequired, closeInfo: PropTypes.func.isRequired,
infoIsOpen: PropTypes.bool.isRequired, infoIsOpen: PropTypes.bool.isRequired,
@ -81,6 +82,12 @@ class SourceInfo extends Component {
<th align="left"> <label>Name</label> </th> <th align="left"> <label>Name</label> </th>
<th align="left"> <input value={this.props.name} readOnly/> </th> <th align="left"> <input value={this.props.name} readOnly/> </th>
</tr> </tr>
{this.props.source == "mDNS" ?
<tr>
<th align="left"> <label>Domain</label> </th>
<th align="left"> <input value={this.props.domain} readOnly/> </th>
</tr>
: undefined}
<tr> <tr>
<th align="left"> <label>SDP</label> </th> <th align="left"> <label>SDP</label> </th>
<th align="left"> <textarea rows='15' cols='55' value={this.props.sdp} readOnly/> </th> <th align="left"> <textarea rows='15' cols='55' value={this.props.sdp} readOnly/> </th>