From 3b2bb6e94deb4fb3572fa1e5734b17cacedb6a5f Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Thu, 2 Feb 2023 10:47:25 +0100
Subject: [PATCH 01/17] test validators for optional parameters

---
 lib/galaxy/tools/parameters/basic.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py
index e84317ff557..e50d5a01bec 100644
--- a/lib/galaxy/tools/parameters/basic.py
+++ b/lib/galaxy/tools/parameters/basic.py
@@ -327,6 +327,15 @@ class SimpleTextToolParameter(ToolParameter):
         input_source = ensure_input_source(input_source)
         super().__init__(tool, input_source)
         self.optional = input_source.get_bool("optional", False)
+
+        if not self.optional:
+            try:
+                for validator in self.validators:
+                    validator.validate("")
+                self.optional = True
+            except ValueError:
+                self.optional = False
+
         if self.optional:
             self.value = None
         else:

From 9cf8af6d2155d186b5982780c8e7617f738eede0 Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:18:54 +0100
Subject: [PATCH 02/17] check type

Co-authored-by: Marius van den Beek <m.vandenbeek@gmail.com>
---
 lib/galaxy/tools/parameters/basic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py
index e50d5a01bec..9fb5e937fff 100644
--- a/lib/galaxy/tools/parameters/basic.py
+++ b/lib/galaxy/tools/parameters/basic.py
@@ -328,7 +328,7 @@ class SimpleTextToolParameter(ToolParameter):
         super().__init__(tool, input_source)
         self.optional = input_source.get_bool("optional", False)
 
-        if not self.optional:
+        if not self.optional and self.type == "text":
             try:
                 for validator in self.validators:
                     validator.validate("")

From 896af3d693a53c702b8a19caececcb30bf61e5c6 Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:36:32 +0100
Subject: [PATCH 03/17] add validator to optional test

---
 test/unit/app/tools/test_parameter_parsing.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/unit/app/tools/test_parameter_parsing.py b/test/unit/app/tools/test_parameter_parsing.py
index 6c0c01ca28c..abfe41c5c0f 100644
--- a/test/unit/app/tools/test_parameter_parsing.py
+++ b/test/unit/app/tools/test_parameter_parsing.py
@@ -91,7 +91,9 @@ class TestParameterParsing(BaseParameterTestCase):
     def test_parse_optional(self):
         param = self._parameter_for(
             xml="""
-            <param type="text" name="texti" value="mydefault" />
+            <param type="text" name="texti" value="mydefault">
+                <validator type="empty_field" />
+            </param>
         """
         )
         assert param.optional is False

From be0ff2511b624d4b7443e4ea9e955687999f8760 Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Thu, 2 Feb 2023 13:55:36 +0100
Subject: [PATCH 04/17] fix inline test

---
 lib/galaxy/tools/parameters/basic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py
index 9fb5e937fff..6b9094c9fa5 100644
--- a/lib/galaxy/tools/parameters/basic.py
+++ b/lib/galaxy/tools/parameters/basic.py
@@ -362,7 +362,7 @@ class TextToolParameter(SimpleTextToolParameter):
     >>> p = TextToolParameter(None, XML('<param name="_name" type="text" value="default" />'))
     >>> print(p.name)
     _name
