Skip to content

Commit 7bcf41b

Browse files
committed
Refactor and simplify missing reason formatting
1 parent 4219202 commit 7bcf41b

File tree

1 file changed

+9
-20
lines changed

1 file changed

+9
-20
lines changed

site/frontend/src/pages/status/page.vue

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -69,26 +69,15 @@ function formatCommitAsHtml(commit: Commit, reason: MissingReason): string {
6969
return `${pullRequestUrlAsHtml(pr)} (${type}): ${url}`;
7070
}
7171
72-
function formatReason(reason: any): string {
73-
if (typeof reason == "string") {
74-
return reason;
75-
} else if (reason.InProgress) {
76-
return `${formatReason(reason.InProgress)} - in progress`;
77-
} else if (reason["Master"] !== undefined && reason.Master.pr) {
78-
return `<a href="https://github.com/rust-lang/rust/pull/${
79-
reason["Master"].pr
80-
}">
81-
#${reason["Master"].pr}</a>${
82-
reason.Master.is_try_parent ? " - Try commit parent" : ""
72+
function formatMissingReason(reason: MissingReason): string {
73+
if (reason.hasOwnProperty("InProgress")) {
74+
return `${formatMissingReason(reason["InProgress"])} - in progress`;
75+
} else if (reason.hasOwnProperty("Master")) {
76+
return `${pullRequestUrlAsHtml(reason["Master"].pr)}${
77+
reason["Master"].is_try_parent ? " - Try commit parent" : ""
8378
}`;
84-
} else if (reason["Master"] !== undefined && reason.Master.pr == 0) {
85-
return "Master";
86-
} else if (reason["Try"] !== undefined && reason.Try.pr) {
87-
return `
88-
Try for
89-
<a href="https://github.com/rust-lang/rust/pull/${reason["Try"].pr}">
90-
#${reason["Try"].pr}
91-
</a>`;
79+
} else if (reason.hasOwnProperty("Try")) {
80+
return `Try for ${pullRequestUrlAsHtml(reason["Try"].pr)}`;
9281
} else {
9382
// Should never happen, but a reasonable fallback
9483
return JSON.stringify(reason);
@@ -214,7 +203,7 @@ loadStatus(loading);
214203
<tr v-for="[commit, reason] in data.missing">
215204
<td>{{ new Date(commit.date).toLocaleString() }}</td>
216205
<td v-html="commitUrlAsHtml(commit.sha)"></td>
217-
<td v-html="formatReason(reason)"></td>
206+
<td v-html="formatMissingReason(reason)"></td>
218207
</tr>
219208
</tbody>
220209
</table>

0 commit comments

Comments
 (0)