Skip to content

Commit fed1ce5

Browse files
conditional rendering for backward compatibility
1 parent a39eaa5 commit fed1ce5

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

presto-router/src/main/resources/router_ui/src/components/QueryList.jsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,11 @@ export class QueryListItem extends React.Component {
171171
<div className="row stat-row">
172172
{driverDetails}
173173
</div>
174+
{ query.queryStats.completedSplits &&
174175
<div className="row stat-row">
175176
{splitDetails}
176177
</div>
178+
}
177179
<div className="row stat-row">
178180
{timingDetails}
179181
</div>

presto-ui/src/components/QueryDetail.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ function TaskList({tasks}) {
160160
name: (<span className="bi bi-pause-circle-fill" style={GLYPHICON_HIGHLIGHT}
161161
data-bs-toggle="tooltip" data-bs-placement="top"
162162
title="Pending splits"/>),
163-
selector: row => row.stats.queuedSplits,
163+
selector: row => row.stats.queuedSplits ?? row.stats.queuedDrivers,
164164
sortable: true,
165165
maxWidth: '50px',
166166
minWidth: '40px',
@@ -169,7 +169,7 @@ function TaskList({tasks}) {
169169
name: (<span className="bi bi-play-circle-fill" style={GLYPHICON_HIGHLIGHT}
170170
data-bs-toggle="tooltip" data-bs-placement="top"
171171
title="Running splits"/>),
172-
selector: row => row.stats.runningSplits,
172+
selector: row => row.stats.runningSplits ?? row.stats.runningDrivers,
173173
sortable: true,
174174
maxWidth: '50px',
175175
minWidth: '40px',
@@ -188,7 +188,7 @@ function TaskList({tasks}) {
188188
name: (<span className="bi bi-check-lg" style={GLYPHICON_HIGHLIGHT}
189189
data-bs-toggle="tooltip" data-bs-placement="top"
190190
title="Completed splits"/>),
191-
selector: row => row.stats.completedSplits,
191+
selector: row => row.stats.completedSplits ?? row.stats.completedDrivers,
192192
sortable: true,
193193
maxWidth: '50px',
194194
minWidth: '40px',

presto-ui/src/components/QueryList.jsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,11 @@ export class QueryListItem extends React.Component {
255255
<div className="row stat-row">
256256
{driverDetails}
257257
</div>
258-
<div className="row stat-row">
259-
{splitDetails}
260-
</div>
258+
{ query.queryStats.completedSplits &&
259+
<div className="row stat-row">
260+
{splitDetails}
261+
</div>
262+
}
261263
<div className="row stat-row">
262264
{timingDetails}
263265
</div>

presto-ui/src/components/QueryOverview.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ function TaskList({ tasks }: { tasks: Task[] }) : React.Node {
331331
name: (<span className="bi bi-pause-circle-fill" style={GLYPHICON_HIGHLIGHT}
332332
data-bs-toggle="tooltip" data-placement="top"
333333
title="Pending splits" />),
334-
selector: (row: Task) => row.stats.queuedSplits,
334+
selector: (row: Task) => row.stats.queuedSplits ?? row.stats.queuedDrivers,
335335
sortable: true,
336336
maxWidth: '50px',
337337
minWidth: '40px',
@@ -340,7 +340,7 @@ function TaskList({ tasks }: { tasks: Task[] }) : React.Node {
340340
name: (<span className="bi bi-play-circle-fill" style={GLYPHICON_HIGHLIGHT}
341341
data-bs-toggle="tooltip" data-placement="top"
342342
title="Running splits" />),
343-
selector: (row: Task) => row.stats.runningSplits,
343+
selector: (row: Task) => row.stats.runningSplits ?? row.stats.runningDrivers,
344344
sortable: true,
345345
maxWidth: '50px',
346346
minWidth: '40px',
@@ -359,7 +359,7 @@ function TaskList({ tasks }: { tasks: Task[] }) : React.Node {
359359
name: (<span className="bi bi-check-lg" style={GLYPHICON_HIGHLIGHT}
360360
data-bs-toggle="tooltip" data-placement="top"
361361
title="Completed splits" />),
362-
selector: (row: Task) => row.stats.completedSplits,
362+
selector: (row: Task) => row.stats.completedSplits ?? row.stats.completedDrivers,
363363
sortable: true,
364364
maxWidth: '50px',
365365
minWidth: '40px',

0 commit comments

Comments
 (0)