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.0] Show dataset image in workflow_outputs display listing. #17964

Merged
merged 4 commits into from
Apr 11, 2024
Merged

[24.0] Show dataset image in workflow_outputs display listing. #17964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9291173
In HistoryDatasetDisplay markdown element, display images in iframe
dannon Apr 11, 2024
c15b6e0
Allow abstract parent class lookup by classname for isSubType.
dannon Apr 11, 2024
dd9af46
Document isSubType
dannon Apr 11, 2024
ea455b3
Reuse datasetimage display for appropriate datatypes
dannon Apr 11, 2024
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
10 changes: 9 additions & 1 deletion client/src/components/Datatypes/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,18 @@ export class DatatypesMapperModel {
this.datatypesMapping = typesAndMapping.datatypes_mapping;
}

/**
* Checks if a given child datatype is a subtype of a parent datatype.
* @param child - The child datatype extension as registered in the datatypes registry.
* @param parent - The parent datatype, which can be an extension or explicit class name
* Can also be used with extensionless abstract datatypes (e.g. "galaxy.datatypes.images.Image")
* @returns A boolean indicating whether the child is a subtype of the parent.
*/
isSubType(child: string, parent: string): boolean {
const mapping = this.datatypesMapping;
const childClassName = mapping.ext_to_class_name[child];
const parentClassName = mapping.ext_to_class_name[parent];
const parentClassName = mapping.ext_to_class_name[parent] || parent;

if (!childClassName || !parentClassName) {
return false;
}
Expand Down
10 changes: 8 additions & 2 deletions client/src/components/Markdown/Elements/HistoryDatasetDisplay.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@
type="iframe"
aspect="16by9"
:src="displayUrl" />
<HistoryDatasetAsImage
v-else-if="isSubTypeOfAny(datasetType, ['galaxy.datatypes.images.Image'], datatypesModel)"
:args="args" />
<div v-else-if="itemContent.item_data">
<div v-if="isSubTypeOfAny(datasetType, ['tabular'], datatypesModel)">
<UrlDataProvider
Expand All @@ -81,8 +84,8 @@
</UrlDataProvider>
</div>
<pre v-else>
<code class="word-wrap-normal">{{ itemContent.item_data }}</code>
</pre>
<code class="word-wrap-normal">{{ itemContent.item_data }}</code>
</pre>
</div>
<div v-else>No content found.</div>
<b-link v-if="itemContent.truncated" :href="itemContent.item_url"> Show More... </b-link>
Expand All @@ -99,10 +102,13 @@ import LoadingSpan from "components/LoadingSpan";
import { UrlDataProvider } from "components/providers/UrlDataProvider";
import { getAppRoot } from "onload/loadConfig";

import HistoryDatasetAsImage from "./HistoryDatasetAsImage.vue";

export default {
components: {
LoadingSpan,
UrlDataProvider,
HistoryDatasetAsImage,
},
props: {
args: {
Expand Down
Loading