Skip to content

Commit 4a72898

Browse files
matt-aitkenmatt-aitken
committed
Fix for span merge layout
1 parent 897b512 commit 4a72898

File tree

1 file changed

+58
-62
lines changed
  • apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.v3.$projectParam.runs.$runParam.spans.$spanParam

1 file changed

+58
-62
lines changed

‎apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.v3.$projectParam.runs.$runParam.spans.$spanParam/route.tsx‎

Lines changed: 58 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -232,70 +232,66 @@ function SpanBody({
232232
</TabContainer>
233233
</div>
234234
<div className="overflow-y-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600">
235-
<div>
236-
{tab === "detail" ? (
237-
<div className="flex flex-col gap-4 px-3 pt-3">
238-
<Property.Table>
239-
<Property.Item>
240-
<Property.Label>Status</Property.Label>
241-
<Property.Value>
242-
<TaskRunAttemptStatusCombo
243-
status={
244-
span.isCancelled
245-
? "CANCELED"
246-
: span.isError
247-
? "FAILED"
248-
: span.isPartial
249-
? "EXECUTING"
250-
: "COMPLETED"
251-
}
252-
className="text-sm"
253-
/>
254-
</Property.Value>
255-
</Property.Item>
256-
<Property.Item>
257-
<Property.Label>Task</Property.Label>
258-
<Property.Value>
259-
<SimpleTooltip
260-
button={
261-
<TextLink
262-
to={v3RunsPath(organization, project, { tasks: [span.taskSlug] })}
263-
>
264-
{span.taskSlug}
265-
</TextLink>
266-
}
267-
content={`Filter runs by ${span.taskSlug}`}
268-
/>
269-
</Property.Value>
270-
</Property.Item>
271-
{span.idempotencyKey && (
272-
<Property.Item>
273-
<Property.Label>Idempotency key</Property.Label>
274-
<Property.Value>{span.idempotencyKey}</Property.Value>
275-
</Property.Item>
276-
)}
235+
{tab === "detail" ? (
236+
<div className="flex flex-col gap-4 px-3 pt-3">
237+
<Property.Table>
238+
<Property.Item>
239+
<Property.Label>Status</Property.Label>
240+
<Property.Value>
241+
<TaskRunAttemptStatusCombo
242+
status={
243+
span.isCancelled
244+
? "CANCELED"
245+
: span.isError
246+
? "FAILED"
247+
: span.isPartial
248+
? "EXECUTING"
249+
: "COMPLETED"
250+
}
251+
className="text-sm"
252+
/>
253+
</Property.Value>
254+
</Property.Item>
255+
<Property.Item>
256+
<Property.Label>Task</Property.Label>
257+
<Property.Value>
258+
<SimpleTooltip
259+
button={
260+
<TextLink to={v3RunsPath(organization, project, { tasks: [span.taskSlug] })}>
261+
{span.taskSlug}
262+
</TextLink>
263+
}
264+
content={`Filter runs by ${span.taskSlug}`}
265+
/>
266+
</Property.Value>
267+
</Property.Item>
268+
{span.idempotencyKey && (
277269
<Property.Item>
278-
<Property.Label>Version</Property.Label>
279-
<Property.Value>
280-
{span.workerVersion ? (
281-
span.workerVersion
282-
) : (
283-
<span className="flex items-center gap-1">
284-
<span>Never started</span>
285-
<InfoIconTooltip
286-
content={"Runs get locked to the latest version when they start."}
287-
contentClassName="normal-case tracking-normal"
288-
/>
289-
</span>
290-
)}
291-
</Property.Value>
270+
<Property.Label>Idempotency key</Property.Label>
271+
<Property.Value>{span.idempotencyKey}</Property.Value>
292272
</Property.Item>
293-
</Property.Table>
294-
</div>
295-
) : (
296-
<SpanEntity span={span} />
297-
)}
298-
</div>
273+
)}
274+
<Property.Item>
275+
<Property.Label>Version</Property.Label>
276+
<Property.Value>
277+
{span.workerVersion ? (
278+
span.workerVersion
279+
) : (
280+
<span className="flex items-center gap-1">
281+
<span>Never started</span>
282+
<InfoIconTooltip
283+
content={"Runs get locked to the latest version when they start."}
284+
contentClassName="normal-case tracking-normal"
285+
/>
286+
</span>
287+
)}
288+
</Property.Value>
289+
</Property.Item>
290+
</Property.Table>
291+
</div>
292+
) : (
293+
<SpanEntity span={span} />
294+
)}
299295
</div>
300296
</div>
301297
);

0 commit comments

Comments
 (0)