Skip to content

Commit

Permalink
Merge pull request galaxyproject#19055 from ahmedhamidawan/add_galaxy…
Browse files Browse the repository at this point in the history
…-upload_to_uploader

Add `galaxy-upload` link to `UploadModal`
  • Loading branch information
dannon authored Oct 29, 2024
2 parents d11d893 + f518ef2 commit fe2c01d
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 7 deletions.
5 changes: 5 additions & 0 deletions client/src/components/Help/terms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,8 @@ galaxy:
failed: |
This state indicates there was a problem scheduling the workflow invocation. No additional datasets
or jobs will be created for this workflow invocation.
upload:
galaxyUploadUtil: |
A utility for uploading files to a Galaxy server from the command line. Use ``galaxy-upload`` to upload
file(s) to a Galaxy server, and ``galaxy-history-search``, a helper utility to find Galaxy histories
to pass to the ``galaxy-upload`` command.
25 changes: 18 additions & 7 deletions client/src/components/Upload/UploadModal.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<script setup>
import { BModal } from "bootstrap-vue";
import { storeToRefs } from "pinia";
import { ref, watch } from "vue";
Expand All @@ -8,6 +9,8 @@ import { useUserHistories } from "@/composables/userHistories";
import { useUserStore } from "@/stores/userStore";
import { wait } from "@/utils/utils";
import ExternalLink from "../ExternalLink.vue";
import HelpText from "../Help/HelpText.vue";
import UploadContainer from "./UploadContainer.vue";
const { currentUser } = storeToRefs(useUserStore());
Expand Down Expand Up @@ -71,7 +74,7 @@ defineExpose({
</script>
<template>
<b-modal
<BModal
v-model="showModal"
:static="options.modalStatic"
header-class="no-separator"
Expand All @@ -81,12 +84,20 @@ defineExpose({
no-enforce-focus
hide-footer>
<template v-slot:modal-header>
<h2 class="title h-sm" tabindex="0">
{{ options.title }}
<span v-if="currentHistory">
to <b>{{ currentHistory.name }}</b>
<div class="d-flex justify-content-between w-100">
<h2 class="title h-sm" tabindex="0">
{{ options.title }}
<span v-if="currentHistory">
to <b>{{ currentHistory.name }}</b>
</span>
</h2>
<span>
<ExternalLink href="https://galaxy-upload.readthedocs.io/en/latest/"> Click here </ExternalLink>
to check out the
<HelpText uri="galaxy.upload.galaxyUploadUtil" text="galaxy-upload" />
util!
</span>
</h2>
</div>
</template>
<UploadContainer
v-if="currentHistoryId"
Expand All @@ -95,7 +106,7 @@ defineExpose({
:current-history-id="currentHistoryId"
v-bind="options"
@dismiss="dismiss" />
</b-modal>
</BModal>
</template>
<style>
Expand Down

0 comments on commit fe2c01d

Please sign in to comment.