Merge branch 'release_24.1' into dev

galaxyproject · Oct 22, 2024 · 051c5ab · 051c5ab
2 parents 639d302 + ed07d87
commit 051c5ab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/client/src/stores/collectionElementsStore.ts b/client/src/stores/collectionElementsStore.ts
@@ -65,7 +65,7 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore",
 
     const hasLoadingCollectionElementsError = computed(() => {
         return (collection: CollectionEntry) => {
-            return loadingCollectionElementsErrors.value[getCollectionKey(collection) ?? false];
+            return loadingCollectionElementsErrors.value[getCollectionKey(collection)] ?? false;
         };
     });
 

diff --git a/lib/galaxy/jobs/handler.py b/lib/galaxy/jobs/handler.py
@@ -315,6 +315,8 @@ def _check_job_at_startup(self, job):
             self.job_wrapper(job).fail(
                 "This tool was disabled before the job completed.  Please contact your Galaxy administrator."
             )
+        elif job.copied_from_job_id:
+            self.queue.put((job.id, job.tool_id))
         elif job.job_runner_name is not None and job.job_runner_external_id is None:
             # This could happen during certain revisions of Galaxy where a runner URL was persisted before the job was dispatched to a runner.
             log.debug(f"({job.id}) Job runner assigned but no external ID recorded, adding to the job handler queue")

diff --git a/lib/galaxy/tool_util/verify/interactor.py b/lib/galaxy/tool_util/verify/interactor.py
@@ -546,7 +546,7 @@ def stage_data_async(
             file_name = None
             file_name_exists = False
             location = self._ensure_valid_location_in(test_data)
-            if fname:
+            if fname and force_path_paste:
                 file_name = self.test_data_path(tool_id, fname, tool_version=tool_version)
                 file_name_exists = os.path.exists(file_name)
             tool_input["files_0|type"] = "upload_dataset"
@@ -556,7 +556,8 @@ def stage_data_async(
             else:
                 name = fname
                 if force_path_paste:
-                    file_name = self.test_data_path(tool_id, fname, tool_version=tool_version)
+                    if file_name is None:
+                        file_name = self.test_data_path(tool_id, fname, tool_version=tool_version)
                     tool_input["files_0|url_paste"] = f"file://{file_name}"
                 else:
                     file_content = self.test_data_download(tool_id, fname, is_output=False, tool_version=tool_version)