diff --git a/client/src/composables/datatypesMapper.ts b/client/src/composables/datatypesMapper.ts index 706381102ea5..28b2551b08c2 100644 --- a/client/src/composables/datatypesMapper.ts +++ b/client/src/composables/datatypesMapper.ts @@ -11,19 +11,11 @@ export function useDatatypesMapper() { const datatypes: Ref = ref([]); async function getDatatypesMapper() { - try { - await datatypesMapperStore.createMapper(); - datatypesMapper.value = datatypesMapperStore.datatypesMapper; - if (datatypesMapperStore.datatypesMapper) { - datatypes.value = datatypesMapperStore.datatypesMapper.datatypes; - } - } catch (e) { - console.error("unable to create datatypes mapper\n", e); - } finally { - datatypesMapperLoading.value = false; - } - if (!datatypesMapperStore.datatypesMapper) { - throw Error("Error creating datatypesMapper"); + await datatypesMapperStore.createMapper(); + datatypesMapperLoading.value = datatypesMapperStore.loading; + datatypesMapper.value = datatypesMapperStore.datatypesMapper; + if (datatypesMapperStore.datatypesMapper) { + datatypes.value = datatypesMapperStore.datatypesMapper.datatypes; } } diff --git a/lib/galaxy/datatypes/interval.py b/lib/galaxy/datatypes/interval.py index 923be082b95d..c681dafb8c1c 100644 --- a/lib/galaxy/datatypes/interval.py +++ b/lib/galaxy/datatypes/interval.py @@ -193,7 +193,8 @@ def set_meta( def displayable(self, dataset: DatasetProtocol) -> bool: try: return ( - not dataset.dataset.purged + not dataset.deleted + and not dataset.dataset.purged and dataset.has_data() and dataset.state == dataset.states.OK and dataset.metadata.columns > 0 diff --git a/lib/galaxy/datatypes/protocols.py b/lib/galaxy/datatypes/protocols.py index 5bc07c20c9f2..ac4e3de166ca 100644 --- a/lib/galaxy/datatypes/protocols.py +++ b/lib/galaxy/datatypes/protocols.py @@ -16,6 +16,10 @@ class HasCreatingJob(Protocol): def creating_job(self): ... +class HasDeleted(Protocol): + deleted: bool + + class HasExt(Protocol): @property def ext(self): ... @@ -55,6 +59,7 @@ class HasExtraFilesAndMetadata(HasExtraFilesPath, HasMetadata, Protocol): ... class DatasetProtocol( HasCreatingJob, + HasDeleted, HasExt, HasExtraFilesPath, HasFileName, diff --git a/lib/galaxy/datatypes/tabular.py b/lib/galaxy/datatypes/tabular.py index fab0b5893334..223969b2f476 100644 --- a/lib/galaxy/datatypes/tabular.py +++ b/lib/galaxy/datatypes/tabular.py @@ -135,7 +135,8 @@ def set_peek(self, dataset: DatasetProtocol, **kwd) -> None: def displayable(self, dataset: DatasetProtocol) -> bool: try: return ( - not dataset.dataset.purged + not dataset.deleted + and not dataset.dataset.purged and dataset.has_data() and dataset.state == dataset.states.OK and dataset.metadata.columns > 0