sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

correctly use taskId in toasts

pull/255/head
zadam 2019-10-17 21:15:27 +07:00
parent 9689029c4b
commit 21588829c7
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/public/javascripts/services/import.js
Unescape Escape View File

@ -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);