Skip to content

Commit 05b9938

Browse files
committed
Make overview cleaner
1 parent bc7d61a commit 05b9938

File tree

1 file changed

+26
-17
lines changed

1 file changed

+26
-17
lines changed

src/content.js

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -163,28 +163,37 @@ function handlePrPage() {
163163
});
164164

165165
//Load up data from jira
166-
$.ajax({
167-
url: "https://"+jiraUrl+"/rest/api/latest/issue/" + ticketNumber,
168-
dataType: "json",
169-
success: function(result){
166+
chrome.runtime.sendMessage(
167+
{query: 'getTicketInfo', jiraUrl: jiraUrl, ticketNumber: ticketNumber},
168+
function(result) {
169+
var assignee = result.fields.assignee;
170+
var reporter = result.fields.reporter;
171+
172+
var assigneeImage = assignee.avatarUrls['48x48'];
173+
var reporterImage = reporter.avatarUrls['48x48'];
174+
170175
$("#insertedJiraData").html(
171-
'<div class="flex-table gh-header-meta" style="width: 100%; float: left; margin-bottom: 20px;">' +
172-
'<div class="flex-table-item" style="float: left;">' +
173-
'<div class="state" style="background-color: rgb(150, 198, 222);">' +
174-
'<span class="octicon"><img src="'+jiraLogo+'" /></span> Jira' +
176+
'<div class="TableObject gh-header-meta">' +
177+
'<div class="TableObject-item">' +
178+
'<span class="State State--green" style="background-color: rgb(150, 198, 222);">' +
179+
'<img height="16" class="octicon" width="12" aria-hidden="true" src="'+jiraLogo+'"/> <a style="color:white;" href="'+ticketUrl+'" target="_blank">Jira</a>' +
180+
'</span>' +
175181
'</div>' +
182+
'<div class="TableObject-item">' +
183+
'<span class="State State--white" style="background-color: rgb(220, 220, 220);color:rgb(40,40,40);">' +
184+
'<img height="16" class="octicon" width="12" aria-hidden="true" src="'+result.fields.status.iconUrl+'"/> ' + result.fields.status.name +
185+
'</span>' +
176186
'</div>' +
177-
'<div class="flex-table-item flex-table-item-primary" style="float: left; padding-left: 10px; line-height: 31px;">' +
178-
result.fields.summary + ' <span class="Counter">'+result.fields.status.name+'</span>' +
187+
'<div class="TableObject-item TableObject-item--primary">' +
188+
'<b><a href="'+ticketUrl+'" target="_blank">['+ticketNumber+'] - '+result.fields.summary+'</a></b>' +
189+
' - Reported by ' +
190+
'<span class="author text-bold">'+assignee.displayName+'</span>' +
191+
' and assigned to ' +
192+
'<span class="author text-bold">'+reporter.displayName+'</span>' +
179193
'</div>' +
180-
'</div>'
194+
'</div>'
181195
);
182196

183-
var assignee = result.fields.assignee;
184-
var reporter = result.fields.reporter;
185-
var assigneeImage = $.ajax(assignee.self, {async: false}).responseJSON.avatarUrls['48x48'];
186-
var reporterImage = $.ajax(reporter.self, {async: false}).responseJSON.avatarUrls['48x48'];
187-
188197
var assigneeText = '<div class="discussion-timeline pull-discussion-timeline js-quote-selection-container ">' +
189198
'<div class="js-discussion js-socket-channel">' +
190199
'<div class="timeline-comment-wrapper js-comment-container">' +
@@ -227,7 +236,7 @@ function handlePrPage() {
227236
assigneeText + reporterText
228237
);
229238
}
230-
});
239+
);
231240
}
232241

233242
function handlePrCreatePage() {

0 commit comments

Comments
 (0)