Skip to content

Commit 253968b

Browse files
tstrombergtstromberg
committed
Plumb error messages, fix demo avatars
1 parent d9cdca0 commit 253968b

File tree

2 files changed

+61
-37
lines changed

2 files changed

+61
-37
lines changed

‎assets/app.js‎

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -540,8 +540,8 @@ const App = (() => {
540540
'Content-Type': 'application/json'
541541
},
542542
body: JSON.stringify({
543-
commit_title: `Merge pull request #${pr.number} from ${pr.head.ref}`,
544-
commit_message: pr.title
543+
commit_title: `Merge pull request #${pr.number}${pr.head?.ref ? ` from ${pr.head.ref}` : ''}`,
544+
commit_message: pr.title || `Merge PR #${pr.number}`
545545
})
546546
});
547547

@@ -557,8 +557,15 @@ const App = (() => {
557557
// Update the display
558558
updatePRSections();
559559
} else {
560-
const error = await response.json();
561-
showToast(error.message || 'Failed to merge PR', 'error');
560+
let errorMsg = 'Failed to merge PR';
561+
try {
562+
const error = await response.json();
563+
errorMsg = error.message || error.error || errorMsg;
564+
} catch (e) {
565+
// If JSON parsing fails, use status text
566+
errorMsg = `Failed to merge PR: ${response.statusText}`;
567+
}
568+
showToast(errorMsg, 'error');
562569
}
563570
break;
564571

@@ -579,7 +586,14 @@ const App = (() => {
579586
// Refresh the PR list
580587
updatePRSections();
581588
} else {
582-
showToast('Failed to unassign', 'error');
589+
let errorMsg = 'Failed to unassign';
590+
try {
591+
const error = await response.json();
592+
errorMsg = error.message || error.error || errorMsg;
593+
} catch (e) {
594+
errorMsg = `Failed to unassign: ${response.statusText}`;
595+
}
596+
showToast(errorMsg, 'error');
583597
}
584598
break;
585599

@@ -607,16 +621,26 @@ const App = (() => {
607621
// Update the display
608622
updatePRSections();
609623
} else {
610-
const errorMsg = response.status === 403 ?
611-
'Failed to close PR - Permission denied' :
612-
'Failed to close PR';
624+
let errorMsg = 'Failed to close PR';
625+
if (response.status === 403) {
626+
errorMsg = 'Failed to close PR - Permission denied';
627+
} else {
628+
try {
629+
const error = await response.json();
630+
errorMsg = error.message || error.error || `Failed to close PR: ${response.statusText}`;
631+
} catch (e) {
632+
errorMsg = `Failed to close PR: ${response.statusText}`;
633+
}
634+
}
613635
showToast(errorMsg, 'error');
614636
}
615637
break;
616638
}
617639
} catch (error) {
618640
console.error('Error performing PR action:', error);
619-
showToast('An error occurred', 'error');
641+
// Show the actual error message to the user
642+
const errorMessage = error.message || 'An error occurred';
643+
showToast(`Error: ${errorMessage}`, 'error');
620644
}
621645
};
622646

