From 9611a547e18ce7840255b1dd5e3d12d44bbac182 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Sat, 30 Mar 2024 18:19:06 +0800
Subject: [PATCH] Upload link page redesign 2 (#6001)

* ['upload link' page] fixup for the 'Cancel All' button

* ['upload link' page] redesigned the 'total status' bar(moved the progress bar to an independent line)
---
 frontend/src/css/file-uploader.css            |  7 ++-
 .../src/pages/upload-link/file-uploader.js    | 15 +-----
 .../upload-link/upload-progress-dialog.js     | 47 +++++++++----------
 3 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/frontend/src/css/file-uploader.css b/frontend/src/css/file-uploader.css
index 297d1fa6cb..12c3867a8a 100644
--- a/frontend/src/css/file-uploader.css
+++ b/frontend/src/css/file-uploader.css
@@ -82,7 +82,12 @@
   border: 1px solid #eee;
   border-width: 1px 0;
   font-size: 14px;
-  height: 36px;
+  height: 52px;
+}
+
+#upload-link-total-progress-container .progress {
+  height: 5px;
+  margin-top: 8px;
 }
 
 .file-upload-item .upload-success-icon {
diff --git a/frontend/src/pages/upload-link/file-uploader.js b/frontend/src/pages/upload-link/file-uploader.js
index 97a2ce992f..41ee5bda8d 100644
--- a/frontend/src/pages/upload-link/file-uploader.js
+++ b/frontend/src/pages/upload-link/file-uploader.js
@@ -43,7 +43,6 @@ class FileUploader extends React.Component {
       isUploadProgressDialogShow: false,
       currentResumableFile: null,
       uploadBitrate: 0,
-      allFilesUploaded: false,
     };
 
     this.uploadInput = React.createRef();
@@ -150,12 +149,6 @@ class FileUploader extends React.Component {
   };
 
   onChunkingComplete = (resumableFile) => {
-
-    let allFilesUploaded = this.state.allFilesUploaded;
-    if (allFilesUploaded === true) {
-      this.setState({allFilesUploaded: false});
-    }
-
     let path = this.props.path;
     let fileName = resumableFile.fileName;
     let relativePath = resumableFile.relativePath;
@@ -434,7 +427,6 @@ class FileUploader extends React.Component {
     this.notifiedFolders = [];
     // reset upload link loaded
     this.isUploadLinkLoaded = false;
-    this.setState({allFilesUploaded: true});
   };
 
   onError = (message, file) => {
@@ -522,8 +514,7 @@ class FileUploader extends React.Component {
 
     if (!this.resumable.isUploading()) {
       this.setState({
-        totalProgress: '100',
-        allFilesUploaded: true,
+        totalProgress: 100
       });
       this.loaded = 0;
     }
@@ -543,8 +534,7 @@ class FileUploader extends React.Component {
     this.loaded = 0;
 
     this.setState({
-      allFilesUploaded: true,
-      totalProgress: '100',
+      totalProgress: 100,
       uploadFileList: uploadFileList
     });
     // reset upload link loaded
@@ -641,7 +631,6 @@ class FileUploader extends React.Component {
           forbidUploadFileList={this.state.forbidUploadFileList}
           totalProgress={this.state.totalProgress}
           uploadBitrate={this.state.uploadBitrate}
-          allFilesUploaded={this.state.allFilesUploaded}
           onCloseUploadDialog={this.onCloseUploadDialog}
           onCancelAllUploading={this.onCancelAllUploading}
           onUploadCancel={this.onUploadCancel}
diff --git a/frontend/src/pages/upload-link/upload-progress-dialog.js b/frontend/src/pages/upload-link/upload-progress-dialog.js
index 17f79b5243..7d7a35bed1 100644
--- a/frontend/src/pages/upload-link/upload-progress-dialog.js
+++ b/frontend/src/pages/upload-link/upload-progress-dialog.js
@@ -16,7 +16,6 @@ const propTypes = {
   onUploadRetry: PropTypes.func.isRequired,
   onFileUpload: PropTypes.func.isRequired,
   onFolderUpload: PropTypes.func.isRequired,
-  allFilesUploaded: PropTypes.bool.isRequired
 };
 
 class UploadProgressDialog extends React.Component {
@@ -47,7 +46,7 @@ class UploadProgressDialog extends React.Component {
   };
 
   render() {
-    const { totalProgress, allFilesUploaded, uploadBitrate, uploadFileList, forbidUploadFileList } = this.props;
+    const { totalProgress, uploadBitrate, uploadFileList, forbidUploadFileList } = this.props;
     const filesUploadedMsg = gettext('{uploaded_files_num}/{all_files_num} Files')
       .replace('{uploaded_files_num}', uploadFileList.filter(file => file.isSaved).length)
       .replace('{all_files_num}', uploadFileList.length);
@@ -71,34 +70,34 @@ class UploadProgressDialog extends React.Component {
           </ButtonDropdown>
           <Button color="primary" outline={true} className="ml-4"
             onClick={this.props.onCancelAllUploading}
-            disabled={allFilesUploaded}>
+            disabled={totalProgress == 0 || totalProgress == 100}>
             {gettext('Cancel All')}
           </Button>
         </div>
         {totalProgress > 0 && (
-          <div id="upload-link-total-progress-container" className="d-flex align-items-center px-6">
+          <div id="upload-link-total-progress-container" className={`${totalProgress == 100 ? 'd-flex align-items-center' : ''} px-6 py-2`}>
+            <div className="d-flex align-items-center flex-fill">
+              {totalProgress < 100 && (
+                <>
+                  <span>{gettext('File Uploading...')}</span>
+                  <span className="ml-2">{`${totalProgress}% (${Utils.formatBitRate(uploadBitrate)})`}</span>
+                </>
+              )}
+              {totalProgress == 100 && (
+                <>
+                  {filesFailedMsg ?
+                    <p className="m-0 error">{filesFailedMsg}</p> :
+                    <p className="m-0">{gettext('All files uploaded')}</p>
+                  }
+                </>
+              )}
+              {uploadFileList.length > 0 && <span className="ml-auto">{filesUploadedMsg}</span>}
+            </div>
             {totalProgress < 100 && (
-              <>
-                <span>{gettext('File Uploading...')}</span>
-                <div className="upload-progress flex-fill mx-2">
-                  <div className="progress-container d-flex align-items-center">
-                    <div className="progress w-100">
-                      <div className="progress-bar" role="progressbar" style={{width: `${totalProgress}%`}} aria-valuenow={totalProgress} aria-valuemin="0" aria-valuemax="100"></div>
-                    </div>
-                  </div>
-                </div>
-                <span>{`${totalProgress}% (${Utils.formatBitRate(uploadBitrate)})`}</span>
-              </>
+              <div className="progress">
+                <div className="progress-bar" role="progressbar" style={{width: `${totalProgress}%`}} aria-valuenow={totalProgress} aria-valuemin="0" aria-valuemax="100"></div>
+              </div>
             )}
-            {totalProgress == 100 && (
-              <>
-                {filesFailedMsg ?
-                  <p className="m-0 mr-auto error">{filesFailedMsg}</p> :
-                  <p className="m-0 mr-auto">{gettext('All files uploaded')}</p>
-                }
-              </>
-            )}
-            {uploadFileList.length > 0 && <span className="ml-4">{filesUploadedMsg}</span>}
           </div>
         )}
         <div className="mh-2">