-    >>> assert sorted(p.to_dict(trans).items()) == [('area', False), ('argument', None), ('datalist', []), ('help', ''), ('hidden', False), ('is_dynamic', False), ('label', ''), ('model_class', 'TextToolParameter'), ('name', '_name'), ('optional', False), ('refresh_on_change', False), ('type', 'text'), ('value', u'default')]
+    >>> assert sorted(p.to_dict(trans).items()) == [('area', False), ('argument', None), ('datalist', []), ('help', ''), ('hidden', False), ('is_dynamic', False), ('label', ''), ('model_class', 'TextToolParameter'), ('name', '_name'), ('optional', True), ('refresh_on_change', False), ('type', 'text'), ('value', u'default')]
     """
 
     def __init__(self, tool, input_source):

From 6135d965dc7326cae598bbc6f12e6b65d638dfee Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Fri, 3 Feb 2023 14:21:48 +0100
Subject: [PATCH 05/17] load on job state change

---
 .../History/CurrentCollection/CollectionPanel.vue      | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/client/src/components/History/CurrentCollection/CollectionPanel.vue b/client/src/components/History/CurrentCollection/CollectionPanel.vue
index eb69d0ee598..fcc6942e9ce 100644
--- a/client/src/components/History/CurrentCollection/CollectionPanel.vue
+++ b/client/src/components/History/CurrentCollection/CollectionPanel.vue
@@ -4,6 +4,7 @@
     <CollectionElementsProvider
         v-if="dsc"
         :id="dsc.id"
+        ref="provider"
         :key="dsc.id"
         v-slot="{ loading, result: payload }"
         :contents-url="contentsUrl"
@@ -76,6 +77,9 @@ export default {
             const arr = this.selectedCollections;
             return arr[arr.length - 1];
         },
+        jobState() {
+            return this.dsc["job_state_summary"];
+        },
         isRoot() {
             return this.dsc == this.rootCollection;
         },
@@ -93,6 +97,12 @@ export default {
                 this.$emit("update:selected-collections", []);
             }
         },
+        jobState: {
+            handler() {
+                this.$refs.provider.load();
+            },
+            deep: true,
+        },
     },
     methods: {
         updateDsc(collection, fields) {

From b0bc431609307e3aa71d5d066f2bcb348307acec Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Thu, 2 Feb 2023 02:16:00 +0500
Subject: [PATCH 06/17] Create ToolSuccess route and refactor component

---
 client/src/components/Tool/ToolForm.vue       |  24 ++-
 client/src/components/Tool/ToolSuccess.vue    | 143 ++++++++----------
 .../components/Tool/ToolSuccessMessage.vue    |  79 ++++++++++
 client/src/entry/analysis/router.js           |   6 +
 client/src/store/index.js                     |   2 -
 client/src/store/jobStore.js                  |  33 ----
 client/src/stores/jobStore.js                 |  37 +++++
 lib/galaxy/webapps/galaxy/buildapp.py         |   1 +
 8 files changed, 201 insertions(+), 124 deletions(-)
 create mode 100644 client/src/components/Tool/ToolSuccessMessage.vue
 delete mode 100644 client/src/store/jobStore.js
 create mode 100644 client/src/stores/jobStore.js

diff --git a/client/src/components/Tool/ToolForm.vue b/client/src/components/Tool/ToolForm.vue
index ebb30af69bb..e92ef642764 100644
--- a/client/src/components/Tool/ToolForm.vue
+++ b/client/src/components/Tool/ToolForm.vue
@@ -10,12 +10,6 @@
                     <div v-if="showEntryPoints">
                         <ToolEntryPoints v-for="job in entryPoints" :key="job.id" :job-id="job.id" />
                     </div>
-                    <ToolSuccess
-                        v-if="showSuccess"
-                        :job-def="jobDef"
-                        :job-response="jobResponse"
-                        :tool-name="toolName" />
-                    <Webhook v-if="showSuccess" type="tool" :tool-id="jobDef.tool_id" />
                     <b-modal v-model="showError" size="sm" :title="errorTitle | l" scrollable ok-only>
                         <b-alert v-if="errorMessage" show variant="danger">
                             {{ errorMessage }}
@@ -108,7 +102,8 @@
 <script>
 import { getGalaxyInstance } from "app";
 import { useHistoryItemsStore } from "stores/history/historyItemsStore";
-import { mapState } from "pinia";
+import { useJobStore } from "stores/jobStore";
+import { mapState, mapActions } from "pinia";
 import { getToolFormData, updateToolFormData, submitJob } from "./services";
 import { allowCachedJobs } from "./utilities";
 import { refreshContentsWrapper } from "utils/data";
@@ -120,10 +115,8 @@ import LoadingSpan from "components/LoadingSpan";
 import FormDisplay from "components/Form/FormDisplay";
 import FormElement from "components/Form/FormElement";
 import ToolEntryPoints from "components/ToolEntryPoints/ToolEntryPoints";
-import ToolSuccess from "./ToolSuccess";
 import ToolRecommendation from "../ToolRecommendation";
 import UserHistories from "components/providers/UserHistories";
-import Webhook from "components/Common/Webhook";
 import Heading from "components/Common/Heading";
 
 export default {
@@ -136,10 +129,8 @@ export default {
         ToolCard,
         FormElement,
         ToolEntryPoints,
-        ToolSuccess,
         ToolRecommendation,
         UserHistories,
-        Webhook,
         Heading,
     },
     props: {
@@ -168,7 +159,6 @@ export default {
             showForm: false,
             showEntryPoints: false,
             showRecommendation: false,
-            showSuccess: false,
             showError: false,
             showExecuting: false,
             formConfig: {},
@@ -239,6 +229,7 @@ export default {
         });
     },
     methods: {
+        ...mapActions(useJobStore, ["saveResponseForJobId"]),
         emailAllowed(config, user) {
             return config.server_mail_configured && !user.isAnonymous;
         },
@@ -332,9 +323,16 @@ export default {
                     const nJobs = jobResponse && jobResponse.jobs ? jobResponse.jobs.length : 0;
                     if (nJobs > 0) {
                         this.showForm = false;
-                        this.showSuccess = true;
                         this.jobDef = jobDef;
                         this.jobResponse = jobResponse;
+                        const refJobId = this.jobResponse.jobs[0].id;
+                        const response = {
+                            jobDef: this.jobDef,
+                            jobResponse: this.jobResponse,
+                            toolName: this.toolName,
+                        };
+                        this.saveResponseForJobId(refJobId, response);
+                        this.$router.push(`/jobs/${refJobId}/success`);
                     } else {
                         this.showError = true;
                         this.showForm = true;
diff --git a/client/src/components/Tool/ToolSuccess.vue b/client/src/components/Tool/ToolSuccess.vue
index 12c39f38a92..6013cb77819 100644
--- a/client/src/components/Tool/ToolSuccess.vue
+++ b/client/src/components/Tool/ToolSuccess.vue
@@ -1,79 +1,70 @@
-<template>
-    <div class="donemessagelarge">
-        <p>
-            Started tool <b>{{ toolName }}</b> and successfully added {{ nJobsText }} to the queue.
-        </p>
-        <p>The tool uses {{ nInputsText }}:</p>
-        <ul>
-            <li v-for="item of inputs" :key="item.hid">
-                <b>{{ item.hid }}: {{ item.name }}</b>
-            </li>
-        </ul>
-        <p>It produces {{ nOutputsText }}:</p>
-        <ul>
-            <li v-for="item of jobResponse.outputs" :key="item.hid">
-                <b>{{ item.hid }}: {{ item.name }}</b>
-            </li>
-        </ul>
-        <p>
-            You can check the status of queued jobs and view the resulting data by refreshing the History panel. When
-            the job has been run the status will change from 'running' to 'finished' if completed successfully or
-            'error' if problems were encountered.
-        </p>
-    </div>
-</template>
+<script setup lang="ts">
+// import FormBoolean from "./Elements/FormBoolean.vue";
+import { computed, onMounted } from "vue";
 
-<script>
-export default {
-    props: {
-        jobDef: {
-            type: Object,
-            required: true,
-        },
-        jobResponse: {
-            type: Object,
-            required: true,
-        },
-        toolName: {
-            type: String,
-            required: true,
-        },
+import type { ComputedRef } from "vue";
+import { useJobStore } from "@/stores/jobStore";
+import { useRouter } from "vue-router/composables";
+import { getGalaxyInstance } from "@/app";
+import ToolEntryPoints from "@/components/ToolEntryPoints/ToolEntryPoints.vue";
+import ToolSuccessMessage from "./ToolSuccessMessage.vue";
+import ToolRecommendation from "../ToolRecommendation.vue";
+import Webhook from "@/components/Common/Webhook.vue";
+
+const jobStore = useJobStore();
+const router = useRouter();
+
+/* interfaces */
+interface Job {
+    id: string;
+}
+interface JobDef {
+    tool_id: string;
+}
+interface JobResponse {
+    produces_entry_points: boolean;
+    jobs: Array<Job>;
+}
+interface ResponseVal {
+    jobDef: JobDef;
+    jobResponse: JobResponse;
+    toolName: string;
+}
+
+/* props */
+const props = defineProps({
+    jobId: {
+        type: String,
+        required: true,
     },
-    computed: {
-        inputs() {
-            const inputs = [];
-            const index = {};
-            for (const i in this.jobDef.inputs) {
-                const input = this.jobDef.inputs[i];
-                if (input && Array.isArray(input.values)) {
-                    for (const j of input.values) {
-                        if (j.src && !index[j.id]) {
-                            inputs.push(j);
-                            index[j.id] = true;
-                        }
-                    }
-                }
-            }
-            return inputs;
-        },
-        nInputs() {
-            return this.inputs.length;
-        },
-        nOutputs() {
-            return this.jobResponse && this.jobResponse.outputs ? this.jobResponse.outputs.length : 0;
-        },
-        nJobs() {
-            return this.jobResponse && this.jobResponse.jobs ? this.jobResponse.jobs.length : 0;
-        },
-        nJobsText() {
-            return this.nJobs > 1 ? `${this.nJobs} jobs` : `1 job`;
-        },
-        nInputsText() {
-            return this.nInputs > 1 ? `${this.nInputs} inputs` : `this input`;
-        },
-        nOutputsText() {
-            return this.nOutputs > 1 ? `${this.nOutputs} outputs` : `this output`;
-        },
-    },
-};
+});
+
+const responseVal: ComputedRef<ResponseVal> = computed(() => jobStore.getResponseForJobId(props.jobId));
+
+/* lifecyle */
+onMounted(() => {
+    // no response means no tool produced this job in this session (nothing in store)
+    if (!responseVal.value) {
+        router.push(`/jobs/${props.jobId}/view`);
+    }
+});
+
+const jobDef: ComputedRef<JobDef> = computed(() => responseVal.value.jobDef);
+const jobResponse: ComputedRef<JobResponse> = computed(() => responseVal.value.jobResponse);
+const toolName: ComputedRef<string> = computed(() => responseVal.value.toolName);
+
+// getGalaxyInstance is not reactive
+const configEnableRecommendations = getGalaxyInstance().config.enable_tool_recommendations;
+const showRecommendation: boolean = [true, "true"].includes(configEnableRecommendations);
 </script>
+
+<template>
+    <section v-if="responseVal">
+        <div v-if="jobResponse.produces_entry_points">
+            <ToolEntryPoints v-for="job in jobResponse.jobs" :key="job.id" :job-id="job.id" />
+        </div>
+        <ToolSuccessMessage :job-def="jobDef" :job-response="jobResponse" :tool-name="toolName" />
+        <Webhook type="tool" :tool-id="jobDef.tool_id" />
+        <ToolRecommendation v-if="showRecommendation" :tool-id="jobDef.tool_id" />
+    </section>
+</template>
diff --git a/client/src/components/Tool/ToolSuccessMessage.vue b/client/src/components/Tool/ToolSuccessMessage.vue
new file mode 100644
index 00000000000..12c39f38a92
--- /dev/null
+++ b/client/src/components/Tool/ToolSuccessMessage.vue
@@ -0,0 +1,79 @@
+<template>
+    <div class="donemessagelarge">
+        <p>
+            Started tool <b>{{ toolName }}</b> and successfully added {{ nJobsText }} to the queue.
+        </p>
+        <p>The tool uses {{ nInputsText }}:</p>
+        <ul>
+            <li v-for="item of inputs" :key="item.hid">
+                <b>{{ item.hid }}: {{ item.name }}</b>
+            </li>
+        </ul>
+        <p>It produces {{ nOutputsText }}:</p>
+        <ul>
+            <li v-for="item of jobResponse.outputs" :key="item.hid">
+                <b>{{ item.hid }}: {{ item.name }}</b>
+            </li>
+        </ul>
+        <p>
+            You can check the status of queued jobs and view the resulting data by refreshing the History panel. When
+            the job has been run the status will change from 'running' to 'finished' if completed successfully or
+            'error' if problems were encountered.
+        </p>
+    </div>
+</template>
+
+<script>
+export default {
+    props: {
+        jobDef: {
+            type: Object,
+            required: true,
+        },
+        jobResponse: {
+            type: Object,
+            required: true,
+        },
+        toolName: {
+            type: String,
+            required: true,
+        },
+    },
+    computed: {
+        inputs() {
+            const inputs = [];
+            const index = {};
+            for (const i in this.jobDef.inputs) {
+                const input = this.jobDef.inputs[i];
+                if (input && Array.isArray(input.values)) {
+                    for (const j of input.values) {
+                        if (j.src && !index[j.id]) {
+                            inputs.push(j);
+                            index[j.id] = true;
+                        }
+                    }
+                }
+            }
+            return inputs;
+        },
+        nInputs() {
+            return this.inputs.length;
+        },
+        nOutputs() {
+            return this.jobResponse && this.jobResponse.outputs ? this.jobResponse.outputs.length : 0;
+        },
+        nJobs() {
+            return this.jobResponse && this.jobResponse.jobs ? this.jobResponse.jobs.length : 0;
+        },
+        nJobsText() {
+            return this.nJobs > 1 ? `${this.nJobs} jobs` : `1 job`;
+        },
+        nInputsText() {
+            return this.nInputs > 1 ? `${this.nInputs} inputs` : `this input`;
+        },
+        nOutputsText() {
+            return this.nOutputs > 1 ? `${this.nOutputs} outputs` : `this output`;
+        },
+    },
+};
+</script>
diff --git a/client/src/entry/analysis/router.js b/client/src/entry/analysis/router.js
index 558e962322f..d7a55851a84 100644
--- a/client/src/entry/analysis/router.js
+++ b/client/src/entry/analysis/router.js
@@ -46,6 +46,7 @@ import Sharing from "components/Sharing/Sharing";
 import StoredWorkflowInvocations from "components/Workflow/StoredWorkflowInvocations";
 import ToolsJson from "components/ToolsView/ToolsSchemaJson/ToolsJson";
 import ToolsList from "components/ToolsList/ToolsList";
+import ToolSuccess from "components/Tool/ToolSuccess";
 import TourList from "components/Tour/TourList";
 import TourRunner from "components/Tour/TourRunner";
 import TrsImport from "components/Workflow/Import/TrsImport";
@@ -252,6 +253,11 @@ export function getRouter(Galaxy) {
                         path: "interactivetool_entry_points/list",
                         component: InteractiveTools,
                     },
+                    {
+                        path: "jobs/:jobId/success",
+                        component: ToolSuccess,
+                        props: true,
+                    },
                     {
                         path: "jobs/:jobId/view",
                         component: JobDetails,
diff --git a/client/src/store/index.js b/client/src/store/index.js
index dd33e13485e..5088eec76f8 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -21,7 +21,6 @@ import { configStore } from "./configStore";
 import { toolStore } from "./toolStore";
 import { datasetPathDestinationStore } from "./datasetPathDestinationStore";
 import { datasetExtFilesStore } from "./datasetExtFilesStore";
-import { jobStore } from "./jobStore";
 import { collectionAttributesStore } from "./collectionAttributesStore";
 import { panelStore } from "./panelStore";
 
@@ -61,7 +60,6 @@ export function createStore() {
             dataset: datasetStore,
             datasetExtFiles: datasetExtFilesStore,
             datasetPathDestination: datasetPathDestinationStore,
-            informationStore: jobStore,
             invocations: invocationStore,
             jobMetrics: jobMetricsStore,
             gridSearch: gridSearchStore,
diff --git a/client/src/store/jobStore.js b/client/src/store/jobStore.js
deleted file mode 100644
index c5e04d60c41..00000000000
--- a/client/src/store/jobStore.js
+++ /dev/null
@@ -1,33 +0,0 @@
-export const state = {
-    job: {},
-};
-
-import Vue from "vue";
-import { getAppRoot } from "onload/loadConfig";
-import axios from "axios";
-
-const getters = {
-    job: (state) => (jobId) => {
-        return state.job[jobId];
-    },
-};
-
-const actions = {
-    fetchJob: async ({ commit }, jobId) => {
-        const { data } = await axios.get(`${getAppRoot()}api/jobs/${jobId}?full=true`);
-        commit("saveJobForJobId", { jobId, job: data });
-    },
-};
-
-const mutations = {
-    saveJobForJobId: (state, { jobId, job }) => {
-        Vue.set(state.job, jobId, job);
-    },
-};
-
-export const jobStore = {
-    state,
-    getters,
-    actions,
-    mutations,
-};
diff --git a/client/src/stores/jobStore.js b/client/src/stores/jobStore.js
new file mode 100644
index 00000000000..bdd38d39e31
--- /dev/null
+++ b/client/src/stores/jobStore.js
@@ -0,0 +1,37 @@
+/**
+ * Requests jobs
+ * Requests response generated by a tool run
+ */
+
+import { defineStore } from "pinia";
+import Vue from "vue";
+import { getAppRoot } from "onload/loadConfig";
+import axios from "axios";
+
+export const useJobStore = defineStore("jobStore", {
+    state: () => ({
+        job: {},
+        responses: {},
+    }),
+    getters: {
+        getJob: (state) => {
+            return (jobId) => state.job[jobId];
+        },
+        getResponseForJobId: (state) => {
+            return (jobId) => state.responses[jobId];
+        },
+    },
+    actions: {
+        async fetchJob(jobId) {
+            const { data } = await axios.get(`${getAppRoot()}api/jobs/${jobId}?full=true`);
+            this.saveJobForJobId(jobId, data);
+        },
+        // Setters
+        saveJobForJobId(jobId, job) {
+            Vue.set(this.job, jobId, job);
+        },
+        saveResponseForJobId(jobId, response) {
+            Vue.set(this.responses, jobId, response);
+        },
+    },
+});
diff --git a/lib/galaxy/webapps/galaxy/buildapp.py b/lib/galaxy/webapps/galaxy/buildapp.py
index db6b8b0c67f..bf56fd39234 100644
--- a/lib/galaxy/webapps/galaxy/buildapp.py
+++ b/lib/galaxy/webapps/galaxy/buildapp.py
@@ -251,6 +251,7 @@ def app_pair(global_conf, load_app_kwds=None, wsgi_preflight=True, **kwargs):
     webapp.add_client_route("/datasets/{dataset_id}/preview")
     webapp.add_client_route("/datasets/{dataset_id}/show_params")
     webapp.add_client_route("/collection/{collection_id}/edit")
+    webapp.add_client_route("/jobs/{job_id}/success")
     webapp.add_client_route("/jobs/{job_id}/view")
     webapp.add_client_route("/workflows/list")
     webapp.add_client_route("/workflows/list_published")

From 2a2d3144e6ce9f1d0e04021517cf054aa7b9b9b9 Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Thu, 2 Feb 2023 02:20:48 +0500
Subject: [PATCH 07/17] ToolSuccess route - remove import comment

---
 client/src/components/Tool/ToolSuccess.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/src/components/Tool/ToolSuccess.vue b/client/src/components/Tool/ToolSuccess.vue
index 6013cb77819..86eebfab7d3 100644
--- a/client/src/components/Tool/ToolSuccess.vue
+++ b/client/src/components/Tool/ToolSuccess.vue
@@ -1,7 +1,5 @@
 <script setup lang="ts">
-// import FormBoolean from "./Elements/FormBoolean.vue";
 import { computed, onMounted } from "vue";
-
 import type { ComputedRef } from "vue";
 import { useJobStore } from "@/stores/jobStore";
 import { useRouter } from "vue-router/composables";

From 86428b25a9a9bb6af48365a5e081c0907357b618 Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Fri, 3 Feb 2023 01:53:26 +0500
Subject: [PATCH 08/17] Remove jobId from ToolForm success page

---
 client/src/components/Tool/ToolForm.vue    |  7 ++-
 client/src/components/Tool/ToolSuccess.vue | 42 ++++-------------
 client/src/entry/analysis/router.js        |  2 +-
 client/src/stores/jobStore.js              | 37 ---------------
 client/src/stores/jobStore.ts              | 54 ++++++++++++++++++++++
 lib/galaxy/webapps/galaxy/buildapp.py      |  2 +-
 6 files changed, 67 insertions(+), 77 deletions(-)
 delete mode 100644 client/src/stores/jobStore.js
 create mode 100644 client/src/stores/jobStore.ts

diff --git a/client/src/components/Tool/ToolForm.vue b/client/src/components/Tool/ToolForm.vue
index e92ef642764..95bc852fead 100644
--- a/client/src/components/Tool/ToolForm.vue
+++ b/client/src/components/Tool/ToolForm.vue
@@ -229,7 +229,7 @@ export default {
         });
     },
     methods: {
-        ...mapActions(useJobStore, ["saveResponseForJobId"]),
+        ...mapActions(useJobStore, ["saveLatestResponse"]),
         emailAllowed(config, user) {
             return config.server_mail_configured && !user.isAnonymous;
         },
@@ -325,14 +325,13 @@ export default {
                         this.showForm = false;
                         this.jobDef = jobDef;
                         this.jobResponse = jobResponse;
-                        const refJobId = this.jobResponse.jobs[0].id;
                         const response = {
                             jobDef: this.jobDef,
                             jobResponse: this.jobResponse,
                             toolName: this.toolName,
                         };
-                        this.saveResponseForJobId(refJobId, response);
-                        this.$router.push(`/jobs/${refJobId}/success`);
+                        this.saveLatestResponse(response);
+                        this.$router.push(`/jobs/submission/success`);
                     } else {
                         this.showError = true;
                         this.showForm = true;
diff --git a/client/src/components/Tool/ToolSuccess.vue b/client/src/components/Tool/ToolSuccess.vue
index 86eebfab7d3..a197807e104 100644
--- a/client/src/components/Tool/ToolSuccess.vue
+++ b/client/src/components/Tool/ToolSuccess.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { computed, onMounted } from "vue";
-import type { ComputedRef } from "vue";
 import { useJobStore } from "@/stores/jobStore";
 import { useRouter } from "vue-router/composables";
 import { getGalaxyInstance } from "@/app";
@@ -12,44 +11,19 @@ import Webhook from "@/components/Common/Webhook.vue";
 const jobStore = useJobStore();
 const router = useRouter();
 
-/* interfaces */
-interface Job {
-    id: string;
-}
-interface JobDef {
-    tool_id: string;
-}
-interface JobResponse {
-    produces_entry_points: boolean;
-    jobs: Array<Job>;
-}
-interface ResponseVal {
-    jobDef: JobDef;
-    jobResponse: JobResponse;
-    toolName: string;
-}
-
-/* props */
-const props = defineProps({
-    jobId: {
-        type: String,
-        required: true,
-    },
-});
-
-const responseVal: ComputedRef<ResponseVal> = computed(() => jobStore.getResponseForJobId(props.jobId));
+const responseVal = computed(() => jobStore.getLatestResponse);
 
 /* lifecyle */
 onMounted(() => {
-    // no response means no tool produced this job in this session (nothing in store)
-    if (!responseVal.value) {
-        router.push(`/jobs/${props.jobId}/view`);
+    // no response means no ToolForm ran in this session (nothing in store)
+    if (Object.keys(responseVal.value).length === 0) {
+        router.push(`/`);
     }
 });
 
-const jobDef: ComputedRef<JobDef> = computed(() => responseVal.value.jobDef);
-const jobResponse: ComputedRef<JobResponse> = computed(() => responseVal.value.jobResponse);
-const toolName: ComputedRef<string> = computed(() => responseVal.value.toolName);
+const jobDef = computed(() => responseVal.value.jobDef);
+const jobResponse = computed(() => responseVal.value.jobResponse);
+const toolName = computed(() => responseVal.value.toolName);
 
 // getGalaxyInstance is not reactive
 const configEnableRecommendations = getGalaxyInstance().config.enable_tool_recommendations;
@@ -57,7 +31,7 @@ const showRecommendation: boolean = [true, "true"].includes(configEnableRecommen
 </script>
 
 <template>
-    <section v-if="responseVal">
+    <section v-if="jobResponse && jobDef">
         <div v-if="jobResponse.produces_entry_points">
             <ToolEntryPoints v-for="job in jobResponse.jobs" :key="job.id" :job-id="job.id" />
         </div>
diff --git a/client/src/entry/analysis/router.js b/client/src/entry/analysis/router.js
index d7a55851a84..2506529252a 100644
--- a/client/src/entry/analysis/router.js
+++ b/client/src/entry/analysis/router.js
@@ -254,7 +254,7 @@ export function getRouter(Galaxy) {
                         component: InteractiveTools,
                     },
                     {
-                        path: "jobs/:jobId/success",
+                        path: "jobs/submission/success",
                         component: ToolSuccess,
                         props: true,
                     },
diff --git a/client/src/stores/jobStore.js b/client/src/stores/jobStore.js
deleted file mode 100644
index bdd38d39e31..00000000000
--- a/client/src/stores/jobStore.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Requests jobs
- * Requests response generated by a tool run
- */
-
-import { defineStore } from "pinia";
-import Vue from "vue";
-import { getAppRoot } from "onload/loadConfig";
-import axios from "axios";
-
-export const useJobStore = defineStore("jobStore", {
-    state: () => ({
-        job: {},
-        responses: {},
-    }),
-    getters: {
-        getJob: (state) => {
-            return (jobId) => state.job[jobId];
-        },
-        getResponseForJobId: (state) => {
-            return (jobId) => state.responses[jobId];
-        },
-    },
-    actions: {
-        async fetchJob(jobId) {
-            const { data } = await axios.get(`${getAppRoot()}api/jobs/${jobId}?full=true`);
-            this.saveJobForJobId(jobId, data);
-        },
-        // Setters
-        saveJobForJobId(jobId, job) {
-            Vue.set(this.job, jobId, job);
-        },
-        saveResponseForJobId(jobId, response) {
-            Vue.set(this.responses, jobId, response);
-        },
-    },
-});
diff --git a/client/src/stores/jobStore.ts b/client/src/stores/jobStore.ts
new file mode 100644
index 00000000000..3745563b3a7
--- /dev/null
+++ b/client/src/stores/jobStore.ts
@@ -0,0 +1,54 @@
+/**
+ * Requests jobs
+ * Requests response generated by a tool run
+ */
+
+import { defineStore } from "pinia";
+import Vue from "vue";
+import { getAppRoot } from "@/onload/loadConfig";
+import axios from "axios";
+
+/* interfaces */
+interface Job {
+    id: string;
+}
+interface JobDef {
+    tool_id: string;
+}
+interface JobResponse {
+    produces_entry_points: boolean;
+    jobs: Array<Job>;
+}
+interface ResponseVal {
+    jobDef: JobDef;
+    jobResponse: JobResponse;
+    toolName: string;
+}
+
+export const useJobStore = defineStore("jobStore", {
+    state: () => ({
+        jobs: {} as { [index: string]: Job },
+        response: {} as ResponseVal,
+    }),
+    getters: {
+        getJob: (state) => {
+            return (jobId: string) => state.jobs[jobId];
+        },
+        getLatestResponse: (state) => {
+            return state.response;
+        },
+    },
+    actions: {
+        async fetchJob(jobId: string) {
+            const { data } = await axios.get(`${getAppRoot()}api/jobs/${jobId}?full=true`);
+            this.saveJobForJobId(jobId, data);
+        },
+        // Setters
+        saveJobForJobId(jobId: string, job: Job) {
+            Vue.set(this.jobs, jobId, job);
+        },
+        saveLatestResponse(response: ResponseVal) {
+            this.response = response;
+        },
+    },
+});
diff --git a/lib/galaxy/webapps/galaxy/buildapp.py b/lib/galaxy/webapps/galaxy/buildapp.py
index bf56fd39234..46ca9c58779 100644
--- a/lib/galaxy/webapps/galaxy/buildapp.py
+++ b/lib/galaxy/webapps/galaxy/buildapp.py
@@ -251,7 +251,7 @@ def app_pair(global_conf, load_app_kwds=None, wsgi_preflight=True, **kwargs):
     webapp.add_client_route("/datasets/{dataset_id}/preview")
     webapp.add_client_route("/datasets/{dataset_id}/show_params")
     webapp.add_client_route("/collection/{collection_id}/edit")
-    webapp.add_client_route("/jobs/{job_id}/success")
+    webapp.add_client_route("/jobs/submission/success")
     webapp.add_client_route("/jobs/{job_id}/view")
     webapp.add_client_route("/workflows/list")
     webapp.add_client_route("/workflows/list_published")

From 0a0b2d0829b2254c25be44a779c9a4473471158a Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Fri, 3 Feb 2023 18:17:22 +0100
Subject: [PATCH 09/17] Fix large_file.mako arguments

Broke in https://github.com/galaxyproject/galaxy/commit/4a638398fa89b3edd2c84bf2bf25f7d588968d30
---
 lib/galaxy/datatypes/data.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/galaxy/datatypes/data.py b/lib/galaxy/datatypes/data.py
index d8ff7f93e53..7fe72745992 100644
--- a/lib/galaxy/datatypes/data.py
+++ b/lib/galaxy/datatypes/data.py
@@ -542,7 +542,7 @@ class Data(metaclass=DataMeta):
                 trans.fill_template_mako(
                     "/dataset/large_file.mako",
                     truncated_data=open(dataset.file_name, "rb").read(max_peek_size),
-                    dataset=dataset,
+                    data=dataset,
                 ),
                 headers,
             )

From 10d2b61c921411e56a54bf87d06deb35814f4fa3 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Fri, 3 Feb 2023 13:05:00 +0100
Subject: [PATCH 10/17] Don't call setValue in FormElement setup

We already have the necessary data that were passed in via the prop.
Instead we emit the current form state once in the FormDisplay
component's `created` hook.  That works reliably, also if there is no
acutal parameter value.

To handle the no parameter value case in the workflow editor (as happens in the
`__BUILD_LIST__` tool) I've changed the initial empty Object value to null,
so that when we determine whether or not we have to update the module
we're not thrown off by the empty Object value.
---
 client/src/components/Form/FormDisplay.vue               | 6 ++++++
 client/src/components/Form/FormElement.test.js           | 7 +++----
 client/src/components/Form/FormElement.vue               | 3 +--
 client/src/components/Workflow/Editor/Forms/FormTool.vue | 4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/client/src/components/Form/FormDisplay.vue b/client/src/components/Form/FormDisplay.vue
index bad270f506e..b1aedab15d1 100644
--- a/client/src/components/Form/FormDisplay.vue
+++ b/client/src/components/Form/FormDisplay.vue
@@ -127,6 +127,12 @@ export default {
     },
     created() {
         this.onCloneInputs();
+        // build flat formData that is ready to be submitted
+        Object.entries(this.formIndex).forEach(([key, input]) => {
+            this.formData[key] = input.value;
+        });
+        // emit back to parent, so that parent has submittable data
+        this.$emit("onChange", this.formData);
     },
     methods: {
         onReplaceParams() {
diff --git a/client/src/components/Form/FormElement.test.js b/client/src/components/Form/FormElement.test.js
index 79a7770442f..1339639961c 100644
--- a/client/src/components/Form/FormElement.test.js
+++ b/client/src/components/Form/FormElement.test.js
@@ -49,11 +49,10 @@ describe("FormElement", () => {
         });
         expect(wrapper.find(".ui-form-title-text").text()).toEqual("title_text");
         expect(wrapper.findAll("button[title='Disable']").length).toEqual(1);
-        expect(wrapper.emitted().input[0][0]).toEqual("initial_value");
 
         await wrapper.find(".ui-form-collapsible-icon").trigger("click");
-        expect(wrapper.emitted().input[1][0]).toEqual("collapsible_value");
-        expect(wrapper.emitted().input[1][1]).toEqual("input");
+        expect(wrapper.emitted().input[0][0]).toEqual("collapsible_value");
+        expect(wrapper.emitted().input[0][1]).toEqual("input");
 
         await wrapper.setProps({
             collapsedEnableText: "Enable Collapsible",
@@ -63,7 +62,7 @@ describe("FormElement", () => {
         expect(wrapper.findAll("button[title='Disable Collapsible']").length).toEqual(0);
 
         await wrapper.find(".ui-form-collapsible-icon").trigger("click");
-        expect(wrapper.emitted().input[2][0]).toEqual("default_value");
+        expect(wrapper.emitted().input[1][0]).toEqual("default_value");
         expect(wrapper.findAll("button[title='Disable Collapsible']").length).toEqual(1);
         expect(wrapper.findAll("button[title='Enable Collapsible']").length).toEqual(0);
     });
diff --git a/client/src/components/Form/FormElement.vue b/client/src/components/Form/FormElement.vue
index 9e74614f742..688e60357be 100644
--- a/client/src/components/Form/FormElement.vue
+++ b/client/src/components/Form/FormElement.vue
@@ -81,9 +81,8 @@ const collapsed = ref(false);
 const collapsible = computed(() => !props.disabled && collapsibleValue.value !== undefined);
 const connectable = computed(() => collapsible.value && Boolean(attrs.value["connectable"]));
 
-// Determines to wether expand or collapse the input
+// Determines whether to expand or collapse the input
 {
-    setValue(props.value);
     const valueJson = JSON.stringify(props.value);
     connected.value = valueJson === JSON.stringify(connectedValue);
     collapsed.value =
diff --git a/client/src/components/Workflow/Editor/Forms/FormTool.vue b/client/src/components/Workflow/Editor/Forms/FormTool.vue
index 2d8e70e2972..cdd9bde1228 100644
--- a/client/src/components/Workflow/Editor/Forms/FormTool.vue
+++ b/client/src/components/Workflow/Editor/Forms/FormTool.vue
@@ -110,7 +110,7 @@ export default {
     },
     data() {
         return {
-            mainValues: {},
+            mainValues: null,
             messageText: "",
             messageVariant: "success",
         };
@@ -168,7 +168,7 @@ export default {
          * @param { Object } values contains flat key-value pairs `prefixed-name=value`
          */
         onChange(values) {
-            const initialRequest = Object.keys(this.mainValues).length === 0;
+            const initialRequest = this.mainValues === null;
             this.mainValues = values;
             if (!initialRequest) {
                 this.postChanges();

From bc2512b303809e0bec5a27ca6e2aee998d0f44de Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Sat, 4 Feb 2023 09:10:44 +0100
Subject: [PATCH 11/17] Don't request user when it is in store

We'd otherwise request the user on every switch of tool form.
---
 .../Tool/Buttons/ToolOptionsButton.vue        |   2 +-
 client/src/components/Tool/ToolCard.vue       |   2 +-
 .../components/Tool/ToolSourceMenuItem.vue    |   2 +-
 .../Workflow/Editor/Forms/FormTool.vue        | 107 +++++++++---------
 client/src/composables/user.ts                |   5 +-
 5 files changed, 57 insertions(+), 61 deletions(-)

diff --git a/client/src/components/Tool/Buttons/ToolOptionsButton.vue b/client/src/components/Tool/Buttons/ToolOptionsButton.vue
index 4e53cb317e7..931294cf97d 100644
--- a/client/src/components/Tool/Buttons/ToolOptionsButton.vue
+++ b/client/src/components/Tool/Buttons/ToolOptionsButton.vue
@@ -6,7 +6,7 @@ import Webhooks from "utils/webhooks";
 import ToolSourceMenuItem from "components/Tool/ToolSourceMenuItem";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 
-const { currentUser: user } = useCurrentUser();
+const { currentUser: user } = useCurrentUser(false, true);
 
 const props = defineProps({
     id: {
diff --git a/client/src/components/Tool/ToolCard.vue b/client/src/components/Tool/ToolCard.vue
index 9e584cd06d6..dde944c1202 100644
--- a/client/src/components/Tool/ToolCard.vue
+++ b/client/src/components/Tool/ToolCard.vue
@@ -66,7 +66,7 @@ function onSetError(e) {
     errorText.value = e;
 }
 
-const { currentUser: user } = useCurrentUser();
+const { currentUser: user } = useCurrentUser(false, true);
 const hasUser = computed(() => !user.value.isAnonymous);
 
 const versions = computed(() => props.options.versions);
diff --git a/client/src/components/Tool/ToolSourceMenuItem.vue b/client/src/components/Tool/ToolSourceMenuItem.vue
index d774c2c58eb..c27a0deb03b 100644
--- a/client/src/components/Tool/ToolSourceMenuItem.vue
+++ b/client/src/components/Tool/ToolSourceMenuItem.vue
@@ -5,7 +5,7 @@ import { useCurrentUser } from "composables/user";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 
 const { config } = useConfig();
-const { currentUser } = useCurrentUser();
+const { currentUser } = useCurrentUser(false, true);
 
 const props = defineProps({
     toolId: {
diff --git a/client/src/components/Workflow/Editor/Forms/FormTool.vue b/client/src/components/Workflow/Editor/Forms/FormTool.vue
index cdd9bde1228..858e09cf574 100644
--- a/client/src/components/Workflow/Editor/Forms/FormTool.vue
+++ b/client/src/components/Workflow/Editor/Forms/FormTool.vue
@@ -1,62 +1,58 @@
 <template>
-    <CurrentUser v-slot="{ user }">
-        <ToolCard
-            v-if="hasData"
-            :id="configForm.id"
-            :user="user"
-            :version="configForm.version"
-            :title="configForm.name"
-            :description="configForm.description"
-            :options="configForm"
-            :message-text="messageText"
-            :message-variant="messageVariant"
-            @onChangeVersion="onChangeVersion"
-            @onUpdateFavorites="onUpdateFavorites">
-            <template v-slot:body>
-                <FormElement
-                    id="__label"
-                    :value="label"
-                    title="Label"
-                    help="Add a step label."
-                    :error="uniqueErrorLabel"
-                    @input="onLabel" />
-                <FormElement
-                    id="__annotation"
-                    :value="annotation"
-                    title="Step Annotation"
-                    :area="true"
-                    help="Add an annotation or notes to this step. Annotations are available when a workflow is viewed."
-                    @input="onAnnotation" />
-                <FormConditional :step="step" v-on="$listeners" />
-                <div class="mt-2 mb-4">
-                    <Heading h2 separator bold size="sm"> Tool Parameters </Heading>
-                    <FormDisplay
-                        :id="id"
-                        :inputs="inputs"
-                        :errors="errors"
-                        text-enable="Set in Advance"
-                        text-disable="Set at Runtime"
-                        :workflow-building-mode="true"
-                        @onChange="onChange" />
-                </div>
-                <div class="mt-2 mb-4">
-                    <Heading h2 separator bold size="sm"> Additional Options </Heading>
-                    <FormSection
-                        :id="stepId"
-                        :node-inputs="stepInputs"
-                        :node-outputs="stepOutputs"
-                        :step="step"
-                        :datatypes="datatypes"
-                        :post-job-actions="postJobActions"
-                        @onChange="onChangePostJobActions" />
-                </div>
-            </template>
-        </ToolCard>
-    </CurrentUser>
+    <ToolCard
+        v-if="hasData"
+        :id="configForm.id"
+        :version="configForm.version"
+        :title="configForm.name"
+        :description="configForm.description"
+        :options="configForm"
+        :message-text="messageText"
+        :message-variant="messageVariant"
+        @onChangeVersion="onChangeVersion"
+        @onUpdateFavorites="onUpdateFavorites">
+        <template v-slot:body>
+            <FormElement
+                id="__label"
+                :value="label"
+                title="Label"
+                help="Add a step label."
+                :error="uniqueErrorLabel"
+                @input="onLabel" />
+            <FormElement
+                id="__annotation"
+                :value="annotation"
+                title="Step Annotation"
+                :area="true"
+                help="Add an annotation or notes to this step. Annotations are available when a workflow is viewed."
+                @input="onAnnotation" />
+            <FormConditional :step="step" v-on="$listeners" />
+            <div class="mt-2 mb-4">
+                <Heading h2 separator bold size="sm"> Tool Parameters </Heading>
+                <FormDisplay
+                    :id="id"
+                    :inputs="inputs"
+                    :errors="errors"
+                    text-enable="Set in Advance"
+                    text-disable="Set at Runtime"
+                    :workflow-building-mode="true"
+                    @onChange="onChange" />
+            </div>
+            <div class="mt-2 mb-4">
+                <Heading h2 separator bold size="sm"> Additional Options </Heading>
+                <FormSection
+                    :id="stepId"
+                    :node-inputs="stepInputs"
+                    :node-outputs="stepOutputs"
+                    :step="step"
+                    :datatypes="datatypes"
+                    :post-job-actions="postJobActions"
+                    @onChange="onChangePostJobActions" />
+            </div>
+        </template>
+    </ToolCard>
 </template>
 
 <script>
-import CurrentUser from "@/components/providers/CurrentUser";
 import FormDisplay from "@/components/Form/FormDisplay.vue";
 import ToolCard from "@/components/Tool/ToolCard.vue";
 import FormSection from "./FormSection.vue";
@@ -71,7 +67,6 @@ import { toRef } from "vue";
 
 export default {
     components: {
-        CurrentUser,
         FormDisplay,
         ToolCard,
         FormElement,
diff --git a/client/src/composables/user.ts b/client/src/composables/user.ts
index 557b576a3e3..92d864d451c 100644
--- a/client/src/composables/user.ts
+++ b/client/src/composables/user.ts
@@ -6,15 +6,16 @@ import type { Store } from "vuex";
 /**
  * composable user store wrapper
  * @param noFetch when true, the user will not be fetched from the server
+ * @param fetchOnce when true, the user will only be fetched from the server if it is not already in the store
  * @returns currentUser computed
  */
-export function useCurrentUser(noFetch: boolean | Ref<boolean> = false) {
+export function useCurrentUser(noFetch: boolean | Ref<boolean> = false, fetchOnce: boolean | Ref<boolean> = false) {
     // TODO: add store typing
     const store = inject("store") as Store<unknown>;
     const currentUser = computed(() => store.getters["user/currentUser"]);
     const currentFavorites = computed(() => store.getters["user/currentFavorites"]);
     onMounted(() => {
-        if (!unref(noFetch)) {
+        if (!unref(noFetch) && !(Object.keys(currentUser).length > 0) && unref(fetchOnce)) {
             store.dispatch("user/loadUser");
         }
     });

From 0cd2487898500bf49fe7517365eaf76a72eb154e Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Sat, 4 Feb 2023 09:52:32 +0100
Subject: [PATCH 12/17] Don't request config when it is in store

---
 client/src/components/Tool/ToolSourceMenuItem.vue | 2 +-
 client/src/composables/config.js                  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/src/components/Tool/ToolSourceMenuItem.vue b/client/src/components/Tool/ToolSourceMenuItem.vue
index c27a0deb03b..d53c332403b 100644
--- a/client/src/components/Tool/ToolSourceMenuItem.vue
+++ b/client/src/components/Tool/ToolSourceMenuItem.vue
@@ -4,7 +4,7 @@ import { useConfig } from "composables/config";
 import { useCurrentUser } from "composables/user";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 
-const { config } = useConfig();
+const { config } = useConfig(true);
 const { currentUser } = useCurrentUser(false, true);
 
 const props = defineProps({
diff --git a/client/src/composables/config.js b/client/src/composables/config.js
index 2e30dc438f1..6cd69fb71be 100644
--- a/client/src/composables/config.js
+++ b/client/src/composables/config.js
@@ -1,7 +1,7 @@
 import { computed, onMounted, inject } from "vue";
 
 /* composable config wrapper */
-export function useConfig() {
+export function useConfig(fetchOnce = false) {
     const store = inject("store");
 
     const config = computed(() => store.getters["config/config"]);
@@ -9,7 +9,9 @@ export function useConfig() {
 
     // Anytime we mount this (for now), make sure to load.
     onMounted(() => {
-        store.dispatch("config/loadConfigs");
+        if (!(fetchOnce && isLoaded)) {
+            store.dispatch("config/loadConfigs");
+        }
     });
 
     return { config, isLoaded };

From 130a60d42012a0f903dca0756fe47aa791684477 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Sat, 4 Feb 2023 09:52:51 +0100
Subject: [PATCH 13/17] Request webhook data just once

---
 client/src/components/Masthead/_webhooks.js   |  3 +-
 .../Tool/Buttons/ToolOptionsButton.vue        |  4 +-
 client/src/components/Tool/ToolCard.test.js   |  6 ++
 client/src/components/Tool/ToolForm.test.js   |  1 +
 .../Workflow/Editor/Forms/FormTool.test.js    |  5 ++
 .../src/onload/globalInits/onloadWebhooks.js  |  5 +-
 client/src/utils/webhooks.js                  | 56 ++++++++++---------
 7 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/client/src/components/Masthead/_webhooks.js b/client/src/components/Masthead/_webhooks.js
index bc1dff9c6ae..e52294d5ffa 100644
--- a/client/src/components/Masthead/_webhooks.js
+++ b/client/src/components/Masthead/_webhooks.js
@@ -5,8 +5,7 @@ export function loadWebhookMenuItems(items) {
     Webhooks.load({
         type: "masthead",
         callback: function (webhooks) {
-            webhooks.each((model) => {
-                const webhook = model.toJSON();
+            webhooks.forEach((webhook) => {
                 if (webhook.activate) {
                     const obj = {
                         id: webhook.id,
diff --git a/client/src/components/Tool/Buttons/ToolOptionsButton.vue b/client/src/components/Tool/Buttons/ToolOptionsButton.vue
index 931294cf97d..ec467c63c9b 100644
--- a/client/src/components/Tool/Buttons/ToolOptionsButton.vue
+++ b/client/src/components/Tool/Buttons/ToolOptionsButton.vue
@@ -28,9 +28,7 @@ const webhookDetails = ref([]);
 Webhooks.load({
     type: "tool-menu",
     callback: (webhooks) => {
-        webhooks.each((model) => {
-            const webhook = model.toJSON();
-
+        webhooks.forEach((webhook) => {
             if (webhook.activate && webhook.config.function) {
                 webhookDetails.value.push({
                     icon: `fa ${webhook.config.icon}`,
diff --git a/client/src/components/Tool/ToolCard.test.js b/client/src/components/Tool/ToolCard.test.js
index 0ec1a66f60f..0bf54ff9bb2 100644
--- a/client/src/components/Tool/ToolCard.test.js
+++ b/client/src/components/Tool/ToolCard.test.js
@@ -1,5 +1,7 @@
 import { mount } from "@vue/test-utils";
 import { getLocalVue, mockModule } from "tests/jest/helpers";
+import MockAdapter from "axios-mock-adapter";
+import axios from "axios";
 import ToolCard from "./ToolCard";
 import Vuex from "vuex";
 import { userStore } from "store/userStore";
@@ -18,8 +20,12 @@ const createStore = (currentUser) => {
 
 describe("ToolCard", () => {
     let wrapper;
+    let axiosMock;
 
     beforeEach(() => {
+        axiosMock = new MockAdapter(axios);
+        axiosMock.onGet(`/api/webhooks`).reply(200, []);
+
         const store = createStore({
             id: "user.id",
             email: "user.email",
diff --git a/client/src/components/Tool/ToolForm.test.js b/client/src/components/Tool/ToolForm.test.js
index 5f00316645d..df12b6ab34a 100644
--- a/client/src/components/Tool/ToolForm.test.js
+++ b/client/src/components/Tool/ToolForm.test.js
@@ -30,6 +30,7 @@ describe("ToolForm", () => {
             help: "help_text",
         };
         axiosMock.onGet(`/api/tools/tool_id/build?tool_version=version`).reply(200, toolData);
+        axiosMock.onGet(`/api/webhooks`).reply(200, []);
 
         const citations = [];
         axiosMock.onGet(`/api/tools/tool_id/citations`).reply(200, citations);
diff --git a/client/src/components/Workflow/Editor/Forms/FormTool.test.js b/client/src/components/Workflow/Editor/Forms/FormTool.test.js
index 01bdcfb973c..3be5542acac 100644
--- a/client/src/components/Workflow/Editor/Forms/FormTool.test.js
+++ b/client/src/components/Workflow/Editor/Forms/FormTool.test.js
@@ -1,5 +1,7 @@
 import { mount } from "@vue/test-utils";
 import { getLocalVue, mockModule } from "tests/jest/helpers";
+import axios from "axios";
+import MockAdapter from "axios-mock-adapter";
 import FormTool from "./FormTool";
 import MockCurrentUser from "components/providers/MockCurrentUser";
 import MockConfigProvider from "components/providers/MockConfigProvider";
@@ -11,6 +13,9 @@ import { createTestingPinia } from "@pinia/testing";
 const localVue = getLocalVue();
 
 describe("FormTool", () => {
+    const axiosMock = new MockAdapter(axios);
+    axiosMock.onGet(`/api/webhooks`).reply(200, []);
+
     function mountTarget() {
         const store = new Vuex.Store({
             modules: {
diff --git a/client/src/onload/globalInits/onloadWebhooks.js b/client/src/onload/globalInits/onloadWebhooks.js
index ce74aa64a48..f4dfa6c21b8 100644
--- a/client/src/onload/globalInits/onloadWebhooks.js
+++ b/client/src/onload/globalInits/onloadWebhooks.js
@@ -2,14 +2,11 @@ import Webhooks from "utils/webhooks";
 import Utils from "utils/utils";
 
 export function onloadWebhooks(Galaxy) {
-    console.log("onloadWebhooks");
-
     if (Galaxy.config.enable_webhooks) {
         Webhooks.load({
             type: "onload",
             callback: function (webhooks) {
-                webhooks.each((model) => {
-                    var webhook = model.toJSON();
+                webhooks.forEach((webhook) => {
                     if (webhook.activate && webhook.script) {
                         Utils.appendScriptStyle(webhook);
                     }
diff --git a/client/src/utils/webhooks.js b/client/src/utils/webhooks.js
index 30e0ee69822..1fb9452853a 100644
--- a/client/src/utils/webhooks.js
+++ b/client/src/utils/webhooks.js
@@ -1,12 +1,22 @@
+import axios from "axios";
 import Backbone from "backbone";
 import { getAppRoot } from "onload/loadConfig";
+import { rethrowSimple } from "@/utils/simple-error";
 import Utils from "utils/utils";
 
-const Webhooks = Backbone.Collection.extend({
-    url: function () {
-        return `${getAppRoot()}api/webhooks`;
-    },
-});
+let webhookData = undefined;
+
+async function getWebHookData() {
+    if (webhookData === undefined) {
+        try {
+            const { data } = await axios.get(`${getAppRoot()}api/webhooks`);
+            webhookData = data;
+        } catch (e) {
+            rethrowSimple(e);
+        }
+    }
+    return webhookData;
+}
 
 const WebhookView = Backbone.View.extend({
     el: "#webhook-view",
@@ -18,16 +28,13 @@ const WebhookView = Backbone.View.extend({
         this.$el.attr("tool_id", toolId);
         this.$el.attr("tool_version", toolVersion);
 
-        const webhooks = new Webhooks();
-        webhooks.fetch({
-            success: (data) => {
-                if (options.type) {
-                    data.reset(filterType(data, options.type));
-                }
-                if (data.length > 0) {
-                    this.render(weightedRandomPick(data));
-                }
-            },
+        getWebHookData().then((data) => {
+            if (options.type) {
+                data.reset(filterType(data, options.type));
+            }
+            if (data.length > 0) {
+                this.render(weightedRandomPick(data));
+            }
         });
     },
 
@@ -40,21 +47,18 @@ const WebhookView = Backbone.View.extend({
 });
 
 const load = (options) => {
-    const webhooks = new Webhooks();
-    webhooks.fetch({
-        async: options.async !== undefined ? options.async : true,
-        success: (data) => {
-            if (options.type) {
-                data.reset(filterType(data, options.type));
-            }
-            options.callback(data);
-        },
+    getWebHookData().then((data) => {
+        let filteredData = data;
+        if (options.type) {
+            filteredData = filterType(data, options.type);
+        }
+        options.callback(filteredData);
     });
 };
 
 function filterType(data, type) {
-    return data.models.filter((item) => {
-        const itype = item.get("type");
+    return data.filter((item) => {
+        const itype = item.type;
         if (itype) {
             return itype.indexOf(type) !== -1;
         } else {

From dde55b39f4aa4a41971b8887e0632a78e1845fc3 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Sat, 4 Feb 2023 14:19:30 +0100
Subject: [PATCH 14/17] Add selenium test for inserting new inputs

---
 client/src/utils/navigation/navigation.yml    |  1 +
 .../selenium/test_workflow_editor.py          | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml
index 7720e0eed86..4157da48d60 100644
--- a/client/src/utils/navigation/navigation.yml
+++ b/client/src/utils/navigation/navigation.yml
@@ -490,6 +490,7 @@ tool_form:
     parameter_checkbox: 'div.ui-form-element[id="form-element-${parameter}"] .ui-switch'
     parameter_input: 'div.ui-form-element[id="form-element-${parameter}"] .ui-input'
     parameter_textarea: 'div.ui-form-element[id="form-element-${parameter}"] textarea'
+    repeat_insert: '[data-description="repeat insert"]'
     reference: '.formatted-reference'
     about: '.tool-footer'
 
diff --git a/lib/galaxy_test/selenium/test_workflow_editor.py b/lib/galaxy_test/selenium/test_workflow_editor.py
index b4b3212f6e6..f50d75e87a7 100644
--- a/lib/galaxy_test/selenium/test_workflow_editor.py
+++ b/lib/galaxy_test/selenium/test_workflow_editor.py
@@ -918,6 +918,26 @@ steps:
         output_connector.send_keys(Keys.SPACE)
         assert self.driver.switch_to.active_element.text == "No compatible input found in workflow"
 
+    @selenium_test
+    def test_insert_input_handling(self):
+        self.open_in_workflow_editor(
+            """class: GalaxyWorkflow
+inputs: []
+steps:
+  build_list:
+    tool_id: __BUILD_LIST__
+        """
+        )
+        editor = self.components.workflow_editor
+        node = editor.node._(label="build_list")
+        node.wait_for_and_click()
+        assert not node.has_class("input-terminal")
+        self.components.tool_form.repeat_insert.wait_for_and_click()
+        node.input_terminal(name="datasets_0|input").wait_for_present()
+        self.components.tool_form.repeat_insert.wait_for_and_click()
+        node.input_terminal(name="datasets_1|input").wait_for_present()
+        self.assert_workflow_has_changes_and_save()
+
     @selenium_test
     def test_workflow_output_handling(self):
         self.open_in_workflow_editor(

From f7d9e04dea28832c8be043ae2ca077fe93746155 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Sat, 4 Feb 2023 17:34:15 +0100
Subject: [PATCH 15/17] Reuse buildFormData

---
 client/src/components/Form/FormDisplay.vue | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/client/src/components/Form/FormDisplay.vue b/client/src/components/Form/FormDisplay.vue
index b1aedab15d1..31d209317f4 100644
--- a/client/src/components/Form/FormDisplay.vue
+++ b/client/src/components/Form/FormDisplay.vue
@@ -128,13 +128,18 @@ export default {
     created() {
         this.onCloneInputs();
         // build flat formData that is ready to be submitted
-        Object.entries(this.formIndex).forEach(([key, input]) => {
-            this.formData[key] = input.value;
-        });
+        this.formData = this.buildFormData();
         // emit back to parent, so that parent has submittable data
         this.$emit("onChange", this.formData);
     },
     methods: {
+        buildFormData() {
+            const params = {};
+            Object.entries(this.formIndex).forEach(([key, input]) => {
+                params[key] = input.value;
+            });
+            return params;
+        },
         onReplaceParams() {
             let refreshOnChange = false;
             Object.entries(this.replaceParams).forEach(([key, value]) => {
@@ -165,10 +170,7 @@ export default {
         },
         onChange(refreshOnChange) {
             this.onCreateIndex();
-            const params = {};
-            Object.entries(this.formIndex).forEach(([key, input]) => {
-                params[key] = input.value;
-            });
+            const params = this.buildFormData();
             if (JSON.stringify(params) != JSON.stringify(this.formData)) {
                 this.formData = params;
                 this.resetError();

From 706ec29add1bca5fc6afb38dcd980020d4792971 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Sun, 5 Feb 2023 11:48:23 +0100
Subject: [PATCH 16/17] Cast `None` value to `""`

for inferred optional text parameters, for old tools.
This maintains templating behavior for exisiting tools.
---
 lib/galaxy/tool_util/xsd/galaxy.xsd       |  5 ++++
 lib/galaxy/tools/evaluation.py            |  4 ++-
 lib/galaxy/tools/parameters/basic.py      | 30 +++++++++++++++--------
 lib/galaxy/tools/parameters/wrapped.py    |  2 +-
 lib/galaxy/tools/wrappers.py              | 12 ++++++++-
 test/functional/tools/cheetah_casting.xml |  7 ++++--
 6 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/lib/galaxy/tool_util/xsd/galaxy.xsd b/lib/galaxy/tool_util/xsd/galaxy.xsd
index c4115d9e717..cec54b8433b 100644
--- a/lib/galaxy/tool_util/xsd/galaxy.xsd
+++ b/lib/galaxy/tool_util/xsd/galaxy.xsd
@@ -59,6 +59,11 @@ List of behavior changes associated with profile versions:
 
 - Do not strip leading and trailing whitespaces in `from_work_dir` attribute.
 
+### 23.0
+
+- Text parameters that are inferred to be optional (i.e the `optional` tag is not set, but the tool parameter accepts an empty string)
+  are set to `None` for templating in Cheetah. Older tools receive the empty string `""` as the templated value.
+
 ### Examples
 
 A normal tool:
diff --git a/lib/galaxy/tools/evaluation.py b/lib/galaxy/tools/evaluation.py
index 2ae9cd70ca2..e2c400b7e6d 100644
--- a/lib/galaxy/tools/evaluation.py
+++ b/lib/galaxy/tools/evaluation.py
@@ -356,7 +356,9 @@ class ToolEvaluator:
                     input, value, other_values=param_dict, compute_environment=self.compute_environment
                 )
             else:
-                input_values[input.name] = InputValueWrapper(input, value, param_dict)
+                input_values[input.name] = InputValueWrapper(
+                    input, value, param_dict, profile=self.tool and self.tool.profile
+                )
 
         # HACK: only wrap if check_values is not false, this deals with external
         #       tools where the inputs don't even get passed through. These
diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py
index 6b9094c9fa5..279c4a931fc 100644
--- a/lib/galaxy/tools/parameters/basic.py
+++ b/lib/galaxy/tools/parameters/basic.py
@@ -164,6 +164,7 @@ class ToolParameter(Dictifiable):
         self.hidden = input_source.get_bool("hidden", False)
         self.refresh_on_change = input_source.get_bool("refresh_on_change", False)
         self.optional = input_source.parse_optional()
+        self.optionality_inferred = False
         self.is_dynamic = False
         self.label = input_source.parse_label()
         self.help = input_source.parse_help()
@@ -326,15 +327,23 @@ class SimpleTextToolParameter(ToolParameter):
     def __init__(self, tool, input_source):
         input_source = ensure_input_source(input_source)
         super().__init__(tool, input_source)
-        self.optional = input_source.get_bool("optional", False)
-
-        if not self.optional and self.type == "text":
-            try:
-                for validator in self.validators:
-                    validator.validate("")
-                self.optional = True
-            except ValueError:
-                self.optional = False
+        optional = input_source.get("optional", None)
+        if optional is not None:
+            optional = string_as_bool(optional)
+        else:
+            # Optionality not explicitly defined, default to False
+            optional = False
+            if self.type == "text":
+                # A text parameter that doesn't raise a validation error on empty string
+                # is considered to be optional
+                try:
+                    for validator in self.validators:
+                        validator.validate("")
+                    optional = True
+                    self.optionality_inferred = True
+                except ValueError:
+                    pass
+        self.optional = optional
 
         if self.optional:
             self.value = None
@@ -362,7 +371,8 @@ class TextToolParameter(SimpleTextToolParameter):
     >>> p = TextToolParameter(None, XML('<param name="_name" type="text" value="default" />'))
     >>> print(p.name)
     _name
-    >>> assert sorted(p.to_dict(trans).items()) == [('area', False), ('argument', None), ('datalist', []), ('help', ''), ('hidden', False), ('is_dynamic', False), ('label', ''), ('model_class', 'TextToolParameter'), ('name', '_name'), ('optional', True), ('refresh_on_change', False), ('type', 'text'), ('value', u'default')]
+    >>> sorted(p.to_dict(trans).items())
+    [('area', False), ('argument', None), ('datalist', []), ('help', ''), ('hidden', False), ('is_dynamic', False), ('label', ''), ('model_class', 'TextToolParameter'), ('name', '_name'), ('optional', True), ('refresh_on_change', False), ('type', 'text'), ('value', 'default')]
     """
 
     def __init__(self, tool, input_source):
