Skip to content

Commit 406c4fa

Browse files
authored
Merge pull request #2269 from Jamesbarford/fix/more-screen-responsive-status-page
Fix; 12 chars for a tag and a more responsive collectors grid
2 parents ef604b4 + bbb51d4 commit 406c4fa

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

site/frontend/src/pages/status_new/collector.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script setup lang="tsx">
22
import {h, ref, Ref} from "vue";
33
import {parseISO, differenceInHours} from "date-fns";
4-
import {formatISODate} from "../../utils/formatting";
4+
import {formatISODate, shortenTag} from "../../utils/formatting";
55
import {CollectorConfig, BenchmarkJobStatus} from "./data";
66
77
const props = defineProps<{
@@ -149,7 +149,7 @@ function ActiveStatus({collector}: {collector: CollectorConfig}) {
149149
<template v-for="job in collector.jobs">
150150
<tr v-if="ACTIVE_FILTERS[job.status]">
151151
<td class="table-cell-padding">
152-
{{ job.requestTag }}
152+
{{ shortenTag(job.requestTag) }}
153153
</td>
154154
<td class="table-cell-padding">
155155
{{ formatJobStatus(job.status) }}

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ import {h, ref, Ref} from "vue";
44
import {getJson} from "../../utils/requests";
55
import {STATUS_DATA_NEW_URL} from "../../urls";
66
import {withLoading} from "../../utils/loading";
7-
import {formatSecondsAsDuration, formatISODate} from "../../utils/formatting";
7+
import {
8+
formatSecondsAsDuration,
9+
formatISODate,
10+
shortenTag,
11+
} from "../../utils/formatting";
812
import {useExpandedStore} from "../../utils/expansion";
913
import {
1014
BenchmarkRequest,
@@ -150,7 +154,7 @@ loadStatusData(loading);
150154
<td><PullRequestLink :request="req" /></td>
151155
<td>{{ req.requestType }}</td>
152156
<td>
153-
{{ req.tag }}
157+
{{ shortenTag(req.tag) }}
154158
</td>
155159
<td>
156160
{{ formatStatus(req.status)
@@ -324,7 +328,7 @@ loadStatusData(loading);
324328
.collectors-grid {
325329
width: 100%;
326330
display: grid;
327-
grid-template-columns: repeat(auto-fill, minmax(500px, 1fr));
331+
grid-template-columns: repeat(auto-fill, minmax(500px, 100%));
328332
gap: 20px;
329333
}
330334
</style>

site/frontend/src/utils/formatting.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,11 @@ export function formatISODate(dateString?: string): string {
2727
}
2828
return "";
2929
}
30+
31+
// Shorten a tag, only commit shas will be truncated
32+
export function shortenTag(tag: string): string {
33+
if (tag.length < 40) {
34+
return tag;
35+
}
36+
return tag.slice(0, 12);
37+
}

0 commit comments

Comments
 (0)