Skip to content

Commit 05636bd

Browse files
authored
Fix ui build + update python-multipart (#805)
* Fix ui build * require python-multipart > 22 * missed styling
1 parent ae76ef8 commit 05636bd

File tree

5 files changed

+86
-26
lines changed

5 files changed

+86
-26
lines changed

servers/cromwell/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jsonschema==4.17.3
1616
MarkupSafe==2.1.1
1717
pathlib==1.0.1
1818
python-dateutil==2.6.0
19+
python-multipart>=0.0.22
1920
pytz==2022.4
2021
requests==2.32.5
2122
six==1.11.0

ui/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ RUN /ui/node_modules/.bin/ng build --configuration=production
2525

2626
FROM us.gcr.io/broad-dsp-gcr-public/base/nginx:mainline-alpine
2727

28-
COPY --from=1 /ui/dist /ui/dist
28+
COPY --from=1 /ui/dist/browser /ui/dist
2929
ADD ./ui/nginx.prod.conf /etc/nginx/nginx.conf

ui/src/app/job-details/common/failures-table/failures-table.component.css

Lines changed: 68 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1-
mat-table {
1+
/* Failures table - matching resources/labels table styling */
2+
3+
:host ::ng-deep mat-table,
4+
:host ::ng-deep .mat-table {
25
margin-top: 1.25rem;
36
display: table;
7+
table-layout: fixed;
48
width: 99%;
5-
border-radius: 0.3125rem;
9+
border-radius: 5px;
610
border: 1px solid #CCCFD4;
711
box-shadow: 0 0 2px 0 rgba(0,0,0,0.12), 0 3px 2px 0 rgba(0,0,0,0.12);
12+
margin-left: auto;
13+
margin-right: auto;
814
}
915

1016
:host-context(mat-card.card) mat-table {
@@ -15,65 +21,103 @@ mat-table {
1521
margin-top: 0;
1622
}
1723

18-
.mat-header-row,
19-
.mat-row {
24+
:host ::ng-deep .mat-mdc-header-row,
25+
:host ::ng-deep .mat-header-row,
26+
:host ::ng-deep .mat-mdc-row,
27+
:host ::ng-deep .mat-row {
2028
display: table-row;
29+
padding: 0;
30+
border: none;
31+
}
32+
33+
:host ::ng-deep .mat-row {
2134
min-height: auto;
2235
}
2336

24-
.mat-header-cell {
25-
color: #333F52;
26-
font-weight: 600;
37+
:host ::ng-deep .mat-mdc-header-cell,
38+
:host ::ng-deep .mat-header-cell,
39+
:host ::ng-deep .mat-mdc-cell,
40+
:host ::ng-deep .mat-cell,
41+
:host ::ng-deep td,
42+
:host ::ng-deep th {
43+
display: table-cell;
44+
vertical-align: middle;
2745
padding: 0.5rem;
46+
border-bottom: 1px solid rgba(0, 0, 0, 0.12);
47+
border-right: 1px solid rgba(0, 0, 0, 0.12);
48+
overflow: hidden;
49+
text-align: left;
50+
font-size: 0.75rem;
51+
line-height: 1.2rem;
2852
}
2953

30-
td,
31-
th {
32-
text-align: left;
33-
font-size: 0.7rem;
34-
line-height: 1rem;
35-
border-bottom: 1px solid rgba(0, 0, 0, 0.12);
36-
display: table-cell;
54+
:host ::ng-deep .mat-mdc-header-cell:last-child,
55+
:host ::ng-deep .mat-header-cell:last-child,
56+
:host ::ng-deep .mat-mdc-cell:last-child,
57+
:host ::ng-deep .mat-cell:last-child,
58+
:host ::ng-deep th:last-child,
59+
:host ::ng-deep td:last-child {
60+
border-right: none;
3761
}
3862

39-
th {
63+
:host ::ng-deep .mat-mdc-header-row,
64+
:host ::ng-deep .mat-header-row {
4065
background-color: #F1F4F7;
66+
min-height: 3rem;
67+
}
68+
69+
:host ::ng-deep .mat-mdc-header-cell,
70+
:host ::ng-deep .mat-header-cell,
71+
:host ::ng-deep th {
4172
color: #333F52;
4273
font-weight: 600;
43-
padding: 0.5rem 1rem;
74+
font-size: 0.7rem;
75+
white-space: nowrap;
4476
}
4577

46-
td {
47-
padding: 1rem;
78+
:host ::ng-deep .mat-mdc-cell,
79+
:host ::ng-deep .mat-cell,
80+
:host ::ng-deep td {
81+
font-size: 0.75rem;
82+
line-height: 1.2rem;
83+
height: auto;
4884
}
4985

5086
th.failure-task,
5187
td.failure-task {
52-
min-width: 5.375rem;
53-
max-width: 14.75rem;
88+
width: 20%;
5489
white-space: nowrap;
5590
overflow: hidden;
5691
text-overflow: ellipsis;
5792
}
5893

5994
th.failure-message,
6095
td.failure-message {
96+
width: 50%;
6197
line-height: 1.25rem;
6298
word-wrap: break-word;
99+
white-space: normal;
63100
}
64101

65102
th.failure-shard,
66103
td.failure-shard {
67-
max-width: 3.5rem;
68-
min-width: 3.5rem;
104+
width: 10%;
69105
overflow: hidden;
70106
text-overflow: ellipsis;
71107
}
72108

73109
th.failure-links,
74110
td.failure-links {
75-
max-width: 7em;
76-
min-width: 7em;
111+
width: 20%;
112+
}
113+
114+
.title-link {
115+
color: #5C912E;
116+
text-decoration: none;
117+
}
118+
119+
.title-link:hover {
120+
text-decoration: underline;
77121
}
78122

79123
.log-item {

ui/src/app/job-list/table/table.component.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,16 @@ export class JobsTableComponent implements OnInit {
189189
}
190190

191191
shouldShowMenu(job: QueryJobsResult, df: DisplayField): boolean {
192-
return !this.isFirstColumn(df) && (this.canEdit(df) || (this.canFilterBy(df.field) && this.getFieldValue(job, df)));
192+
// Don't show menu for first column (name field shown as link)
193+
if (this.isFirstColumn(df)) {
194+
return false;
195+
}
196+
// Don't show menu for copyable ID fields (they have their own display logic)
197+
if (this.isCopyableIdField(df)) {
198+
return false;
199+
}
200+
// Show menu for editable fields or filterable fields with values
201+
return this.canEdit(df) || (this.canFilterBy(df.field) && this.getFieldValue(job, df));
193202
}
194203

195204
getFieldValue(job: QueryJobsResult, df: DisplayField): any {

ui/src/app/sign-in/sign-in.component.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,9 @@ p {
1111
text-align: center;
1212
position: relative
1313
}
14+
15+
.sign-in-card .mat-mdc-card-title,
16+
.sign-in-card .mat-card-title {
17+
font-family: 'Montserrat', sans-serif;
18+
}
19+

0 commit comments

Comments
 (0)