From b890859025bcf339836c3c6f60d509e9fc33b088 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Fri, 18 Oct 2019 22:44:03 +0200
Subject: [PATCH] further refactoring of export notifications

---
 src/public/javascripts/dialogs/export.js  | 36 ++++++++++-------------
 src/public/javascripts/services/import.js |  7 ++---
 src/views/dialogs/export.ejs              |  4 ---
 3 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/src/public/javascripts/dialogs/export.js b/src/public/javascripts/dialogs/export.js
index 99c40cf08..26be7ac4d 100644
--- a/src/public/javascripts/dialogs/export.js
+++ b/src/public/javascripts/dialogs/export.js
@@ -10,8 +10,6 @@ const $subtreeFormats = $("#export-subtree-formats");
 const $singleFormats = $("#export-single-formats");
 const $subtreeType = $("#export-type-subtree");
 const $singleType = $("#export-type-single");
-const $exportProgressWrapper = $("#export-progress-count-wrapper");
-const $exportProgressCount = $("#export-progress-count");
 const $exportButton = $("#export-button");
 const $opmlVersions = $("#opml-versions");
 
@@ -24,8 +22,6 @@ export async function showDialog(node, defaultType) {
     // each opening of the dialog resets the taskId so we don't associate it with previous exports anymore
     taskId = '';
     $exportButton.removeAttr("disabled");
-    $exportProgressWrapper.hide();
-    $exportProgressCount.text('0');
 
     if (defaultType === 'subtree') {
         $subtreeType.prop("checked", true).change();
@@ -54,8 +50,7 @@ export async function showDialog(node, defaultType) {
 }
 
 $form.submit(() => {
-    // disabling so export can't be triggered again
-    $exportButton.attr("disabled", "disabled");
+    $dialog.modal('hide');
 
     const exportType = $dialog.find("input[name='export-type']:checked").val();
 
@@ -112,26 +107,27 @@ $('input[name=export-subtree-format]').change(function () {
     }
 });
 
+function makeToast(id, message) {
+    return {
+        id: id,
+        title: "Export status",
+        message: message,
+        icon: "arrow-square-up-right"
+    };
+}
+
 ws.subscribeToMessages(async message => {
     if (message.type === 'task-error' && message.taskType === 'export') {
+        infoService.closePersistent(message.taskId);
         infoService.showError(message.message);
-        $dialog.modal('hide');
-        return;
     }
-
-    if (!message.taskId || message.taskId !== taskId) {
-        // incoming messages must correspond to this export instance
-        return;
-    }
-
-    if (message.type === 'task-progress-count' && message.taskType === 'export') {
-        $exportProgressWrapper.slideDown();
-
-        $exportProgressCount.text(message.progressCount);
+    else if (message.type === 'task-progress-count' && message.taskType === 'export') {
+        infoService.showPersistent(makeToast(message.taskId, "Export in progress: " + message.progressCount));
     }
     else if (message.type === 'task-succeeded' && message.taskType === 'export') {
-        $dialog.modal('hide');
+        const toast = makeToast(message.taskId, "Import finished successfully.");
+        toast.closeAfter = 5000;
 
-        infoService.showMessage("Export finished successfully.");
+        infoService.showPersistent(toast);
     }
 });
\ No newline at end of file
diff --git a/src/public/javascripts/services/import.js b/src/public/javascripts/services/import.js
index c51e58c57..771c9407f 100644
--- a/src/public/javascripts/services/import.js
+++ b/src/public/javascripts/services/import.js
@@ -51,14 +51,11 @@ ws.subscribeToMessages(async message => {
     if (message.type === 'task-error' && message.taskType === 'import') {
         infoService.closePersistent(message.taskId);
         infoService.showError(message.message);
-        return;
     }
-
-    if (message.type === 'task-progress-count' && message.taskType === 'import') {
+    else if (message.type === 'task-progress-count' && message.taskType === 'import') {
         infoService.showPersistent(makeToast(message.taskId, "Import in progress: " + message.progressCount));
     }
-
-    if (message.type === 'task-succeeded' && message.taskType === 'import') {
+    else if (message.type === 'task-succeeded' && message.taskType === 'import') {
         const toast = makeToast(message.taskId, "Import finished successfully.");
         toast.closeAfter = 5000;
 
diff --git a/src/views/dialogs/export.ejs b/src/views/dialogs/export.ejs
index 2840307b9..5b0ed94c0 100644
--- a/src/views/dialogs/export.ejs
+++ b/src/views/dialogs/export.ejs
@@ -9,10 +9,6 @@
             </div>
             <form id="export-form">
                 <div class="modal-body">
-                    <div id="export-progress-count-wrapper" class="alert alert-primary" style="padding: 15px;">
-                        <strong>Note export progress count:</strong> <span id="export-progress-count"></span>
-                    </div>
-
                     <div class="form-check">
                         <input class="form-check-input" type="radio" name="export-type" id="export-type-subtree" value="subtree">
                         <label class="form-check-label" for="export-type-subtree">this note and all of its descendants</label>