Skip to content

Commit ebada7e

Browse files
authored
Make the assignee details optional
A ticket can be unassigned so this should be optional. Also using backtick is easier to build HTML.
1 parent 2a993ea commit ebada7e

File tree

1 file changed

+34
-24
lines changed

1 file changed

+34
-24
lines changed

src/content.js

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -152,32 +152,42 @@ function handlePrPage() {
152152
chrome.runtime.sendMessage(
153153
{query: 'getTicketInfo', jiraUrl: jiraUrl, ticketNumber: ticketNumber},
154154
function(result) {
155-
let assignee = result.fields.assignee;
156-
let reporter = result.fields.reporter;
157-
158-
let assigneeImage = assignee.avatarUrls['16x16'];
159-
let reporterImage = reporter.avatarUrls['16x16'];
155+
const reporter = result.fields.reporter;
156+
const assignee = result.fields.assignee || false;
157+
let assigneeDetails = '';
158+
159+
if (assignee) {
160+
assigneeDetails = ` and assigned to <span class="author text-bold">
161+
<img src="${assignee.avatarUrls['16x16']}" width="16"/>
162+
${assignee.displayName}
163+
</span>`;
164+
}
160165

161166
$("#insertedJiraData").html(
162-
'<div class="TableObject gh-header-meta">' +
163-
'<div class="TableObject-item">' +
164-
'<span class="State State--green" style="background-color: rgb(150, 198, 222);">' +
165-
'<img height="16" class="octicon" width="12" aria-hidden="true" src="'+jiraLogo+'"/> <a style="color:white;" href="'+ticketUrl+'" target="_blank">Jira</a>' +
166-
'</span>' +
167-
'</div>' +
168-
'<div class="TableObject-item">' +
169-
'<span class="State State--white" style="background-color: rgb(220, 220, 220);color:rgb(40,40,40);">' +
170-
'<img height="16" class="octicon" width="12" aria-hidden="true" src="'+result.fields.status.iconUrl+'"/> ' + result.fields.status.name +
171-
'</span>' +
172-
'</div>' +
173-
'<div class="TableObject-item TableObject-item--primary">' +
174-
'<b><a href="'+ticketUrl+'" target="_blank">['+ticketNumber+'] - '+result.fields.summary+'</a></b>' +
175-
' - Reported by ' +
176-
'<span class="author text-bold"><img src="'+reporterImage+'" width="16"/> '+reporter.displayName+'</span>' +
177-
' and assigned to ' +
178-
'<span class="author text-bold"><img src="'+assigneeImage+'" width="16"/> '+assignee.displayName+'</span>' +
179-
'</div>' +
180-
'</div>'
167+
`<div class="TableObject gh-header-meta">
168+
<div class="TableObject-item">
169+
<span class="State State--green" style="background-color: rgb(150, 198, 222);">
170+
<img height="16" class="octicon" width="12" aria-hidden="true" src="${jiraLogo}"/>
171+
<a style="color:white;" href="${ticketUrl}" target="_blank">Jira</a>
172+
</span>
173+
</div>
174+
<div class="TableObject-item">
175+
<span class="State State--white" style="background-color: rgb(220, 220, 220);color:rgb(40,40,40);">
176+
<img height="16" class="octicon" width="12" aria-hidden="true" src="${result.fields.status.iconUrl}"/>
177+
${result.fields.status.name}
178+
</span>
179+
</div>
180+
<div class="TableObject-item TableObject-item--primary">
181+
<strong>
182+
<a href="${ticketUrl}" target="_blank">
183+
[${ticketNumber}] - ${result.fields.summary}
184+
</a>
185+
</strong> - Reported by <span class="author text-bold">
186+
<img src="${reporter.avatarUrls['16x16']}" width="16"/>
187+
${reporter.displayName}
188+
</span>${assigneeDetails}
189+
</div>
190+
</div>`
181191
);
182192
}
183193
);

0 commit comments

Comments
 (0)