Skip to content

Commit b300938

Browse files
move workflow editor run activity to bottom fixed section of activity bar
1 parent 65c9589 commit b300938

3 files changed

Lines changed: 28 additions & 11 deletions

File tree

client/src/components/ActivityBar/ActivityBar.vue

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ const props = withDefaults(
4040
activityBarId?: string;
4141
specialActivities?: Activity[];
4242
exitActivity?: Activity;
43+
runActivity?: Activity;
4344
showAdmin?: boolean;
4445
optionsTitle?: string;
4546
optionsTooltip?: string;
@@ -56,6 +57,7 @@ const props = withDefaults(
5657
activityBarId: "default",
5758
specialActivities: () => [],
5859
exitActivity: undefined,
60+
runActivity: undefined,
5961
showAdmin: true,
6062
optionsTitle: "More",
6163
optionsHeading: "Additional Activities",
@@ -387,6 +389,17 @@ defineExpose({
387389
tooltip="Administer this Galaxy"
388390
variant="danger"
389391
@click="toggleSidebar('admin')" />
392+
<ActivityItem
393+
v-if="props.runActivity"
394+
:id="`${props.runActivity.id}`"
395+
:activity-bar-id="props.activityBarId"
396+
:icon="props.runActivity.icon"
397+
:indicator="props.runActivity.indicator"
398+
:indicator-variant="props.runActivity.indicatorVariant"
399+
:title="props.runActivity.title"
400+
:tooltip="props.runActivity.tooltip"
401+
:variant="props.runActivity.variant"
402+
@click="onActivityClicked(props.runActivity)" />
390403
<ActivityItem
391404
v-if="props.exitActivity"
392405
:id="`${props.exitActivity.id}`"

client/src/components/Workflow/Editor/Index.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
:default-activities="workflowActivities"
4040
:special-activities="specialWorkflowActivities"
4141
:exit-activity="exitWorkflowActivity"
42+
:run-activity="runWorkflowActivity"
4243
activity-bar-id="workflow-editor"
4344
:show-admin="false"
4445
options-title="Options"
@@ -621,7 +622,7 @@ export default {
621622
const isNewTempWorkflow = computed(() => !props.workflowId);
622623
const lintData = useLintData(id, steps, datatypesMapper, annotation, readme, license, creator);
623624
624-
const { specialWorkflowActivities, exitWorkflowActivity } = useSpecialWorkflowActivities(
625+
const { specialWorkflowActivities, exitWorkflowActivity, runWorkflowActivity } = useSpecialWorkflowActivities(
625626
computed(() => ({
626627
hasInvalidConnections: hasInvalidConnections.value,
627628
lintData: lintData,
@@ -727,6 +728,7 @@ export default {
727728
insertMarkdown,
728729
specialWorkflowActivities,
729730
exitWorkflowActivity,
731+
runWorkflowActivity,
730732
isNewTempWorkflow,
731733
saveWorkflowTitle,
732734
confirm,

client/src/components/Workflow/Editor/modules/activities.ts

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,16 +123,6 @@ export function useWorkflowActivities(
123123
indicator: undoStackLength.value,
124124
indicatorVariant: "primary",
125125
},
126-
{
127-
title: "Run",
128-
id: "workflow-run",
129-
description: "Run this workflow with specific parameters.",
130-
tooltip: "Run workflow",
131-
icon: faPlay,
132-
visible: true,
133-
click: true,
134-
optional: true,
135-
},
136126
{
137127
description: "Save this workflow.",
138128
icon: faSave,
@@ -281,6 +271,17 @@ export function useSpecialWorkflowActivities(options: Ref<SpecialActivityOptions
281271
},
282272
]);
283273

274+
const runWorkflowActivity: Activity = {
275+
title: "Run",
276+
id: "workflow-run",
277+
description: "Run this workflow with specific parameters.",
278+
tooltip: "Run workflow",
279+
icon: faPlay,
280+
visible: true,
281+
click: true,
282+
optional: true,
283+
};
284+
284285
const exitWorkflowActivity = computed<Activity>(() => ({
285286
description: "",
286287
icon: faSave,
@@ -295,5 +296,6 @@ export function useSpecialWorkflowActivities(options: Ref<SpecialActivityOptions
295296
return {
296297
specialWorkflowActivities,
297298
exitWorkflowActivity,
299+
runWorkflowActivity,
298300
};
299301
}

0 commit comments

Comments
 (0)