Skip to content

Commit 65e9fac

Browse files
committed
improved format of value in TRACE messages and fixed external link detection to support https and open api urls
1 parent b3dcbc7 commit 65e9fac

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

src/components/LogMessage.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ export default class LogMessage extends Component {
1212
render() {
1313

1414
function addLinks(value) {
15-
var urlMatch = value.match("(http){1}.*(\.html){1}");
15+
var urlMatch = value.match("(http){1}s?://[^\\s]*");
1616
if (urlMatch) {
1717
let matchedUrl = urlMatch[0];
1818
return (<span>{value.substr(0, value.indexOf(matchedUrl))}<a style={{
1919
textDecoration: "underline",
2020
color: "rgb(95, 113, 245)"
21-
}} href={matchedUrl} target="_blank">{matchedUrl}</a>{value.substr(value.indexOf(matchedUrl) + matchedUrl.length)}</span>);
21+
}} href={matchedUrl} target="_blank" rel="noopener noreferrer">{matchedUrl}</a>{value.substr(value.indexOf(matchedUrl) + matchedUrl.length)}</span>);
2222
} else {
2323
return value;
2424
}
@@ -51,7 +51,7 @@ export default class LogMessage extends Component {
5151
style={cellStyle}>{addLinks(messagePart.value)}</div>;
5252
} else {
5353
if (messagePart.multiline || messagePart.because) {
54-
let reason = messagePart.value.map(
54+
let line = messagePart.value.map(
5555
(reason, index) => {
5656
let color = "rgb(255, 255, 255)";
5757
if (messagePart.because) {
@@ -73,7 +73,7 @@ export default class LogMessage extends Component {
7373
whiteSpace: "pre",
7474
paddingLeft: "20px",
7575
paddingBottom: "10px",
76-
}}>{reason}</span>
76+
}}>{addLinks(reason)}</span>
7777
}
7878
);
7979
return <div key={messagePart.key}
@@ -88,7 +88,7 @@ export default class LogMessage extends Component {
8888
marginTop: "-1px",
8989
}}><span>...</span>
9090
</summary>
91-
{reason}
91+
{line}
9292
</details>
9393
</div>;
9494
} else if (messagePart.json) {
@@ -113,9 +113,12 @@ export default class LogMessage extends Component {
113113
paddingLeft: "5px",
114114
paddingRight: "5px",
115115
whiteSpace: "pre",
116+
letterSpacing: "0.12em",
116117
}}>{addLinks(messagePart.value)}</div>;
117118
}
118119
}
120+
} else {
121+
return <span/>;
119122
}
120123
}) : <div style={Object.assign({
121124
fontSize: "19px",

0 commit comments

Comments
 (0)