-
Notifications
You must be signed in to change notification settings - Fork 1k
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.
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
Some minor changes to the dataset show_params page #11244
Conversation
9b65361
to
7e4cd2d
Compare
@@ -37,13 +37,25 @@ | |||
<tr v-if="dataset.id"> | |||
<td>History Content API ID</td> | |||
<td> | |||
<div id="dataset-id">{{ dataset.id }} <decoded-id :id="dataset.id" /></div> | |||
<div id="dataset-id"> | |||
{{ dataset.id }} <decoded-id :id="dataset.id" /> (<a |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should go into the JobInformation.vue file and it probably needs to use the job id?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
addressed
lib/galaxy/model/__init__.py
Outdated
if self.workflow_invocation_step: | ||
rval['created_by_workflow'] = True | ||
rval['workflow_invocation_id'] = self.workflow_invocation_step.workflow_invocation.id | ||
rval['workflow_id'] = self.workflow_invocation_step.workflow_invocation.workflow_id | ||
else: | ||
rval['created_by_workflow'] = False |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is really muddying the waters here, can you please remove this section?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
While my initial reaction is that I don't like this, of course this would be useful, but this is a bit of a "details" view that we don't want to return whenever someone hits the job api endpoint.
I would suggest adding another view here and then serializing the workflow invocation step (rval['workflow_invocation_step'] = self.workflow_invocation_step.to_dict() if self.workflow_invocation_step else {}
). You can to add the workflow_invocation_id
in https://github.com/galaxyproject/galaxy/blob/dev/lib/galaxy/model/__init__.py#L5670-L5671.
The job component can then fetch the additional details from the vuex store if it is appropriate.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is also hopefully been addressed
<div id="history_id">{{ dataset.history_id }} <decoded-id :id="dataset.history_id" /></div> | ||
<div id="history_id"> | ||
{{ dataset.history_id }} <decoded-id :id="dataset.history_id" /> (<a | ||
:href="'/histories/view?id=' + dataset.history_id" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we want to get away from this direct navigation, but I'm not sure what the replacement is. @dannon is that how you would do this ? Might also be better to have a button for this ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess, we kinda have to deal with it for now, not sure about global Vue router status
We just discussed in a paper-cuts call the stderr/stdout display. I think it would be nice if we have a more scalable way to display files in this view. Not only stderr/stdout but also inputs and outputs. From my bug-hunting perspective, when I try to answer user-report-mails I usually see the job-info page. And most of the time I need to see stderr and the input sites. It would be nice if we could open a modal (or the scratchbook?) to show those datasets. This would make the debugging way easier. This should not go into this PR, but if you like the idea @mvdbeek Oleg could work on it he said. |
Can we discuss that in the next call ? I joined late ... have you seen how this looks like in 21.01 ? |
3d2a1fb
to
c248ffa
Compare
@@ -1,11 +1,11 @@ | |||
<template> | |||
<DatasetProvider :id="hda_id" v-slot="{ item: dataset, loading }"> | |||
<div v-if="!loading"> | |||
<h3>Dataset Information</h3> | |||
<h3>Dataset Information (<a :href="'/datasets/edit?dataset_id=' + dataset.id" target="_top">edit</a>)</h3> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add a edit button here ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
addressed
client/src/components/DatasetInformation/DatasetInformation.vue
Outdated
Show resolved
Hide resolved
@@ -6,7 +6,7 @@ | |||
<tr v-if="job && job.tool_id"> | |||
<td>Galaxy Tool ID:</td> | |||
<td id="galaxy-tool-id"> | |||
{{ job.tool_id }} | |||
{{ job.tool_id }} (<a :href="'/root?tool_id=' + job.tool_id" target="_top">run</a>) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add a button here as well ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
addressed
<td>Workflow ID:</td> | ||
<td id="workflow-id"> | ||
{{ job.workflow_invocation_step.id }} (<a | ||
:href="'/workflow/display_by_id?id=' + job.workflow_invocation_step.id" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is probably the workflow id, not the Stored Workflow id. Are you sure this is correct ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
addressed
client/src/store/jobStore.js
Outdated
@@ -14,7 +14,7 @@ const getters = { | |||
|
|||
const actions = { | |||
fetchJob: async ({ commit }, jobId) => { | |||
const { data } = await axios.get(`${getAppRoot()}api/jobs/${jobId}?full=true`); | |||
const { data } = await axios.get(`${getAppRoot()}api/jobs/${jobId}?full=true&view=workflow`); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is going to fetch the expensive details for every job here. You need to make the view a variable.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
addressed
@@ -47,7 +65,11 @@ | |||
</tr> | |||
<tr v-if="job && job.id"> | |||
<td>Job API ID:</td> | |||
<td id="encoded-job-id">{{ job.id }} <decoded-id :id="job.id" /></td> | |||
<td id="encoded-job-id"> | |||
{{ job.id }} <decoded-id :id="job.id" /> (<a :href="'/root?job_id=' + job.id" target="_top" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you make the rerun a button (like it is in the history panel)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
addressed
a27a4e8
to
6daa29e
Compare
There's also a lot of different things in here, some more controversial than others. Could you break this up into one fix / improvement per PR ? That'll increase the chance to get things merged quickly |
Just checking I understand correctly: the controversial part is exposing the workflow and invocation ID in the jobs API? |
</td> | ||
<td> | ||
<b-button | ||
class="edit-button" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@simonbray there's more, this for instance probably doesn't make sense now that we display the dataset component in line, which already has the edit button
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I removed the edit button as well as the job rerun button; both are already present in the newly embedded dataset / job components.
@@ -7,6 +7,9 @@ | |||
<td>Galaxy Tool ID:</td> | |||
<td id="galaxy-tool-id"> | |||
{{ job.tool_id }} | |||
<a title="run" :href="`${getAppRoot()}root?tool_id=${job.tool_id}`" target="_top"> | |||
<font-awesome-icon icon="play" /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks a bit odd without any spacing
It's just generally a good strategy to create PRs that don't contain too many changes that don't depend on each other. |
6a68789
to
4a96b6d
Compare
Implemented some of the suggestions in #11109