Skip to content
Snippets Groups Projects
Commit a795a90d authored by Nico Vermaas's avatar Nico Vermaas
Browse files

adding href to http links to make it links

parent 23c95227
No related branches found
No related tags found
1 merge request!8Esap gui dev
Pipeline #7592 passed with warnings
...@@ -3,7 +3,6 @@ import { Table } from "react-bootstrap"; ...@@ -3,7 +3,6 @@ import { Table } from "react-bootstrap";
export default function SampResults(props) { export default function SampResults(props) {
//alert('SampGrid')
let fieldnames = props.fieldnames let fieldnames = props.fieldnames
let data = props.votable_in_json['data'] let data = props.votable_in_json['data']
...@@ -27,8 +26,13 @@ export default function SampResults(props) { ...@@ -27,8 +26,13 @@ export default function SampResults(props) {
return ( return (
<tr key={record}> <tr key={record}>
{record.map((col) => { {record.map((col) => {
let value = col.toString()
if (value.includes('http')) {
value = <a href={value} target="_blank" rel="noopener noreferrer">{value}</a>
}
return ( return (
<td key={col}>{col}</td> <td key={value}>{value}</td>
) )
})} })}
</tr> </tr>
......
...@@ -6,27 +6,16 @@ import SampGrid from './SampGrid' ...@@ -6,27 +6,16 @@ import SampGrid from './SampGrid'
export default function SampPage(props) { export default function SampPage(props) {
const [ myVOTable, setMyVOTable] = useState([]); const [ myVOTable, setMyVOTable] = useState([]);
const pingFunc = function (my_connection) { // register to existing SAMP hub
my_connection.notifyAll([new window.samp.Message("samp.app.ping", {})])
}
const register = () => { const register = () => {
connector.register() connector.register()
} }
// unregister from existing SAMP hub
const unregister = () => { const unregister = () => {
connector.unregister() connector.unregister()
} }
const handlePingClick = () => {
connector.runWithConnection(pingFunc)
}
const handlePing = (cc, senderId, message, isCall) => {
alert('handle samp.app.ping')
if (isCall) {
return {text: "ping to you, " + cc.getName(senderId)};
}
}
const handleLoadVOTable = (cc, senderId, message, isCall) => { const handleLoadVOTable = (cc, senderId, message, isCall) => {
// alert('handle table.load.votable') // alert('handle table.load.votable')
...@@ -75,10 +64,6 @@ export default function SampPage(props) { ...@@ -75,10 +64,6 @@ export default function SampPage(props) {
// attach eventhandlers // attach eventhandlers
var callHandler = cc.callHandler; var callHandler = cc.callHandler;
callHandler["samp.app.ping"] = function(senderId, message, isCall) {
handlePing(cc,senderId, message, isCall)
};
callHandler["table.load.votable"] = function(senderId, message, isCall) { callHandler["table.load.votable"] = function(senderId, message, isCall) {
handleLoadVOTable(cc,senderId, message, isCall) handleLoadVOTable(cc,senderId, message, isCall)
}; };
...@@ -87,7 +72,7 @@ export default function SampPage(props) { ...@@ -87,7 +72,7 @@ export default function SampPage(props) {
var subs = cc.calculateSubscriptions(); var subs = cc.calculateSubscriptions();
// initialize the connector // initialize the connector
var connector = new window.samp.Connector("astroview", {"samp.name": "AstroView"}, cc, subs) var connector = new window.samp.Connector("ESAP", {"samp.name": "ESAP"}, cc, subs)
// only render when myVOTable has a value // only render when myVOTable has a value
var renderSampGrid var renderSampGrid
...@@ -102,7 +87,6 @@ export default function SampPage(props) { ...@@ -102,7 +87,6 @@ export default function SampPage(props) {
<h2>SAMP demo</h2> <h2>SAMP demo</h2>
<p>Start a SAMP enabled application (like Topcat), register to the hub and transmit data from Topcat.</p> <p>Start a SAMP enabled application (like Topcat), register to the hub and transmit data from Topcat.</p>
<button variant="outline-warning" onClick={() => register()}>register</button>&nbsp; <button variant="outline-warning" onClick={() => register()}>register</button>&nbsp;
<button variant="outline-success" onClick={() => handlePingClick()}>SAMP Ping</button>&nbsp;
<button variant="outline-warning" onClick={() => unregister()}>unregister</button>&nbsp; <button variant="outline-warning" onClick={() => unregister()}>unregister</button>&nbsp;
{renderSampGrid} {renderSampGrid}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment