Merge pull request #1273 from hypothesis/simplify-thread-generation

Simplify root thread generation in top-level UI components

src/sidebar/components/annotation-viewer-content.js

@@ -36,15 +36,11 @@ function AnnotationViewerContentController(
   streamFilter,
   annotationMapper
 ) {
-  const self = this;
-
   store.setAppIsSidebar(false);
 
   const id = $routeParams.id;
 
-  store.subscribe(function() {
-    self.rootThread = rootThread.thread(store.getState());
-  });
+  this.rootThread = () => rootThread.thread(store.getState());
 
   this.setCollapsed = function(id, collapsed) {
     store.setCollapsed(id, collapsed);

src/sidebar/components/sidebar-content.js

@@ -17,15 +17,7 @@ function SidebarContentController(
 ) {
   const self = this;
 
-  function thread() {
-    return rootThread.thread(store.getState());
-  }
-
-  const unsubscribeAnnotationUI = store.subscribe(function() {
-    self.rootThread = thread();
-  });
-
-  $scope.$on('$destroy', unsubscribeAnnotationUI);
+  this.rootThread = () => rootThread.thread(store.getState());
 
   function focusAnnotation(annotation) {
     let highlights = [];

src/sidebar/components/stream-content.js

@@ -11,8 +11,6 @@ function StreamContentController(
   rootThread,
   searchFilter
 ) {
-  const self = this;
-
   store.setAppIsSidebar(false);
 
   /** `offset` parameter for the next search API call. */
@@ -62,10 +60,7 @@ function StreamContentController(
   fetch(20);
 
   this.setCollapsed = store.setCollapsed;
-
-  store.subscribe(function() {
-    self.rootThread = rootThread.thread(store.getState());
-  });
+  this.rootThread = () => rootThread.thread(store.getState());
 
   // Sort the stream so that the newest annotations are at the top
   store.setSortKey('Newest');

src/sidebar/components/test/sidebar-content-test.js

@@ -164,6 +164,11 @@ describe('sidebar.components.sidebar-content', function() {
     fakeAnnotations.load.reset();
   }
 
+  it('generates the thread list', () => {
+    const thread = fakeRootThread.thread(store.getState());
+    assert.equal(ctrl.rootThread(), thread);
+  });
+
   context('when the search URIs of connected frames change', () => {
     beforeEach(connectFrameAndPerformInitialFetch);
 

src/sidebar/templates/annotation-viewer-content.html

@@ -2,5 +2,5 @@
   on-change-collapsed="vm.setCollapsed(id, collapsed)"
   on-force-visible="vm.forceVisible(thread)"
   show-document-info="true"
-  thread="vm.rootThread">
+  thread="vm.rootThread()">
 </thread-list>

src/sidebar/templates/sidebar-content.html

@@ -35,7 +35,7 @@
   on-select="vm.scrollTo(annotation)"
   show-document-info="false"
   ng-if="!vm.selectedGroupUnavailable()"
-  thread="vm.rootThread">
+  thread="vm.rootThread()">
 </thread-list>
 
 <logged-out-message ng-if="vm.shouldShowLoggedOutMessage()" on-login="vm.onLogin()">

src/sidebar/templates/stream-content.html

@@ -2,6 +2,6 @@
   <thread-list
     on-change-collapsed="vm.setCollapsed(id, collapsed)"
     show-document-info="true"
-    thread="vm.rootThread">
+    thread="vm.rootThread()">
   </thread-list>
 </span>