From 780b7dc6fd1830244a6236905a6e8ce9afcfb993 Mon Sep 17 00:00:00 2001
From: Shyam Sunder <sgsunder1@gmail.com>
Date: Mon, 29 Nov 2021 20:06:20 -0500
Subject: [PATCH] client/upload: restore option to pause upload chain on error

---
 client/css/post-upload.styl                     |  5 +++++
 client/html/post_upload.tpl                     | 12 ++++++++++--
 client/js/controllers/post_upload_controller.js | 17 +++++++++++++----
 client/js/views/post_upload_view.js             | 10 +++++++++-
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/client/css/post-upload.styl b/client/css/post-upload.styl
index 38362937..ea79fcac 100644
--- a/client/css/post-upload.styl
+++ b/client/css/post-upload.styl
@@ -14,9 +14,11 @@ $cancel-button-color = tomato
         &.inactive input[type=submit],
         &.inactive .skip-duplicates
         &.inactive .always-upload-similar
+        &.inactive .pause-remain-on-error
         &.uploading input[type=submit],
         &.uploading .skip-duplicates,
         &.uploading .always-upload-similar
+        &.uploading .pause-remain-on-error
         &:not(.uploading) .cancel
             display: none
 
@@ -44,6 +46,9 @@ $cancel-button-color = tomato
     .always-upload-similar
         margin-left: 1em
 
+    .pause-remain-on-error
+        margin-left: 1em
+
     form>.messages
         margin-top: 1em
 
diff --git a/client/html/post_upload.tpl b/client/html/post_upload.tpl
index 6374fe8c..3c1b2388 100644
--- a/client/html/post_upload.tpl
+++ b/client/html/post_upload.tpl
@@ -7,7 +7,7 @@
 
             <span class='skip-duplicates'>
                 <%= ctx.makeCheckbox({
-                    text: 'Skip duplicates',
+                    text: 'Skip duplicate',
                     name: 'skip-duplicates',
                     checked: false,
                 }) %>
@@ -15,12 +15,20 @@
 
             <span class='always-upload-similar'>
                 <%= ctx.makeCheckbox({
-                    text: 'Always upload similar',
+                    text: 'Force upload similar',
                     name: 'always-upload-similar',
                     checked: false,
                 }) %>
             </span>
 
+            <span class='pause-remain-on-error'>
+                <%= ctx.makeCheckbox({
+                    text: 'Pause on error',
+                    name: 'pause-remain-on-error',
+                    checked: true,
+                }) %>
+            </span>
+
             <input type='button' value='Cancel' class='cancel'/>
         </div>
 
diff --git a/client/js/controllers/post_upload_controller.js b/client/js/controllers/post_upload_controller.js
index a54baec7..720a116c 100644
--- a/client/js/controllers/post_upload_controller.js
+++ b/client/js/controllers/post_upload_controller.js
@@ -90,21 +90,30 @@ class PostUploadController {
                                     uploadable
                                 );
                             }
+                            if (e.detail.pauseRemainOnError) {
+                                return Promise.reject();
+                            }
                         })
                     ),
                 Promise.resolve()
             )
             .then(() => {
                 if (anyFailures) {
-                    this._view.showError(genericErrorMessage);
-                    this._view.enableForm();
-                } else {
+                    return Promise.reject();
+                }
+            })
+            .then(
+                () => {
                     this._view.clearMessages();
                     misc.disableExitConfirmation();
                     const ctx = router.show(uri.formatClientLink("posts"));
                     ctx.controller.showSuccess("Posts uploaded.");
+                },
+                (error) => {
+                    this._view.showError(genericErrorMessage);
+                    this._view.enableForm();
                 }
-            });
+            );
     }
 
     _uploadSinglePost(uploadable, skipDuplicates, alwaysUploadSimilar) {
diff --git a/client/js/views/post_upload_view.js b/client/js/views/post_upload_view.js
index 4f0f0bf1..fc98a19e 100644
--- a/client/js/views/post_upload_view.js
+++ b/client/js/views/post_upload_view.js
@@ -285,7 +285,7 @@ class PostUploadView extends events.EventTarget {
         for (let uploadable of this._uploadables) {
             this._updateUploadableFromDom(uploadable);
         }
-        this._submitButtonNode.value = "Resume upload";
+        this._submitButtonNode.value = "Resume";
         this._emit("submit");
     }
 
@@ -362,6 +362,8 @@ class PostUploadView extends events.EventTarget {
                     skipDuplicates: this._skipDuplicatesCheckboxNode.checked,
                     alwaysUploadSimilar:
                         this._alwaysUploadSimilarCheckboxNode.checked,
+                    pauseRemainOnError:
+                        this._pauseRemainOnErrorCheckboxNode.checked,
                 },
             })
         );
@@ -431,6 +433,12 @@ class PostUploadView extends events.EventTarget {
         );
     }
 
+    get _pauseRemainOnErrorCheckboxNode() {
+        return this._hostNode.querySelector(
+            "form [name=pause-remain-on-error]"
+        );
+    }
+
     get _submitButtonNode() {
         return this._hostNode.querySelector("form [type=submit]");
     }