Skip to content

Commit 29b97b0

Browse files
ahmedhamidawanahmedhamidawan
authored
Merge pull request #20440 from ahmedhamidawan/align_tool_and_workflow_run_headers
[25.0] Wrap Tool and Workflow run headers properly
2 parents 6b62fb4 + ccbbe70 commit 29b97b0

File tree

2 files changed

+69
-65
lines changed

2 files changed

+69
-65
lines changed

‎client/src/components/Tool/ToolForm.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
<template v-slot:buttons>
8686
<ButtonSpinner
8787
id="execute"
88+
class="text-nowrap"
8889
title="Run Tool"
8990
:disabled="!canMutateHistory"
9091
size="small"

‎client/src/components/Workflow/WorkflowNavigationTitle.vue‎

Lines changed: 68 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -137,76 +137,79 @@ async function rerunWorkflow() {
137137
<BAlert v-if="error" variant="danger" show>{{ error }}</BAlert>
138138

139139
<div class="position-relative">
140-
<div v-if="workflow" class="bg-secondary px-2 py-1 rounded d-flex flex-gapx-1">
141-
<div class="flex-grow-1 d-flex align-items-center flex-gapx-1" data-description="workflow heading">
140+
<div v-if="workflow" class="bg-secondary px-2 py-1 rounded d-flex flex-gapx-1 justify-content-between">
141+
<div class="py-1 d-flex flex-wrap align-items-center flex-gapx-1" data-description="workflow heading">
142142
<FontAwesomeIcon :icon="faSitemap" fixed-width />
143143
<b> {{ props.invocation ? "Invoked " : "" }}Workflow: {{ getWorkflowName() }} </b>
144144
<span>(Version: {{ workflow.version + 1 }})</span>
145145
</div>
146-
<GButtonGroup data-button-group>
147-
<GButton
148-
v-if="owned && workflow"
149-
tooltip
150-
data-button-edit
151-
transparent
152-
color="blue"
146+
<div class="d-flex flex-gapx-1 align-self-baseline">
147+
<GButtonGroup data-button-group>
148+
<GButton
149+
v-if="owned && workflow"
150+
tooltip
151+
data-button-edit
152+
transparent
153+
color="blue"
154+
size="small"
155+
title="Edit Workflow"
156+
disabled-title="This workflow has been deleted."
157+
:disabled="workflow.deleted"
158+
:to="`/workflows/edit?id=${workflow.id}&version=${workflow.version}`">
159+
<FontAwesomeIcon :icon="faEdit" fixed-width />
160+
</GButton>
161+
<AsyncButton
162+
v-else
163+
data-description="import workflow button"
164+
transparent
165+
color="blue"
166+
size="small"
167+
:disabled="isAnonymous || workflowImportedAttempted"
168+
:title="workflowImportTitle"
169+
:icon="faUpload"
170+
:action="onImport">
171+
</AsyncButton>
172+
173+
<slot name="workflow-title-actions" />
174+
</GButtonGroup>
175+
<ButtonSpinner
176+
v-if="!props.invocation"
177+
id="run-workflow"
178+
class="text-nowrap"
179+
data-description="execute workflow button"
180+
:wait="runWaiting"
181+
:disabled="runDisabled"
153182
size="small"
154-
title="Edit Workflow"
155-
disabled-title="This workflow has been deleted."
156-
:disabled="workflow.deleted"
157-
:to="`/workflows/edit?id=${workflow.id}&version=${workflow.version}`">
158-
<FontAwesomeIcon :icon="faEdit" fixed-width />
159-
</GButton>
160-
<AsyncButton
161-
v-else
162-
data-description="import workflow button"
163-
transparent
164-
color="blue"
165-
size="small"
166-
:disabled="isAnonymous || workflowImportedAttempted"
167-
:title="workflowImportTitle"
168-
:icon="faUpload"
169-
:action="onImport">
170-
</AsyncButton>
171-
172-
<slot name="workflow-title-actions" />
173-
</GButtonGroup>
174-
<ButtonSpinner
175-
v-if="!props.invocation"
176-
id="run-workflow"
177-
data-description="execute workflow button"
178-
:wait="runWaiting"
179-
:disabled="runDisabled"
180-
size="small"
181-
:tooltip="executeButtonTooltip"
182-
:title="!props.validRerun ? 'Run Workflow' : 'Rerun Workflow'"
183-
@onClick="emit('on-execute')" />
184-
<GButtonGroup v-else>
185-
<GButton
186-
title="Run Workflow"
187-
disabled-title="This workflow has been deleted."
188-
data-button-run
189-
tooltip
190-
color="blue"
191-
size="small"
192-
:disabled="workflow.deleted"
193-
:to="`/workflows/run?id=${workflow.id}&version=${workflow.version}`">
194-
<FontAwesomeIcon :icon="faPlay" fixed-width />
195-
<span v-localize>Run</span>
196-
</GButton>
197-
<GButton
198-
title="Rerun Workflow with same inputs"
199-
disabled-title="This workflow has been deleted."
200-
data-button-rerun
201-
tooltip
202-
color="blue"
203-
size="small"
204-
:disabled="workflow.deleted"
205-
@click="rerunWorkflow">
206-
<FontAwesomeIcon :icon="faRedo" fixed-width />
207-
<span v-localize>Rerun</span>
208-
</GButton>
209-
</GButtonGroup>
183+
:tooltip="executeButtonTooltip"
184+
:title="!props.validRerun ? 'Run Workflow' : 'Rerun Workflow'"
185+
@onClick="emit('on-execute')" />
186+
<GButtonGroup v-else>
187+
<GButton
188+
title="Run Workflow"
189+
disabled-title="This workflow has been deleted."
190+
data-button-run
191+
tooltip
192+
color="blue"
193+
size="small"
194+
:disabled="workflow.deleted"
195+
:to="`/workflows/run?id=${workflow.id}&version=${workflow.version}`">
196+
<FontAwesomeIcon :icon="faPlay" fixed-width />
197+
<span v-localize>Run</span>
198+
</GButton>
199+
<GButton
200+
title="Rerun Workflow with same inputs"
201+
disabled-title="This workflow has been deleted."
202+
data-button-rerun
203+
tooltip
204+
color="blue"
205+
size="small"
206+
:disabled="workflow.deleted"
207+
@click="rerunWorkflow">
208+
<FontAwesomeIcon :icon="faRedo" fixed-width />
209+
<span v-localize>Rerun</span>
210+
</GButton>
211+
</GButtonGroup>
212+
</div>
210213
</div>
211214
<div v-if="props.success" class="donemessagelarge">
212215
Successfully invoked workflow

0 commit comments

Comments
 (0)