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

Fix cancel upload and hide 'uploading' message for files_drop shared folders #33937

Merged
merged 2 commits into from
Jan 9, 2019

Conversation

VicDeo
Copy link
Member

@VicDeo VicDeo commented Dec 19, 2018

Description

Fix not working cancel upload and hide 'Uploading' message after the upload is done.

Related Issue

Motivation and Context

How Has This Been Tested?

#33177 (comment)

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

Open tasks:

  • Backport (if applicable set "backport-request" label and remove when the backport was done)

@VicDeo VicDeo added this to the development milestone Dec 19, 2018
@VicDeo VicDeo self-assigned this Dec 19, 2018
@codecov
Copy link

codecov bot commented Dec 19, 2018

Codecov Report

Merging #33937 into master will decrease coverage by 0.02%.
The diff coverage is 33.33%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master   #33937      +/-   ##
============================================
- Coverage     64.77%   64.75%   -0.03%     
- Complexity    18330    18336       +6     
============================================
  Files          1198     1198              
  Lines         69374    69400      +26     
  Branches       1276     1276              
============================================
  Hits          44938    44938              
- Misses        24064    24090      +26     
  Partials        372      372
Flag Coverage Δ Complexity Δ
#javascript 52.97% <33.33%> (-0.01%) 0 <0> (ø)
#phpunit 66.11% <ø> (-0.03%) 18336 <ø> (+6)
Impacted Files Coverage Δ Complexity Δ
apps/files_sharing/js/PublicUploadView.js 73.8% <33.33%> (-3.12%) 0 <0> (ø)
apps/files_external/lib/config.php 10.71% <0%> (-5.68%) 19% <0%> (+6%)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 00bd3c0...cc1e600. Read the comment docs.

@codecov
Copy link

codecov bot commented Dec 19, 2018

Codecov Report

Merging #33937 into master will decrease coverage by <.01%.
The diff coverage is 14.28%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master   #33937      +/-   ##
============================================
- Coverage     64.77%   64.76%   -0.01%     
  Complexity    18340    18340              
============================================
  Files          1198     1198              
  Lines         69418    69425       +7     
  Branches       1276     1276              
============================================
+ Hits          44964    44965       +1     
- Misses        24085    24091       +6     
  Partials        369      369
Flag Coverage Δ Complexity Δ
#javascript 53.05% <14.28%> (-0.04%) 0 <0> (ø)
#phpunit 66.12% <ø> (ø) 18340 <ø> (ø) ⬇️
Impacted Files Coverage Δ Complexity Δ
apps/files_sharing/js/PublicUploadView.js 67.39% <14.28%> (-9.54%) 0 <0> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 91b662d...14424b3. Read the comment docs.

@VicDeo VicDeo changed the title Hide progress when all files were uploaded Fix cancel upload and hide 'uploading' message for files_drop shared folders Dec 20, 2018
@VicDeo VicDeo requested a review from PVince81 December 20, 2018 16:02
@PVince81
Copy link
Contributor

@VicDeo would you manage some unit tests ? and/or UI tests ?

@phil-davis
Copy link
Contributor

@VicDeo this suffered from the recent problem merged to master this afternoon.
Rebase and CI will feel better.

@VicDeo VicDeo force-pushed the fix-33177 branch 2 times, most recently from 8b42202 to b2767c3 Compare December 20, 2018 18:50
@VicDeo
Copy link
Member Author

VicDeo commented Dec 20, 2018

@PVince81 I see no opportunity for the unit tests here. acceptance tests are possible with a lot of pain.
Aching in progress...

@PVince81
Copy link
Contributor

if this was never covered before it's an opportunity to bootstrap the tests... good luck

@VicDeo
Copy link
Member Author

VicDeo commented Dec 20, 2018

@PVince81 yes, files_drop page is not covered with acceptance tests at all.
Basic file upload scenario has been added.
Our tests consider file to be uploaded as soon as the progress bar disappears.

Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

👍 fair enough

tests to be bootstrapped separately

@PVince81 PVince81 merged commit a5069c7 into master Jan 9, 2019
@delete-merged-branch delete-merged-branch bot deleted the fix-33177 branch January 9, 2019 10:48
@PVince81
Copy link
Contributor

PVince81 commented Jan 9, 2019

@VicDeo please backport for 10.1.1

@VicDeo
Copy link
Member Author

VicDeo commented Jan 9, 2019

Stable10: #34097

@lock lock bot locked as resolved and limited conversation to collaborators Jan 9, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"File Drop" Public Link Cancelling is Buggy
3 participants