diff --git a/client/src/components/History/Content/ContentItem.vue b/client/src/components/History/Content/ContentItem.vue index 70059b96f61..dc7022d3a82 100644 --- a/client/src/components/History/Content/ContentItem.vue +++ b/client/src/components/History/Content/ContentItem.vue @@ -250,10 +250,11 @@ function onDisplay() { // but we're using a __vkey__ bit as a workaround // Only conditionally force to keep urls clean most of the time. if (route.path === itemUrls.value.display) { - // @ts-ignore + // @ts-ignore - monkeypatched router, drop with migration. router.push(itemUrls.value.display, { title: props.name, force: true }); } else if (itemUrls.value.display) { - router.push({ path: itemUrls.value.display, params: { title: props.name } }); + // @ts-ignore - monkeypatched router, drop with migration. + router.push(itemUrls.value.display, { title: props.name }); } } } diff --git a/lib/galaxy/datatypes/binary.py b/lib/galaxy/datatypes/binary.py index 9366456f593..f0c09f54221 100644 --- a/lib/galaxy/datatypes/binary.py +++ b/lib/galaxy/datatypes/binary.py @@ -4329,9 +4329,9 @@ class Npz(CompressedArchive): def sniff(self, filename: str) -> bool: try: - npz = np.load(filename) - if isinstance(npz, np.lib.npyio.NpzFile): - return True + with np.load(filename) as npz: + if isinstance(npz, np.lib.npyio.NpzFile) and any(f.filename.endswith(".npy") for f in npz.zip.filelist): + return True except Exception: return False return False diff --git a/lib/galaxy/managers/workflows.py b/lib/galaxy/managers/workflows.py index 054f5f1e78a..43b65e6b061 100644 --- a/lib/galaxy/managers/workflows.py +++ b/lib/galaxy/managers/workflows.py @@ -90,6 +90,7 @@ from galaxy.tools.parameters import ( visit_input_values, ) from galaxy.tools.parameters.basic import ( + ConnectedValue, DataCollectionToolParameter, DataToolParameter, RuntimeValue, @@ -1520,12 +1521,12 @@ class WorkflowContentsManager(UsesAnnotations): if name: input_dicts.append({"name": name, "description": annotation_str}) for name, val in step_state.items(): - if isinstance(val, RuntimeValue): + if isinstance(val, RuntimeValue) and not isinstance(val, ConnectedValue): input_dicts.append({"name": name, "description": f"runtime parameter for tool {module.get_name()}"}) elif isinstance(val, dict): # Input type is described by a dict, e.g. indexed parameters. for partval in val.values(): - if isinstance(partval, RuntimeValue): + if isinstance(partval, RuntimeValue) and not isinstance(val, ConnectedValue): input_dicts.append( {"name": name, "description": f"runtime parameter for tool {module.get_name()}"} )