diff --git a/lib/galaxy/tools/parameters/wrapped.py b/lib/galaxy/tools/parameters/wrapped.py
index 71a81c8f245..819b9ac08f6 100644
--- a/lib/galaxy/tools/parameters/wrapped.py
+++ b/lib/galaxy/tools/parameters/wrapped.py
@@ -98,7 +98,7 @@ class WrappedParameters:
                     name=input.name,
                 )
             else:
-                input_values[input.name] = InputValueWrapper(input, value, incoming)
+                input_values[input.name] = InputValueWrapper(input, value, incoming, tool.profile)
 
 
 def make_dict_copy(from_dict):
diff --git a/lib/galaxy/tools/wrappers.py b/lib/galaxy/tools/wrappers.py
index 3c9e7e1056a..d9ee3523b4e 100644
--- a/lib/galaxy/tools/wrappers.py
+++ b/lib/galaxy/tools/wrappers.py
@@ -120,10 +120,20 @@ class InputValueWrapper(ToolParameterValueWrapper):
     def __init__(
         self,
         input: "ToolParameter",
-        value: str,
+        value: Optional[str],
         other_values: Optional[Dict[str, str]] = None,
+        profile: Optional[float] = None,
     ) -> None:
         self.input = input
+        if (
+            value is None
+            and input.type == "text"
+            and input.optional
+            and input.optionality_inferred
+            and (profile is None or profile < 23.0)
+        ):
+            # Tools with old profile versions may treat an optional text parameter as `""`
+            value = ""
         self.value = value
         self._other_values: Dict[str, str] = other_values or {}
 
