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

Vueify Tool Form Data Selector #16578

Merged
merged 86 commits into from
Sep 18, 2023
Merged
Changes from 1 commit
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
b48687f
Initial commit, prep FormData component placeholder and connect to Fo…
guerler Jun 11, 2023
dae798c
Sketch out required props
guerler Jun 28, 2023
9c6cb95
Prep form data prop typing
guerler Jun 28, 2023
e5252db
Draft data input elements
guerler Jun 30, 2023
1a8d9c3
Add variante loop to input element
guerler Aug 16, 2023
bbfbdfa
Draft button group for input selector
guerler Aug 16, 2023
26382f4
Fix layout, use fontawesome and bootstrap components
guerler Aug 16, 2023
872e62e
Add the batch mode switch option to data input selector
guerler Aug 16, 2023
b4dbd82
Hide button group if there is only a single variant defined
guerler Aug 16, 2023
5ee21d5
Add type guard, re-use existing form select component
guerler Aug 16, 2023
f4117fa
Match incoming data input value to available options
guerler Aug 16, 2023
4d0e59b
Draft input value handling
guerler Aug 16, 2023
e1b7839
Add type guard, properly handle dataset labels
guerler Aug 17, 2023
bb71e85
Preserve data option tagged as keep
guerler Aug 17, 2023
d96e74c
Refactor select field handling, move type specific prep to parent com…
guerler Aug 17, 2023
e7ff4c4
Consolidate option formatting
guerler Aug 17, 2023
1319054
Ensure correct mapping of keep-state entries
guerler Aug 18, 2023
587ac0c
Add comments and trigger set value when switching between select fiel…
guerler Aug 18, 2023
4507db9
Add select field tooltip
guerler Aug 18, 2023
761e4b6
Fix value matching condition
guerler Aug 18, 2023
2bfd34d
Add sorting by hid for now
guerler Aug 19, 2023
7f6c572
Avoid overwriting cached options, indication of an issue with the bac…
guerler Aug 19, 2023
a290696
Add placholder
guerler Aug 19, 2023
51c8282
Add drag/drop event handler and highlighting
guerler Aug 19, 2023
8a1828a
Generalize drop highlighting, enable success and danger styles
guerler Aug 19, 2023
bfdd133
Add incoming value handler for drop and data dialog events
guerler Aug 20, 2023
710c2ce
Add file dialog button
guerler Aug 20, 2023
1433f19
Remove backbone data selector from code base
guerler Aug 20, 2023
edf067f
Properly set file dialog attributes
guerler Aug 20, 2023
98f64e6
Fix Form Select test case, and linting
guerler Aug 20, 2023
da534dc
Add tag filter to options
guerler Aug 20, 2023
9bb5b58
Add wait indicator, add prop to disable select field
guerler Aug 20, 2023
88eac5d
Use eventbus to set waiting flag to avoid unexpected side effects?
guerler Aug 20, 2023
23e366c
Add file dialog condition, fix variant key, use source constants, sel…
guerler Aug 20, 2023
c41267b
Add field type matcher
guerler Aug 21, 2023
8ab0ebb
Explore handling dce's separately
guerler Aug 21, 2023
db6f967
Avoid merging dce's into hda/hdca options, display without modificati…
guerler Aug 21, 2023
a6eed8e
Minor formatting in simple run workflow form and ensuring that data v…
guerler Aug 22, 2023
d3790eb
Fix selenium test, add temporary render delay for simple workflow run…
guerler Aug 22, 2023
6bf930c
Avoid resubmitting dce's for now, preserve existing value as is
guerler Aug 22, 2023
ba481e5
Fix tool form input selector, remove unused navigation target
guerler Aug 22, 2023
3123662
Pick first entry if field is null, not optional but values are available
guerler Aug 22, 2023
dd5f08d
Fix rerun error message selenium test
guerler Aug 22, 2023
7a133e5
Add entry for optional single dataset/collection input field
guerler Aug 22, 2023
80b1651
Allow for more detailed batch mode mapping, particularly for dce's
guerler Aug 22, 2023
f74e473
Remove select field type from legacy parameter factory
guerler Aug 23, 2023
5a6000c
Add unit test case
guerler Aug 23, 2023
be7e2a7
Add unit test for multiple data selector
guerler Aug 23, 2023
b124776
Generalize value handling, add dce test cases
guerler Aug 23, 2023
72f7a42
Add test case for multiple dataset collection element handling
guerler Aug 23, 2023
578781d
Add basic drag/drop tests, adjust file browser behavior
guerler Aug 23, 2023
78d4e33
Fix select field word break and overflow behavior
guerler Aug 23, 2023
2604235
Fix and add test case for linked/unlinked batch mode selection
guerler Aug 23, 2023
4fa7a09
Add consistent support for ldda's, should probably re-consider this u…
guerler Aug 23, 2023
c54328c
Resize alert
guerler Aug 23, 2023
3a8a4f3
Watch option changes
guerler Aug 23, 2023
b8b7084
Use boolean is_dataset for dce's instead of dce.hda
guerler Aug 30, 2023
ea14508
Remove unused legacy input element variations
guerler Aug 27, 2023
4cf4350
Remove legacy test, handled in vue component
guerler Aug 27, 2023
2312c5d
Remove backbone-based text input elements
guerler Aug 27, 2023
3dfe0ff
Consolidate offset top handling for input element highlighting
guerler Aug 27, 2023
c4e954e
Fix numeric input field style and size
guerler Aug 27, 2023
2dc6f14
Match on initialization
guerler Aug 27, 2023
356ead9
Add test to validate initial matching process
guerler Aug 27, 2023
140c296
Minor refactoring, move getter into separate function
guerler Aug 27, 2023
2965fc3
Do not reconstruct repeat blocks on every value change?
guerler Aug 27, 2023
ae1ee5f
Add additional tests for form data input element
guerler Aug 28, 2023
dcaea97
Remove input cloning, restore key object handling as in current dev (…
guerler Aug 30, 2023
b948c52
Rename map_over_type to subcollection_type to avoid confusion
guerler Aug 30, 2023
d947f12
Adjust api tests for dces
guerler Aug 31, 2023
250fd29
Move source type helper into reusable function
guerler Aug 31, 2023
99a50e8
Add source type representation to dce label, consolidate matching ope…
guerler Aug 31, 2023
d62b55d
Refactoring and clean up, use matched values as computed value
guerler Sep 1, 2023
d3d5811
Add batch mode info to dce data label
guerler Sep 1, 2023
7ac7c82
Skip input field matching to determine batch state if subcollection e…
guerler Sep 1, 2023
092c5c0
Rename subcollection_type to map_over_type to avoid the need for an a…
guerler Sep 5, 2023
e8d2b2b
Remove dce/ldda alert section, prep for integration into existing sel…
guerler Sep 8, 2023
b2dcce3
Remove entry duplication from data parameter options population
guerler Sep 8, 2023
5c65ea2
Temporarily restore tool form reactivity
guerler Sep 8, 2023
da1b919
Populate available select field options with matching dce/ldda entries
guerler Sep 8, 2023
9020d82
Rework tests, adjust handling
guerler Sep 8, 2023
20eaf9c
Disable form reactivity, restore current dev
guerler Sep 8, 2023
84412e2
Add dataset tag filter test
guerler Sep 9, 2023
6799ce0
Remove unused backbone field dialog wrapper
guerler Sep 9, 2023
7a9786f
Label dces as either dataset collection or dataset
guerler Sep 9, 2023
491dcd5
Avoid using component internal eventbus, use regular parent props ins…
guerler Sep 16, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adjust api tests for dces
guerler committed Sep 9, 2023
commit d947f12eac86d9f9e48c24e7910e11aa52056f74
6 changes: 3 additions & 3 deletions lib/galaxy_test/api/test_jobs.py
Original file line number Diff line number Diff line change
@@ -841,14 +841,14 @@ def test_search_with_hdca_list_pair_collection_mapped_over_pair_input(self, hist
list_id_a = self.__history_with_ok_collection(collection_type="list:pair", history_id=history_id)
inputs = json.dumps(
{
"f1": {"batch": True, "values": [{"src": "hdca", "id": list_id_a, "map_over_type": "paired"}]},
"f1": {"batch": True, "values": [{"src": "hdca", "id": list_id_a, "subcollection_type": "paired"}]},
}
)
self._job_search(tool_id="collection_paired_test", history_id=history_id, inputs=inputs)

def _get_simple_rerun_params(self, history_id, private=False):
list_id_a = self.__history_with_ok_collection(collection_type="list:pair", history_id=history_id)
inputs = {"f1": {"batch": True, "values": [{"src": "hdca", "id": list_id_a, "map_over_type": "paired"}]}}
inputs = {"f1": {"batch": True, "values": [{"src": "hdca", "id": list_id_a, "subcollection_type": "paired"}]}}
run_response = self._run(
history_id=history_id,
tool_id="collection_paired_test",
@@ -907,7 +907,7 @@ def test_job_build_for_rerun_list_list(self, history_id):
assert first_element["element_type"] == "dataset_collection"
assert first_element["element_identifier"] == "test0"
assert first_element["model_class"] == "DatasetCollectionElement"
inputs = {"input1": {"batch": True, "values": [{"src": "hdca", "id": list_list_id, "map_over_type": "list"}]}}
inputs = {"input1": {"batch": True, "values": [{"src": "hdca", "id": list_list_id, "subcollection_type": "list"}]}}
run_response = self._run(
history_id=history_id,
tool_id="identifier_collection",