[24.2] Ensure job states are fetched in invocation view #20010
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes galaxyproject#20003 We weren't checking if the job states summary had been fetched before we had the ``` if (invocationSchedulingTerminal.value && jobCount.value === 0) ``` check. `jobCount` would always be 0 if the states summary hadn't been fetched yet.
**For a singular invocation** (excluding cases of batch runs), we now push to the `workflows/invocations/{invocation_id}` route when the workflow is run.
Without this, we would stay on the `workflows/run` route and refreshing would take you back to the run form, instead of the invocation view.
ahmedhamidawan
commented
Apr 14, 2025
client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
Show resolved
Hide resolved
ahmedhamidawan
commented
Apr 14, 2025
client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
Show resolved
Hide resolved
As we can see this value being set in `summarize_invocation_jobs` here https://github.com/galaxyproject/galaxy/blob/4a0cca07d97d7bbd22eb39ddab38d4d4354aa4fa/lib/galaxy/managers/jobs.py#L957-L1000, `new` seems to be a non-terminal `populated_state`, meaning this summary will have updates which will eventually produce some state counts. To fix the bug of never getting a state count for the invocation view before the scheduling state becomes terminal, we now wait for the state to be something else than `new`, and only then look for other reasons to stop polling.
mvdbeek
approved these changes
Apr 15, 2025
Member
mvdbeek
left a comment
There was a problem hiding this comment.
That looks good to me, thanks @ahmedhamidawan!
Member
|
But the selenium tests look related ... |
Member
|
From the failing test: I think there's a badge ("new history badge") missing here that let's you switch to the new history ? |
This means that we show the little icon to switch to the history for the invocation if that history isn't current, regardless of if results were generated in a new history or not.
Member
Author
|
This was happening because we now push to invocation route on workflow run, and hence, we were unable to pass the |
Member
|
Excellent, that was another minor thing I didn't like, a 2 for 1! |
mvdbeek
approved these changes
Apr 15, 2025
Member
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #20003
We weren't checking if the job states summary had been fetched before we had the following check:
jobCountis always 0 if the states summary hasn't been fetched yet or hasstates: {}; which can happen when thepopulated_state === "new". Now we check for that and keep polling until we see some other state thannew.(Additional Improvement) Route to Invocation on Run
For a singular invocation (excluding cases of batch runs), we now push to the
workflows/invocations/{invocation_id}route when the workflow is run.Without this, we would stay on the
workflows/runroute and refreshing would take you back to the run form, instead of the invocation view.TODODone ✅:(If problematic (for merge forwards) I can target dev in another PR just for tests? Doesn't seem bad though...)
How to test the changes?
(Select all options that apply)
License