diff --git a/test/functional/tools/cheetah_casting.xml b/test/functional/tools/cheetah_casting.xml
index ab9c7606158..26cdfc62ea3 100644
--- a/test/functional/tools/cheetah_casting.xml
+++ b/test/functional/tools/cheetah_casting.xml
@@ -3,13 +3,16 @@
         #set $int_val_inc = int($inttest) + 1
         #set $int_flot_val_inc = int($floattest) + 1
         #set $float_val_inc = float($floattest) + 1
-        echo $int_val_inc   >> '$out_file1';
+        #set $text_val = $texttest.strip()
+        echo $int_val_inc >> '$out_file1';
         echo $int_flot_val_inc >> '$out_file1';
         echo $float_val_inc >> '$out_file1';
+        echo $text_val >> '#out_file1'
     </command>
     <inputs>
         <param name="inttest" value="1" type="integer" />
         <param name="floattest" value="1.0" type="float" />
+        <param name="texttest" type="text" />
     </inputs>
     <outputs>
         <data name="out_file1" format="txt" />
@@ -27,4 +30,4 @@
             </output>
         </test>
     </tests>
-</tool>
+</tool>
\ No newline at end of file

From ccb8b9656e14d9b98748eb4f505c3d03c7428697 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Sun, 5 Feb 2023 12:02:48 +0100
Subject: [PATCH 17/17] Fix type annotation for ToolParameterValueWrapper

---
 lib/galaxy/tools/wrappers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/galaxy/tools/wrappers.py b/lib/galaxy/tools/wrappers.py
index d9ee3523b4e..187f9adf095 100644
--- a/lib/galaxy/tools/wrappers.py
+++ b/lib/galaxy/tools/wrappers.py
@@ -66,7 +66,7 @@ class ToolParameterValueWrapper:
     Base class for object that Wraps a Tool Parameter and Value.
     """
 
-    value: Union[str, List[str]]
+    value: Optional[Union[str, List[str]]]
     input: "ToolParameter"
 
     def __bool__(self) -> bool:
@@ -246,7 +246,7 @@ class SelectToolParameterWrapper(ToolParameterValueWrapper):
         compute_environment: Optional["ComputeEnvironment"] = None,
     ):
         self.input = input
-        self.value = value
+        self.value: Union[str, List[str]] = value
         self.input.value_label = input.value_to_display_text(value)
         self._other_values = other_values or {}
         self.compute_environment = compute_environment