From ee8b8fec4dde495b084c75dbe49970516e4a7a07 Mon Sep 17 00:00:00 2001
From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com>
Date: Mon, 24 Aug 2020 17:31:39 +0200
Subject: [PATCH] fix: Show SmartTag status in sidebar

---
 .../javascripts/views/tags/tags-view.pug      | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/app/assets/javascripts/views/tags/tags-view.pug b/app/assets/javascripts/views/tags/tags-view.pug
index af0ebb94a..374d7dd08 100644
--- a/app/assets/javascripts/views/tags/tags-view.pug
+++ b/app/assets/javascripts/views/tags/tags-view.pug
@@ -10,7 +10,7 @@
         .sk-h3.title
           span.sk-bold Views
         .sk-button.sk-secondary-contrast.wide(
-          ng-click='self.clickedAddNewTag()', 
+          ng-click='self.clickedAddNewTag()',
           title='Create a new tag'
           )
           .sk-label
@@ -18,38 +18,37 @@
     .scrollable
       .infinite-scroll
         .tag(
-          ng-class="{'selected' : self.state.selectedTag == tag, 'faded' : !tag.isAllTag}", 
-          ng-click='self.selectTag(tag)', 
+          ng-class="{'selected' : self.state.selectedTag == tag, 'faded' : !tag.isAllTag}",
+          ng-click='self.selectTag(tag)',
           ng-repeat='tag in self.state.smartTags track by tag.uuid'
           )
           .tag-info
-            input.title(
-              ng-disabled='true', 
-              ng-change='self.onTagTitleChange(tag)'
-              ng-model='tag.title'
-              )
+            .title(ng-if="!tag.errorDecrypting") {{tag.title}}
             .count(ng-show='tag.isAllTag') {{self.state.noteCounts[tag.uuid]}}
+          .danger.small-text.bold(ng-show='tag.conflictOf') Conflicted Copy
+          .danger.small-text.bold(ng-show='tag.errorDecrypting && !tag.waitingForKey') Missing Keys
+          .info.small-text.bold(ng-show='tag.errorDecrypting && tag.waitingForKey') Waiting For Keys
         .tags-title-section.section-title-bar
           .section-title-bar-header
             .sk-h3.title
               span.sk-bold Tags
         .tag(
-          ng-class="{'selected' : self.state.selectedTag == tag}", 
-          ng-click='self.selectTag(tag)', 
+          ng-class="{'selected' : self.state.selectedTag == tag}",
+          ng-click='self.selectTag(tag)',
           ng-repeat='tag in self.state.tags track by tag.uuid'
           )
           .tag-info
             .tag-icon #
             input.title(
-              ng-attr-id='tag-{{tag.uuid}}', 
-              ng-blur='self.saveTag($event, tag)' 
-              ng-change='self.onTagTitleChange(tag)', 
+              ng-attr-id='tag-{{tag.uuid}}',
+              ng-blur='self.saveTag($event, tag)'
+              ng-change='self.onTagTitleChange(tag)',
               ng-model='self.titles[tag.uuid]',
-              ng-class="{'editing' : self.state.editingTag == tag}", 
-              ng-click='self.selectTag(tag)', 
-              ng-keyup='$event.keyCode == 13 && $event.target.blur()', 
-              should-focus='self.state.templateTag || self.state.editingTag == tag', 
-              sn-autofocus='true', 
+              ng-class="{'editing' : self.state.editingTag == tag}",
+              ng-click='self.selectTag(tag)',
+              ng-keyup='$event.keyCode == 13 && $event.target.blur()',
+              should-focus='self.state.templateTag || self.state.editingTag == tag',
+              sn-autofocus='true',
               spellcheck='false'
               )
             .count {{self.state.noteCounts[tag.uuid]}}
@@ -63,10 +62,10 @@
         .no-tags-placeholder(ng-show='self.state.tags.length == 0')
           | No tags. Create one using the add button above.
   panel-resizer(
-    collapsable='true', 
-    control='self.panelPuppet', 
-    default-width='150', 
-    hoverable='true', 
-    on-resize-finish='self.onPanelResize', 
+    collapsable='true',
+    control='self.panelPuppet',
+    default-width='150',
+    hoverable='true',
+    on-resize-finish='self.onPanelResize',
     panel-id="'tags-column'"
     )