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.

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

Closed
wants to merge 28 commits into from

Conversation

simonbray
Copy link
Member

Implemented some of the suggestions in #11109

@github-actions github-actions bot added this to the 21.05 milestone Jan 28, 2021
@@ -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
Copy link
Member

@mvdbeek mvdbeek Jan 28, 2021

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?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addressed

Comment on lines 1139 to 1144
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
Copy link
Member

@mvdbeek mvdbeek Jan 28, 2021

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?

Copy link
Member

@mvdbeek mvdbeek Jan 28, 2021

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.

Copy link
Contributor

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"
Copy link
Member

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 ?

Copy link
Contributor

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

@bgruening
Copy link
Member

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.

@mvdbeek
Copy link
Member

mvdbeek commented Feb 25, 2021

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.

Can we discuss that in the next call ? I joined late ... have you seen how this looks like in 21.01 ?

@mvdbeek mvdbeek self-assigned this Apr 7, 2021
@@ -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>
Copy link
Member

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 ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addressed

@@ -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>)
Copy link
Member

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 ?

Copy link
Contributor

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"
Copy link
Member

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 ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addressed

@@ -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`);
Copy link
Member

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.

Copy link
Contributor

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"
Copy link
Member

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)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addressed

@mvdbeek mvdbeek modified the milestones: 21.05, 21.09 May 3, 2021
@simonbray simonbray requested a review from mvdbeek August 19, 2021 12:52
@mvdbeek mvdbeek removed this from the 21.09 milestone Sep 8, 2021
@OlegZharkov OlegZharkov modified the milestone: 21.09 Sep 8, 2021
@mvdbeek
Copy link
Member

mvdbeek commented Sep 8, 2021

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

@simonbray
Copy link
Member Author

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"
Copy link
Member

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

Copy link
Member Author

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" />
Copy link
Member

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

@mvdbeek
Copy link
Member

mvdbeek commented Sep 8, 2021

Just checking I understand correctly: the controversial part is exposing the workflow and invocation ID in the jobs API?

It's just generally a good strategy to create PRs that don't contain too many changes that don't depend on each other.

@mvdbeek mvdbeek marked this pull request as draft October 17, 2022 09:22
@simonbray simonbray marked this pull request as ready for review December 22, 2022 11:41
@github-actions github-actions bot added this to the 23.0 milestone Dec 22, 2022
@simonbray simonbray marked this pull request as draft December 22, 2022 14:50
@dannon dannon modified the milestones: 23.0, 23.1 Jan 10, 2023
@simonbray simonbray closed this Feb 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants