Merge 24.0 into 24.1 #18239
Merged
Merge 24.0 into 24.1 #18239
Conversation
This file contains 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
I assume the union_mode does not trickle down... type accessible as literal False
that does not fetch dataset details or allow other interactions minor adjustments
The data is either present in the store if a user has actually submitted or job, or it is not. That includes both `jobDef` and `jobResponse`. Followup to galaxyproject#18141.
This reverts commit 90d04a0.
…direct [24.0] Fix on success redirect
This eliminates the code path that failed in galaxyproject#18189, and should generally be a nice performance improvement.
…ataset_on_error [24.0] Fix Edit Dataset UI when there is an error retrieving the dataset
…update [24.0] Avoid object store path lookup when constructing JobState object
Instead of the legacy ones.
Can be string or array
This now matched the filter in formattedOptions, so that upon first rendering there's no discrepancy with currentValue.
This prevents `ProtocolError` caused by the error middleware not being
able to reset the content length. Only affects routes that explicitly
set the content-length and don't have a default response handler.
This is effectively the case when using `web.expose`. To test this,
make sure you get Galaxy's error middleware output in the browser
and your console.
```
diff --git a/lib/galaxy/webapps/galaxy/controllers/dataset.py b/lib/galaxy/webapps/galaxy/controllers/dataset.py
index c95d9df788..92b04684d3 100644
--- a/lib/galaxy/webapps/galaxy/controllers/dataset.py
+++ b/lib/galaxy/webapps/galaxy/controllers/dataset.py
@@ -456,6 +456,8 @@ class DatasetInterface(BaseUIController, UsesAnnotations, UsesItemRatings, UsesE
def imp(self, trans, dataset_id=None, **kwd):
"""Import another user's dataset via a shared URL; dataset is added to user's current history."""
# Set referer message.
+ trans.response.headers["content-length"] = 0
+ trans = None
referer = trans.request.referer
if referer and not referer.startswith(f"{trans.request.application_url}{url_for('/login')}"):
referer_message = f"<a href='{escape(referer)}'>return to the previous page</a>"
```
…g_fetch_invalid_url [24.0] Raise ``RequestParameterInvalidException`` if url can't be verified
…ss_only [24.0] Don't set dataset peek for errored jobs
…ation_log_level [24.0] Decrease log level for expected visualization errors
…ts_deleted_job_files [24.0] Raise appropriate exception if accessing deleted input file
…gth_if_no_error_handling [24.0] Reset content-length for unhandled exceptions
github-actions
bot
added
area/testing
area/API
area/jobs
area/visualizations
area/database
|
I can take a look at the merge failures if you are not already on it |
|
I was :). Can you take a look at 0f9eab7 ? My thinking is that we need to separate the two error conditions, if submitting the value failed we shouldn't disable the rest of the interface |
davelopez
reviewed
May 28, 2024
| @@ -26,7 +26,8 @@ const props = defineProps<Props>(); | |||
| const historyStore = useHistoryStore(); | |||
|
|
|||
| const loading = ref(false); | |||
| const messageText = ref(""); | |||
| const loadingFailed = ref(false); | |||
| const messageText = ref<string | null>(null); | |||
There was a problem hiding this comment.
My thinking is that we need to separate the two error conditions, if submitting the value failed we shouldn't disable the rest of the interface
Yeah! That looks way better! Thank you!
Minor thing, undefined can serve here as well no need for extra null handling.
Suggested change
| const messageText = ref<string | null>(null); | |
| const messageText = ref<string>(); |
There was a problem hiding this comment.
don't we need to include undefined then in the type hint ?
There was a problem hiding this comment.
It should be inferred by leaving the value empty
Unless you want to use the more verbose type definition that imports Ref from vue:
const messageText: Ref<string | undefined> = ref();
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
(Please replace this header with a description of your pull request. Please include BOTH what you did and why you made the changes. The "why" may simply be citing a relevant Galaxy issue.)
(If fixing a bug, please add any relevant error or traceback)
(For UI components, it is recommended to include screenshots or screencasts)
How to test the changes?
(Select all options that apply)
License