From 7270bf287df122ca48306b8e28cac52282f08af2 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Tue, 25 Feb 2020 16:31:44 +0100
Subject: [PATCH] fixes and right pane layout changes

---
 src/public/javascripts/services/tree_cache.js      |  4 ++--
 src/public/javascripts/services/ws.js              |  2 +-
 .../javascripts/widgets/collapsible_widget.js      | 14 ++------------
 src/public/javascripts/widgets/edited_notes.js     |  2 --
 src/public/javascripts/widgets/similar_notes.js    |  2 --
 src/public/javascripts/widgets/what_links_here.js  |  2 --
 src/public/stylesheets/desktop.css                 |  9 +++++++++
 7 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/public/javascripts/services/tree_cache.js b/src/public/javascripts/services/tree_cache.js
index 3d49c3e36..a81da05bf 100644
--- a/src/public/javascripts/services/tree_cache.js
+++ b/src/public/javascripts/services/tree_cache.js
@@ -105,8 +105,8 @@ class TreeCache {
                 const targetNote = this.notes[attributeRow.value];
 
                 if (targetNote) {
-                    if (!note.targetRelations.includes(attributeId)) {
-                        note.targetRelations.push(attributeId);
+                    if (!targetNote.targetRelations.includes(attributeId)) {
+                        targetNote.targetRelations.push(attributeId);
                     }
                 }
             }
diff --git a/src/public/javascripts/services/ws.js b/src/public/javascripts/services/ws.js
index 91c4a5f43..7b1978d94 100644
--- a/src/public/javascripts/services/ws.js
+++ b/src/public/javascripts/services/ws.js
@@ -288,7 +288,7 @@ async function processSyncRows(syncRows) {
                 }
 
                 if (targetNote) {
-                    targetNote.targetRelations = targetNote.targetRelations.filter(attributeId => attributeId !== attribute.value);
+                    targetNote.targetRelations = targetNote.targetRelations.filter(attributeId => attributeId !== attribute.attributeId);
                 }
             }
         }
diff --git a/src/public/javascripts/widgets/collapsible_widget.js b/src/public/javascripts/widgets/collapsible_widget.js
index 39551c723..127ae2c4e 100644
--- a/src/public/javascripts/widgets/collapsible_widget.js
+++ b/src/public/javascripts/widgets/collapsible_widget.js
@@ -14,7 +14,7 @@ const WIDGET_TPL = `
         <div class="widget-header-actions"></div>
     </div>
 
-    <div id="[to be set]" class="collapse body-wrapper" style="transition: none;">
+    <div id="[to be set]" class="collapse body-wrapper" style="transition: none; ">
         <div class="card-body"></div>
     </div>
 </div>
@@ -27,26 +27,16 @@ export default class CollapsibleWidget extends TabAwareWidget {
 
     getHelp() { return {}; }
 
-    getMaxHeight() { return null; }
-
     doRender() {
         this.$widget = $(WIDGET_TPL);
         this.$widget.find('[data-target]').attr('data-target', "#" + this.componentId);
 
         this.$bodyWrapper = this.$widget.find('.body-wrapper');
-        this.$bodyWrapper.attr('id', this.componentId);
-
+        this.$bodyWrapper.attr('id', this.componentId); // for toggle to work we need id
         this.$bodyWrapper.collapse("show");
 
         this.$body = this.$bodyWrapper.find('.card-body');
 
-        const maxHeight = this.getMaxHeight();
-
-        if (maxHeight) {
-            this.$body.css("max-height", maxHeight);
-            this.$body.css("overflow", "auto");
-        }
-
         this.$title = this.$widget.find('.widget-title');
         this.$title.text(this.getWidgetTitle());
 
diff --git a/src/public/javascripts/widgets/edited_notes.js b/src/public/javascripts/widgets/edited_notes.js
index 4db1b421d..3e47d7f6b 100644
--- a/src/public/javascripts/widgets/edited_notes.js
+++ b/src/public/javascripts/widgets/edited_notes.js
@@ -12,8 +12,6 @@ export default class EditedNotesWidget extends CollapsibleWidget {
         };
     }
 
-    getMaxHeight() { return "200px"; }
-
     isEnabled() {
         return super.isEnabled()
             && this.note.hasOwnedLabel("dateNote");
diff --git a/src/public/javascripts/widgets/similar_notes.js b/src/public/javascripts/widgets/similar_notes.js
index 05f77b962..b0b7b96bd 100644
--- a/src/public/javascripts/widgets/similar_notes.js
+++ b/src/public/javascripts/widgets/similar_notes.js
@@ -12,8 +12,6 @@ export default class SimilarNotesWidget extends CollapsibleWidget {
         };
     }
 
-    getMaxHeight() { return "200px"; }
-
     noteSwitched() {
         const noteId = this.noteId;
 
diff --git a/src/public/javascripts/widgets/what_links_here.js b/src/public/javascripts/widgets/what_links_here.js
index 0ba7769ba..d392ac212 100644
--- a/src/public/javascripts/widgets/what_links_here.js
+++ b/src/public/javascripts/widgets/what_links_here.js
@@ -4,8 +4,6 @@ import linkService from "../services/link.js";
 export default class WhatLinksHereWidget extends CollapsibleWidget {
     getWidgetTitle() { return "What links here"; }
 
-    getMaxHeight() { return "200px"; }
-
     getHelp() {
         return {
             title: "This list contains all notes which link to this note through links and relations."
diff --git a/src/public/stylesheets/desktop.css b/src/public/stylesheets/desktop.css
index 141011ad3..7aba0c8bb 100644
--- a/src/public/stylesheets/desktop.css
+++ b/src/public/stylesheets/desktop.css
@@ -142,6 +142,9 @@ body {
 
 #right-pane .card {
     border: 0;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
 }
 
 #right-pane .card-header {
@@ -183,10 +186,16 @@ body {
     text-decoration: none;
 }
 
+#right-pane .body-wrapper {
+    overflow: auto;
+}
+
 #right-pane .card-body {
     width: 100%;
     padding: 8px;
     border: 0;
+    height: 100%;
+    overflow: auto;
 }
 
 #right-pane .card-body ul {