Merge with AD-1290

js/components/ascribe_detail/edition_container.js

@@ -27,21 +27,15 @@ let EditionContainer = React.createClass({
         return EditionStore.getState();
     },
 
-    onChange(state) {
-        this.setState(state);
-        if (!state.edition.digital_work) {
-            return;
-        }
-        let isEncoding = state.edition.digital_work.isEncoding;
-        if (state.edition.digital_work.mime === 'video' && typeof isEncoding === 'number' && isEncoding !== 100 && !this.state.timerId) {
-            let timerId = window.setInterval(() => EditionActions.fetchOne(this.props.params.editionId), 10000);
-            this.setState({timerId: timerId});
-        }
-    },
-
     componentDidMount() {
         EditionStore.listen(this.onChange);
-        EditionActions.fetchOne(this.props.params.editionId);
+
+        // Every time we enter the edition detail page, just reset the edition
+        // store as it will otherwise display wrong/old data once the user loads
+        // the edition detail a second time
+        EditionActions.updateEdition({});
+
+        this.loadEdition();
     },
 
     // This is done to update the container when the user clicks on the prev or next
@@ -54,15 +48,21 @@ let EditionContainer = React.createClass({
     },
 
     componentWillUnmount() {
-        // Every time we're leaving the edition detail page,
-        // just reset the edition that is saved in the edition store
-        // as it will otherwise display wrong/old data once the user loads
-        // the edition detail a second time
-        EditionActions.updateEdition({});
         window.clearInterval(this.state.timerId);
         EditionStore.unlisten(this.onChange);
     },
 
+    onChange(state) {
+        this.setState(state);
+        if (!state.edition.digital_work) {
+            return;
+        }
+        let isEncoding = state.edition.digital_work.isEncoding;
+        if (state.edition.digital_work.mime === 'video' && typeof isEncoding === 'number' && isEncoding !== 100 && !this.state.timerId) {
+            let timerId = window.setInterval(() => EditionActions.fetchOne(this.props.params.editionId), 10000);
+            this.setState({timerId: timerId});
+        }
+    },
 
     loadEdition() {
         EditionActions.fetchOne(this.props.params.editionId);

js/components/ascribe_detail/piece_container.js

@@ -49,8 +49,8 @@ import { setDocumentTitle } from '../../utils/dom_utils';
  */
 let PieceContainer = React.createClass({
     propTypes: {
-        params: React.PropTypes.object,
         furtherDetailsType: React.PropTypes.func,
+        params: React.PropTypes.object,
         location: React.PropTypes.object
     },
 
@@ -78,15 +78,16 @@ let PieceContainer = React.createClass({
         PieceListStore.listen(this.onChange);
         UserActions.fetchCurrentUser();
         PieceStore.listen(this.onChange);
-        PieceActions.fetchOne(this.props.params.pieceId);
+
+        // Every time we enter the piece detail page, just reset the piece
+        // store as it will otherwise display wrong/old data once the user loads
+        // the piece detail a second time
+        PieceActions.updatePiece({});
+
+        this.loadPiece();
     },
 
     componentWillUnmount() {
-        // Every time we're leaving the piece detail page,
-        // just reset the piece that is saved in the piece store
-        // as it will otherwise display wrong/old data once the user loads
-        // the piece detail a second time
-        PieceActions.updatePiece({});
         PieceStore.unlisten(this.onChange);
         UserStore.unlisten(this.onChange);
         PieceListStore.unlisten(this.onChange);
@@ -276,6 +277,15 @@ let PieceContainer = React.createClass({
                             successMessage={getLangText('Private note saved')}
                             url={ApiUrls.note_private_piece}
                             currentUser={this.state.currentUser}/>
+                        <Note
+                            id={this.getId}
+                            label={getLangText('Piece note (public)')}
+                            defaultValue={this.state.piece.public_note || null}
+                            placeholder={getLangText('Enter your comments ...')}
+                            editable={!!this.state.piece.acl.acl_edit}
+                            successMessage={getLangText('Public piece note saved')}
+                            url={ApiUrls.note_public_piece}
+                            currentUser={this.state.currentUser}/>
                     </CollapsibleParagraph>
                     <CollapsibleParagraph
                         title={getLangText('Further Details')}

js/components/whitelabel/prize/components/ascribe_detail/prize_piece_container.js

@@ -47,6 +47,10 @@ import { setDocumentTitle } from '../../../../../utils/dom_utils';
  * This is the component that implements resource/data specific functionality
  */
 let PieceContainer = React.createClass({
+    propTypes: {
+        params: React.PropTypes.object
+    },
+
     getInitialState() {
         return mergeOptions(
             PieceStore.getState(),
@@ -58,6 +62,11 @@ let PieceContainer = React.createClass({
         PieceStore.listen(this.onChange);
         PieceActions.fetchOne(this.props.params.pieceId);
         UserStore.listen(this.onChange);
+
+        // Every time we enter the piece detail page, just reset the piece
+        // store as it will otherwise display wrong/old data once the user loads
+        // the piece detail a second time
+        PieceActions.updatePiece({});
     },
 
     // This is done to update the container when the user clicks on the prev or next
@@ -70,11 +79,6 @@ let PieceContainer = React.createClass({
     },
 
     componentWillUnmount() {
-        // Every time we're leaving the piece detail page,
-        // just reset the piece that is saved in the piece store
-        // as it will otherwise display wrong/old data once the user loads
-        // the piece detail a second time
-        PieceActions.updatePiece({});
         PieceStore.unlisten(this.onChange);
         UserStore.unlisten(this.onChange);
     },

js/components/whitelabel/wallet/components/cyland/cyland_detail/cyland_piece_container.js

@@ -51,9 +51,8 @@ let CylandPieceContainer = React.createClass({
         UserStore.listen(this.onChange);
         PieceListStore.listen(this.onChange);
 
-        // Every time we're leaving the piece detail page,
+        // Every time we enter the piece detail page, just reset the piece
-        // just reset the piece that is saved in the piece store
+        // store as it will otherwise display wrong/old data once the user loads
-        // as it will otherwise display wrong/old data once the user loads
         // the piece detail a second time
         PieceActions.updatePiece({});
 

js/components/whitelabel/wallet/components/ikonotv/ikonotv_detail/ikonotv_piece_container.js

@@ -52,9 +52,8 @@ let IkonotvPieceContainer = React.createClass({
         UserStore.listen(this.onChange);
         PieceListStore.listen(this.onChange);
 
-        // Every time we're leaving the piece detail page,
+        // Every time we enter the piece detail page, just reset the piece
-        // just reset the piece that is saved in the piece store
+        // store as it will otherwise display wrong/old data once the user loads
-        // as it will otherwise display wrong/old data once the user loads
         // the piece detail a second time
         PieceActions.updatePiece({});