Merge 24.2 into dev #19240
Merged
Merge 24.2 into dev #19240
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
[24.2] release testing - UI tests for new workflow parameters
It always returned None ...
The SimpleTextParameter change might have larger implications (galaxyproject#13523), but it allows us to detect if we need to use the provided default value.
…rs_with_default [24.2] Fix default value handling for parameters connected to required parameters
This is an initial/draft implementation. Some of the next steps are: - By default, instead of the modals treating the items as selections from the current history, automatically filter items valid for the list (e.g.: for a list with csv elements, filter out csvs from the history in this list). - In case nothing can be auto paried for `list:paired`, do not attempt to auto pair by default and simply show all items. - In case the current history is empty and to make it clearer in general, allow history to be switched from within the modal? - Allow files to be uploaded (and dropped) directly to either the form field or within the list builder once it is opened. One thing I have not planned for yet is the rule builder. I can see that for `list` and `list:paired`, we get that from the `props.collectionTypes` in `FormData`. But when would we use the rule builder instead? Fixes galaxyproject#18704
This allows a collection type `list` to be created via the collection creater from the workflow/tool form directly. It tracks the current history changes via the new `useHistoryItemsForType` composable. It utilises the `FormSelectMany` component to easily move items between selected and unselected for list columns. The items in the list creator can be filtered for extension, parent datatype or all items in the history, based on whether the form field required a certain extension(s) as input for the list.
This keeps the order in which the user adds items to the selection evident in the selected column.
- Converted the file(s) to composition API and typescript - Improved styling of the modal and its components Still need to add `extensions` handling for cases where a certain extension is required for the collection.
The `isSubClassOfAny` was incorrect logic for implicit conversions. `isSubTypeOfAny` gives us what we want as far as filtering items that would be valid for implicit conversions goes. Also, we concluded that the `All` option was also not acceptable as only valid extensions must be enforced in the collection creator.
Place it right next to the buttons for choosing between batch or singular collection
- `buildCollectionModal.ts` still exists but just to create the rules collection modal, all other modals are replaced with a parent `CollectionCreatorModal` - also added a `collectionBuilderItemsStore` that is used to store the datasets fetched for the builder; only when the builder is opened: which is when we start reacting to any changes in the `historyId`, `history.update_time` and any filter on a history selection.
`stringifyObject` does not need to be re-run for every selected value. Co-authored-by: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
In the case of `list`, they are now added directly to the final list. In the case of `list:paired` and `paired`, they are added to the `workingElements`; the user can then manually add them. This is all still done within the `CollectionCreator`. Next thing to look at is to try to only allow/wait for those uploaded files to be attempted as collection additions if they are of `ok` state. One way to do that is to maybe use a list to keep track of uploaded items in the creator, and if those uploaded items disappear from `workingElements` (meaning they are invalid) we have explicit Toasts mentioning this.
After refactoring `move MarkdownEditor to activity bar`
github-actions
bot
added
area/UI-UX
area/testing
area/workflows
area/database
jmchilton
force-pushed
the
merge_24.2_into_dev
branch
from
166f194 to
4b3ee52
Compare
This meant also adjusting the creator(s) content to prioritize the alert message with the link.
…_formats [24.2] Avoid a class of unhelpful accepted format drop downs.
…essage [24.2] Improve the empty history message for guiding users to collections.
…tivity-bar [24.2] Backport of Workflow Editor Activity Bar
[24.2] Fix PSA Redirect
|
Integration and mulled tests are unrelated I believe, merging this. |
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.
A few relevant conflicts already.
How to test the changes?
(Select all options that apply)
License