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

Dataup 187 move globus upload below drag and drop #1855

Merged
merged 18 commits into from
Oct 14, 2020

Conversation

eamahanna
Copy link
Contributor

@eamahanna eamahanna commented Oct 9, 2020

Description of PR purpose/changes

This PR moves the upload with globus and upload with url buttons bellow the dropzone. It also edits the text in the drop zone.
Screen Shot 2020-10-12 at 3 05 10 PM

Jira Ticket / Issue

https://kbase-jira.atlassian.net/browse/DATAUP-187

  • Added the Jira Ticket to the title of the PR e.g. (DATAUP-69 Adds a PR template)

Testing Instructions

  • Details for how to test the PR:
    Unit tests: execute make test-frontend-unit

To view changes locally:

  1. navigate to the narrative repo and execute kbase-narrative
  2. create a new narrative
  3. In the new narrative click the add data button and open the import tab
  4. You will see the changes in on the import tab

Dev Checklist:

  • My code follows the guidelines at https://sites.google.com/truss.works/kbasetruss/development
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have run Black and Flake8 on changed Python Code manually or with git precommit (and the travis build passes)

Updating Version and Release Notes (if applicable)

@lgtm-com
Copy link

lgtm-com bot commented Oct 9, 2020

This pull request fixes 1 alert when merging 1d1b9c8 into 2a619e8 - view on LGTM.com

fixed alerts:

  • 1 for Potentially unsafe external link

@coveralls
Copy link

coveralls commented Oct 9, 2020

Coverage Status

Coverage decreased (-0.03%) to 16.961% when pulling 355721b on DATAUP-187-move-globus-upload-below-drag-and-drop into 0294cb5 on truss.

@eamahanna eamahanna marked this pull request as ready for review October 12, 2020 23:13
@eamahanna eamahanna changed the base branch from develop to truss October 12, 2020 23:23
Copy link
Contributor

@leia-sefkin leia-sefkin left a comment

Choose a reason for hiding this comment

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

Feels somewhat disingenuous to review and approve since I wrote a decent chunk of this 😬 but with that caveat it looks good overall to me. Only one small comment about test coverage.

Copy link
Contributor

@leia-sefkin leia-sefkin left a comment

Choose a reason for hiding this comment

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

LGTM

@sonarcloud
Copy link

sonarcloud bot commented Oct 14, 2020

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@eamahanna eamahanna merged commit ceb1c0b into truss Oct 14, 2020
@eamahanna eamahanna deleted the DATAUP-187-move-globus-upload-below-drag-and-drop branch October 14, 2020 20:59
@leia-sefkin leia-sefkin mentioned this pull request Oct 15, 2020
7 tasks
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

Successfully merging this pull request may close these issues.

None yet

5 participants