From a081ae7307e0ab80494fdf37070b90dde0867552 Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Wed, 11 Jan 2017 14:13:49 +0100
Subject: [PATCH] Properly sync resolved comments dropdown to entries

---
 .../controllers/ReviewPanelController.coffee           | 10 +++++++++-
 .../directives/resolvedCommentsDropdown.coffee         |  3 +--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
index a3dcc1e2d8..27ab2ea7d4 100644
--- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
+++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
@@ -130,7 +130,7 @@ define [
 							rangesTracker = getChangeTracker(doc.id)
 							rangesTracker.comments = doc.ranges?.comments or []
 							rangesTracker.changes = doc.ranges?.changes or []
-							updateEntries(doc.id)
+						updateEntries(doc.id)
 
 		refreshOverviewPanel = () ->
 			$scope.reviewPanel.overview.loading = true
@@ -152,6 +152,8 @@ define [
 			rangesTracker = getChangeTracker(doc_id)
 			entries = getDocEntries(doc_id)
 			
+			changed = false
+
 			# Assume we'll delete everything until we see it, then we'll remove it from this object
 			delete_changes = {}
 			for change_id, change of entries
@@ -159,6 +161,7 @@ define [
 					delete_changes[change_id] = true 
 
 			for change in rangesTracker.changes
+				changed = true
 				delete delete_changes[change.id]
 				entries[change.id] ?= {}
 					
@@ -178,6 +181,7 @@ define [
 					refreshChangeUsers(change.metadata.user_id)
 
 			for comment in rangesTracker.comments
+				changed = true
 				delete delete_changes[comment.id]
 				entries[comment.id] ?= {}
 				new_entry = {
@@ -190,7 +194,11 @@ define [
 					entries[comment.id][key] = value
 
 			for change_id, _ of delete_changes
+				changed = true
 				delete entries[change_id]
+			
+			if changed
+				$scope.$broadcast "entries:changed"
 
 		$scope.$on "editor:track-changes:changed", () ->
 			doc_id = $scope.editor.open_doc_id
diff --git a/services/web/public/coffee/ide/review-panel/directives/resolvedCommentsDropdown.coffee b/services/web/public/coffee/ide/review-panel/directives/resolvedCommentsDropdown.coffee
index 1c798de0e3..c7d1813f34 100644
--- a/services/web/public/coffee/ide/review-panel/directives/resolvedCommentsDropdown.coffee
+++ b/services/web/public/coffee/ide/review-panel/directives/resolvedCommentsDropdown.coffee
@@ -21,7 +21,6 @@ define [
 			scope.toggleOpenState = () ->
 				scope.state.isOpen = !scope.state.isOpen
 				if (scope.state.isOpen)
-					filterResolvedComments()
 					scope.onOpen()
 
 			scope.resolvedComments = []
@@ -55,4 +54,4 @@ define [
 
 							scope.resolvedComments.push(resolvedComment)
 
-			scope.$watchCollection "resolvedIds", filterResolvedComments
+			scope.$on "entries:changed", filterResolvedComments
\ No newline at end of file