‎assets/demo-data.js‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
const DEMO_DATA = {
77
user: {
88
login: 'demo',
9-
avatar_url: 'https://github.com/identicons/demo.png',
9+
avatar_url: 'https://avatars.githubusercontent.com/u/1?v=4',
1010
name: 'Demo User'
1111
},
1212

@@ -24,12 +24,12 @@ const DEMO_DATA = {
2424
updated_at: new Date(Date.now() - 3 * 60 * 60 * 1000).toISOString(), // 3 hours ago
2525
user: {
2626
login: 'johndoe',
27-
avatar_url: 'https://github.com/identicons/johndoe.png'
27+
avatar_url: 'https://avatars.githubusercontent.com/u/2?v=4'
2828
},
2929
requested_reviewers: [
3030
{
3131
login: 'demo',
32-
avatar_url: 'https://github.com/identicons/demo.png'
32+
avatar_url: 'https://avatars.githubusercontent.com/u/1?v=4'
3333
}
3434
],
3535
labels: [
@@ -59,16 +59,16 @@ const DEMO_DATA = {
5959
updated_at: new Date(Date.now() - 1 * 24 * 60 * 60 * 1000).toISOString(), // 1 day ago
6060
user: {
6161
login: 'sarahchen',
62-
avatar_url: 'https://github.com/identicons/sarahchen.png'
62+
avatar_url: 'https://avatars.githubusercontent.com/u/3?v=4'
6363
},
6464
requested_reviewers: [
6565
{
6666
login: 'tstromberg',
67-
avatar_url: 'https://github.com/identicons/tstromberg.png'
67+
avatar_url: 'https://avatars.githubusercontent.com/u/4?v=4'
6868
},
6969
{
7070
login: 'mikejones',
71-
avatar_url: 'https://github.com/identicons/mikejones.png'
71+
avatar_url: 'https://avatars.githubusercontent.com/u/5?v=4'
7272
}
7373
],
7474
labels: [
@@ -98,12 +98,12 @@ const DEMO_DATA = {
9898
updated_at: new Date(Date.now() - 30 * 60 * 1000).toISOString(), // 30 minutes ago
9999
user: {
100100
login: 'alexkim',
101-
avatar_url: 'https://github.com/identicons/alexkim.png'
101+
avatar_url: 'https://avatars.githubusercontent.com/u/6?v=4'
102102
},
103103
requested_reviewers: [
104104
{
105105
login: 'demo',
106-
avatar_url: 'https://github.com/identicons/demo.png'
106+
avatar_url: 'https://avatars.githubusercontent.com/u/1?v=4'
107107
}
108108
],
109109
labels: [
@@ -133,12 +133,12 @@ const DEMO_DATA = {
133133
updated_at: new Date(Date.now() - 2 * 24 * 60 * 60 * 1000).toISOString(), // 2 days ago
134134
user: {
135135
login: 'jennywu',
136-
avatar_url: 'https://github.com/identicons/jennywu.png'
136+
avatar_url: 'https://avatars.githubusercontent.com/u/7?v=4'
137137
},
138138
requested_reviewers: [
139139
{
140140
login: 'demo',
141-
avatar_url: 'https://github.com/identicons/demo.png'
141+
avatar_url: 'https://avatars.githubusercontent.com/u/1?v=4'
142142
}
143143
],
144144
labels: [
@@ -170,12 +170,12 @@ const DEMO_DATA = {
170170
updated_at: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000).toISOString(), // 7 days ago
171171
user: {
172172
login: 'davidlee',
173-
avatar_url: 'https://github.com/identicons/davidlee.png'
173+
avatar_url: 'https://avatars.githubusercontent.com/u/8?v=4'
174174
},
175175
requested_reviewers: [
176176
{
177177
login: 'demo',
178-
avatar_url: 'https://github.com/identicons/demo.png'
178+
avatar_url: 'https://avatars.githubusercontent.com/u/1?v=4'
179179
}
180180
],
181181
labels: [
@@ -198,12 +198,12 @@ const DEMO_DATA = {
198198
updated_at: new Date(Date.now() - 45 * 24 * 60 * 60 * 1000).toISOString(), // 45 days ago
199199
user: {
200200
login: 'robertsmith',
201-
avatar_url: 'https://github.com/identicons/robertsmith.png'
201+
avatar_url: 'https://avatars.githubusercontent.com/u/9?v=4'
202202
},
203203
requested_reviewers: [
204204
{
205205
login: 'demo',
206-
avatar_url: 'https://github.com/identicons/demo.png'
206+
avatar_url: 'https://avatars.githubusercontent.com/u/1?v=4'
207207
}
208208
],
209209
labels: [
@@ -230,16 +230,16 @@ const DEMO_DATA = {
230230
updated_at: new Date(Date.now() - 6 * 60 * 60 * 1000).toISOString(), // 6 hours ago
231231
user: {
232232
login: 'demo',
233-
avatar_url: 'https://github.com/identicons/demo.png'
233+
avatar_url: 'https://avatars.githubusercontent.com/u/1?v=4'
234234
},
235235
requested_reviewers: [
236236
{
237237
login: 'kubernetes-reviewer',
238-
avatar_url: 'https://github.com/identicons/kubernetes-reviewer.png'
238+
avatar_url: 'https://avatars.githubusercontent.com/u/10?v=4'
239239
},
240240
{
241241
login: 'sig-storage-lead',
242-
avatar_url: 'https://github.com/identicons/sig-storage-lead.png'
242+
avatar_url: 'https://avatars.githubusercontent.com/u/11?v=4'
243243
}
244244
],
245245
labels: [
@@ -271,12 +271,12 @@ const DEMO_DATA = {
271271
updated_at: new Date(Date.now() - 1 * 24 * 60 * 60 * 1000).toISOString(), // 1 day ago
272272
user: {
273273
login: 'demo',
274-
avatar_url: 'https://github.com/identicons/demo.png'
274+
avatar_url: 'https://avatars.githubusercontent.com/u/1?v=4'
275275
},
276276
requested_reviewers: [
277277
{
278278
login: 'terraform-gcp-reviewer',
279-
avatar_url: 'https://github.com/identicons/terraform-gcp-reviewer.png'
279+
avatar_url: 'https://avatars.githubusercontent.com/u/12?v=4'
280280
}
281281
],
282282
labels: [
@@ -308,12 +308,12 @@ const DEMO_DATA = {
308308
updated_at: new Date(Date.now() - 12 * 60 * 60 * 1000).toISOString(), // 12 hours ago
309309
user: {
310310
login: 'demo',
311-
avatar_url: 'https://github.com/identicons/demo.png'
311+
avatar_url: 'https://avatars.githubusercontent.com/u/1?v=4'
312312
},
313313
requested_reviewers: [
314314
{
315315
login: 'frontend-lead',
316-
avatar_url: 'https://github.com/identicons/frontend-lead.png'
316+
avatar_url: 'https://avatars.githubusercontent.com/u/13?v=4'
317317
}
318318
],
319319
labels: [
@@ -337,16 +337,16 @@ const DEMO_DATA = {
337337
updated_at: new Date(Date.now() - 3 * 24 * 60 * 60 * 1000).toISOString(), // 3 days ago
338338
user: {
339339
login: 'demo',
340-
avatar_url: 'https://github.com/identicons/demo.png'
340+
avatar_url: 'https://avatars.githubusercontent.com/u/1?v=4'
341341
},
342342
requested_reviewers: [
343343
{
344344
login: 'platform-team',
345-
avatar_url: 'https://github.com/identicons/platform-team.png'
345+
avatar_url: 'https://avatars.githubusercontent.com/u/14?v=4'
346346
},
347347
{
348348
login: 'sre-lead',
349-
avatar_url: 'https://github.com/identicons/sre-lead.png'
349+
avatar_url: 'https://avatars.githubusercontent.com/u/15?v=4'
350350
}
351351
],
352352
labels: [
@@ -371,12 +371,12 @@ const DEMO_DATA = {
371371
updated_at: new Date(Date.now() - 14 * 24 * 60 * 60 * 1000).toISOString(), // 14 days ago
372372
user: {
373373
login: 'demo',
374-
avatar_url: 'https://github.com/identicons/demo.png'
374+
avatar_url: 'https://avatars.githubusercontent.com/u/1?v=4'
375375
},
376376
requested_reviewers: [
377377
{
378378
login: 'infrastructure-team',
379-
avatar_url: 'https://github.com/identicons/infrastructure-team.png'
379+
avatar_url: 'https://avatars.githubusercontent.com/u/16?v=4'
380380
}
381381
],
382382
labels: [
@@ -403,7 +403,7 @@ const DEMO_DATA = {
403403
updated_at: new Date(Date.now() - 4 * 60 * 60 * 1000).toISOString(), // 4 hours ago
404404
user: {
405405
login: 'demo',
406-
avatar_url: 'https://github.com/identicons/demo.png'
406+
avatar_url: 'https://avatars.githubusercontent.com/u/1?v=4'
407407
},
408408
requested_reviewers: [],
409409
labels: [
@@ -427,7 +427,7 @@ const DEMO_DATA = {
427427
updated_at: new Date(Date.now() - 5 * 24 * 60 * 60 * 1000).toISOString(), // 5 days ago
428428
user: {
429429
login: 'demo',
430-
avatar_url: 'https://github.com/identicons/demo.png'
430+
avatar_url: 'https://avatars.githubusercontent.com/u/1?v=4'
431431
},
432432
requested_reviewers: [],
433433
labels: [

0 commit comments

Comments
 (0)