From 21588829c7558fec2c930c408ae86036c20f273d Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Thu, 17 Oct 2019 21:15:27 +0200
Subject: [PATCH] correctly use taskId in toasts

---
 src/public/javascripts/services/import.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/public/javascripts/services/import.js b/src/public/javascripts/services/import.js
index cc493d496..c51e58c57 100644
--- a/src/public/javascripts/services/import.js
+++ b/src/public/javascripts/services/import.js
@@ -38,27 +38,28 @@ export async function uploadFiles(parentNoteId, files, options) {
     }
 }
 
-ws.subscribeToMessages(async message => {
-    const toast = {
-        id: "import",
+function makeToast(id, message) {
+    return {
+        id: id,
         title: "Import status",
+        message: message,
         icon: "plus"
     };
+}
 
+ws.subscribeToMessages(async message => {
     if (message.type === 'task-error' && message.taskType === 'import') {
-        infoService.closePersistent(toast.id);
+        infoService.closePersistent(message.taskId);
         infoService.showError(message.message);
         return;
     }
 
     if (message.type === 'task-progress-count' && message.taskType === 'import') {
-        toast.message = "Import in progress: " + message.progressCount;
-
-        infoService.showPersistent(toast);
+        infoService.showPersistent(makeToast(message.taskId, "Import in progress: " + message.progressCount));
     }
 
     if (message.type === 'task-succeeded' && message.taskType === 'import') {
-        toast.message = "Import finished successfully.";
+        const toast = makeToast(message.taskId, "Import finished successfully.");
         toast.closeAfter = 5000;
 
         infoService.showPersistent(toast);