Skip to content

Commit fbcb160

Browse files
authored
Show Summary on Pending Activities (#2729)
* Show summary on pending activities * Fix sticky div blocking click, fix showing expanded row on readOnly, fix border
1 parent 94b9896 commit fbcb160

3 files changed

Lines changed: 31 additions & 38 deletions

File tree

src/lib/components/lines-and-dots/svg/group-details-row.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
</div>
162162
</div>
163163
{#if childWorkflowStartedEvent}
164-
<div class="surface-primary px-4">
164+
<div class="surface-primary p-4">
165165
<div class="font-medium leading-4 text-secondary">Child Workflow</div>
166166
{#key group.eventList.length}
167167
<GraphWidget
@@ -170,8 +170,8 @@
170170
.workflowId}
171171
runId={childWorkflowStartedEvent.attributes.workflowExecution
172172
.runId}
173-
viewportHeight={200}
174-
class="surface-primary overflow-x-hidden border border-subtle"
173+
viewportHeight={320}
174+
class="surface-primary overflow-x-hidden border border-b-0 border-subtle"
175175
onLoad={onDecode}
176176
/>
177177
{/key}

src/lib/components/lines-and-dots/svg/timeline-graph-row.svelte

Lines changed: 23 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -113,40 +113,30 @@
113113
/>
114114
{/if}
115115
{#if showText}
116-
{#if pendingActivity}
117-
{#key pendingActivity.attempt}
118-
<Text
119-
point={textPosition}
120-
{textAnchor}
121-
{backdrop}
122-
backdropHeight={radius * 2}
123-
config={TimelineConfig}
124-
icon="retry"
125-
>
126-
{group?.displayName} • {translate('workflows.attempt')}
127-
{pendingActivity.attempt} / {pendingActivity.maximumAttempts || ''}
128-
</Text>
129-
{/key}
130-
{:else}
131-
<MetadataDecoder
132-
value={group?.userMetadata?.summary}
133-
prefix={isActivityTaskScheduledEvent(group.initialEvent)
134-
? group?.displayName
135-
: ''}
136-
fallback={group?.displayName}
137-
let:decodedValue
116+
<MetadataDecoder
117+
value={group?.userMetadata?.summary}
118+
prefix={isActivityTaskScheduledEvent(group.initialEvent)
119+
? group?.displayName
120+
: ''}
121+
fallback={group?.displayName}
122+
let:decodedValue
123+
>
124+
<Text
125+
point={textPosition}
126+
{textAnchor}
127+
{backdrop}
128+
backdropHeight={radius * 2}
129+
config={TimelineConfig}
130+
icon={pendingActivity ? 'retry' : undefined}
138131
>
139-
<Text
140-
point={textPosition}
141-
{textAnchor}
142-
{backdrop}
143-
backdropHeight={radius * 2}
144-
config={TimelineConfig}
145-
>
146-
{decodedValue}
147-
</Text>
148-
</MetadataDecoder>
149-
{/if}
132+
{#if pendingActivity}
133+
{translate('workflows.attempt')}
134+
{pendingActivity.attempt} / {pendingActivity.maximumAttempts || ''}
135+
{''}
136+
{/if}
137+
{decodedValue}
138+
</Text>
139+
</MetadataDecoder>
150140
{/if}
151141
<Dot
152142
point={[x, y]}

src/lib/components/lines-and-dots/svg/timeline-graph.svelte

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@
6666
on:scroll={handleScroll}
6767
>
6868
<EndTimeInterval {workflow} {startTime} let:endTime let:duration>
69-
<div class="sticky top-[120px]" class:invisible={!!$activeGroups.length}>
69+
<div
70+
class="pointer-events-none sticky top-[120px]"
71+
class:invisible={!!$activeGroups.length}
72+
>
7073
<div class="flex w-full justify-between text-xs">
7174
<p class="w-60 -translate-x-24 rotate-90">
7275
{formatDate(startTime, $timeFormat)}
@@ -118,7 +121,7 @@
118121
/>
119122
{/key}
120123
{/if}
121-
{#if $activeGroups.includes(group.id)}
124+
{#if !readOnly && $activeGroups.includes(group.id)}
122125
<GroupDetailsRow y={y + 1.33 * radius} {group} {canvasWidth} />
123126
{/if}
124127
{/each}

0 commit comments

Comments
 (0)