From bce135d811eba7f81bc88af90057daeac19ba59c Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Wed, 15 Sep 2021 14:53:00 +0800
Subject: [PATCH] [upload link] bugfix & improvements for notifications

---
 .../src/pages/upload-link/file-uploader.js    | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/frontend/src/pages/upload-link/file-uploader.js b/frontend/src/pages/upload-link/file-uploader.js
index 508b33ffe4..2a27dd3712 100644
--- a/frontend/src/pages/upload-link/file-uploader.js
+++ b/frontend/src/pages/upload-link/file-uploader.js
@@ -302,8 +302,8 @@ class FileUploader extends React.Component {
 
   // start uploading
   onUploadStart = () => {
-    const message = gettext('File upload started.');
-    toaster.info(message);
+    const message = gettext('File upload started');
+    toaster.notify(message);
   }
 
   onProgress = () => {
@@ -418,12 +418,14 @@ class FileUploader extends React.Component {
       retryFileList: this.state.retryFileList,
       uploadFileList: uploadFileList
     });
-
   }
 
   onComplete = () => {
-    const message = gettext('All files uploaded');
-    toaster.success(message);
+    if (!this.error) {
+      const message = gettext('All files uploaded');
+      toaster.success(message);
+    }
+    this.error = false; // reset it
 
     this.notifiedFolders = [];
     // reset upload link loaded
@@ -431,9 +433,14 @@ class FileUploader extends React.Component {
     this.setState({allFilesUploaded: true});
   }
 
-  onError = (message) => {
-    const msg = gettext('Error');
+  onError = (message, file) => {
+    let msg = gettext('Error');
+    if (file && file.fileName) {
+      msg = gettext('Failed to upload {file_name}.')
+        .replace('{file_name}', file.fileName);
+    }
     toaster.danger(msg);
+    this.error = true;
 
     // reset upload link loaded
     this.isUploadLinkLoaded = false;