From 7d76fb8bf556a3856ea828196518a503a69a2880 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Wed, 8 Jun 2022 22:52:17 +0200
Subject: [PATCH] merge fix

---
 src/services/bulk_actions.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/services/bulk_actions.js b/src/services/bulk_actions.js
index 85d24a24b..21d78bbae 100644
--- a/src/services/bulk_actions.js
+++ b/src/services/bulk_actions.js
@@ -1,8 +1,9 @@
-const log = require("./log.js");
-const noteRevisionService = require("./note_revisions.js");
-const becca = require("../becca/becca.js");
-const cloningService = require("./cloning.js");
-const branchService = require("./branches.js");
+const log = require("./log");
+const noteRevisionService = require("./note_revisions");
+const becca = require("../becca/becca");
+const cloningService = require("./cloning");
+const branchService = require("./branches");
+const utils = require("./utils");
 
 const ACTION_HANDLERS = {
     addLabel: (action, note) => {
@@ -12,7 +13,9 @@ const ACTION_HANDLERS = {
         note.addRelation(action.relationName, action.targetNoteId);
     },
     deleteNote: (action, note) => {
-        note.markAsDeleted();
+        const deleteId = 'searchbulkaction-' + utils.randomString(10);
+
+        note.deleteNote(deleteId);
     },
     deleteNoteRevisions: (action, note) => {
         noteRevisionService.eraseNoteRevisions(note.getNoteRevisions().map(rev => rev.noteRevisionId));