From 3a4d32f163393b0b8042dc4c2a281d6b0dedec82 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sun, 15 Mar 2020 21:52:04 +0100
Subject: [PATCH] fix clone-to, move-to keyboard shortcuts

---
 src/public/javascripts/services/entrypoints.js   | 12 ++++++++++++
 src/public/javascripts/widgets/desktop_layout.js |  5 ++++-
 src/public/javascripts/widgets/note_tree.js      | 14 +-------------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/public/javascripts/services/entrypoints.js b/src/public/javascripts/services/entrypoints.js
index d53b7709c..60acf9001 100644
--- a/src/public/javascripts/services/entrypoints.js
+++ b/src/public/javascripts/services/entrypoints.js
@@ -167,4 +167,16 @@ export default class Entrypoints extends Component {
     }
 
     createTopLevelNoteCommand() { noteCreateService.createNewTopLevelNote(); }
+
+    async cloneNotesToCommand() {
+        const selectedOrActiveNoteIds = appContext.mainTreeWidget.getSelectedOrActiveNodes().map(node => node.data.noteId);
+
+        this.triggerCommand('cloneNoteIdsTo', {noteIds: selectedOrActiveNoteIds});
+    }
+
+    async moveNotesToCommand() {
+        const selectedOrActiveBranchIds = appContext.mainTreeWidget.getSelectedOrActiveNodes().map(node => node.data.branchId);
+
+        this.triggerCommand('moveBranchIdsTo', {branchIds: selectedOrActiveBranchIds});
+    }
 }
diff --git a/src/public/javascripts/widgets/desktop_layout.js b/src/public/javascripts/widgets/desktop_layout.js
index bd5ac4674..7eb67cfdf 100644
--- a/src/public/javascripts/widgets/desktop_layout.js
+++ b/src/public/javascripts/widgets/desktop_layout.js
@@ -25,6 +25,7 @@ import NoteRevisionsWidget from "./note_revisions.js";
 import SimilarNotesWidget from "./similar_notes.js";
 import WhatLinksHereWidget from "./what_links_here.js";
 import SidePaneToggles from "./side_pane_toggles.js";
+import appContext from "../services/app_context.js";
 
 const RIGHT_PANE_CSS = `
 <style>
@@ -99,6 +100,8 @@ const RIGHT_PANE_CSS = `
 
 export default class DesktopLayout {
     getRootWidget(appContext) {
+        appContext.mainTreeWidget = new NoteTreeWidget();
+
         return new FlexContainer('column')
             .setParent(appContext)
             .id('root-widget')
@@ -116,7 +119,7 @@ export default class DesktopLayout {
                     .child(new GlobalButtonsWidget())
                     .child(new SearchBoxWidget())
                     .child(new SearchResultsWidget())
-                    .child(new NoteTreeWidget())
+                    .child(appContext.mainTreeWidget)
                 )
                 .child(new FlexContainer('column').id('center-pane')
                     .child(new FlexContainer('row').class('title-row')
diff --git a/src/public/javascripts/widgets/note_tree.js b/src/public/javascripts/widgets/note_tree.js
index 513856712..b018cb132 100644
--- a/src/public/javascripts/widgets/note_tree.js
+++ b/src/public/javascripts/widgets/note_tree.js
@@ -618,18 +618,6 @@ export default class NoteTreeWidget extends TabAwareWidget {
         this.reloadTreeFromCache();
     }
 
-    async cloneNotesToCommand() {
-        const selectedOrActiveNoteIds = this.getSelectedOrActiveNodes().map(node => node.data.noteId);
-
-        this.triggerCommand('cloneNoteIdsTo', {noteIds: selectedOrActiveNoteIds});
-    }
-
-    async moveNotesToCommand() {
-        const selectedOrActiveBranchIds = this.getSelectedOrActiveNodes().map(node => node.data.branchId);
-
-        this.triggerCommand('moveBranchIdsTo', {branchIds: selectedOrActiveBranchIds});
-    }
-
     async getHotKeys() {
         const actions = await keyboardActionsService.getActionsForScope('note-tree');
         const hotKeyMap = {
@@ -830,6 +818,6 @@ export default class NoteTreeWidget extends TabAwareWidget {
     duplicateNoteCommand({node}) {
         const branch = treeCache.getBranch(node.data.branchId);
 
-        noteCreateService.duplicateNote(noteId, branch.parentNoteId);
+        noteCreateService.duplicateNote(node.data.noteId, branch.parentNoteId);
     }
 }
\ No newline at end of file