Skip to content

Commit 4793727

Browse files
committed
prefer template strings
1 parent 2fc24ca commit 4793727

File tree

4 files changed

+25
-23
lines changed

4 files changed

+25
-23
lines changed

.eslintrc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# yaml-language-server: $schema=https://json.schemastore.org/eslintrc.json
12
extends:
23
- 'eslint:recommended'
34
- 'plugin:react/recommended'
@@ -14,6 +15,7 @@ ignorePatterns:
1415
- 'dist'
1516
rules:
1617
no-var: error
18+
prefer-template: error
1719
semi: error
1820
quotes: ['error', 'single']
1921
jsx-quotes: ['error', 'prefer-single']

src/Graph.jsx

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -60,23 +60,23 @@ class Popup extends React.Component {
6060
const yOffset = 45;
6161

6262
const style = {
63-
left: this.props.selectedEpic.popupPosition.x + 'px',
64-
top: this.props.selectedEpic.popupPosition.y + yOffset + 'px',
63+
left: `${this.props.selectedEpic.popupPosition.x}px`,
64+
top: `${this.props.selectedEpic.popupPosition.y + yOffset}px`,
6565
};
6666

6767
const epic = this.props.selectedEpic.epic;
6868

6969
let className = 'popup';
7070
if (epic.flagged) {
71-
className = className + ' flagged';
71+
className = `${className} flagged`;
7272
}
7373

7474
return (
7575
<div className={className} style={style}>
7676
<div className='popup-summary'>{epic.summary}</div>
7777
<div className='popup-container'>
78-
<PopupIcon alt={'Type: ' + epic.type} imageURL={epic.typeImageURL} />
79-
<PopupIcon alt={'Priority: ' + epic.priority} imageURL={epic.priorityImageURL} />
78+
<PopupIcon alt={`Type: ${epic.type}`} imageURL={epic.typeImageURL} />
79+
<PopupIcon alt={`Priority: ${epic.priority}`} imageURL={epic.priorityImageURL} />
8080
<span className='popup popup-flagged'>{epic.flagged ? '⚑' : ''}</span>
8181
<PopupEstimate estimate={epic.estimate} />
8282
<PopupKey epicKey={epic.key} />
@@ -119,7 +119,7 @@ class PopupAssignee extends React.Component {
119119
return <span className='popup-avatar' />;
120120
}
121121

122-
const alt = 'Assignee: ' + this.props.assignee;
122+
const alt = `Assignee: ${this.props.assignee}`;
123123
return (
124124
<span className='popup-avatar'>
125125
<img src={this.props.assigneeImageURL} alt={alt} title={alt} />
@@ -130,7 +130,7 @@ class PopupAssignee extends React.Component {
130130

131131
class PopupKey extends React.Component {
132132
render() {
133-
const url = '/api/issues/' + this.props.epicKey + '/details';
133+
const url = `/api/issues/${this.props.epicKey}/details`;
134134

135135
return (
136136
<span className='popup-key'>
@@ -217,7 +217,7 @@ class GraphApp extends React.Component {
217217

218218
componentDidMount() {
219219
const issueKey = this.props.issueKey;
220-
console.log('loading ' + issueKey);
220+
console.log(`loading ${issueKey}`);
221221
const uriPrefix = this.props.issueType === 'Milestone' ? '/api/milestones/' : '/api/epics/';
222222

223223
fetch(uriPrefix + issueKey)
@@ -233,10 +233,10 @@ class GraphApp extends React.Component {
233233
issueGraph: result,
234234
selectedEpics: this.initSelectedEpics(result),
235235
});
236-
console.log('loaded ' + issueKey);
236+
console.log(`loaded ${issueKey}`);
237237
})
238238
.catch((err) => {
239-
console.log('failed to load ' + issueKey + ' error: ' + err);
239+
console.log(`failed to load ${issueKey} error: ${err}`);
240240
this.setState({
241241
isLoaded: false,
242242
error: true,
@@ -322,8 +322,8 @@ class RelatedIssues extends React.Component {
322322
componentDidMount() {
323323
const issueKey = this.props.issueKey;
324324

325-
console.log('loading related issues for ' + issueKey);
326-
fetch('/api/issues/' + issueKey + '/related')
325+
console.log(`loading related issues for ${issueKey}`);
326+
fetch(`/api/issues/${issueKey}/related`)
327327
.then((res) => {
328328
if (!res.ok) {
329329
throw new Error('not ok');
@@ -335,10 +335,10 @@ class RelatedIssues extends React.Component {
335335
isLoaded: true,
336336
issues: result,
337337
});
338-
console.log('loaded related issues for ' + issueKey);
338+
console.log(`loaded related issues for ${issueKey}`);
339339
})
340340
.catch(() => {
341-
console.log('failed to load related issues for ' + issueKey);
341+
console.log(`failed to load related issues for ${issueKey}`);
342342
this.setState({
343343
isLoaded: false,
344344
error: true,
@@ -530,7 +530,7 @@ class Graph extends React.Component {
530530
const blockingIssue = iss.data.id;
531531
return issueGraph.graph[blockingIssue].flatMap((blockedIssue) => {
532532
if (!issueKeys.has(blockedIssue)) {
533-
console.log('skipping edge for unselected epic issue ' + blockedIssue);
533+
console.log(`skipping edge for unselected epic issue ${blockedIssue}`);
534534
return [];
535535
}
536536
return [
@@ -582,8 +582,8 @@ class IssueGraph extends React.Component {
582582
return <div>Loading...</div>;
583583
}
584584
const issue = this.state.issue;
585-
const issueURL = 'https://' + this.state.jiraHost + '/browse/' + issue.key;
586-
const issueLabel = issue.key + ' - ' + issue.summary;
585+
const issueURL = `https://${this.state.jiraHost}/browse/${issue.key}`;
586+
const issueLabel = `${issue.key} - ${issue.summary}`;
587587
return (
588588
<div>
589589
<h1>
@@ -623,8 +623,8 @@ class IssueGraph extends React.Component {
623623
componentDidMount() {
624624
const issueKey = this.props.issueKey;
625625

626-
console.log('loading related issues for ' + issueKey);
627-
fetch('/api/issues/' + issueKey)
626+
console.log(`loading related issues for ${issueKey}`);
627+
fetch(`/api/issues/${issueKey}`)
628628
.then((res) => {
629629
if (!res.ok) {
630630
throw new Error('not ok');
@@ -646,10 +646,10 @@ class IssueGraph extends React.Component {
646646
summary: result.issue.summary,
647647
};
648648
pushRecentIssue(issue);
649-
console.log('loaded issue ' + issueKey);
649+
console.log(`loaded issue ${issueKey}`);
650650
})
651651
.catch((err) => {
652-
console.log('failed to load issue ' + issueKey + ' error: ' + err);
652+
console.log(`failed to load issue ${issueKey} error: ${err}`);
653653
this.setState((prevState) => ({
654654
...prevState,
655655
...{

src/IssueList.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class IssueList extends React.Component {
3434

3535
class Issue extends React.Component {
3636
render() {
37-
const path = '/issues/' + this.props.issueKey;
37+
const path = `/issues/${this.props.issueKey}`;
3838
return (
3939
<li>
4040
<Link to={path} key={this.props.issueKey}>

src/recent.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const getRecentIssues = () => {
1515
try {
1616
parsed = JSON.parse(rawRecentIssues);
1717
} catch (e) {
18-
console.log('failed to parse recent-epics from local storage: ' + e);
18+
console.log(`failed to parse recent-epics from local storage: ${e}`);
1919
}
2020
if (parsed && parsed.constructor === Array) {
2121
return parsed;

0 commit comments

Comments
 (0)