From a4acbf3aea02f609798cbb2b3c89b26f6b6edb72 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Tue, 27 Aug 2019 22:19:32 +0200
Subject: [PATCH] fixes for link map

---
 src/public/javascripts/dialogs/link_map.js    |  4 +++-
 src/public/javascripts/services/link_map.js   | 24 +++++++++++--------
 .../services/note_detail_relation_map.js      |  4 ++++
 src/public/javascripts/widgets/link_map.js    |  6 ++++-
 src/public/stylesheets/link_map.css           |  1 -
 src/views/dialogs/link_map.ejs                |  2 +-
 6 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/public/javascripts/dialogs/link_map.js b/src/public/javascripts/dialogs/link_map.js
index ffc69d598..4beeda536 100644
--- a/src/public/javascripts/dialogs/link_map.js
+++ b/src/public/javascripts/dialogs/link_map.js
@@ -20,12 +20,14 @@ export async function showDialog() {
     $maxNotesInput.val(10);
     LINK_TYPES.forEach(lt => $("#link-map-" + lt).prop('checked', true));
 
-    const note = noteDetailService.getActiveNoteId();
+    const note = noteDetailService.getActiveNote();
 
     if (!note) {
         return;
     }
 
+    $linkMapContainer.css("height", $("body").height() - 150);
+
     linkMapService = new LinkMapService(note, $linkMapContainer);
     linkMapService.render();
 
diff --git a/src/public/javascripts/services/link_map.js b/src/public/javascripts/services/link_map.js
index f74ec8763..395a4d99d 100644
--- a/src/public/javascripts/services/link_map.js
+++ b/src/public/javascripts/services/link_map.js
@@ -14,8 +14,13 @@ const linkOverlays = [
 ];
 
 export default class LinkMap {
-    constructor(note, $linkMapContainer) {
+    constructor(note, $linkMapContainer, options = {}) {
         this.note = note;
+        this.options = $.extend({
+            maxDepth: 10,
+            zoom: 1.0
+        }, options);
+
         this.$linkMapContainer = $linkMapContainer;
         this.linkMapContainerId = this.$linkMapContainer.attr("id");
     }
@@ -37,17 +42,15 @@ export default class LinkMap {
 
         const maxNotes = 50;
 
-        const currentNoteId = this.note.noteId;
-
-        const links = await server.post(`notes/${currentNoteId}/link-map`, {
+        const links = await server.post(`notes/${this.note.noteId}/link-map`, {
             maxNotes,
-            maxDepth: 1
+            maxDepth: this.options.maxDepth
         });
 
         const noteIds = new Set(links.map(l => l.noteId).concat(links.map(l => l.targetNoteId)));
 
         if (noteIds.size === 0) {
-            noteIds.add(currentNoteId);
+            noteIds.add(this.note.noteId);
         }
 
         // preload all notes
@@ -55,6 +58,7 @@ export default class LinkMap {
 
         const graph = new Springy.Graph();
         graph.addNodes(...noteIds);
+        graph.addEdges(...links.map(l => [l.noteId, l.targetNoteId]));
 
         const layout = new Springy.Layout.ForceDirected(
             graph,
@@ -81,7 +85,7 @@ export default class LinkMap {
                 $noteBox.append($("<span>").addClass("title").append($link));
             });
 
-            if (noteId === currentNoteId) {
+            if (noteId === this.note.noteId) {
                 $noteBox.addClass("link-map-active-note");
             }
 
@@ -89,7 +93,7 @@ export default class LinkMap {
 
             this.jsPlumbInstance.draggable($noteBox[0], {
                 start: params => {
-                    renderer.stop();
+                    this.renderer.stop();
                 },
                 drag: params => {},
                 stop: params => {}
@@ -103,7 +107,7 @@ export default class LinkMap {
             layout,
             () => {},
             (edge, p1, p2) => {
-                const connectionId = edge.source.id + '-' + edge.target.id;
+                const connectionId = this.linkMapContainerId + '-' + edge.source.id + '-' + edge.target.id;
 
                 if ($("#" + connectionId).length > 0) {
                     return;
@@ -169,7 +173,7 @@ export default class LinkMap {
         this.$linkMapContainer.empty();
 
         // reset zoom/pan
-        this.pzInstance.zoomTo(0, 0, 0.7);
+        this.pzInstance.zoomTo(0, 0, this.options.zoom);
         this.pzInstance.moveTo(0, 0);
     }
 
diff --git a/src/public/javascripts/services/note_detail_relation_map.js b/src/public/javascripts/services/note_detail_relation_map.js
index 63dfb6d0a..3a322eb1f 100644
--- a/src/public/javascripts/services/note_detail_relation_map.js
+++ b/src/public/javascripts/services/note_detail_relation_map.js
@@ -552,6 +552,10 @@ class NoteDetailRelationMap {
 
         const transform = this.$relationMapContainer.css('transform');
 
+        if (transform === 'none') {
+            return 1;
+        }
+
         const matches = transform.match(matrixRegex);
 
         if (!matches) {
diff --git a/src/public/javascripts/widgets/link_map.js b/src/public/javascripts/widgets/link_map.js
index 36cc84130..2a1738044 100644
--- a/src/public/javascripts/widgets/link_map.js
+++ b/src/public/javascripts/widgets/link_map.js
@@ -26,10 +26,14 @@ class LinkMapWidget extends StandardWidget {
 
         const $linkMapContainer = this.$body.find('.link-map-container');
         $linkMapContainer.attr("id", "link-map-container-" + linkMapContainerIdCtr++);
+        $linkMapContainer.css("height", "300px");
 
         const LinkMapServiceClass = (await import('../services/link_map.js')).default;
 
-        const linkMapService = new LinkMapServiceClass(this.ctx.note, $linkMapContainer);
+        const linkMapService = new LinkMapServiceClass(this.ctx.note, $linkMapContainer, {
+            maxDepth: 1,
+            zoom: 0.7
+        });
 
         await linkMapService.render();
     }
diff --git a/src/public/stylesheets/link_map.css b/src/public/stylesheets/link_map.css
index 86a8cafb1..bd7de2dfa 100644
--- a/src/public/stylesheets/link_map.css
+++ b/src/public/stylesheets/link_map.css
@@ -1,6 +1,5 @@
 .link-map-container {
     position: relative;
-    height: 300px;
     outline: none; /* remove dotted outline on click */
 }
 
diff --git a/src/views/dialogs/link_map.ejs b/src/views/dialogs/link_map.ejs
index 2bacf585e..b97bef017 100644
--- a/src/views/dialogs/link_map.ejs
+++ b/src/views/dialogs/link_map.ejs
@@ -45,7 +45,7 @@
                 </div>
             </div>
             <div class="modal-body" style="outline: none; overflow: hidden;">
-                <div id="link-map-container"></div>
+                <div id="link-map-container" class="link-map-container"></div>
             </div>
         </div>
     </div>