Cleanup per PR review.

galaxyproject · Mar 25, 2024 · 3a38971 · 3a38971
1 parent 8399ee8
commit 3a38971
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/client/src/components/Markdown/MarkdownDialog.vue b/client/src/components/Markdown/MarkdownDialog.vue
@@ -151,27 +151,32 @@ function onOk(selectedLabel: WorkflowLabel | undefined) {
     const labelText: string = selectedLabel ? selectedLabel.label : "<ENTER LABEL>";
     const labelType: string = selectedLabel ? selectedLabel.type : defaultLabelType;
     selectedShow.value = false;
+
+    function onInsertArgument() {
+        emit("onInsert", `${props.argumentName}(${labelType}="${labelText}")`);
+    }
+
     if (props.argumentType == "history_dataset_id") {
         if (props.useLabels) {
-            emit("onInsert", `${props.argumentName}(${labelType}="${labelText}")`);
+            onInsertArgument();
         } else {
             dataShow.value = true;
         }
     } else if (props.argumentType == "history_dataset_collection_id") {
         if (props.useLabels) {
-            emit("onInsert", `${props.argumentName}(${labelType}="${labelText}")`);
+            onInsertArgument();
         } else {
             dataCollectionShow.value = true;
         }
     } else if (props.argumentType == "job_id") {
         if (props.useLabels) {
-            emit("onInsert", `${props.argumentName}(${labelType}="${labelText}")`);
+            onInsertArgument();
         } else {
             jobShow.value = true;
         }
     } else if (props.argumentType == "invocation_id") {
         if (props.useLabels) {
-            emit("onInsert", `${props.argumentName}(${labelType}="${labelText}")`);
+            onInsertArgument();
         } else {
             invocationShow.value = true;
         }

diff --git a/client/src/components/Markdown/MarkdownSelector.vue b/client/src/components/Markdown/MarkdownSelector.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import BootstrapVue from "bootstrap-vue";
-import Vue, { computed, ref } from "vue";
+import { BModal } from "bootstrap-vue";
+import { computed, ref } from "vue";
 
 import { WorkflowLabel } from "./labels";
 
@@ -28,8 +28,6 @@ const emit = defineEmits<{
     (e: "onCancel"): void;
 }>();
 
-Vue.use(BootstrapVue);
-
 function onOk() {
     emit("onOk", selectedValue.value);
 }
@@ -41,19 +39,13 @@ function onCancel() {
 
 <template>
     <span>
-        <b-modal
-            v-model="modalShow"
-            :title="title"
-            ok-title="Continue"
-            @ok="onOk"
-            @cancel="onCancel"
-            @hidden="onCancel">
+        <BModal v-model="modalShow" :title="title" ok-title="Continue" @ok="onOk" @cancel="onCancel" @hidden="onCancel">
             <LabelSelector
                 v-model="selectedValue"
                 class="ml-2"
                 :has-labels="hasLabels"
                 :label-title="labelTitle"
                 :labels="labels" />
-        </b-modal>
+        </BModal>
     </span>
 </template>