Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[24.1] Also check dataset.deleted when determining if data can be displayed #18547

Merged
merged 1 commit into from
Jul 17, 2024
Merged

[24.1] Also check dataset.deleted when determining if data can be displayed #18547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/galaxy/datatypes/interval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
davelopez marked this conversation as resolved.
Show resolved Hide resolved
and dataset.has_data()
and dataset.state == dataset.states.OK
and dataset.metadata.columns > 0
Expand Down
5 changes: 5 additions & 0 deletions lib/galaxy/datatypes/protocols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ class HasCreatingJob(Protocol):
def creating_job(self): ...


class HasDeleted(Protocol):
deleted: bool


class HasExt(Protocol):
@property
def ext(self): ...
Expand Down Expand Up @@ -55,6 +59,7 @@ class HasExtraFilesAndMetadata(HasExtraFilesPath, HasMetadata, Protocol): ...

class DatasetProtocol(
HasCreatingJob,
HasDeleted,
HasExt,
HasExtraFilesPath,
HasFileName,
Expand Down
3 changes: 2 additions & 1 deletion lib/galaxy/datatypes/tabular.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,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
Expand Down
Loading