From db95996e9b19b229a496c4369419c9bd1a6077ea Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Thu, 20 Dec 2018 01:15:56 +0300
Subject: [PATCH 1/2] Hide progress when all files were uploaded

---
 apps/files_sharing/js/PublicUploadView.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/files_sharing/js/PublicUploadView.js b/apps/files_sharing/js/PublicUploadView.js
index a5edf69e48f0..5eff071d9878 100644
--- a/apps/files_sharing/js/PublicUploadView.js
+++ b/apps/files_sharing/js/PublicUploadView.js
@@ -66,6 +66,7 @@
 				this,
 				'_onUploadBeforeAdd',
 				'_onUploadDone',
+				'_onUploadStop',
 				'_getUploadUrl'
 			);
 		},
@@ -83,6 +84,10 @@
 			}));
 		},
 
+		_onUploadStop: function (e, data) {
+			this.$('#uploadprogresswrapper .stop, #uploadprogressbar .label').hide();
+		},
+
 		_getUploadUrl: function(fileName) {
 			return OC.getRootPath() + '/public.php/webdav/' + encodeURIComponent(fileName);
 		},
@@ -127,6 +132,7 @@
 			});
 			this._uploader.on('beforeadd', this._onUploadBeforeAdd);
 			this._uploader.on('done', this._onUploadDone);
+			this._uploader.on('stop', this._onUploadStop);
 
 			return this;
 		},

From a3f4cd85e5ac9969fdab9d3fe2990730d2c34d58 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Thu, 20 Dec 2018 18:50:03 +0300
Subject: [PATCH 2/2] Fix cancel upload behavior

---
 apps/files_sharing/js/PublicUploadView.js             | 10 +++++++++-
 tests/acceptance/features/lib/PublicLinkFilesPage.php |  6 ++++++
 tests/acceptance/features/webUIUpload/upload.feature  |  8 +++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/js/PublicUploadView.js b/apps/files_sharing/js/PublicUploadView.js
index 5eff071d9878..23fe0f8274e7 100644
--- a/apps/files_sharing/js/PublicUploadView.js
+++ b/apps/files_sharing/js/PublicUploadView.js
@@ -26,7 +26,7 @@
 		'        <input type="button" class="stop icon-close" style="display:none" value="" />' +
 		'    </div>' +
 		'    <label>' +
-		'        <input type="file" class="uploader hiddenuploadfield" name="files[]" />' +
+		'        <input type="file" id="file_upload_start" class="uploader hiddenuploadfield" name="files[]" />' +
 		'        <div class="public-upload-view--dropzone">' +
 		'            <span class="icon icon-upload"></span><span>{{uploadButtonLabel}}</span>' +
 		'        </div>' +
@@ -67,6 +67,7 @@
 				'_onUploadBeforeAdd',
 				'_onUploadDone',
 				'_onUploadStop',
+				'onUploadCancel',
 				'_getUploadUrl'
 			);
 		},
@@ -88,6 +89,10 @@
 			this.$('#uploadprogresswrapper .stop, #uploadprogressbar .label').hide();
 		},
 
+		onUploadCancel: function () {
+			this._uploader.cancelUploads();
+		},
+
 		_getUploadUrl: function(fileName) {
 			return OC.getRootPath() + '/public.php/webdav/' + encodeURIComponent(fileName);
 		},
@@ -150,6 +155,9 @@
 		view.render();
 
 		$('#preview .uploadForm').append(view.$el);
+		$('#uploadprogresswrapper .stop').on('click', function () {
+			view.onUploadCancel();
+		});
 	});
 
 })(OC,OCA);
diff --git a/tests/acceptance/features/lib/PublicLinkFilesPage.php b/tests/acceptance/features/lib/PublicLinkFilesPage.php
index 1734721fb00c..881b540cf5c1 100644
--- a/tests/acceptance/features/lib/PublicLinkFilesPage.php
+++ b/tests/acceptance/features/lib/PublicLinkFilesPage.php
@@ -36,6 +36,7 @@ class PublicLinkFilesPage extends FilesPageBasic {
 	protected $fileNamesXpath = "//span[@class='nametext']";
 	protected $fileNameMatchXpath = "//span[@class='nametext' and .=%s]";
 	protected $fileListXpath = ".//tbody[@id='fileList']";
+	protected $uploadFormXpath = "//div[@class='uploadForm']";
 	protected $emptyContentXpath = ".//div[@id='emptycontent']";
 	protected $addToYourOcBtnId = "save-button";
 	protected $singleFileDownloadBtnXpath = "//a[@id='downloadFile']";
@@ -335,6 +336,9 @@ public function waitTillPageIsLoaded(
 			$downloadButton = $this->find(
 				"xpath", $this->singleFileDownloadBtnXpath
 			);
+			$uploadForm = $this->find(
+				"xpath", $this->uploadFormXpath
+			);
 			if ($fileList !== null) {
 				try {
 					$fileListIsVisible = $fileList->isVisible();
@@ -382,6 +386,8 @@ public function waitTillPageIsLoaded(
 				}
 			} elseif ($downloadButton !== null) {
 				break;
+			} elseif ($uploadForm !== null) {
+				break;
 			}
 
 			\usleep(STANDARD_SLEEP_TIME_MICROSEC);
diff --git a/tests/acceptance/features/webUIUpload/upload.feature b/tests/acceptance/features/webUIUpload/upload.feature
index a8458f7d58dc..609355432fb5 100644
--- a/tests/acceptance/features/webUIUpload/upload.feature
+++ b/tests/acceptance/features/webUIUpload/upload.feature
@@ -101,4 +101,10 @@ Feature: File Upload
     And the public accesses the last created public link using the webUI
     And the user uploads overwriting file "lorem.txt" using the webUI and retries if the file is locked
     Then file "lorem.txt" should be listed on the webUI
-    And the content of "simple-folder/lorem.txt" should be the same as the local "lorem.txt"
\ No newline at end of file
+    And the content of "simple-folder/lorem.txt" should be the same as the local "lorem.txt"
+
+  Scenario: upload a file into files_drop share
+    Given the user has created a new public link for folder "simple-folder" using the webUI with
+      | permission | upload |
+    And the public accesses the last created public link using the webUI
+    Then the user uploads file "lorem.txt" using the webUI