Merge pull request #3544 from zooniverse/fix-classifier-mount

Fix classifier mount
zooniverse · Mar 6, 2017 · 104968b · 104968b
2 parents 021bd32 + 7692ae5
commit 104968b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/app/classifier/frame-annotator.jsx b/app/classifier/frame-annotator.jsx
@@ -28,6 +28,9 @@ export default class FrameAnnotator extends React.Component {
     if (nextProps.annotation !== this.props.annotation) {
       this.handleAnnotationChange(this.props.annotation, nextProps.annotation);
     }
+    if (nextProps.subject !== this.props.subject) {
+      this.setState({ alreadySeen: nextProps.subject.already_seen || seenThisSession.check(nextProps.workflow, nextProps.subject) });
+    }
   }
 
   getSizeRect() {

diff --git a/app/classifier/index.cjsx b/app/classifier/index.cjsx
@@ -77,11 +77,18 @@ Classifier = React.createClass
 
   componentWillReceiveProps: (nextProps) ->
     if nextProps.subject isnt @props.subject
-      @loadSubject subject
-    if nextProps.classification isnt @props.classification
-      @prepareToClassify nextProps.classification
+      @loadSubject nextProps.subject
     if @props.subject isnt nextProps.subject or !@context.geordi?.keys["subjectID"]?
       @context.geordi?.remember subjectID: nextProps.subject?.id
+
+    if nextProps.classification isnt @props.classification
+      @props.classification.stopListening 'change', =>
+        {annotations} = @props.classification
+        @setState {annotations}
+      nextProps.classification.listen 'change', =>
+        {annotations} = nextProps.classification
+        @setState {annotations}
+      @prepareToClassify nextProps.classification
 
   componentWillMount: () ->
     interventionMonitor.setProjectSlug @props.project.slug
@@ -619,9 +626,7 @@ module.exports = React.createClass
       @loadClassification nextProps.classification
 
   loadClassification: (classification) ->
-    @setState subject: null
-
-    # TODO: These underscored references are temporary stopgaps.
+# TODO: These underscored references are temporary stopgaps.
 
     Promise.resolve(classification._subjects ? classification.get 'subjects').then ([subject]) =>
       # We'll only handle one subject per classification right now.

diff --git a/app/collections/favorites-button.cjsx b/app/collections/favorites-button.cjsx
@@ -44,7 +44,7 @@ module.exports = React.createClass
       favorites.get('subjects', id: @props.subject.id)
         .then ([subject]) -> subject?
     else
-      false
+      Promise.resolve false
 
   componentWillMount: ->
     # see if the subject is in the project's favorites collection
@@ -56,6 +56,12 @@ module.exports = React.createClass
       .then (favorited) =>
         @setState {favorited}
 
+  componentDidUpdate: (prevProps) ->
+    if prevProps.subject isnt @props.subject
+      @findSubjectInCollection(@state.favorites)
+      .then (favorited) =>
+        @setState {favorited}
+
   addSubjectTo: (collection) ->
     @setState favorited: true
     collection.addLink('subjects', [@props.subject.id.toString()])