From de4733e848f8d9954e67714927a118a86342c831 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Tue, 6 Aug 2019 23:20:27 +0200
Subject: [PATCH] updating attributes widget based on sync data changes

---
 src/public/javascripts/services/attributes.js |  6 ++++++
 .../javascripts/services/tab_context.js       |  2 ++
 src/public/javascripts/widgets/attributes.js  | 20 ++++++++++++++-----
 src/public/javascripts/widgets/note_info.js   |  2 --
 .../javascripts/widgets/note_revisions.js     |  6 ++++++
 src/services/messaging.js                     |  3 +++
 6 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/public/javascripts/services/attributes.js b/src/public/javascripts/services/attributes.js
index 5ee1db06e..3bbd947f6 100644
--- a/src/public/javascripts/services/attributes.js
+++ b/src/public/javascripts/services/attributes.js
@@ -268,6 +268,12 @@ class Attributes {
             this.$savedIndicator.fadeIn();
         }
     }
+
+    syncDataReceived(syncData) {
+        if (syncData.find(sd => sd.entityName === 'attributes' && sd.noteId === this.ctx.note.noteId)) {
+            this.reloadAttributes();
+        }
+    }
 }
 
 export default Attributes;
\ No newline at end of file
diff --git a/src/public/javascripts/services/tab_context.js b/src/public/javascripts/services/tab_context.js
index 7e80f67bb..405d13b46 100644
--- a/src/public/javascripts/services/tab_context.js
+++ b/src/public/javascripts/services/tab_context.js
@@ -357,6 +357,8 @@ class TabContext {
     }
 
     syncDataReceived(syncData) {
+        this.attributes.syncDataReceived(syncData);
+
         if (this.sidebar) {
             this.sidebar.syncDataReceived(syncData);
         }
diff --git a/src/public/javascripts/widgets/attributes.js b/src/public/javascripts/widgets/attributes.js
index c666b9d5e..1aec87f4a 100644
--- a/src/public/javascripts/widgets/attributes.js
+++ b/src/public/javascripts/widgets/attributes.js
@@ -26,8 +26,6 @@ class AttributesWidget {
     async renderBody() {
         const $body = this.$widget.find('.card-body');
 
-        $body.empty();
-
         const attributes = await this.ctx.attributes.getAttributes();
         const ownedAttributes = attributes.filter(attr => attr.noteId === this.ctx.note.noteId);
 
@@ -35,7 +33,9 @@ class AttributesWidget {
             $body.text("No own attributes yet...");
         }
 
-        await this.renderAttributes(ownedAttributes, $body);
+        const $attributesContainer = $("<div>");
+
+        await this.renderAttributes(ownedAttributes, $attributesContainer);
 
         const inheritedAttributes = attributes.filter(attr => attr.noteId !== this.ctx.note.noteId);
 
@@ -57,14 +57,16 @@ class AttributesWidget {
                     $inheritedAttrs.hide();
                 });
 
-            $body.append($showInheritedAttributes);
-            $body.append($inheritedAttrs);
+            $attributesContainer.append($showInheritedAttributes);
+            $attributesContainer.append($inheritedAttrs);
 
             await this.renderAttributes(inheritedAttributes, $inheritedAttrs);
 
             $inheritedAttrs.append($hideInheritedAttributes);
             $inheritedAttrs.hide();
         }
+
+        $body.empty().append($attributesContainer);
     }
 
     async renderAttributes(attributes, $container) {
@@ -86,6 +88,14 @@ class AttributesWidget {
             }
         }
     }
+
+    syncDataReceived(syncData) {
+        if (syncData.find(sd => sd.entityName === 'attributes' && sd.noteId === this.ctx.note.noteId)) {
+            // no need to invalidate attributes since the Attribute class listens to this as well
+            // (and is guaranteed to run first)
+            this.renderBody();
+        }
+    }
 }
 
 export default AttributesWidget;
\ No newline at end of file
diff --git a/src/public/javascripts/widgets/note_info.js b/src/public/javascripts/widgets/note_info.js
index 12113a809..893c28a1c 100644
--- a/src/public/javascripts/widgets/note_info.js
+++ b/src/public/javascripts/widgets/note_info.js
@@ -57,8 +57,6 @@ class NoteInfoWidget {
 
     syncDataReceived(syncData) {
         if (syncData.find(sd => sd.entityName === 'notes' && sd.entityId === this.ctx.note.noteId)) {
-            console.log("Re-rendering note info");
-
             this.renderBody();
         }
     }
diff --git a/src/public/javascripts/widgets/note_revisions.js b/src/public/javascripts/widgets/note_revisions.js
index b24c1af36..da3251a3e 100644
--- a/src/public/javascripts/widgets/note_revisions.js
+++ b/src/public/javascripts/widgets/note_revisions.js
@@ -39,6 +39,12 @@ class NoteRevisionsWidget {
             }).text(item.dateModifiedFrom)));
         }
     }
+
+    syncDataReceived(syncData) {
+        if (syncData.find(sd => sd.entityName === 'note_revisions' && sd.noteId === this.ctx.note.noteId)) {
+            this.renderBody();
+        }
+    }
 }
 
 export default NoteRevisionsWidget;
\ No newline at end of file
diff --git a/src/services/messaging.js b/src/services/messaging.js
index bae58ac0c..96a827922 100644
--- a/src/services/messaging.js
+++ b/src/services/messaging.js
@@ -70,6 +70,9 @@ async function sendPing(client, lastSentSyncId) {
         if (sync.entityName === 'attributes') {
             sync.noteId = await sql.getValue(`SELECT noteId FROM attributes WHERE attributeId = ?`, [sync.entityId]);
         }
+        else if (sync.entityName === 'note_revisions') {
+            sync.noteId = await sql.getValue(`SELECT noteId FROM note_revisions WHERE noteRevisionId = ?`, [sync.entityId]);
+        }
     }
 
     const stats = require('./sync').stats;