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

File Upload - Scalable upload options, AKA "dual-mode" #4610

Closed
pameyer opened this issue Apr 24, 2018 · 55 comments
Closed

File Upload - Scalable upload options, AKA "dual-mode" #4610

pameyer opened this issue Apr 24, 2018 · 55 comments
Assignees

Comments

@pameyer
Copy link
Contributor

pameyer commented Apr 24, 2018

As a repository operator, I'd like to be able to support Dataverse native HTTP (browser and API) uploads and DCM uploads in the same installation. Similarly, I'd like to be able to support Dataverse native HTTP, S3 redirect (, swift?) download methods alongside RSAL downloads in the same installation.

@mheppler mheppler changed the title dual-mode File Upload - Scalable upload options, AKA "dual-mode" May 30, 2018
@mheppler
Copy link
Contributor

mheppler commented May 30, 2018

This includes:

  • make the Upload Files pg scalable for any combination of HTTP, dropbox, rsync+ssh, or any other config options we develop down the road
  • the file upload workflow for rsync only will need to change, to use the Upload Files pg and not just the Upload Files popup, to be more consistent across the various config options
  • for this initial phase of delivering "dual-mode", you will only be able to upload one way or another, HTTP/Dropbox or rsync+ssh, but not both
  • download methods will depend on which upload method was used
  • dataset lock will continue to be applied when the rsync script is downloaded, which displays the lock warning msg on the Upload Files pg -- you will not be able to return to the Upload Files pg once you leave it, because the dataset lock feature currently disables the Upload Files button

screen shot 2018-05-30 at 12 32 24 pm

mheppler added a commit that referenced this issue May 31, 2018
@mheppler
Copy link
Contributor

Initial commit for UI prototype added to branch 4610-upload-dual-mode. Changes include:

Tasks to tackle in the next phase of development:

  • Proper render logic for dropbox and rsync panels
  • Final help text for panels, added to bundle
  • Investigate bug for new "Done" button on editdatafiles.xhtml when you delete uploaded files from the table
  • Investigate use of element id's in commandButtons on Lines 296-297 of editFilesFragment.xhtml, does not seem scalable, and not sure if I added all the new UI id's to all the buttons that need them (see delete bug above?)
  • Write help/error/success msg text for all the various render conditions related to what upload options are available and when (note: you can not upload via rsync if you have already uploaded files via http, and vice versa)

@mheppler
Copy link
Contributor

This probably needs it's own issue, but the documentation for how to set up Dropbox for file upload is severely lacking. It took me far too long to find these required steps in the Dropbox documentation. We should link to that page from our guides to make it easier to set up. Currently, we provide no instructions.

@oscardssmith oscardssmith self-assigned this Jun 21, 2018
@oscardssmith oscardssmith removed their assignment Jun 22, 2018
pdurbin added a commit that referenced this issue Jun 25, 2018
Conflicts:
src/main/java/Bundle.properties

Note that for `file.selectToAdd.tipMoreInformation` I chose the new
version in the branch, which will undo the fix at fe59aef
@pdurbin
Copy link
Member

pdurbin commented Jun 25, 2018

3db4486 was so far develop that I couldn't even run the code so I merged the lastest in fb4e4f3. Heads up to @dlmurphy that I went with the version of @mheppler 's branch, which will undo fe59aef so you two should get on the same page about that tooltip.

@dlmurphy
Copy link
Contributor

dlmurphy commented Jun 25, 2018

@pdurbin, I just talked with @mheppler and we're good with that merge. That tooltip will likely be further edited in the near future as part of the 5.0 redesign process anyway.

mheppler added a commit that referenced this issue Sep 27, 2018
…w with empty msg if a file was deleted in the Edit File view [ref #4610]
@mheppler
Copy link
Contributor

mheppler commented Sep 27, 2018

Wanted to add some additional information about the 827072f commit above -- "Improved render logic for filesTable on editFilesFragment to only show with empty msg if a file was deleted in the Edit File view".

Once upon a time, the editFilesFragment was made to be an include that could be used on more than one page (7c7e1e0). I believe there may have been some render logic related to authentication in the filesTable dataTable that was a remnant and was no longer needed.

#{(datasetPage or (dataverseSession.user.authenticated and permissionsWrapper.canIssueUpdateDatasetCommand(EditDatafilesPage.dataset)))}

The rsync upload workflow does not require this dataTable to be displayed with the emptyMessage "Files you upload will appear here." The changes to dual-mode brought that msg back into rsync-only and is also not required in dual mode. So new render logic was added to the table, removing the unnecessary authentication render logic as well as the logic to always display it on the dataset pg.

#{!empty EditDatafilesPage.fileMetadatas or !EditDatafilesPage.showFileUploadFragment()}

This new render logic only displays the dataTable when it is empty in the Edit Files workflow after you have deleted every file(s) displayed in the table, which then displays the proper "There are no selected files to display" as the emptyMessage.

Edit Files:

screen shot 2018-09-27 at 2 18 02 pm

Create Dataset:

screen shot 2018-09-27 at 2 18 27 pm

@sekmiller
Copy link
Contributor

With my latest check in you can delete a file in the Edit Metadata workflow. IF the list of files is empty the buttons will not revert to "Done" because you must press "Save Changes" complete the delete. Or "Cancel" if you change your mind. Again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests