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.

Sign up for GitHub

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

Jump to bottom

Libraries Modernisation: Directory Dataset Picker #18638

Merged
merged 24 commits into from
Oct 7, 2024
Merged

Libraries Modernisation: Directory Dataset Picker #18638

merged 24 commits into from
Oct 7, 2024

Conversation

itisAliRH
Copy link
Member

@itisAliRH itisAliRH commented Aug 2, 2024 •
edited
Loading

This PR is a follow-up on #18518 and replaces the old dataset picker from user and import directories and path to the library folder. Also, remove the jstree and related files (related #18451)

Libraries.Modernisation.Directory.Dataset.Picker.webm

How to test the changes?

(Select all options that apply)

  • I've included appropriate automated tests.
  • This is a refactoring of components with existing test coverage.
  • Instructions for manual testing are as follows:
    1. Open a library in Data Libraries
    2. Import file or folder from Dataset > User directory or from Dataset > from import directory Dataset > from path as admin
    3. Select files or folders or past paths to enter

License

  • I agree to license these and all my past contributions to the core galaxy codebase under the MIT license.

@github-actions github-actions bot added this to the 24.2 milestone Aug 2, 2024
@itisAliRH itisAliRH force-pushed the libraries-modernization-1-directory-dataset-picker branch 2 times, most recently from 11cf6e3 to f169c1f Compare August 2, 2024 13:41
@itisAliRH itisAliRH marked this pull request as draft August 2, 2024 13:48
@itisAliRH itisAliRH force-pushed the libraries-modernization-1-directory-dataset-picker branch from f169c1f to 3e5bea1 Compare September 16, 2024 11:57
@itisAliRH
🛠️: refactor FontAwesome icon import in FolderTopBar and `FormDrill…
cfaf9be 
…downOption`
@itisAliRH
🛠️: refactor remote files fetching logic in DirectoryDatasetPicker
2cdbbb7
@itisAliRH
✨: use progress bar on importing datasets from directories
b7d9240
@itisAliRH
🛠️: unified dataset addition logic in FolderTopBar
b4e7605
@itisAliRH
🛠️: enhanced DirectoryDatasetPicker by adding a scroll to the items…
caa4d0e 
… list and making the import button dynamic to reflect the number of selected items being import
@itisAliRH
🛠️: use IconDefinition for leafIcon and branchIcon in FormDrill…
d31a760 
…downOption`
@itisAliRH
✨: modified SingleItemSelectors to utilize flexible trackBy and `…
7f622f2 
…label` prop, revised selected item type, and update its usage
@itisAliRH
🛠️: replaced Multiselect with SingleItemSelector, revised data fe…
938e5c9 
…tching logic, improved types, and adjusted ui in `DirectoryDatasetPicker`
@itisAliRH
✨: add no-options alert to FormDrilldown and import missing bootstr…
d74a025 
…ap components
@itisAliRH
🛠️: DirectoryDatasetPicker shows error on fetching options and fix …
bcb9a54 
…errors when there is no option available
@itisAliRH itisAliRH marked this pull request as ready for review September 20, 2024 13:43
@martenson
Copy link
Member

It looks like a very nice modernization @itisAliRH.

I'd like to also encourage you to take a step back and challenge the current designs. E.g. I'd put more focus on the tree browsing element and deprioritize dbkey, format, and the bool (maybe reorder them?). The bools could also use some explaining to the user, maybe in a form of (?) element.

@itisAliRH
Copy link
Member Author

It looks like a very nice modernization @itisAliRH.

I'd like to also encourage you to take a step back and challenge the current designs. E.g. I'd put more focus on the tree browsing element and deprioritize dbkey, format, and the bool (maybe reorder them?). The bools could also use some explaining to the user, maybe in a form of (?) element.

Thank you for the feedback @martenson!

The primary goal of this pull request was to remove the jstree library which is blocking us from migrating to Vue3. We are planning a complete redesign of the Data Library soon, addressing many design and usability concerns. The suggestions you mentioned are constructive, and I will consider them during the redesign.

@itisAliRH
Copy link
Member Author

Test failures are not related! It's ready to merge :)

davelopez
davelopez reviewed Oct 1, 2024
View reviewed changes
Copy link
Contributor

@davelopez davelopez left a comment

Choose a reason for hiding this comment

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

It's a pretty cool modernization indeed!

Find some minor comments below for small improvements.

client/src/components/Libraries/LibraryFolder/TopToolbar/DirectoryDatasetPicker.vue Outdated Show resolved Hide resolved
client/src/components/Libraries/LibraryFolder/TopToolbar/DirectoryDatasetPicker.vue Outdated Show resolved Hide resolved
client/src/components/Libraries/LibraryFolder/TopToolbar/DirectoryDatasetPicker.vue Show resolved Hide resolved
client/src/components/Libraries/LibraryFolder/TopToolbar/DirectoryDatasetPicker.vue Outdated Show resolved Hide resolved
client/src/components/Libraries/LibraryFolder/TopToolbar/DirectoryDatasetPicker.vue Outdated Show resolved Hide resolved
client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue Outdated Show resolved Hide resolved
@martenson martenson added the kind/refactoring cleanup or refactoring of existing code, no functional changes label Oct 2, 2024
itisAliRH and others added 3 commits October 7, 2024 00:26
@itisAliRH @davelopez
🛠️: improve Libraries/LibraryFolder/FolderTopBar ImportSource type
5859880 
Co-authored-by: David López <46503462+davelopez@users.noreply.github.com>
@itisAliRH @davelopez
🛠️: updatemapDataToOptions method input type, in use `errorMessageA…
a44d583 
…sString` and drop unnessary try/catch blocks in `DirectoryDatasetPicker`

Co-authored-by: David López <46503462+davelopez@users.noreply.github.com>
@itisAliRH @davelopez
🛠️: using any for fetchOptions data in DirectoryDatasetPicker bec…
19d2ba4 
…ause there is no model for the jstree response in the backend

Co-authored-by: David López <46503462+davelopez@users.noreply.github.com>
davelopez
davelopez approved these changes Oct 7, 2024
View reviewed changes
Copy link
Contributor

@davelopez davelopez left a comment

Choose a reason for hiding this comment

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

Thank you @itisAliRH!

@davelopez davelopez merged commit aac9e5c into galaxyproject:dev Oct 7, 2024
55 of 56 checks passed
@itisAliRH itisAliRH deleted the libraries-modernization-1-directory-dataset-picker branch October 7, 2024 16:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davelopez davelopez davelopez approved these changes

@dannon dannon Awaiting requested review from dannon

Assignees
No one assigned
Labels
area/API area/testing/selenium area/testing area/UI-UX kind/refactoring cleanup or refactoring of existing code, no functional changes
Projects
None yet
Milestone
24.2
Development

Successfully merging this pull request may close these issues.
3 participants
@itisAliRH @martenson @davelopez