Merge with master

.env-template

@@ -0,0 +1,3 @@
+SAUCE_USERNAME=ascribe
+SAUCE_ACCESS_KEY=
+SAUCE_DEFAULT_URL=

.eslintrc

@@ -2,7 +2,7 @@
     "parser": "babel-eslint",
     "env": {
         "browser": true,
-        "es6": true
+        "es6": true,
     },
     "rules": {
         "new-cap": [2, {newIsCap: true, capIsNew: false}],

.gitignore

@@ -22,3 +22,4 @@ node_modules/*
 build
 
 .DS_Store
+.env

README.md

@@ -48,15 +48,18 @@ For this project, we're using:
 
 Branch names
 =====================
-Since we moved to Github, we cannot create branch names automatically with JIRA anymore.
+
-To not lose context, but still be able to switch branches quickly using a ticket's number, we're recommending the following rules when naming our branches in onion.
+To allow Github and JIRA to track branches while still allowing us to switch branches quickly using a ticket's number (and keep our peace of mind), we have the following rules for naming branches:
 
 ```
+// For issues logged in Github:
+AG-<Github-issue-id>-brief-and-sane-description-of-the-ticket
+
+// For issues logged in JIRA:
 AD-<JIRA-ticket-id>-brief-and-sane-description-of-the-ticket
 ```
 
-where `brief-and-sane-description-of-the-ticket` does not need to equal to the ticket's title.
+where `brief-and-sane-description-of-the-ticket` does not need to equal to the issue or ticket's title.
-This allows JIRA to still track branches and pull-requests while allowing us to keep our peace of mind.
 
 Example
 -------------

js/actions/contract_list_actions.js

@@ -28,12 +28,10 @@ class ContractListActions {
     }
 
 
-    changeContract(contract){
+    changeContract(contract) {
         return Q.Promise((resolve, reject) => {
             OwnershipFetcher.changeContract(contract)
-                .then((res) => {
+                .then(resolve)
-                    resolve(res);
-                })
                 .catch((err)=> {
                     console.logGlobal(err);
                     reject(err);
@@ -41,13 +39,11 @@ class ContractListActions {
         });
     }
 
-    removeContract(contractId){
+    removeContract(contractId) {
-        return Q.Promise( (resolve, reject) => {
+        return Q.Promise((resolve, reject) => {
             OwnershipFetcher.deleteContract(contractId)
-                .then((res) => {
+                .then(resolve)
-                    resolve(res);
+                .catch((err) => {
-                })
-                .catch( (err) => {
                     console.logGlobal(err);
                     reject(err);
                 });

js/actions/edition_actions.js

@@ -7,11 +7,11 @@ class EditionActions {
     constructor() {
         this.generateActions(
             'fetchEdition',
-            'successFetchEdition',
             'successFetchCoa',
-            'flushEdition',
+            'successFetchEdition',
             'errorCoa',
-            'errorEdition'
+            'errorEdition',
+            'flushEdition'
         );
     }
 }

js/actions/edition_list_actions.js

@@ -17,23 +17,31 @@ class EditionListActions {
         );
     }
 
-    fetchEditionList(pieceId, page, pageSize, orderBy, orderAsc, filterBy) {
+    fetchEditionList({ pieceId, page, pageSize, orderBy, orderAsc, filterBy, maxEdition }) {
-        if((!orderBy && typeof orderAsc === 'undefined') || !orderAsc) {
+        if ((!orderBy && typeof orderAsc === 'undefined') || !orderAsc) {
             orderBy = 'edition_number';
             orderAsc = true;
         }
 
         // Taken from: http://stackoverflow.com/a/519157/1263876
-        if((typeof page === 'undefined' || !page) && (typeof pageSize === 'undefined' || !pageSize)) {
+        if ((typeof page === 'undefined' || !page) && (typeof pageSize === 'undefined' || !pageSize)) {
             page = 1;
             pageSize = 10;
         }
 
+        let itemsToFetch = pageSize;
+        // If we only want to fetch up to a specified edition, fetch all pages up to it
+        // as one page and adjust afterwards
+        if (typeof maxEdition === 'number') {
+            itemsToFetch = Math.ceil(maxEdition / pageSize) * pageSize;
+            page = 1;
+        }
+
         return Q.Promise((resolve, reject) => {
             EditionListFetcher
-                .fetch(pieceId, page, pageSize, orderBy, orderAsc, filterBy)
+                .fetch({ pieceId, page, orderBy, orderAsc, filterBy, pageSize: itemsToFetch })
                 .then((res) => {
-                    if(res && !res.editions) {
+                    if (res && !res.editions) {
                         throw new Error('Piece has no editions to fetch.');
                     }
 
@@ -44,8 +52,9 @@ class EditionListActions {
                         orderBy,
                         orderAsc,
                         filterBy,
-                        'editionListOfPiece': res.editions,
+                        maxEdition,
-                        'count': res.count
+                        count: res.count,
+                        editionListOfPiece: res.editions
                     });
                     resolve(res);
                 })
@@ -54,7 +63,6 @@ class EditionListActions {
                     reject(err);
                 });
         });
-        
     }
 }
 

js/actions/facebook_actions.js

@@ -0,0 +1,14 @@
+'use strict';
+
+import { altThirdParty } from '../alt';
+
+
+class FacebookActions {
+    constructor() {
+        this.generateActions(
+            'sdkReady'
+        );
+    }
+}
+
+export default altThirdParty.createActions(FacebookActions);

js/actions/piece_actions.js

@@ -1,28 +1,19 @@
 'use strict';
 
 import { alt } from '../alt';
-import PieceFetcher from '../fetchers/piece_fetcher';
 
 
 class PieceActions {
     constructor() {
         this.generateActions(
+            'fetchPiece',
+            'successFetchPiece',
+            'errorPiece',
+            'flushPiece',
             'updatePiece',
-            'updateProperty',
+            'updateProperty'
-            'pieceFailed'
         );
     }
-
-    fetchOne(pieceId) {
-        PieceFetcher.fetchOne(pieceId)
-            .then((res) => {
-                this.actions.updatePiece(res.piece);
-            })
-            .catch((err) => {
-                console.logGlobal(err);
-                this.actions.pieceFailed(err.json);
-            });
-    }
 }
 
 export default alt.createActions(PieceActions);

js/actions/piece_list_actions.js

@@ -15,7 +15,7 @@ class PieceListActions {
         );
     }
 
-    fetchPieceList(page, pageSize, search, orderBy, orderAsc, filterBy) {
+    fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy }) {
         // To prevent flickering on a pagination request,
         // we overwrite the piecelist with an empty list before
         // pieceListCount === -1 defines the loading state
@@ -34,7 +34,7 @@ class PieceListActions {
         // afterwards, we can load the list
         return Q.Promise((resolve, reject) => {
             PieceListFetcher
-                .fetch(page, pageSize, search, orderBy, orderAsc, filterBy)
+                .fetch({ page, pageSize, search, orderBy, orderAsc, filterBy })
                 .then((res) => {
                     this.actions.updatePieceList({
                         page,

js/actions/prize_list_actions.js

@@ -1,34 +0,0 @@
-'use strict';
-
-import { alt } from '../alt';
-import Q from 'q';
-
-import PrizeListFetcher from '../fetchers/prize_list_fetcher';
-
-class PrizeListActions {
-    constructor() {
-        this.generateActions(
-            'updatePrizeList'
-        );
-    }
-
-    fetchPrizeList() {
-        return Q.Promise((resolve, reject) => {
-            PrizeListFetcher
-                .fetch()
-                .then((res) => {
-                    this.actions.updatePrizeList({
-                        prizeList: res.prizes,
-                        prizeListCount: res.count
-                    });
-                    resolve(res);
-                })
-                .catch((err) => {
-                    console.logGlobal(err);
-                    reject(err);
-                });
-        });
-    }
-}
-
-export default alt.createActions(PrizeListActions);

js/app.js

@@ -1,14 +1,13 @@
 'use strict';
 
 import 'babel/polyfill';
+import 'classlist-polyfill';
 
 import React from 'react';
 import { Router, Redirect } from 'react-router';
 import history from './history';
 
-/* eslint-disable */
 import fetch from 'isomorphic-fetch';
-/* eslint-enable */
 
 import ApiUrls from './constants/api_urls';
 
@@ -17,44 +16,27 @@ import getRoutes from './routes';
 import requests from './utils/requests';
 
 import { updateApiUrls } from './constants/api_urls';
-import { getSubdomainSettings } from './utils/constants_utils';
+import { getDefaultSubdomainSettings, getSubdomainSettings } from './utils/constants_utils';
 import { initLogging } from './utils/error_utils';
 import { getSubdomain } from './utils/general_utils';
 
 import EventActions from './actions/event_actions';
 
-/* eslint-disable */
 // You can comment out the modules you don't need
-// import DebugHandler from './third_party/debug';
+// import DebugHandler from './third_party/debug_handler';
-import GoogleAnalyticsHandler from './third_party/ga';
+import FacebookHandler from './third_party/facebook_handler';
-import RavenHandler from './third_party/raven';
+import GoogleAnalyticsHandler from './third_party/ga_handler';
-import IntercomHandler from './third_party/intercom';
+import IntercomHandler from './third_party/intercom_handler';
-import NotificationsHandler from './third_party/notifications';
+import NotificationsHandler from './third_party/notifications_handler';
-import FacebookHandler from './third_party/facebook';
+import RavenHandler from './third_party/raven_handler';
-/* eslint-enable */
 
-initLogging();
 
-let headers = {
+const AppGateway = {
-    'Accept': 'application/json',
-    'Content-Type': 'application/json'
-};
-
-requests.defaults({
-    urlMap: ApiUrls,
-    http: {
-        headers: headers,
-        credentials: 'include'
-    }
-});
-
-class AppGateway {
     start() {
-        let settings;
-        let subdomain = getSubdomain();
-
         try {
-            settings = getSubdomainSettings(subdomain);
+            const subdomain = getSubdomain();
+            const settings = getSubdomainSettings(subdomain);
+
             AppConstants.whitelabel = settings;
             updateApiUrls(settings.type, subdomain);
             this.load(settings);
@@ -62,28 +44,25 @@ class AppGateway {
             // if there are no matching subdomains, we're routing
             // to the default frontend
             console.logGlobal(err);
-            this.load();
+            this.load(getDefaultSubdomainSettings());
         }
-    }
+    },
 
     load(settings) {
-        let type = 'default';
+        const { subdomain, type } = settings;
-        let subdomain = 'www';
         let redirectRoute = (<Redirect from="/" to="/collection" />);
 
-        if (settings) {
+        if (subdomain) {
-            type = settings.type;
+            // Some whitelabels have landing pages so we should not automatically redirect from / to /collection.
-            subdomain = settings.subdomain;
+            // Only www and cc do not have a landing page.
-        }
+            if (subdomain !== 'cc') {
+                redirectRoute = null;
+            }
 
-        // www and cc do not have a landing page
+            // Adds a client specific class to the body for whitelabel styling
-        if(subdomain && subdomain !== 'cc') {
+            window.document.body.classList.add('client--' + subdomain);
-            redirectRoute = null;
         }
 
-        // Adds a client specific class to the body for whitelabel styling
-        window.document.body.classList.add('client--' + subdomain);
-
         // Send the applicationWillBoot event to the third-party stores
         EventActions.applicationWillBoot(settings);
 
@@ -101,8 +80,21 @@ class AppGateway {
         // Send the applicationDidBoot event to the third-party stores
         EventActions.applicationDidBoot(settings);
     }
-}
+};
 
-let ag = new AppGateway();
+// Initialize pre-start components
-ag.start();
+initLogging();
 
+requests.defaults({
+    urlMap: ApiUrls,
+    http: {
+        headers: {
+            'Accept': 'application/json',
+            'Content-Type': 'application/json'
+        },
+        credentials: 'include'
+    }
+});
+
+// And bootstrap app
+AppGateway.start();

js/components/ascribe_accordion_list/accordion_list_item_edition_widget.js

@@ -19,9 +19,10 @@ import { getLangText } from '../../utils/lang_utils';
 
 let AccordionListItemEditionWidget = React.createClass({
     propTypes: {
-        className: React.PropTypes.string,
         piece: React.PropTypes.object.isRequired,
         toggleCreateEditionsDialog: React.PropTypes.func.isRequired,
+
+        className: React.PropTypes.string,
         onPollingSuccess: React.PropTypes.func
     },
 
@@ -50,14 +51,15 @@ let AccordionListItemEditionWidget = React.createClass({
      * Calls the store to either show or hide the editionListTable
      */
     toggleTable() {
-        let pieceId = this.props.piece.id;
+        const { piece: { id: pieceId } } = this.props;
-        let isEditionListOpen = this.state.isEditionListOpenForPieceId[pieceId] ? this.state.isEditionListOpenForPieceId[pieceId].show : false;
+        const { filterBy, isEditionListOpenForPieceId } = this.state;
+        const isEditionListOpen = isEditionListOpenForPieceId[pieceId] ? isEditionListOpenForPieceId[pieceId].show : false;
 
-        if(isEditionListOpen) {
+        if (isEditionListOpen) {
             EditionListActions.toggleEditionList(pieceId);
         } else {
             EditionListActions.toggleEditionList(pieceId);
-            EditionListActions.fetchEditionList(pieceId, null, null, null, null, this.state.filterBy);
+            EditionListActions.fetchEditionList({ pieceId, filterBy });
         }
     },
 

js/components/ascribe_accordion_list/accordion_list_item_table_editions.js

@@ -66,22 +66,34 @@ let AccordionListItemTableEditions = React.createClass({
     },
 
     filterSelectedEditions() {
-        let selectedEditions = this.state.editionList[this.props.parentId]
+        return this.state
-            .filter((edition) => edition.selected);
+                   .editionList[this.props.parentId]
-        return selectedEditions;
+                   .filter((edition) => edition.selected);
     },
 
     loadFurtherEditions() {
+        const { parentId: pieceId } = this.props;
+        const { page, pageSize, orderBy, orderAsc, filterBy } = this.state.editionList[pieceId];
+
         // trigger loading animation
         this.setState({
             showMoreLoading: true
         });
 
-        let editionList = this.state.editionList[this.props.parentId];
+        EditionListActions.fetchEditionList({
-        EditionListActions.fetchEditionList(this.props.parentId, editionList.page + 1, editionList.pageSize,
+            pieceId,
-                                            editionList.orderBy, editionList.orderAsc, editionList.filterBy);
+            pageSize,
+            orderBy,
+            orderAsc,
+            filterBy,
+            page: page + 1
+        });
     },
     render() {
+        const { className, parentId } = this.props;
+        const { editionList, isEditionListOpenForPieceId, showMoreLoading } = this.state;
+        const editionsForPiece = editionList[parentId];
+
         let selectedEditionsCount = 0;
         let allEditionsCount = 0;
         let orderBy;
@@ -89,95 +101,97 @@ let AccordionListItemTableEditions = React.createClass({
         let show = false;
         let showExpandOption = false;
 
-        let editionsForPiece = this.state.editionList[this.props.parentId];
-        let loadingSpinner = <AscribeSpinner size="sm" color="dark-blue" />;
-
         // here we need to check if all editions of a specific
         // piece are already defined. Otherwise .length will throw an error and we'll not
         // be notified about it.
-        if(editionsForPiece) {
+        if (editionsForPiece) {
             selectedEditionsCount = this.filterSelectedEditions().length;
             allEditionsCount = editionsForPiece.length;
             orderBy = editionsForPiece.orderBy;
             orderAsc = editionsForPiece.orderAsc;
         }
 
-        if(this.props.parentId in this.state.isEditionListOpenForPieceId) {
+        if (parentId in isEditionListOpenForPieceId) {
-            show = this.state.isEditionListOpenForPieceId[this.props.parentId].show;
+            show = isEditionListOpenForPieceId[parentId].show;
         }
 
         // if the number of editions in the array is equal to the maximum number of editions,
         // then the "Show me more" dialog should be hidden from the user's view
-        if(editionsForPiece && editionsForPiece.count > editionsForPiece.length) {
+        if (editionsForPiece && editionsForPiece.count > editionsForPiece.length) {
             showExpandOption = true;
         }
 
-        let transition = new TransitionModel('editions', 'editionId', 'bitcoin_id', (e) => e.stopPropagation() );
+        const transition = new TransitionModel({
+            to: 'editions',
+            queryKey: 'editionId',
+            valueKey: 'bitcoin_id',
+            callback: (e) => e.stopPropagation()
+        });
 
-        let columnList = [
+        const columnList = [
-            new ColumnModel(
+            new ColumnModel({
-                (item) => {
+                transformFn: (item) => {
                     return {
                         'editionId': item.id,
-                        'pieceId': this.props.parentId,
+                        'pieceId': parentId,
                         'selectItem': this.selectItem,
                         'selected': item.selected
-                    }; },
+                    };
-                    '',
+                },
+                displayElement: (
                     <AccordionListItemTableSelectAllEditionsCheckbox
                         onChange={this.toggleAllItems}
                         numOfSelectedEditions={selectedEditionsCount}
-                        numOfAllEditions={allEditionsCount}/>,
+                        numOfAllEditions={allEditionsCount}/>
-                    TableItemCheckbox,
+                ),
-                    1,
+                displayType: TableItemCheckbox,
-                    false
+                rowWidth: 1
-            ),
+            }),
-            new ColumnModel(
+            new ColumnModel({
-                (item) => {
+                transition,
+                transformFn: (item) => {
                     return {
                         'content': item.edition_number + ' ' + getLangText('of') + ' ' + item.num_editions
-                    }; },
+                    };
-                    'edition_number',
+                },
-                    getLangText('Edition'),
+                columnName: 'edition_number',
-                    TableItemText,
+                displayElement: getLangText('Edition'),
-                    1,
+                displayType: TableItemText,
-                    false,
+                rowWidth: 1
-                    transition
+            }),
-            ),
+            new ColumnModel({
-            new ColumnModel(
+                transition,
-                (item) => {
+                transformFn: (item) => {
                     return {
                         'content': item.bitcoin_id
-                    }; },
+                    };
-                    'bitcoin_id',
+                },
-                    getLangText('ID'),
+                columnName: 'bitcoin_id',
-                    TableItemText,
+                displayElement: getLangText('ID'),
-                    5,
+                displayType: TableItemText,
-                    false,
+                rowWidth: 5,
-                    transition,
+                className: 'hidden-xs visible-sm visible-md visible-lg'
-                    'hidden-xs visible-sm visible-md visible-lg'
+            }),
-            ),
+            new ColumnModel({
-            new ColumnModel(
+                transition,
-                (item) => {
+                transformFn: (item) => {
-                    let content = item.acl;
                     return {
-                        'content': content,
+                        'content': item.acl,
                         'notifications': item.notifications
-                    }; },
+                    };
-                    'acl',
+                },
-                    getLangText('Actions'),
+                columnName: 'acl',
-                    TableItemAclFiltered,
+                displayElement: getLangText('Actions'),
-                    4,
+                displayType: TableItemAclFiltered,
-                    false,
+                rowWidth: 4
-                    transition
+            })
-            )
         ];
 
-        if(show && editionsForPiece && editionsForPiece.length > 0) {
+        if (show && editionsForPiece && editionsForPiece.length) {
             return (
-                <div className={this.props.className}>
+                <div className={className}>
                     <AccordionListItemTable
-                        parentId={this.props.parentId}
+                        parentId={parentId}
                         itemList={editionsForPiece}
                         columnList={columnList}
                         show={show}
@@ -188,7 +202,14 @@ let AccordionListItemTableEditions = React.createClass({
                     <AccordionListItemTableToggle
                         className="ascribe-accordion-list-table-toggle"
                         onClick={this.loadFurtherEditions}
-                        message={show && showExpandOption ? <span>{this.state.showMoreLoading ? loadingSpinner : <span className="glyphicon glyphicon-option-horizontal" aria-hidden="true" style={{top: 3}} />} Show me more</span> : null} />
+                        message={show && showExpandOption ? (
+                                <span>
+                                    {showMoreLoading ? <AscribeSpinner size="sm" color="dark-blue" />
+                                                     : <span className="glyphicon glyphicon-option-horizontal" aria-hidden="true" style={{top: 3}} />}
+                                    {getLangText('Show me more')}
+                                </span>
+                            ) : null
+                        } />
                 </div>
             );
         } else {

js/components/ascribe_accordion_list/accordion_list_item_wallet.js

@@ -88,11 +88,12 @@ let AccordionListItemWallet = React.createClass({
     },
 
     onPollingSuccess(pieceId) {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
         EditionListActions.toggleEditionList(pieceId);
 
-        let notification = new GlobalNotificationModel('Editions successfully created', 'success', 10000);
+        const notification = new GlobalNotificationModel('Editions successfully created', 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 

js/components/ascribe_buttons/create_editions_button.js

@@ -28,6 +28,12 @@ let CreateEditionsButton = React.createClass({
         EditionListStore.listen(this.onChange);
     },
 
+    componentDidUpdate() {
+        if(this.props.piece.num_editions === 0 && typeof this.state.pollingIntervalIndex === 'undefined') {
+            this.startPolling();
+        }
+    },
+
     componentWillUnmount() {
         EditionListStore.unlisten(this.onChange);
         clearInterval(this.state.pollingIntervalIndex);
@@ -37,28 +43,24 @@ let CreateEditionsButton = React.createClass({
         this.setState(state);
     },
 
-    componentDidUpdate() {
-        if(this.props.piece.num_editions === 0 && typeof this.state.pollingIntervalIndex === 'undefined') {
-            this.startPolling();
-        }
-    },
-
     startPolling() {
         // start polling until editions are defined
         let pollingIntervalIndex = setInterval(() => {
 
             // requests, will try to merge the filterBy parameter with other parameters (mergeOptions).
             // Therefore it can't but null but instead has to be an empty object
-            EditionListActions.fetchEditionList(this.props.piece.id, null, null, null, null, {})
+            EditionListActions
-            .then((res) => {
+                .fetchEditionList({
-
+                    pieceId: this.props.piece.id,
-                clearInterval(this.state.pollingIntervalIndex);
+                    filterBy: {}
-                this.props.onPollingSuccess(this.props.piece.id, res.editions[0].num_editions);
+                })
-
+                .then((res) => {
-            })
+                    clearInterval(this.state.pollingIntervalIndex);
-            .catch((err) => {
+                    this.props.onPollingSuccess(this.props.piece.id, res.editions[0].num_editions);
-                /* Ignore and keep going */
+                })
-            });
+                .catch((err) => {
+                    /* Ignore and keep going */
+                });
         }, 5000);
 
         this.setState({

js/components/ascribe_detail/edition.js

@@ -1,7 +1,7 @@
 'use strict';
 
 import React from 'react';
-import { Link, History } from 'react-router';
+import { Link } from 'react-router';
 import Moment from 'moment';
 
 import Row from 'react-bootstrap/lib/Row';
@@ -44,8 +44,6 @@ let Edition = React.createClass({
         loadEdition: React.PropTypes.func
     },
 
-    mixins: [History],
-
     getDefaultProps() {
         return {
             furtherDetailsType: FurtherDetails
@@ -53,98 +51,103 @@ let Edition = React.createClass({
     },
 
     render() {
-        let FurtherDetailsType = this.props.furtherDetailsType;
+        const {
+            actionPanelButtonListType,
+            coaError,
+            currentUser,
+            edition,
+            furtherDetailsType: FurtherDetailsType,
+            loadEdition } = this.props;
 
         return (
             <Row>
                 <Col md={6} className="ascribe-print-col-left">
                     <MediaContainer
-                        content={this.props.edition}/>
+                        content={edition}
+                        currentUser={currentUser} />
                 </Col>
                 <Col md={6} className="ascribe-edition-details ascribe-print-col-right">
                     <div className="ascribe-detail-header">
                         <hr className="hidden-print" style={{marginTop: 0}}/>
-                        <h1 className="ascribe-detail-title">{this.props.edition.title}</h1>
+                        <h1 className="ascribe-detail-title">{edition.title}</h1>
-                        <DetailProperty label="BY" value={this.props.edition.artist_name} />
+                        <DetailProperty label="CREATED BY" value={edition.artist_name} />
-                        <DetailProperty label="DATE" value={Moment(this.props.edition.date_created, 'YYYY-MM-DD').year()} />
+                        <DetailProperty label="DATE" value={Moment(edition.date_created, 'YYYY-MM-DD').year()} />
                         <hr/>
                     </div>
                     <EditionSummary
-                        actionPanelButtonListType={this.props.actionPanelButtonListType}
+                        actionPanelButtonListType={actionPanelButtonListType}
-                        edition={this.props.edition}
+                        edition={edition}
-                        currentUser={this.props.currentUser}
+                        currentUser={currentUser}
-                        handleSuccess={this.props.loadEdition}/>
+                        handleSuccess={loadEdition}/>
                     <CollapsibleParagraph
                         title={getLangText('Certificate of Authenticity')}
-                        show={this.props.edition.acl.acl_coa === true}>
+                        show={edition.acl.acl_coa === true}>
                         <CoaDetails
-                            coa={this.props.edition.coa}
+                            coa={edition.coa}
-                            coaError={this.props.coaError}
+                            coaError={coaError}
-                            editionId={this.props.edition.bitcoin_id}/>
+                            editionId={edition.bitcoin_id}/>
                     </CollapsibleParagraph>
 
                     <CollapsibleParagraph
                         title={getLangText('Provenance/Ownership History')}
-                        show={this.props.edition.ownership_history && this.props.edition.ownership_history.length > 0}>
+                        show={edition.ownership_history && edition.ownership_history.length > 0}>
                         <HistoryIterator
-                            history={this.props.edition.ownership_history} />
+                            history={edition.ownership_history} />
                     </CollapsibleParagraph>
 
                     <CollapsibleParagraph
                         title={getLangText('Consignment History')}
-                        show={this.props.edition.consign_history && this.props.edition.consign_history.length > 0}>
+                        show={edition.consign_history && edition.consign_history.length > 0}>
                         <HistoryIterator
-                            history={this.props.edition.consign_history} />
+                            history={edition.consign_history} />
                     </CollapsibleParagraph>
 
                     <CollapsibleParagraph
                         title={getLangText('Loan History')}
-                        show={this.props.edition.loan_history && this.props.edition.loan_history.length > 0}>
+                        show={edition.loan_history && edition.loan_history.length > 0}>
                         <HistoryIterator
-                            history={this.props.edition.loan_history} />
+                            history={edition.loan_history} />
                     </CollapsibleParagraph>
 
                     <CollapsibleParagraph
                         title="Notes"
-                        show={!!(this.props.currentUser.username
+                        show={!!(currentUser.username || edition.acl.acl_edit || edition.public_note)}>
-                                || this.props.edition.acl.acl_edit
-                                || this.props.edition.public_note)}>
                         <Note
-                            id={() => {return {'bitcoin_id': this.props.edition.bitcoin_id}; }}
+                            id={() => {return {'bitcoin_id': edition.bitcoin_id}; }}
                             label={getLangText('Personal note (private)')}
-                            defaultValue={this.props.edition.private_note ? this.props.edition.private_note : null}
+                            defaultValue={edition.private_note ? edition.private_note : null}
                             placeholder={getLangText('Enter your comments ...')}
                             editable={true}
                             successMessage={getLangText('Private note saved')}
                             url={ApiUrls.note_private_edition}
-                            currentUser={this.props.currentUser}/>
+                            currentUser={currentUser}/>
                         <Note
-                            id={() => {return {'bitcoin_id': this.props.edition.bitcoin_id}; }}
+                            id={() => {return {'bitcoin_id': edition.bitcoin_id}; }}
                             label={getLangText('Personal note (public)')}
-                            defaultValue={this.props.edition.public_note ? this.props.edition.public_note : null}
+                            defaultValue={edition.public_note ? edition.public_note : null}
                             placeholder={getLangText('Enter your comments ...')}
-                            editable={!!this.props.edition.acl.acl_edit}
+                            editable={!!edition.acl.acl_edit}
-                            show={!!this.props.edition.public_note || !!this.props.edition.acl.acl_edit}
+                            show={!!edition.public_note || !!edition.acl.acl_edit}
                             successMessage={getLangText('Public edition note saved')}
                             url={ApiUrls.note_public_edition}
-                            currentUser={this.props.currentUser}/>
+                            currentUser={currentUser}/>
                     </CollapsibleParagraph>
                     <CollapsibleParagraph
                         title={getLangText('Further Details')}
-                        show={this.props.edition.acl.acl_edit
+                        show={edition.acl.acl_edit ||
-                            || Object.keys(this.props.edition.extra_data).length > 0
+                              Object.keys(edition.extra_data).length > 0 ||
-                            || this.props.edition.other_data.length > 0}>
+                              edition.other_data.length > 0}>
                         <FurtherDetailsType
-                            editable={this.props.edition.acl.acl_edit}
+                            editable={edition.acl.acl_edit}
-                            pieceId={this.props.edition.parent}
+                            pieceId={edition.parent}
-                            extraData={this.props.edition.extra_data}
+                            extraData={edition.extra_data}
-                            otherData={this.props.edition.other_data}
+                            otherData={edition.other_data}
-                            handleSuccess={this.props.loadEdition} />
+                            handleSuccess={loadEdition} />
                     </CollapsibleParagraph>
                     <CollapsibleParagraph
                         title={getLangText('SPOOL Details')}>
                         <SpoolDetails
-                            edition={this.props.edition} />
+                            edition={edition} />
                     </CollapsibleParagraph>
                 </Col>
             </Row>
@@ -221,7 +224,11 @@ let EditionSummary = React.createClass({
 let CoaDetails = React.createClass({
     propTypes: {
         editionId: React.PropTypes.string,
-        coa: React.PropTypes.object,
+        coa: React.PropTypes.oneOfType([
+            React.PropTypes.number,
+            React.PropTypes.string,
+            React.PropTypes.object
+        ]),
         coaError: React.PropTypes.object
     },
 

js/components/ascribe_detail/edition_action_panel.js

@@ -72,19 +72,20 @@ let EditionActionPanel = React.createClass({
         EditionListActions.closeAllEditionLists();
         EditionListActions.clearAllEditionSelections();
 
-        let notification = new GlobalNotificationModel(response.notification, 'success');
+        const notification = new GlobalNotificationModel(response.notification, 'success');
         GlobalNotificationActions.appendGlobalNotification(notification);
 
-        this.history.pushState(null, '/collection');
+        this.history.push('/collection');
     },
 
     refreshCollection() {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+
-        EditionListActions.refreshEditionList({pieceId: this.props.edition.parent});
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
+        EditionListActions.refreshEditionList({ pieceId: this.props.edition.parent });
     },
 
-    handleSuccess(response){
+    handleSuccess(response) {
         this.refreshCollection();
         this.props.handleSuccess();
         if (response){
@@ -93,7 +94,7 @@ let EditionActionPanel = React.createClass({
         }
     },
 
-    render(){
+    render() {
         const {
             actionPanelButtonListType: ActionPanelButtonListType,
             edition,

js/components/ascribe_detail/edition_container.js

@@ -35,7 +35,7 @@ let EditionContainer = React.createClass({
 
     getInitialState() {
         return mergeOptions(
-            EditionStore.getState(),
+            EditionStore.getInitialState(),
             UserStore.getState()
         );
     },
@@ -44,27 +44,23 @@ let EditionContainer = React.createClass({
         EditionStore.listen(this.onChange);
         UserStore.listen(this.onChange);
 
-        // Every time we're entering the edition detail page,
+        this.loadEdition();
-        // 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.flushEdition();
-        EditionActions.fetchEdition(this.props.params.editionId);
-
         UserActions.fetchCurrentUser();
     },
 
     // This is done to update the container when the user clicks on the prev or next
     // button to update the URL parameter (and therefore to switch pieces)
     componentWillReceiveProps(nextProps) {
-        if(this.props.params.editionId !== nextProps.params.editionId) {
+        if (this.props.params.editionId !== nextProps.params.editionId) {
-            EditionActions.fetchEdition(this.props.params.editionId);
+            EditionActions.flushEdition();
+            this.loadEdition(nextProps.params.editionId);
         }
     },
 
     componentDidUpdate() {
-        const { editionMeta } = this.state;
+        const { err: editionErr } = this.state.editionMeta;
-        if(editionMeta.err && editionMeta.err.json && editionMeta.err.json.status === 404) {
+
+        if (editionErr && editionErr.json && editionErr.json.status === 404) {
             this.throws(new ResourceNotFoundError(getLangText("Oops, the edition you're looking for doesn't exist.")));
         }
     },
@@ -81,18 +77,22 @@ let EditionContainer = React.createClass({
         if(state && state.edition && state.edition.digital_work) {
             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);
+                let timerId = window.setInterval(() => EditionActions.fetchEdition(this.props.params.editionId), 10000);
                 this.setState({timerId: timerId});
             }
         }
     },
 
+    loadEdition(editionId = this.props.params.editionId) {
+        EditionActions.fetchEdition(editionId);
+    },
+
     render() {
         const { edition, currentUser, coaMeta } = this.state;
         const { actionPanelButtonListType, furtherDetailsType } = this.props;
 
-        if (Object.keys(edition).length && edition.id) {
+        if (edition.id) {
-            setDocumentTitle([edition.artist_name, edition.title].join(', '));
+            setDocumentTitle(`${edition.artist_name}, ${edition.title}`);
 
             return (
                 <Edition
@@ -101,7 +101,7 @@ let EditionContainer = React.createClass({
                     edition={edition}
                     coaError={coaMeta.err}
                     currentUser={currentUser}
-                    loadEdition={() => EditionActions.fetchEdition(this.props.params.editionId)} />
+                    loadEdition={this.loadEdition} />
             );
         } else {
             return (

js/components/ascribe_detail/further_details.js

@@ -5,25 +5,27 @@ import React from 'react';
 import Row from 'react-bootstrap/lib/Row';
 import Col from 'react-bootstrap/lib/Col';
 
-import Form from './../ascribe_forms/form';
-
-import PieceExtraDataForm from './../ascribe_forms/form_piece_extradata';
-
 import GlobalNotificationModel from '../../models/global_notification_model';
 import GlobalNotificationActions from '../../actions/global_notification_actions';
 
 import FurtherDetailsFileuploader from './further_details_fileuploader';
 
+import Form from './../ascribe_forms/form';
+import PieceExtraDataForm from './../ascribe_forms/form_piece_extradata';
+
 import { formSubmissionValidation } from '../ascribe_uploader/react_s3_fine_uploader_utils';
 
+import { getLangText } from '../../utils/lang_utils';
+
 
 let FurtherDetails = React.createClass({
     propTypes: {
+        pieceId: React.PropTypes.number.isRequired,
+
         editable: React.PropTypes.bool,
-        pieceId: React.PropTypes.number,
         extraData: React.PropTypes.object,
+        handleSuccess: React.PropTypes.func,
         otherData: React.PropTypes.arrayOf(React.PropTypes.object),
-        handleSuccess: React.PropTypes.func
     },
 
     getInitialState() {
@@ -32,13 +34,18 @@ let FurtherDetails = React.createClass({
         };
     },
 
-    showNotification(){
+    showNotification() {
-        this.props.handleSuccess();
+        const { handleSuccess } = this.props;
-        let notification = new GlobalNotificationModel('Details updated', 'success');
+
+        if (typeof handleSucess === 'function') {
+            handleSuccess();
+        }
+
+        const notification = new GlobalNotificationModel(getLangText('Details updated'), 'success');
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 
-    submitFile(file){
+    submitFile(file) {
         this.setState({
             otherDataKey: file.key
         });
@@ -51,40 +58,42 @@ let FurtherDetails = React.createClass({
     },
 
     render() {
+        const { editable, extraData, otherData, pieceId } = this.props;
+
         return (
             <Row>
                 <Col md={12} className="ascribe-edition-personal-note">
                     <PieceExtraDataForm
                         name='artist_contact_info'
                         title='Artist Contact Info'
+                        convertLinks
+                        editable={editable}
+                        extraData={extraData}
                         handleSuccess={this.showNotification}
-                        editable={this.props.editable}
+                        pieceId={pieceId} />
-                        pieceId={this.props.pieceId}
-                        extraData={this.props.extraData}
-                        />
                     <PieceExtraDataForm
                         name='display_instructions'
                         title='Display Instructions'
+                        editable={editable}
+                        extraData={extraData}
                         handleSuccess={this.showNotification}
-                        editable={this.props.editable}
+                        pieceId={pieceId} />
-                        pieceId={this.props.pieceId}
-                        extraData={this.props.extraData} />
                     <PieceExtraDataForm
                         name='technology_details'
                         title='Technology Details'
+                        editable={editable}
+                        extraData={extraData}
                         handleSuccess={this.showNotification}
-                        editable={this.props.editable}
+                        pieceId={pieceId} />
-                        pieceId={this.props.pieceId}
-                        extraData={this.props.extraData} />
                     <Form>
                         <FurtherDetailsFileuploader
                             submitFile={this.submitFile}
                             setIsUploadReady={this.setIsUploadReady}
                             isReadyForFormSubmission={formSubmissionValidation.atLeastOneUploadedFile}
-                            editable={this.props.editable}
+                            editable={editable}
                             overrideForm={true}
-                            pieceId={this.props.pieceId}
+                            pieceId={pieceId}
-                            otherData={this.props.otherData}
+                            otherData={otherData}
                             multiple={true} />
                     </Form>
                 </Col>

js/components/ascribe_detail/further_details_fileuploader.js

@@ -8,6 +8,7 @@ import ReactS3FineUploader from './../ascribe_uploader/react_s3_fine_uploader';
 
 import ApiUrls from '../../constants/api_urls';
 import AppConstants from '../../constants/application_constants';
+import { validationTypes } from '../../constants/uploader_constants';
 
 import { getCookie } from '../../utils/fetch_api_utils';
 import { getLangText } from '../../utils/lang_utils';
@@ -15,21 +16,26 @@ import { getLangText } from '../../utils/lang_utils';
 
 let FurtherDetailsFileuploader = React.createClass({
     propTypes: {
+        pieceId: React.PropTypes.number.isRequired,
+
+        areAssetsDownloadable: React.PropTypes.bool,
+        editable: React.PropTypes.bool,
+        isReadyForFormSubmission: React.PropTypes.func,
         label: React.PropTypes.string,
-        pieceId: React.PropTypes.number,
+        multiple: React.PropTypes.bool,
         otherData: React.PropTypes.arrayOf(React.PropTypes.object),
+        onValidationFailed: React.PropTypes.func,
         setIsUploadReady: React.PropTypes.func,
         submitFile: React.PropTypes.func,
-        onValidationFailed: React.PropTypes.func,
+        validation: ReactS3FineUploader.propTypes.validation
-        isReadyForFormSubmission: React.PropTypes.func,
-        editable: React.PropTypes.bool,
-        multiple: React.PropTypes.bool
     },
 
     getDefaultProps() {
         return {
+            areAssetsDownloadable: true,
             label: getLangText('Additional files'),
-            multiple: false
+            multiple: false,
+            validation: validationTypes.additionalData
         };
     },
 
@@ -59,7 +65,7 @@ let FurtherDetailsFileuploader = React.createClass({
                         url: ApiUrls.blob_otherdatas,
                         pieceId: this.props.pieceId
                     }}
-                    validation={AppConstants.fineUploader.validation.additionalData}
+                    validation={this.props.validation}
                     submitFile={this.props.submitFile}
                     onValidationFailed={this.props.onValidationFailed}
                     setIsUploadReady={this.props.setIsUploadReady}
@@ -91,7 +97,7 @@ let FurtherDetailsFileuploader = React.createClass({
                            'X-CSRFToken': getCookie(AppConstants.csrftoken)
                         }
                     }}
-                    areAssetsDownloadable={true}
+                    areAssetsDownloadable={this.props.areAssetsDownloadable}
                     areAssetsEditable={this.props.editable}
                     multiple={this.props.multiple} />
             </Property>

js/components/ascribe_detail/media_container.js

@@ -14,11 +14,9 @@ import CollapsibleButton from './../ascribe_collapsible/collapsible_button';
 
 import AclProxy from '../acl_proxy';
 
-import UserActions from '../../actions/user_actions';
+import { getLangText } from '../../utils/lang_utils';
-import UserStore from '../../stores/user_store';
+import { extractFileExtensionFromString } from '../../utils/file_utils';
 
-import { mergeOptions } from '../../utils/general_utils.js';
-import { getLangText } from '../../utils/lang_utils.js';
 
 const EMBED_IFRAME_HEIGHT = {
     video: 315,
@@ -28,25 +26,22 @@ const EMBED_IFRAME_HEIGHT = {
 let MediaContainer = React.createClass({
     propTypes: {
         content: React.PropTypes.object,
+        currentUser: React.PropTypes.object,
         refreshObject: React.PropTypes.func
     },
 
     getInitialState() {
-        return mergeOptions(
+        return {
-            UserStore.getState(),
+            timerId: null
-            {
+        };
-                timerId: null
-            });
     },
 
     componentDidMount() {
-        UserStore.listen(this.onChange);
-        UserActions.fetchCurrentUser();
-
         if (!this.props.content.digital_work) {
             return;
         }
-        let isEncoding = this.props.content.digital_work.isEncoding;
+
+        const isEncoding = this.props.content.digital_work.isEncoding;
         if (this.props.content.digital_work.mime === 'video' && typeof isEncoding === 'number' && isEncoding !== 100 && !this.state.timerId) {
             let timerId = window.setInterval(this.props.refreshObject, 10000);
             this.setState({timerId: timerId});
@@ -60,22 +55,26 @@ let MediaContainer = React.createClass({
     },
 
     componentWillUnmount() {
-        UserStore.unlisten(this.onChange);
-
         window.clearInterval(this.state.timerId);
     },
 
-    onChange(state) {
-        this.setState(state);
-    },
-
     render() {
-        const { content } = this.props;
+        const { content, currentUser } = this.props;
         // Pieces and editions are joined to the user by a foreign key in the database, so
         // the information in content will be updated if a user updates their username.
         // We also force uniqueness of usernames, so this check is safe to dtermine if the
         // content was registered by the current user.
-        const didUserRegisterContent = this.state.currentUser && (this.state.currentUser.username === content.user_registered);
+        const didUserRegisterContent = currentUser && (currentUser.username === content.user_registered);
+
+        // We want to show the file's extension as a label of the download button.
+        // We can however not only use `extractFileExtensionFromString` on the url for that
+        // as files might be saved on S3 without a file extension which leads
+        // `extractFileExtensionFromString` to extract everything starting from the top level
+        // domain: e.g. '.net/live/<hash>'.
+        // Therefore, we extract the file's name (last part of url, separated with a slash)
+        // and try to extract the file extension from there.
+        const fileName = content.digital_work.url.split('/').pop();
+        const fileExtension = extractFileExtensionFromString(fileName);
 
         let thumbnail = content.thumbnail.thumbnail_sizes && content.thumbnail.thumbnail_sizes['600x600'] ?
             content.thumbnail.thumbnail_sizes['600x600'] : content.thumbnail.url_safe;
@@ -94,8 +93,11 @@ let MediaContainer = React.createClass({
             embed = (
                 <CollapsibleButton
                     button={
-                        <Button bsSize="xsmall" className="ascribe-margin-1px" disabled={isEmbedDisabled ? '"disabled"' : ''}>
+                        <Button
-                            Embed
+                            bsSize="xsmall"
+                            className="ascribe-margin-1px"
+                            disabled={isEmbedDisabled}>
+                            {getLangText('Embed')}
                         </Button>
                     }
                     panel={
@@ -125,8 +127,16 @@ let MediaContainer = React.createClass({
                         show={['video', 'audio', 'image'].indexOf(mimetype) === -1 || content.acl.acl_download}
                         aclObject={content.acl}
                         aclName="acl_download">
-                        <Button bsSize="xsmall" className="ascribe-margin-1px" href={this.props.content.digital_work.url} target="_blank">
+                        <Button
-                            Download .{mimetype} <Glyphicon glyph="cloud-download"/>
+                            bsSize="xsmall"
+                            className="ascribe-margin-1px"
+                            href={content.digital_work.url}
+                            target="_blank">
+                            {/*
+                                If it turns out that `fileExtension` is an empty string, we're just
+                                using the label 'file'.
+                            */}
+                            {getLangText('Download')} .{fileExtension || 'file'} <Glyphicon glyph="cloud-download"/>
                         </Button>
                     </AclProxy>
                     {embed}

js/components/ascribe_detail/piece.js

@@ -16,10 +16,10 @@ import MediaContainer from './media_container';
 let Piece = React.createClass({
     propTypes: {
         piece: React.PropTypes.object,
+        currentUser: React.PropTypes.object,
         header: React.PropTypes.object,
         subheader: React.PropTypes.object,
         buttons: React.PropTypes.object,
-        loadPiece: React.PropTypes.func,
         children: React.PropTypes.oneOfType([
             React.PropTypes.arrayOf(React.PropTypes.element),
             React.PropTypes.element
@@ -28,24 +28,26 @@ let Piece = React.createClass({
 
 
     updateObject() {
-        return PieceActions.fetchOne(this.props.piece.id);
+        return PieceActions.fetchPiece(this.props.piece.id);
     },
 
     render() {
+        const { buttons, children, currentUser, header, piece, subheader } = this.props;
+
         return (
             <Row>
                 <Col md={6} className="ascribe-print-col-left">
                     <MediaContainer
-                        refreshObject={this.updateObject}
+                        content={piece}
-                        content={this.props.piece}/>
+                        currentUser={currentUser}
+                        refreshObject={this.updateObject} />
                 </Col>
                 <Col md={6} className="ascribe-edition-details ascribe-print-col-right">
-                    {this.props.header}
+                    {header}
-                    {this.props.subheader}
+                    {subheader}
-                    {this.props.buttons}
+                    {buttons}
-
-                    {this.props.children}
 
+                    {children}
                 </Col>
             </Row>
         );

js/components/ascribe_detail/piece_container.js

@@ -69,7 +69,7 @@ let PieceContainer = React.createClass({
         return mergeOptions(
             UserStore.getState(),
             PieceListStore.getState(),
-            PieceStore.getState(),
+            PieceStore.getInitialState(),
             {
                 showCreateEditionsDialog: false
             }
@@ -81,19 +81,24 @@ let PieceContainer = React.createClass({
         PieceListStore.listen(this.onChange);
         PieceStore.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.loadPiece();
         UserActions.fetchCurrentUser();
     },
 
-    componentDidUpdate() {
+    // This is done to update the container when the user clicks on the prev or next
-        const { pieceError } = this.state;
+    // button to update the URL parameter (and therefore to switch pieces) or
+    // when the user clicks on a notification while being in another piece view
+    componentWillReceiveProps(nextProps) {
+        if (this.props.params.pieceId !== nextProps.params.pieceId) {
+            PieceActions.flushPiece();
+            this.loadPiece(nextProps.params.pieceId);
+        }
+    },
 
-        if (pieceError && pieceError.status === 404) {
+    componentDidUpdate() {
+        const { err: pieceErr } = this.state.pieceMeta;
+
+        if (pieceErr && pieceErr.json && pieceErr.json.status === 404) {
             this.throws(new ResourceNotFoundError(getLangText("Oops, the piece you're looking for doesn't exist.")));
         }
     },
@@ -116,8 +121,7 @@ let PieceContainer = React.createClass({
             ALSO, WE ENABLED THE LOAN BUTTON FOR IKONOTV TO LET THEM LOAN ON A PIECE LEVEL
 
          */
-        if(state && state.piece && state.piece.acl && typeof state.piece.acl.acl_loan !== 'undefined') {
+        if (state && state.piece && state.piece.acl && typeof state.piece.acl.acl_loan !== 'undefined') {
-
             let pieceState = mergeOptions({}, state.piece);
             pieceState.acl.acl_loan = false;
             this.setState({
@@ -129,11 +133,10 @@ let PieceContainer = React.createClass({
         }
     },
 
-    loadPiece() {
+    loadPiece(pieceId = this.props.params.pieceId) {
-        PieceActions.fetchOne(this.props.params.pieceId);
+        PieceActions.fetchPiece(pieceId);
     },
 
-
     toggleCreateEditionsDialog() {
         this.setState({
             showCreateEditionsDialog: !this.state.showCreateEditionsDialog
@@ -141,43 +144,47 @@ let PieceContainer = React.createClass({
     },
 
     handleEditionCreationSuccess() {
-        PieceActions.updateProperty({key: 'num_editions', value: 0});
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
+
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+        PieceActions.updateProperty({ key: 'num_editions', value: 0 });
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
+
         this.toggleCreateEditionsDialog();
     },
 
     handleDeleteSuccess(response) {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
 
         // since we're deleting a piece, we just need to close
         // all editions dialogs and not reload them
         EditionListActions.closeAllEditionLists();
         EditionListActions.clearAllEditionSelections();
 
-        let notification = new GlobalNotificationModel(response.notification, 'success');
+        const notification = new GlobalNotificationModel(response.notification, 'success');
         GlobalNotificationActions.appendGlobalNotification(notification);
 
-        this.history.pushState(null, '/collection');
+        this.history.push('/collection');
     },
 
     getCreateEditionsDialog() {
-        if(this.state.piece.num_editions < 1 && this.state.showCreateEditionsDialog) {
+        if (this.state.piece.num_editions < 1 && this.state.showCreateEditionsDialog) {
             return (
                 <div style={{marginTop: '1em'}}>
                     <CreateEditionsForm
                         pieceId={this.state.piece.id}
                         handleSuccess={this.handleEditionCreationSuccess} />
-                    <hr/>
+                    <hr />
                 </div>
             );
         } else {
-            return (<hr/>);
+            return (<hr />);
         }
     },
 
     handlePollingSuccess(pieceId, numEditions) {
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
 
         // we need to refresh the num_editions property of the actual piece we're looking at
         PieceActions.updateProperty({
@@ -189,27 +196,26 @@ let PieceContainer = React.createClass({
         // btw.: It's not sufficient to just set num_editions to numEditions, since a single accordion
         // list item also uses the firstEdition property which we can only get from the server in that case.
         // Therefore we need to at least refetch the changed piece from the server or on our case simply all
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
 
-        let notification = new GlobalNotificationModel('Editions successfully created', 'success', 10000);
+        const notification = new GlobalNotificationModel(getLangText('Editions successfully created'), 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 
     getId() {
-        return {'id': this.state.piece.id};
+        return { 'id': this.state.piece.id };
     },
 
     getActions() {
         const { piece, currentUser } = this.state;
 
-        if (piece && piece.notifications && piece.notifications.length > 0) {
+        if (piece.notifications && piece.notifications.length > 0) {
             return (
                 <ListRequestActions
                     pieceOrEditions={piece}
                     currentUser={currentUser}
                     handleSuccess={this.loadPiece}
-                    notifications={piece.notifications}/>);
+                    notifications={piece.notifications} />);
         } else {
             return (
                 <AclProxy
@@ -235,12 +241,12 @@ let PieceContainer = React.createClass({
                                     onPollingSuccess={this.handlePollingSuccess}/>
                                 <DeleteButton
                                     handleSuccess={this.handleDeleteSuccess}
-                                    piece={piece}/>
+                                    piece={piece} />
                                 <AclInformation
                                     aim="button"
                                     verbs={['acl_share', 'acl_transfer', 'acl_create_editions', 'acl_loan', 'acl_delete',
                                             'acl_consign']}
-                                    aclObject={piece.acl}/>
+                                    aclObject={piece.acl} />
                         </AclButtonList>
                     </DetailProperty>
                 </AclProxy>
@@ -249,76 +255,76 @@ let PieceContainer = React.createClass({
     },
 
     render() {
-        if (this.state.piece && this.state.piece.id) {
+        const { furtherDetailsType: FurtherDetailsType } = this.props;
-            let FurtherDetailsType = this.props.furtherDetailsType;
+        const { currentUser, piece } = this.state;
-            setDocumentTitle([this.state.piece.artist_name, this.state.piece.title].join(', '));
+
+        if (piece.id) {
+            setDocumentTitle(`${piece.artist_name}, ${piece.title}`);
 
             return (
                 <Piece
-                    piece={this.state.piece}
+                    piece={piece}
-                    loadPiece={this.loadPiece}
+                    currentUser={currentUser}
                     header={
                         <div className="ascribe-detail-header">
-                            <hr className="hidden-print" style={{marginTop: 0}}/>
+                            <hr className="hidden-print" style={{marginTop: 0}} />
-                            <h1 className="ascribe-detail-title">{this.state.piece.title}</h1>
+                            <h1 className="ascribe-detail-title">{piece.title}</h1>
-                            <DetailProperty label="BY" value={this.state.piece.artist_name} />
+                            <DetailProperty label="CREATED BY" value={piece.artist_name} />
-                            <DetailProperty label="DATE" value={Moment(this.state.piece.date_created, 'YYYY-MM-DD').year() } />
+                            <DetailProperty label="DATE" value={Moment(piece.date_created, 'YYYY-MM-DD').year() } />
-                            {this.state.piece.num_editions > 0 ? <DetailProperty label="EDITIONS" value={ this.state.piece.num_editions } /> : null}
+                            {piece.num_editions > 0 ? <DetailProperty label="EDITIONS" value={ piece.num_editions } /> : null}
                             <hr/>
                         </div>
                         }
                     subheader={
                         <div className="ascribe-detail-header">
-                            <DetailProperty label={getLangText('REGISTREE')} value={ this.state.piece.user_registered } />
+                            <DetailProperty label={getLangText('ASCRIBED BY')} value={ piece.user_registered } />
-                            <DetailProperty label={getLangText('ID')} value={ this.state.piece.bitcoin_id } ellipsis={true} />
+                            <DetailProperty label={getLangText('ID')} value={ piece.bitcoin_id } ellipsis={true} />
-                            <LicenseDetail license={this.state.piece.license_type} />
+                            <LicenseDetail license={piece.license_type} />
                         </div>
                     }
                     buttons={this.getActions()}>
                     {this.getCreateEditionsDialog()}
                     <CollapsibleParagraph
                         title={getLangText('Loan History')}
-                        show={this.state.piece.loan_history && this.state.piece.loan_history.length > 0}>
+                        show={piece.loan_history && piece.loan_history.length > 0}>
                         <HistoryIterator
-                            history={this.state.piece.loan_history} />
+                            history={piece.loan_history} />
                     </CollapsibleParagraph>
                     <CollapsibleParagraph
                         title={getLangText('Notes')}
-                        show={!!(this.state.currentUser.username
+                        show={!!(currentUser.username || piece.acl.acl_edit || piece.public_note)}>
-                                || this.state.piece.acl.acl_edit
-                                || this.state.piece.public_note)}>
                         <Note
                             id={this.getId}
                             label={getLangText('Personal note (private)')}
-                            defaultValue={this.state.piece.private_note || null}
+                            defaultValue={piece.private_note || null}
-                            show = {!!this.state.currentUser.username}
+                            show = {!!currentUser.username}
                             placeholder={getLangText('Enter your comments ...')}
                             editable={true}
                             successMessage={getLangText('Private note saved')}
                             url={ApiUrls.note_private_piece}
-                            currentUser={this.state.currentUser}/>
+                            currentUser={currentUser} />
                         <Note
                             id={this.getId}
                             label={getLangText('Personal note (public)')}
-                            defaultValue={this.state.piece.public_note || null}
+                            defaultValue={piece.public_note || null}
                             placeholder={getLangText('Enter your comments ...')}
-                            editable={!!this.state.piece.acl.acl_edit}
+                            editable={!!piece.acl.acl_edit}
-                            show={!!(this.state.piece.public_note || this.state.piece.acl.acl_edit)}
+                            show={!!(piece.public_note || piece.acl.acl_edit)}
                             successMessage={getLangText('Public note saved')}
                             url={ApiUrls.note_public_piece}
-                            currentUser={this.state.currentUser}/>
+                            currentUser={currentUser} />
                     </CollapsibleParagraph>
                     <CollapsibleParagraph
                         title={getLangText('Further Details')}
-                        show={this.state.piece.acl.acl_edit
+                        show={piece.acl.acl_edit
-                            || Object.keys(this.state.piece.extra_data).length > 0
+                            || Object.keys(piece.extra_data).length > 0
-                            || this.state.piece.other_data.length > 0}
+                            || piece.other_data.length > 0}
                         defaultExpanded={true}>
                         <FurtherDetailsType
-                            editable={this.state.piece.acl.acl_edit}
+                            editable={piece.acl.acl_edit}
-                            pieceId={this.state.piece.id}
+                            pieceId={piece.id}
-                            extraData={this.state.piece.extra_data}
+                            extraData={piece.extra_data}
-                            otherData={this.state.piece.other_data}
+                            otherData={piece.other_data}
                             handleSuccess={this.loadPiece} />
                     </CollapsibleParagraph>
 

js/components/ascribe_forms/create_editions_form.js

@@ -19,7 +19,7 @@ let CreateEditionsForm = React.createClass({
         pieceId: React.PropTypes.number
     },
 
-    getFormData(){
+    getFormData() {
         return {
             piece_id: parseInt(this.props.pieceId, 10)
         };
@@ -58,11 +58,12 @@ let CreateEditionsForm = React.createClass({
                     <input
                         type="number"
                         placeholder="(e.g. 32)"
-                        min={1}/>
+                        min={1}
+                        max={100} />
                 </Property>
             </Form>
         );
     }
 });
 
-export default CreateEditionsForm;
+export default CreateEditionsForm;

js/components/ascribe_forms/form.js

@@ -205,16 +205,15 @@ let Form = React.createClass({
     },
 
     getButtons() {
-        if (this.state.submitted){
+        if (this.state.submitted) {
             return this.props.spinner;
         }
-        if (this.props.buttons){
+        if (this.props.buttons !== undefined) {
             return this.props.buttons;
         }
-        let buttons = null;
 
-        if (this.state.edited && !this.props.disabled){
+        if (this.state.edited && !this.props.disabled) {
-            buttons = (
+            return (
                 <div className="row" style={{margin: 0}}>
                     <p className="pull-right">
                         <Button
@@ -230,9 +229,9 @@ let Form = React.createClass({
                     </p>
                 </div>
             );
-
+        } else {
+            return null;
         }
-        return buttons;
     },
 
     getErrors() {

js/components/ascribe_forms/form_create_contract.js

@@ -2,19 +2,20 @@
 
 import React from 'react';
 
-import Form from '../ascribe_forms/form';
+import ContractListActions from '../../actions/contract_list_actions';
-import Property from '../ascribe_forms/property';
 
 import GlobalNotificationModel from '../../models/global_notification_model';
 import GlobalNotificationActions from '../../actions/global_notification_actions';
 
-import ContractListActions from '../../actions/contract_list_actions';
-
-import AppConstants from '../../constants/application_constants';
-import ApiUrls from '../../constants/api_urls';
-
 import InputFineUploader from './input_fineuploader';
 
+import Form from '../ascribe_forms/form';
+import Property from '../ascribe_forms/property';
+
+import ApiUrls from '../../constants/api_urls';
+import AppConstants from '../../constants/application_constants';
+import { validationTypes } from '../../constants/uploader_constants';
+
 import { getLangText } from '../../utils/lang_utils';
 import { formSubmissionValidation } from '../ascribe_uploader/react_s3_fine_uploader_utils';
 
@@ -78,8 +79,8 @@ let CreateContractForm = React.createClass({
                             url: ApiUrls.blob_contracts
                         }}
                         validation={{
-                            itemLimit: AppConstants.fineUploader.validation.additionalData.itemLimit,
+                            itemLimit: validationTypes.additionalData.itemLimit,
-                            sizeLimit: AppConstants.fineUploader.validation.additionalData.sizeLimit,
+                            sizeLimit: validationTypes.additionalData.sizeLimit,
                             allowedExtensions: ['pdf']
                         }}
                         areAssetsDownloadable={true}

js/components/ascribe_forms/form_piece_extradata.js

@@ -13,43 +13,48 @@ import InputTextAreaToggable from './input_textarea_toggable';
 
 let PieceExtraDataForm = React.createClass({
     propTypes: {
-        pieceId: React.PropTypes.number,
+        name: React.PropTypes.string.isRequired,
+        pieceId: React.PropTypes.number.isRequired,
+
+        convertLinks: React.PropTypes.bool,
+        editable: React.PropTypes.bool,
         extraData: React.PropTypes.object,
         handleSuccess: React.PropTypes.func,
-        name: React.PropTypes.string,
+        title: React.PropTypes.string
-        title: React.PropTypes.string,
-        editable: React.PropTypes.bool
     },
 
     getFormData() {
-        let extradata = {};
-        extradata[this.props.name] = this.refs.form.refs[this.props.name].state.value;
         return {
-            extradata: extradata,
+            extradata: {
+                [this.props.name]: this.refs.form.refs[this.props.name].state.value
+            },
             piece_id: this.props.pieceId
         };
     },
-    
+
     render() {
-        let defaultValue = this.props.extraData[this.props.name] || '';
+        const { convertLinks, editable, extraData, handleSuccess, name, pieceId, title } = this.props;
-        if (defaultValue.length === 0 && !this.props.editable){
+        const defaultValue = (extraData && extraData[name]) || null;
+
+        if (!defaultValue && !editable) {
             return null;
         }
-        let url = requests.prepareUrl(ApiUrls.piece_extradata, {piece_id: this.props.pieceId});
+
         return (
             <Form
                 ref='form'
-                url={url}
+                disabled={!editable}
-                handleSuccess={this.props.handleSuccess}
                 getFormData={this.getFormData}
-                disabled={!this.props.editable}>
+                handleSuccess={handleSuccess}
+                url={requests.prepareUrl(ApiUrls.piece_extradata, { piece_id: pieceId })}>
                 <Property
-                    name={this.props.name}
+                    name={name}
-                    label={this.props.title}>
+                    label={title}>
                     <InputTextAreaToggable
                         rows={1}
+                        convertLinks={convertLinks}
                         defaultValue={defaultValue}
-                        placeholder={getLangText('Fill in%s', ' ') + this.props.title}
+                        placeholder={getLangText('Fill in%s', ' ') + title}
                         required />
                 </Property>
                 <hr />

js/components/ascribe_forms/form_register_piece.js

@@ -8,12 +8,16 @@ import UserActions from '../../actions/user_actions';
 import Form from './form';
 import Property from './property';
 import InputFineUploader from './input_fineuploader';
-import UploadButton from '../ascribe_uploader/ascribe_upload_button/upload_button';
+
 import FormSubmitButton from '../ascribe_buttons/form_submit_button';
 
+import UploadButton from '../ascribe_uploader/ascribe_upload_button/upload_button';
+
+import AscribeSpinner from '../ascribe_spinner';
+
 import ApiUrls from '../../constants/api_urls';
 import AppConstants from '../../constants/application_constants';
-import AscribeSpinner from '../ascribe_spinner';
+import { validationParts, validationTypes } from '../../constants/uploader_constants';
 
 import { getLangText } from '../../utils/lang_utils';
 import { mergeOptions } from '../../utils/general_utils';
@@ -180,7 +184,7 @@ let RegisterPieceForm = React.createClass({
                         createBlobRoutine={{
                             url: ApiUrls.blob_digitalworks
                         }}
-                        validation={AppConstants.fineUploader.validation.registerWork}
+                        validation={validationTypes.registerWork}
                         setIsUploadReady={this.setIsUploadReady('digitalWorkKeyReady')}
                         isReadyForFormSubmission={formSubmissionValidation.atLeastOneUploadedFile}
                         isFineUploaderActive={isFineUploaderActive}
@@ -206,9 +210,9 @@ let RegisterPieceForm = React.createClass({
                             fileClass: 'thumbnail'
                         }}
                         validation={{
-                            itemLimit: AppConstants.fineUploader.validation.workThumbnail.itemLimit,
+                            itemLimit: validationTypes.workThumbnail.itemLimit,
-                            sizeLimit: AppConstants.fineUploader.validation.workThumbnail.sizeLimit,
+                            sizeLimit: validationTypes.workThumbnail.sizeLimit,
-                            allowedExtensions: ['png', 'jpg', 'jpeg', 'gif']
+                            allowedExtensions: validationParts.allowedExtensions.images
                         }}
                         setIsUploadReady={this.setIsUploadReady('thumbnailKeyReady')}
                         fileClassToUpload={{
@@ -216,9 +220,7 @@ let RegisterPieceForm = React.createClass({
                             plural: getLangText('Select representative images')
                         }}
                         isFineUploaderActive={isFineUploaderActive}
-                        disabled={!isFineUploaderEditable}
+                        disabled={!isFineUploaderEditable} />
-                        enableLocalHashing={enableLocalHashing}
-                        uploadMethod={location.query.method} />
                 </Property>
                 <Property
                     name='artist_name'

js/components/ascribe_forms/form_send_contract_agreement.js

@@ -58,7 +58,7 @@ let SendContractAgreementForm = React.createClass({
         notification = new GlobalNotificationModel(notification, 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
 
-        this.history.pushState(null, '/collection');
+        this.history.push('/collection');
     },
 
     getFormData() {

js/components/ascribe_forms/input_fineuploader.js

@@ -28,11 +28,7 @@ const InputFineUploader = React.createClass({
         createBlobRoutine: shape({
             url: string
         }),
-        validation: shape({
+        validation: ReactS3FineUploader.propTypes.validation,
-            itemLimit: number,
-            sizeLimit: string,
-            allowedExtensions: arrayOf(string)
-        }),
 
         // isFineUploaderActive is used to lock react fine uploader in case
         // a user is actually not logged in already to prevent him from droping files

js/components/ascribe_forms/input_textarea_toggable.js

@@ -4,17 +4,20 @@ import React from 'react';
 
 import TextareaAutosize from 'react-textarea-autosize';
 
+import { anchorize } from '../../utils/dom_utils';
+
 
 let InputTextAreaToggable = React.createClass({
     propTypes: {
         autoFocus: React.PropTypes.bool,
-        disabled: React.PropTypes.bool,
+        convertLinks: React.PropTypes.bool,
-        rows: React.PropTypes.number.isRequired,
-        required: React.PropTypes.bool,
         defaultValue: React.PropTypes.string,
-        placeholder: React.PropTypes.string,
+        disabled: React.PropTypes.bool,
         onBlur: React.PropTypes.func,
-        onChange: React.PropTypes.func
+        onChange: React.PropTypes.func,
+        placeholder: React.PropTypes.string,
+        required: React.PropTypes.bool,
+        rows: React.PropTypes.number.isRequired
     },
 
     getInitialState() {
@@ -36,7 +39,7 @@ let InputTextAreaToggable = React.createClass({
     componentDidUpdate() {
         // If the initial value of state.value is null, we want to set props.defaultValue
         // as a value. In all other cases TextareaAutosize.onChange is updating.handleChange already
-        if(this.state.value === null && this.props.defaultValue) {
+        if (this.state.value === null && this.props.defaultValue) {
             this.setState({
                 value: this.props.defaultValue
             });
@@ -49,28 +52,26 @@ let InputTextAreaToggable = React.createClass({
     },
 
     render() {
-        let className = 'form-control ascribe-textarea';
+        const { convertLinks, disabled, onBlur, placeholder, required, rows } = this.props;
-        let textarea = null;
+        const { value } = this.state;
 
-        if(!this.props.disabled) {
+        if (!disabled) {
-            className = className + ' ascribe-textarea-editable';
+            return (
-            textarea = (
                 <TextareaAutosize
                     ref='textarea'
-                    className={className}
+                    className='form-control ascribe-textarea ascribe-textarea-editable'
-                    value={this.state.value}
+                    value={value}
-                    rows={this.props.rows}
+                    rows={rows}
                     maxRows={10}
-                    required={this.props.required}
+                    required={required}
                     onChange={this.handleChange}
-                    onBlur={this.props.onBlur}
+                    onBlur={onBlur}
-                    placeholder={this.props.placeholder} />
+                    placeholder={placeholder} />
             );
         } else {
-            textarea = <pre className="ascribe-pre">{this.state.value}</pre>;
+            // Can only convert links when not editable, as textarea does not support anchors
+            return <pre className="ascribe-pre">{convertLinks ? anchorize(value) : value}</pre>;
         }
-
-        return textarea;
     }
 });
 

js/components/ascribe_forms/property.js

@@ -240,7 +240,17 @@ const Property = React.createClass({
     },
 
     handleCheckboxToggle() {
-        this.setExpanded(!this.state.expanded);
+        const expanded = !this.state.expanded;
+
+        this.setExpanded(expanded);
+
+        // Reset the value to be the initial value when the checkbox is unticked since the
+        // user doesn't want to specify their own value.
+        if (!expanded) {
+            this.setState({
+                value: this.state.initialValue
+            });
+        }
     },
 
     renderChildren(style) {

js/components/ascribe_media/media_player.js

@@ -184,7 +184,7 @@ let Video = React.createClass({
             );
         } else {
             return (
-                <Image src={this.props.preview} />
+                <Image preview={this.props.preview} />
             );
         }
     }

js/components/ascribe_modal/modal_wrapper.js

@@ -1,19 +1,20 @@
 'use strict';
 
 import React from 'react';
-import ReactAddons from 'react/addons';
 
 import Modal from 'react-bootstrap/lib/Modal';
 
 let ModalWrapper = React.createClass({
     propTypes: {
-        trigger: React.PropTypes.element,
         title: React.PropTypes.oneOfType([
             React.PropTypes.arrayOf(React.PropTypes.element),
             React.PropTypes.element,
             React.PropTypes.string
         ]).isRequired,
-        handleSuccess: React.PropTypes.func.isRequired,
+
+        handleCancel: React.PropTypes.func,
+        handleSuccess: React.PropTypes.func,
+        trigger: React.PropTypes.element,
         children: React.PropTypes.oneOfType([
             React.PropTypes.arrayOf(React.PropTypes.element),
             React.PropTypes.element
@@ -38,14 +39,25 @@ let ModalWrapper = React.createClass({
         });
     },
 
+    handleCancel() {
+        if (typeof this.props.handleCancel === 'function') {
+            this.props.handleCancel();
+        }
+
+        this.hide();
+    },
+
     handleSuccess(response) {
-        this.props.handleSuccess(response);
+        if (typeof this.props.handleSuccess === 'function') {
+            this.props.handleSuccess(response);
+        }
+
         this.hide();
     },
 
     renderChildren() {
-        return ReactAddons.Children.map(this.props.children, (child) => {
+        return React.Children.map(this.props.children, (child) => {
-            return ReactAddons.addons.cloneWithProps(child, {
+            return React.cloneElement(child, {
                 handleSuccess: (response) => {
                     if (typeof child.props.handleSuccess === 'function') {
                         child.props.handleSuccess(response);
@@ -60,14 +72,23 @@ let ModalWrapper = React.createClass({
     render() {
         const { trigger, title } = this.props;
 
-        // If the trigger component exists, we add the ModalWrapper's show() as its onClick method.
+        // If the trigger component exists, we add the ModalWrapper's show() to its onClick method.
         // The trigger component should, in most cases, be a button.
-        const clonedTrigger = React.isValidElement(trigger) ? React.cloneElement(trigger, {onClick: this.show})
+        const clonedTrigger = React.isValidElement(trigger) ?
-                                                            : null;
+            React.cloneElement(trigger, {
+                onClick: (...params) => {
+                    if (typeof trigger.props.onClick === 'function') {
+                        trigger.props.onClick(...params);
+                    }
+
+                    this.show();
+                }
+            }) : null;
+
         return (
             <span>
                 {clonedTrigger}
-                <Modal show={this.state.showModal} onHide={this.hide}>
+                <Modal show={this.state.showModal} onHide={this.handleCancel}>
                     <Modal.Header closeButton>
                         <Modal.Title>
                             {title}

js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js

@@ -91,13 +91,13 @@ let PieceListToolbarFilterWidget = React.createClass({
                         label also iterate over its items, to get all filterable options */}
                     {this.props.filterParams.map(({ label, items }, i) => {
                         return (
-                            <div>
+                            <div key={label}>
-                                <li
+                                <li style={{'textAlign': 'center'}}>
-                                    style={{'textAlign': 'center'}}
-                                    key={i}>
                                     <em>{label}:</em>
                                 </li>
-                                {items.map((param, j) => {
+                                {items.map((paramItem) => {
+                                    let itemLabel;
+                                    let param;
 
                                     // As can be seen in the PropTypes, a param can either
                                     // be a string or an object of the shape:
@@ -108,22 +108,22 @@ let PieceListToolbarFilterWidget = React.createClass({
                                     // }
                                     //
                                     // This is why we need to distinguish between both here.
-                                    if (typeof param !== 'string') {
+                                    if (typeof paramItem !== 'string') {
-                                        label = param.label;
+                                        param = paramItem.key;
-                                        param = param.key;
+                                        itemLabel = paramItem.label;
                                     } else {
-                                        param = param;
+                                        param = paramItem;
-                                        label = param.split('acl_')[1].replace(/_/g, ' ');
+                                        itemLabel = paramItem.split('acl_')[1].replace(/_/g, ' ');
                                     }
 
                                     return (
                                         <li
-                                            key={j}
+                                            key={itemLabel}
                                             onClick={this.filterBy(param)}
                                             className="filter-widget-item">
                                             <div className="checkbox-line">
                                                 <span>
-                                                    {getLangText(label)}
+                                                    {getLangText(itemLabel)}
                                                 </span>
                                                 <input
                                                     readOnly

js/components/ascribe_piece_list_toolbar/piece_list_toolbar_order_widget.js

@@ -63,22 +63,20 @@ let PieceListToolbarOrderWidget = React.createClass({
                     </li>
                     {this.props.orderParams.map((param) => {
                         return (
-                            <div>
+                            <li
-                                <li
+                                key={param}
-                                    key={param}
+                                onClick={this.orderBy(param)}
-                                    onClick={this.orderBy(param)}
+                                className="filter-widget-item">
-                                    className="filter-widget-item">
+                                <div className="checkbox-line">
-                                    <div className="checkbox-line">
+                                    <span>
-                                        <span>
+                                        {getLangText(param.replace('_', ' '))}
-                                            {getLangText(param.replace('_', ' '))}
+                                    </span>
-                                        </span>
+                                    <input
-                                        <input
+                                        readOnly
-                                            readOnly
+                                        type="radio"
-                                            type="radio"
+                                        checked={param.indexOf(this.props.orderBy) > -1} />
-                                            checked={param.indexOf(this.props.orderBy) > -1} />
+                                </div>
-                                    </div>
+                            </li>
-                                </li>
-                            </div>
                         );
                     })}
                 </DropdownButton>
@@ -89,4 +87,4 @@ let PieceListToolbarOrderWidget = React.createClass({
     }
 });
 
-export default PieceListToolbarOrderWidget;
+export default PieceListToolbarOrderWidget;

js/components/ascribe_routes/proxy_handler.js

@@ -40,7 +40,7 @@ export function AuthRedirect({to, when}) {
 
         // and redirect if `true`.
         if(exprToValidate) {
-            window.setTimeout(() => history.replaceState(null, to, query));
+            window.setTimeout(() => history.replace({ query, pathname: to }));
             return true;
 
             // Otherwise there can also be the case that the backend
@@ -48,7 +48,7 @@ export function AuthRedirect({to, when}) {
         } else if(!exprToValidate && when === 'loggedIn' && redirect) {
 
             delete query.redirect;
-            window.setTimeout(() => history.replaceState(null, '/' + redirect, query));
+            window.setTimeout(() => history.replace({ query, pathname: '/' + redirect }));
             return true;
 
         } else if(!exprToValidate && when === 'loggedOut' && redirectAuthenticated) {

js/components/ascribe_settings/contract_settings.js

@@ -28,11 +28,7 @@ import { mergeOptions, truncateTextAtCharIndex } from '../../utils/general_utils
 
 
 let ContractSettings = React.createClass({
-    propTypes: {
+    getInitialState() {
-        location: React.PropTypes.object
-    },
-
-    getInitialState(){
         return mergeOptions(
             ContractListStore.getState(),
             UserStore.getState()
@@ -64,40 +60,39 @@ let ContractSettings = React.createClass({
             ContractListActions.removeContract(contract.id)
                 .then((response) => {
                     ContractListActions.fetchContractList(true);
-                    let notification = new GlobalNotificationModel(response.notification, 'success', 4000);
+                    const notification = new GlobalNotificationModel(response.notification, 'success', 4000);
                     GlobalNotificationActions.appendGlobalNotification(notification);
                 })
                 .catch((err) => {
-                    let notification = new GlobalNotificationModel(err, 'danger', 10000);
+                    const notification = new GlobalNotificationModel(err, 'danger', 10000);
                     GlobalNotificationActions.appendGlobalNotification(notification);
                 });
         };
     },
 
-    getPublicContracts(){
+    getPublicContracts() {
         return this.state.contractList.filter((contract) => contract.is_public);
     },
 
-    getPrivateContracts(){
+    getPrivateContracts() {
         return this.state.contractList.filter((contract) => !contract.is_public);
     },
 
     render() {
-        let publicContracts = this.getPublicContracts();
+        const publicContracts = this.getPublicContracts();
-        let privateContracts = this.getPrivateContracts();
+        const privateContracts = this.getPrivateContracts();
         let createPublicContractForm = null;
 
         setDocumentTitle(getLangText('Contracts settings'));
 
-        if(publicContracts.length === 0) {
+        if (publicContracts.length === 0) {
             createPublicContractForm = (
                 <CreateContractForm
                     isPublic={true}
                     fileClassToUpload={{
                         singular: 'new contract',
                         plural: 'new contracts'
-                    }}
+                    }} />
-                    location={this.props.location}/>
             );
         }
 
@@ -114,7 +109,7 @@ let ContractSettings = React.createClass({
                             {publicContracts.map((contract, i) => {
                                 return (
                                     <ActionPanel
-                                        key={i}
+                                        key={contract.id}
                                         title={contract.name}
                                         content={truncateTextAtCharIndex(contract.name, 120, '(...).pdf')}
                                         buttons={
@@ -123,8 +118,7 @@ let ContractSettings = React.createClass({
                                                     aclObject={this.state.whitelabel}
                                                     aclName="acl_update_public_contract">
                                                     <ContractSettingsUpdateButton
-                                                        contract={contract}
+                                                        contract={contract} />
-                                                        location={this.props.location}/>
                                                 </AclProxy>
                                                 <a
                                                     className="btn btn-default btn-sm margin-left-2px"
@@ -154,12 +148,11 @@ let ContractSettings = React.createClass({
                             fileClassToUpload={{
                                 singular: getLangText('new contract'),
                                 plural: getLangText('new contracts')
-                            }}
+                            }} />
-                            location={this.props.location}/>
                             {privateContracts.map((contract, i) => {
                                 return (
                                     <ActionPanel
-                                        key={i}
+                                        key={contract.id}
                                         title={contract.name}
                                         content={truncateTextAtCharIndex(contract.name, 120, '(...).pdf')}
                                         buttons={
@@ -168,8 +161,7 @@ let ContractSettings = React.createClass({
                                                     aclObject={this.state.whitelabel}
                                                     aclName="acl_update_private_contract">
                                                     <ContractSettingsUpdateButton
-                                                        contract={contract}
+                                                        contract={contract} />
-                                                        location={this.props.location}/>
                                                 </AclProxy>
                                                 <a
                                                     className="btn btn-default btn-sm margin-left-2px"

js/components/ascribe_settings/contract_settings_update_button.js

@@ -2,17 +2,18 @@
 
 import React from 'react';
 
-import ReactS3FineUploader from '../ascribe_uploader/react_s3_fine_uploader';
-import UploadButton from '../ascribe_uploader/ascribe_upload_button/upload_button';
-
-import AppConstants from '../../constants/application_constants';
-import ApiUrls from '../../constants/api_urls';
-
 import ContractListActions from '../../actions/contract_list_actions';
 
 import GlobalNotificationModel from '../../models/global_notification_model';
 import GlobalNotificationActions from '../../actions/global_notification_actions';
 
+import ReactS3FineUploader from '../ascribe_uploader/react_s3_fine_uploader';
+import UploadButton from '../ascribe_uploader/ascribe_upload_button/upload_button';
+
+import ApiUrls from '../../constants/api_urls';
+import AppConstants from '../../constants/application_constants';
+import { validationTypes } from '../../constants/uploader_constants';
+
 import { formSubmissionValidation } from '../ascribe_uploader/react_s3_fine_uploader_utils';
 import { getCookie } from '../../utils/fetch_api_utils';
 import { getLangText } from '../../utils/lang_utils';
@@ -24,71 +25,75 @@ let ContractSettingsUpdateButton = React.createClass({
     },
 
     submitFile(file) {
-        let contract = this.props.contract;
-
         // override the blob with the key's value
-        contract.blob = file.key;
+        const contract = Object.assign(this.props.contract, { blob: file.key });
 
         // send it to the server
         ContractListActions
             .changeContract(contract)
             .then((res) => {
-
                 // Display feedback to the user
-                let notification = new GlobalNotificationModel(getLangText('Contract %s successfully updated', res.name), 'success', 5000);
+                const notification = new GlobalNotificationModel(getLangText('Contract %s successfully updated', contract.name), 'success', 5000);
                 GlobalNotificationActions.appendGlobalNotification(notification);
 
                 // and refresh the contract list to get the updated contracs
-                return ContractListActions.fetchContractList(true);
+                return ContractListActions
-            })
+                            .fetchContractList(true)
-            .then(() => {
+                            // Also, reset the fineuploader component if fetch is successful so that the user can again 'update' his contract
-                // Also, reset the fineuploader component so that the user can again 'update' his contract
+                            .then(this.refs.fineuploader.reset)
-                this.refs.fineuploader.reset();
+                            .catch((err) => {
-            })
+                                const notification = new GlobalNotificationModel(getLangText('Latest contract failed to load'), 'danger', 5000);
-            .catch((err) => {
+                                GlobalNotificationActions.appendGlobalNotification(notification);
-                console.logGlobal(err);
+
-                let notification = new GlobalNotificationModel(getLangText('Contract could not be updated'), 'success', 5000);
+                                return Promise.reject(err);
+                            });
+            }, (err) => {
+                const notification = new GlobalNotificationModel(getLangText('Contract could not be updated'), 'danger', 5000);
                 GlobalNotificationActions.appendGlobalNotification(notification);
-            });
+
+                return Promise.reject(err);
+            })
+            .catch(console.logGlobal);
     },
 
     render() {
         return (
            <ReactS3FineUploader
-                fileInputElement={UploadButton()}
+               ref='fineuploader'
-                keyRoutine={{
+               fileInputElement={UploadButton({ showLabel: false })}
-                    url: AppConstants.serverUrl + 's3/key/',
+               keyRoutine={{
-                    fileClass: 'contract'
+                   url: AppConstants.serverUrl + 's3/key/',
-                }}
+                   fileClass: 'contract'
-                createBlobRoutine={{
+               }}
-                    url: ApiUrls.blob_contracts
+               createBlobRoutine={{
-                }}
+                   url: ApiUrls.blob_contracts
-                validation={{
+               }}
-                    itemLimit: AppConstants.fineUploader.validation.registerWork.itemLimit,
+               validation={{
-                    sizeLimit: AppConstants.fineUploader.validation.additionalData.sizeLimit,
+                   itemLimit: validationTypes.registerWork.itemLimit,
-                    allowedExtensions: ['pdf']
+                   sizeLimit: validationTypes.additionalData.sizeLimit,
-                }}
+                   allowedExtensions: ['pdf']
-                setIsUploadReady={() =>{/* So that ReactS3FineUploader is not complaining */}}
+               }}
-                signature={{
+               setIsUploadReady={() =>{/* So that ReactS3FineUploader is not complaining */}}
-                    endpoint: AppConstants.serverUrl + 's3/signature/',
+               signature={{
-                    customHeaders: {
+                   endpoint: AppConstants.serverUrl + 's3/signature/',
-                       'X-CSRFToken': getCookie(AppConstants.csrftoken)
+                   customHeaders: {
-                    }
+                      'X-CSRFToken': getCookie(AppConstants.csrftoken)
-                }}
+                   }
-                deleteFile={{
+               }}
-                    enabled: true,
+               deleteFile={{
-                    method: 'DELETE',
+                   enabled: true,
-                    endpoint: AppConstants.serverUrl + 's3/delete',
+                   method: 'DELETE',
-                    customHeaders: {
+                   endpoint: AppConstants.serverUrl + 's3/delete',
-                       'X-CSRFToken': getCookie(AppConstants.csrftoken)
+                   customHeaders: {
-                    }
+                      'X-CSRFToken': getCookie(AppConstants.csrftoken)
-                }}
+                   }
-                fileClassToUpload={{
+               }}
-                    singular: getLangText('UPDATE'),
+               fileClassToUpload={{
-                    plural: getLangText('UPDATE')
+                   singular: getLangText('UPDATE'),
-                }}
+                   plural: getLangText('UPDATE')
-                isReadyForFormSubmission={formSubmissionValidation.atLeastOneUploadedFile}
+               }}
-                submitFile={this.submitFile} />
+               isReadyForFormSubmission={formSubmissionValidation.atLeastOneUploadedFile}
+               submitFile={this.submitFile} />
         );
     }
 });

js/components/ascribe_settings/webhook_settings.js

@@ -34,7 +34,6 @@ let WebhookSettings = React.createClass({
     componentDidMount() {
         WebhookStore.listen(this.onChange);
         WebhookActions.fetchWebhooks();
-        WebhookActions.fetchWebhookEvents();
     },
 
     componentWillUnmount() {
@@ -49,7 +48,7 @@ let WebhookSettings = React.createClass({
         return (event) => {
             WebhookActions.removeWebhook(webhookId);
 
-            let notification = new GlobalNotificationModel(getLangText('Webhook deleted'), 'success', 2000);
+            const notification = new GlobalNotificationModel(getLangText('Webhook deleted'), 'success', 2000);
             GlobalNotificationActions.appendGlobalNotification(notification);
         };
     },
@@ -57,16 +56,16 @@ let WebhookSettings = React.createClass({
     handleCreateSuccess() {
         this.refs.webhookCreateForm.reset();
         WebhookActions.fetchWebhooks(true);
-        let notification = new GlobalNotificationModel(getLangText('Webhook successfully created'), 'success', 5000);
+
+        const notification = new GlobalNotificationModel(getLangText('Webhook successfully created'), 'success', 5000);
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 
-    getWebhooks(){
+    getWebhooks() {
-        let content = <AscribeSpinner color='dark-blue' size='lg'/>;
-
         if (this.state.webhooks) {
-            content = this.state.webhooks.map(function(webhook, i) {
+            return this.state.webhooks.map(function(webhook, i) {
                 const event = webhook.event.split('.')[0];
+
                 return (
                     <ActionPanel
                         name={webhook.event}
@@ -91,11 +90,14 @@ let WebhookSettings = React.createClass({
                                     </button>
                                 </div>
                             </div>
-                        }/>
+                        } />
                     );
             }, this);
+        } else {
+            return (
+                <AscribeSpinner color='dark-blue' size='lg'/>
+            );
         }
-        return content;
     },
 
     getEvents() {
@@ -110,18 +112,18 @@ let WebhookSettings = React.createClass({
                                 <option
                                     name={i}
                                     key={i}
-                                    value={ event + '.webhook' }>
+                                    value={event + '.webhook'}>
-                                    { event.toUpperCase() }
+                                    {event.toUpperCase()}
                                 </option>
                             );
                         })}
                     </select>
                 </Property>);
+        } else {
+            return null;
         }
-        return null;
     },
 
-    
     render() {
         return (
             <CollapsibleParagraph
@@ -138,20 +140,19 @@ let WebhookSettings = React.createClass({
                         a target url.
                     </p>
                 </div>
-                <AclProxy
+                <AclProxy show={this.state.webhookEvents && this.state.webhookEvents.length}>
-                    show={this.state.webhookEvents && this.state.webhookEvents.length}>
                     <Form
                         ref="webhookCreateForm"
                         url={ApiUrls.webhooks}
                         handleSuccess={this.handleCreateSuccess}>
-                        { this.getEvents() }
+                        {this.getEvents()}
                         <Property
                             name='target'
                             label={getLangText('Redirect Url')}>
                             <input
                                 type="text"
                                 placeholder={getLangText('Enter the url to be triggered')}
-                                required/>
+                                required />
                         </Property>
                         <hr />
                     </Form>
@@ -162,4 +163,4 @@ let WebhookSettings = React.createClass({
     }
 });
 
-export default WebhookSettings;
+export default WebhookSettings;

js/components/ascribe_slides_container/slides_container.js

@@ -57,21 +57,21 @@ const SlidesContainer = React.createClass({
     // When the start_from parameter is used, this.setSlideNum can not simply be used anymore.
     nextSlide(additionalQueryParams) {
         const slideNum = parseInt(this.props.location.query.slide_num, 10) || 0;
-        let nextSlide = slideNum + 1;
+        this.setSlideNum(slideNum + 1, additionalQueryParams);
-        this.setSlideNum(nextSlide, additionalQueryParams);
     },
 
     setSlideNum(nextSlideNum, additionalQueryParams = {}) {
-        let queryParams = Object.assign(this.props.location.query, additionalQueryParams);
+        const { location: { pathname } } = this.props;
-        queryParams.slide_num = nextSlideNum;
+        const query = Object.assign({}, this.props.location.query, additionalQueryParams, { slide_num: nextSlideNum });
-        this.history.pushState(null, this.props.location.pathname, queryParams);
+
+        this.history.push({ pathname, query });
     },
 
     // breadcrumbs are defined as attributes of the slides.
     // To extract them we have to read the DOM element's attributes
     extractBreadcrumbs() {
         const startFrom = parseInt(this.props.location.query.start_from, 10) || -1;
-        let breadcrumbs = [];
+        const breadcrumbs = [];
 
         React.Children.map(this.props.children, (child, i) => {
             if(child && i >= startFrom && child.props['data-slide-title']) {
@@ -179,4 +179,4 @@ const SlidesContainer = React.createClass({
     }
 });
 
-export default SlidesContainer;
+export default SlidesContainer;

js/components/ascribe_social_share/facebook_share_button.js

@@ -2,6 +2,8 @@
 
 import React from 'react';
 
+import FacebookHandler from '../../third_party/facebook_handler';
+
 import AppConstants from '../../constants/application_constants';
 
 import { InjectInHeadUtils } from '../../utils/inject_utils';
@@ -17,24 +19,40 @@ let FacebookShareButton = React.createClass({
         };
     },
 
-    componentDidMount() {
+    getInitialState() {
-        /**
+        return FacebookHandler.getState();
-         * Ideally we would only use FB.XFBML.parse() on the component that we're
-         * mounting, but doing this when we first load the FB sdk causes unpredictable behaviour.
-         * The button sometimes doesn't get initialized, likely because FB hasn't properly
-         * been initialized yet.
-         *
-         * To circumvent this, we always have the sdk parse the entire DOM on the initial load
-         * (see FacebookHandler) and then use FB.XFBML.parse() on the mounting component later.
-         */
-
-        InjectInHeadUtils
-            .inject(AppConstants.facebook.sdkUrl)
-            .then(() => { FB.XFBML.parse(this.refs.fbShareButton.getDOMNode().parentElement) });
     },
 
-    shouldComponentUpdate(nextProps) {
+    componentDidMount() {
-        return this.props.type !== nextProps.type;
+        FacebookHandler.listen(this.onChange);
+
+        this.loadFacebook();
+    },
+
+    shouldComponentUpdate(nextProps, nextState) {
+        // Don't update if the props haven't changed or the FB SDK loading status is still the same
+        return this.props.type !== nextProps.type || nextState.loaded !== this.state.loaded;
+    },
+
+    componentDidUpdate() {
+        // If the component changes, we need to reparse the share button's XFBML.
+        // To prevent cases where the Facebook SDK hasn't been loaded yet at this stage,
+        // let's make sure that it's injected before trying to reparse.
+        this.loadFacebook();
+    },
+
+    onChange(state) {
+        this.setState(state);
+    },
+
+    loadFacebook() {
+        InjectInHeadUtils
+            .inject(AppConstants.facebook.sdkUrl)
+            .then(() => {
+                if (this.state.loaded) {
+                    FB.XFBML.parse(this.refs.fbShareButton.getDOMNode().parent)
+                }
+            });
     },
 
     render() {

js/components/ascribe_table/models/table_models.js

@@ -2,15 +2,15 @@
 
 export class ColumnModel {
     // ToDo: Add validation for all passed-in parameters
-    constructor(transformFn, columnName, displayName, displayType, rowWidth, canBeOrdered, transition, className) {
+    constructor({ transformFn, columnName = '', displayElement, displayType, rowWidth, canBeOrdered, transition, className = '' }) {
         this.transformFn = transformFn;
         this.columnName = columnName;
-        this.displayName = displayName;
+        this.displayElement = displayElement;
         this.displayType = displayType;
         this.rowWidth = rowWidth;
         this.canBeOrdered = canBeOrdered;
         this.transition = transition;
-        this.className = className ? className : '';
+        this.className = className;
     }
 }
 
@@ -28,7 +28,7 @@ export class ColumnModel {
  * our selfes, using this TransitionModel.
  */
 export class TransitionModel {
-    constructor(to, queryKey, valueKey, callback) {
+    constructor({ to, queryKey, valueKey, callback }) {
         this.to = to;
         this.queryKey = queryKey;
         this.valueKey = valueKey;
@@ -38,4 +38,4 @@ export class TransitionModel {
     toReactRouterLink(queryValue) {
         return '/' + this.to + '/' + queryValue;
     }
-}
+}

js/components/ascribe_table/table_header.js

@@ -1,5 +1,5 @@
-'use strict';
 
+'use strict';
 import React from 'react';
 
 import TableHeaderItem from './table_header_item';
@@ -29,7 +29,7 @@ let TableHeader = React.createClass({
                             <TableHeaderItem
                                 className={column.className}
                                 key={i}
-                                displayName={column.displayName}
+                                displayElement={column.displayElement}
                                 columnName={columnName}
                                 canBeOrdered={canBeOrdered}
                                 orderAsc={this.props.orderAsc}

js/components/ascribe_table/table_header_item.js

@@ -7,7 +7,7 @@ import TableHeaderItemCarret from './table_header_item_carret';
 let TableHeaderItem = React.createClass({
 
     propTypes: {
-        displayName: React.PropTypes.oneOfType([
+        displayElement: React.PropTypes.oneOfType([
             React.PropTypes.string,
             React.PropTypes.element
         ]).isRequired,
@@ -24,29 +24,31 @@ let TableHeaderItem = React.createClass({
     },
 
     render() {
-        if(this.props.canBeOrdered && this.props.changeOrder && this.props.orderAsc != null && this.props.orderBy) {
+        const { canBeOrdered, changeOrder, className, columnName, displayElement, orderAsc, orderBy } = this.props;
-            if(this.props.columnName === this.props.orderBy) {
+
+        if (canBeOrdered && changeOrder && orderAsc != null && orderBy) {
+            if (columnName === orderBy) {
                 return (
                     <th
-                        className={'ascribe-table-header-column ' + this.props.className}
+                        className={'ascribe-table-header-column ' + className}
                         onClick={this.changeOrder}>
-                        <span>{this.props.displayName} <TableHeaderItemCarret orderAsc={this.props.orderAsc} /></span>
+                        <span>{displayElement} <TableHeaderItemCarret orderAsc={orderAsc} /></span>
                     </th>
                 );
             } else {
                 return (
                     <th
-                        className={'ascribe-table-header-column ' + this.props.className}
+                        className={'ascribe-table-header-column ' + className}
                         onClick={this.changeOrder}>
-                        <span>{this.props.displayName}</span>
+                        <span>{displayElement}</span>
                     </th>
                 );
             }
         } else {
             return (
-                <th className={'ascribe-table-header-column ' + this.props.className}>
+                <th className={'ascribe-table-header-column ' + className}>
                     <span>
-                        {this.props.displayName}
+                        {displayElement}
                     </span>
                 </th>
             );

js/components/ascribe_table/table_item_acl_filtered.js

@@ -3,15 +3,15 @@
 import React from 'react';
 
 
-let TableItemAclFiltered = React.createClass({
+const TableItemAclFiltered = React.createClass({
     propTypes: {
         content: React.PropTypes.object,
-        notifications: React.PropTypes.string
+        notifications: React.PropTypes.array
     },
 
     render() {
-        var availableAcls = ['acl_consign', 'acl_loan', 'acl_transfer', 'acl_view', 'acl_share', 'acl_unshare', 'acl_delete'];
+        const availableAcls = ['acl_consign', 'acl_loan', 'acl_transfer', 'acl_view', 'acl_share', 'acl_unshare', 'acl_delete'];
-        if (this.props.notifications && this.props.notifications.length > 0){
+        if (this.props.notifications && this.props.notifications.length) {
             return (
                 <span>
                     {this.props.notifications[0].action_str}
@@ -19,15 +19,14 @@ let TableItemAclFiltered = React.createClass({
             );
         }
 
-        let filteredAcls = Object.keys(this.props.content).filter((key) => {
+        const filteredAcls = Object.keys(this.props.content)
-            return availableAcls.indexOf(key) > -1 && this.props.content[key];
+            .filter((key) => availableAcls.indexOf(key) > -1 && this.props.content[key])
-        });
+            .map((acl) => acl.split('acl_')[1])
-
+            .join('/');
-        filteredAcls = filteredAcls.map((acl) => acl.split('acl_')[1]);
 
         return (
             <span>
-                {filteredAcls.join('/')}
+                {filteredAcls}
             </span>
         );
     }

js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview.js

@@ -23,6 +23,7 @@ const FileDragAndDropPreview = React.createClass({
             s3Url: string,
             s3UrlSafe: string
         }).isRequired,
+
         handleDeleteFile: func,
         handleCancelFile: func,
         handlePauseFile: func,
@@ -33,9 +34,9 @@ const FileDragAndDropPreview = React.createClass({
     },
 
     toggleUploadProcess() {
-        if(this.props.file.status === 'uploading') {
+        if (this.props.file.status === 'uploading') {
             this.props.handlePauseFile(this.props.file.id);
-        } else if(this.props.file.status === 'paused') {
+        } else if (this.props.file.status === 'paused') {
             this.props.handleResumeFile(this.props.file.id);
         }
     },
@@ -54,13 +55,13 @@ const FileDragAndDropPreview = React.createClass({
             (file.status === 'upload successful' || file.status === 'online') &&
             file.s3UrlSafe) {
             handleDeleteFile(file.id);
-        } else if(handleCancelFile) {
+        } else if (handleCancelFile) {
             handleCancelFile(file.id);
         }
     },
 
     handleDownloadFile() {
-        if(this.props.file.s3Url) {
+        if (this.props.file.s3Url) {
             // This simply opens a new browser tab with the url provided
             open(this.props.file.s3Url);
         }
@@ -69,7 +70,7 @@ const FileDragAndDropPreview = React.createClass({
     getFileName() {
         const { numberOfDisplayedFiles, file } = this.props;
 
-        if(numberOfDisplayedFiles === 1) {
+        if (numberOfDisplayedFiles === 1) {
             return (
                 <span className="file-name">
                     {truncateTextAtCharIndex(file.name, 30, '(...).' + extractFileExtensionFromString(file.name))}
@@ -81,7 +82,7 @@ const FileDragAndDropPreview = React.createClass({
     },
 
     getRemoveButton() {
-        if(this.props.areAssetsEditable) {
+        if (this.props.areAssetsEditable) {
             return (
                 <div className="delete-file">
                     <span
@@ -107,7 +108,7 @@ const FileDragAndDropPreview = React.createClass({
 
         // Decide whether an image or a placeholder picture should be displayed
         // If a file has its `thumbnailUrl` defined, then we display it also as an image
-        if(file.type.split('/')[0] === 'image' || file.thumbnailUrl) {
+        if (file.type.split('/')[0] === 'image' || file.thumbnailUrl) {
             previewElement = (
                 <FileDragAndDropPreviewImage
                     onClick={this.handleDeleteFile}
@@ -123,7 +124,7 @@ const FileDragAndDropPreview = React.createClass({
                 <FileDragAndDropPreviewOther
                     onClick={this.handleDeleteFile}
                     progress={file.progress}
-                    type={file.type.split('/')[1]}
+                    type={extractFileExtensionFromString(file.name)}
                     toggleUploadProcess={this.toggleUploadProcess}
                     areAssetsDownloadable={areAssetsDownloadable}
                     downloadUrl={file.s3UrlSafe}

js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_other.js

@@ -56,9 +56,9 @@ const FileDragAndDropPreviewOther = React.createClass({
                     target="_blank"
                     className="glyphicon glyphicon-download action-file"
                     aria-hidden="true"
-                    title={getLangText('Download file')}/>
+                    title={getLangText('Download file')} />
             );
-        } else if(progress >= 0 && progress < 100) {
+        } else if (progress >= 0 && progress < 100) {
             actionSymbol = (
                 <div className="spinner-file">
                     <AscribeSpinner color='dark-blue' size='md' />
@@ -66,22 +66,19 @@ const FileDragAndDropPreviewOther = React.createClass({
             );
         } else {
             actionSymbol = (
-                <span className='ascribe-icon icon-ascribe-ok action-file'/>
+                <span className='ascribe-icon icon-ascribe-ok action-file' />
             );
         }
 
         return (
-            <div
+            <div className="file-drag-and-drop-preview">
-                className="file-drag-and-drop-preview">
                 <ProgressBar
                     now={Math.ceil(progress)}
                     style={style}
-                    className="ascribe-progress-bar ascribe-progress-bar-xs"/>
+                    className="ascribe-progress-bar ascribe-progress-bar-xs" />
-                <div className="file-drag-and-drop-preview-table-wrapper">
+                <div className="file-drag-and-drop-preview-other">
-                    <div className="file-drag-and-drop-preview-other">
+                    {actionSymbol}
-                        {actionSymbol}
+                    <p style={style}>{'.' + (type ? type : 'file')}</p>
-                        <p style={style}>{'.' + type}</p>
-                    </div>
                 </div>
             </div>
         );

js/components/ascribe_uploader/ascribe_upload_button/upload_button.js

@@ -1,6 +1,7 @@
 'use strict';
 
 import React from 'react';
+import classNames from 'classnames';
 
 import { displayValidProgressFilesFilter } from '../react_s3_fine_uploader_utils';
 import { getLangText } from '../../../utils/lang_utils';
@@ -9,7 +10,7 @@ import { truncateTextAtCharIndex } from '../../../utils/general_utils';
 const { func, array, bool, shape, string } = React.PropTypes;
 
 
-export default function UploadButton({ className = 'btn btn-default btn-sm' } = {}) {
+export default function UploadButton({ className = 'btn btn-default btn-sm', showLabel = true } = {}) {
     return React.createClass({
         displayName: 'UploadButton',
 
@@ -119,28 +120,28 @@ export default function UploadButton({ className = 'btn btn-default btn-sm' } =
         },
 
         getUploadedFileLabel() {
-            const uploadedFile = this.getUploadedFile();
+            if (showLabel) {
-            const uploadingFiles = this.getUploadingFiles();
+                const uploadedFile = this.getUploadedFile();
+                const uploadingFiles = this.getUploadingFiles();
 
-            if(uploadingFiles.length) {
+                if (uploadingFiles.length) {
-                return (
+                    return (
-                    <span>
+                        <span>
-                        {' ' + truncateTextAtCharIndex(uploadingFiles[0].name, 40) + ' '}
+                            {' ' + truncateTextAtCharIndex(uploadingFiles[0].name, 40) + ' '}
-                        [<a onClick={this.onClickRemove}>{getLangText('cancel upload')}</a>]
+                            [<a onClick={this.onClickRemove}>{getLangText('cancel upload')}</a>]
-                    </span>
+                        </span>
-                );
+                    );
-            } else if(uploadedFile) {
+                } else if (uploadedFile) {
-                return (
+                    return (
-                    <span>
+                        <span>
-                        <span className='ascribe-icon icon-ascribe-ok'/>
+                            <span className='ascribe-icon icon-ascribe-ok'/>
-                        {' ' + truncateTextAtCharIndex(uploadedFile.name, 40) + ' '}
+                            {' ' + truncateTextAtCharIndex(uploadedFile.name, 40) + ' '}
-                        [<a onClick={this.onClickRemove}>{getLangText('remove')}</a>]
+                            [<a onClick={this.onClickRemove}>{getLangText('remove')}</a>]
-                    </span>
+                        </span>
-                );
+                    );
-            } else {
+                } else {
-                return (
+                    return <span>{getLangText('No file chosen')}</span>;
-                    <span>{getLangText('No file chosen')}</span>
+                }
-                );
             }
         },
 
@@ -158,7 +159,7 @@ export default function UploadButton({ className = 'btn btn-default btn-sm' } =
              * Therefore the wrapping component needs to be an `anchor` tag instead of a `button`
              */
             return (
-                <div className="upload-button-wrapper">
+                <div className={classNames('ascribe-upload-button', {'ascribe-upload-button-has-label': showLabel})}>
                     {/*
                         The button needs to be of `type="button"` as it would
                         otherwise submit the form its in.

js/components/ascribe_uploader/react_s3_fine_uploader.js

@@ -13,9 +13,9 @@ import GlobalNotificationActions from '../../actions/global_notification_actions
 
 import AppConstants from '../../constants/application_constants';
 
-import { computeHashOfFile } from '../../utils/file_utils';
 import { displayValidFilesFilter, transformAllowedExtensionsToInputAcceptProp } from './react_s3_fine_uploader_utils';
 import { getCookie } from '../../utils/fetch_api_utils';
+import { computeHashOfFile, extractFileExtensionFromString } from '../../utils/file_utils';
 import { getLangText } from '../../utils/lang_utils';
 
 
@@ -36,17 +36,11 @@ const ReactS3FineUploader = React.createClass({
         keyRoutine: shape({
             url: string,
             fileClass: string,
-            pieceId: oneOfType([
+            pieceId: number
-                string,
-                number
-            ])
         }),
         createBlobRoutine: shape({
             url: string,
-            pieceId: oneOfType([
+            pieceId: number
-                string,
-                number
-            ])
         }),
         handleChangedFile: func, // is for when a file is dropped or selected
         submitFile: func, // is for when a file has been successfully uploaded, TODO: rename to handleSubmitFile
@@ -97,7 +91,7 @@ const ReactS3FineUploader = React.createClass({
         }),
         validation: shape({
             itemLimit: number,
-            sizeLimit: string,
+            sizeLimit: number,
             allowedExtensions: arrayOf(string)
         }),
         messages: shape({
@@ -284,22 +278,6 @@ const ReactS3FineUploader = React.createClass({
         this.setState(this.getInitialState());
     },
 
-    // Cancel uploads and clear previously selected files on the input element
-    cancelUploads(id) {
-        typeof id !== 'undefined' ? this.state.uploader.cancel(id) : this.state.uploader.cancelAll();
-
-        // Reset the file input element to clear the previously selected files so that
-        // the user can reselect them again.
-        this.clearFileSelection();
-    },
-
-    clearFileSelection() {
-        const { fileInput } = this.refs;
-        if (fileInput && typeof fileInput.clearSelection === 'function') {
-            fileInput.clearSelection();
-        }
-    },
-
     requestKey(fileId) {
         let filename = this.state.uploader.getName(fileId);
         let uuid = this.state.uploader.getUuid(fileId);
@@ -390,6 +368,107 @@ const ReactS3FineUploader = React.createClass({
         });
     },
 
+    // Cancel uploads and clear previously selected files on the input element
+    cancelUploads(id) {
+        typeof id !== 'undefined' ? this.state.uploader.cancel(id) : this.state.uploader.cancelAll();
+
+        // Reset the file input element to clear the previously selected files so that
+        // the user can reselect them again.
+        this.clearFileSelection();
+    },
+
+    clearFileSelection() {
+        const { fileInput } = this.refs;
+        if (fileInput && typeof fileInput.clearSelection === 'function') {
+            fileInput.clearSelection();
+        }
+    },
+
+    getAllowedExtensions() {
+        const { validation: { allowedExtensions } = {} } = this.props;
+
+        if (allowedExtensions && allowedExtensions.length) {
+            return transformAllowedExtensionsToInputAcceptProp(allowedExtensions);
+        } else {
+            return null;
+        }
+    },
+
+    getXhrErrorComment(xhr) {
+        if (xhr) {
+            return {
+                response: xhr.response,
+                url: xhr.responseURL,
+                status: xhr.status,
+                statusText: xhr.statusText
+            };
+        }
+    },
+
+    isDropzoneInactive() {
+        const filesToDisplay = this.state.filesToUpload.filter((file) => file.status !== 'deleted' && file.status !== 'canceled' && file.size !== -1);
+
+        if ((this.props.enableLocalHashing && !this.props.uploadMethod) || !this.props.areAssetsEditable || !this.props.multiple && filesToDisplay.length > 0) {
+            return true;
+        } else {
+            return false;
+        }
+    },
+
+    isFileValid(file) {
+        const { validation: { allowedExtensions, sizeLimit = 0 }, onValidationFailed } = this.props;
+        const fileExt = extractFileExtensionFromString(file.name);
+
+        if (file.size > sizeLimit) {
+            const fileSizeInMegaBytes = sizeLimit / 1000000;
+
+            const notification = new GlobalNotificationModel(getLangText('A file you submitted is bigger than ' + fileSizeInMegaBytes + 'MB.'), 'danger', 5000);
+            GlobalNotificationActions.appendGlobalNotification(notification);
+
+            if (typeof onValidationFailed === 'function') {
+                onValidationFailed(file);
+            }
+
+            return false;
+        } else if (allowedExtensions && !allowedExtensions.includes(fileExt)) {
+            const notification = new GlobalNotificationModel(getLangText(`The file you've submitted is of an invalid file format: Valid format(s): ${allowedExtensions.join(', ')}`), 'danger', 5000);
+            GlobalNotificationActions.appendGlobalNotification(notification);
+
+            return false;
+        } else {
+            return true;
+        }
+    },
+
+    selectValidFiles(files) {
+        return Array.from(files).reduce((validFiles, file) => {
+            if (this.isFileValid(file)) {
+                validFiles.push(file);
+            }
+            return validFiles;
+        }, []);
+    },
+
+    // This method has been made promise-based to immediately afterwards
+    // call a callback function (instantly after this.setState went through)
+    // This is e.g. needed when showing/hiding the optional thumbnail upload
+    // field in the registration form
+    setStatusOfFile(fileId, status) {
+        return Q.Promise((resolve) => {
+            let changeSet = {};
+
+            if(status === 'deleted' || status === 'canceled') {
+                changeSet.progress = { $set: 0 };
+            }
+
+            changeSet.status = { $set: status };
+
+            let filesToUpload = React.addons.update(this.state.filesToUpload, { [fileId]: changeSet });
+
+            this.setState({ filesToUpload }, resolve);
+        });
+    },
+
     setThumbnailForFileId(fileId, url) {
         const { filesToUpload } = this.state;
 
@@ -512,34 +591,6 @@ const ReactS3FineUploader = React.createClass({
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 
-    getXhrErrorComment(xhr) {
-        if (xhr) {
-            return {
-                response: xhr.response,
-                url: xhr.responseURL,
-                status: xhr.status,
-                statusText: xhr.statusText
-            };
-        }
-    },
-
-    isFileValid(file) {
-        if (file.size > this.props.validation.sizeLimit) {
-            const fileSizeInMegaBytes = this.props.validation.sizeLimit / 1000000;
-
-            const notification = new GlobalNotificationModel(getLangText('A file you submitted is bigger than ' + fileSizeInMegaBytes + 'MB.'), 'danger', 5000);
-            GlobalNotificationActions.appendGlobalNotification(notification);
-
-            if (typeof this.props.onValidationFailed === 'function') {
-                this.props.onValidationFailed(file);
-            }
-
-            return false;
-        } else {
-            return true;
-        }
-    },
-
     onCancel(id) {
         // when a upload is canceled, we need to update this components file array
         this.setStatusOfFile(id, 'canceled')
@@ -676,6 +727,13 @@ const ReactS3FineUploader = React.createClass({
         this.cancelUploads(fileId);
     },
 
+    handleCancelHashing() {
+        // Every progress tick of the hashing function in handleUploadFile there is a
+        // check if this.state.hashingProgress is -1. If so, there is an error thrown that cancels
+        // the hashing of all files immediately.
+        this.setState({ hashingProgress: -1 });
+    },
+
     handlePauseFile(fileId) {
         if(this.state.uploader.pauseUpload(fileId)) {
             this.setStatusOfFile(fileId, 'paused');
@@ -704,15 +762,8 @@ const ReactS3FineUploader = React.createClass({
             return;
         }
 
-        // validate each submitted file if it fits the file size
+        // Select only the submitted files that fit the file size and allowed extensions
-        let validFiles = [];
+        files = this.selectValidFiles(files);
-        for(let i = 0; i < files.length; i++) {
-            if(this.isFileValid(files[i])) {
-                validFiles.push(files[i]);
-            }
-        }
-        // override standard files list with only valid files
-        files = validFiles;
 
         // if multiple is set to false and user drops multiple files into the dropzone,
         // take the first one and notify user that only one file can be submitted
@@ -823,13 +874,6 @@ const ReactS3FineUploader = React.createClass({
         }
     },
 
-    handleCancelHashing() {
-        // Every progress tick of the hashing function in handleUploadFile there is a
-        // check if this.state.hashingProgress is -1. If so, there is an error thrown that cancels
-        // the hashing of all files immediately.
-        this.setState({ hashingProgress: -1 });
-    },
-
     // ReactFineUploader is essentially just a react layer around s3 fineuploader.
     // However, since we need to display the status of a file (progress, uploading) as well as
     // be able to execute actions on a currently uploading file we need to exactly sync the file list
@@ -899,46 +943,6 @@ const ReactS3FineUploader = React.createClass({
         });
     },
 
-    // This method has been made promise-based to immediately afterwards
-    // call a callback function (instantly after this.setState went through)
-    // This is e.g. needed when showing/hiding the optional thumbnail upload
-    // field in the registration form
-    setStatusOfFile(fileId, status) {
-        return Q.Promise((resolve) => {
-            let changeSet = {};
-
-            if(status === 'deleted' || status === 'canceled') {
-                changeSet.progress = { $set: 0 };
-            }
-
-            changeSet.status = { $set: status };
-
-            let filesToUpload = React.addons.update(this.state.filesToUpload, { [fileId]: changeSet });
-
-            this.setState({ filesToUpload }, resolve);
-        });
-    },
-
-    isDropzoneInactive() {
-        const filesToDisplay = this.state.filesToUpload.filter((file) => file.status !== 'deleted' && file.status !== 'canceled' && file.size !== -1);
-
-        if ((this.props.enableLocalHashing && !this.props.uploadMethod) || !this.props.areAssetsEditable || !this.props.multiple && filesToDisplay.length > 0) {
-            return true;
-        } else {
-            return false;
-        }
-    },
-
-    getAllowedExtensions() {
-        let { validation } = this.props;
-
-        if(validation && validation.allowedExtensions && validation.allowedExtensions.length > 0) {
-            return transformAllowedExtensionsToInputAcceptProp(validation.allowedExtensions);
-        } else {
-            return null;
-        }
-    },
-
     render() {
         const {
              multiple,

js/components/global_action.js

@@ -1,43 +0,0 @@
-'use strict';
-
-import React from 'react';
-
-let GlobalAction = React.createClass({
-    propTypes: {
-        requestActions: React.PropTypes.object
-    },
-
-    render() {
-        let pieceActions = null;
-        if (this.props.requestActions && this.props.requestActions.pieces){
-            pieceActions = this.props.requestActions.pieces.map((item) => {
-                return (
-                    <div className="ascribe-global-action">
-                        {item}
-                    </div>);
-            });
-        }
-        let editionActions = null;
-        if (this.props.requestActions && this.props.requestActions.editions){
-            editionActions = Object.keys(this.props.requestActions.editions).map((pieceId) => {
-                return this.props.requestActions.editions[pieceId].map((item) => {
-                    return (
-                        <div className="ascribe-global-action">
-                            {item}
-                        </div>);
-                });
-            });
-        }
-
-        if (pieceActions || editionActions) {
-            return (
-                <div className="ascribe-global-action-wrapper">
-                    {pieceActions}
-                    {editionActions}
-                </div>);
-        }
-        return null;
-    }
-});
-
-export default GlobalAction;

js/components/header.js

@@ -18,6 +18,8 @@ import AclProxy from './acl_proxy';
 
 import EventActions from '../actions/event_actions';
 
+import PieceListStore from '../stores/piece_list_store';
+
 import UserActions from '../actions/user_actions';
 import UserStore from '../stores/user_store';
 
@@ -43,12 +45,17 @@ let Header = React.createClass({
 
     getInitialState() {
         return mergeOptions(
+            PieceListStore.getState(),
             WhitelabelStore.getState(),
             UserStore.getState()
         );
     },
 
     componentDidMount() {
+        // Listen to the piece list store, but don't fetch immediately to avoid
+        // conflicts with routes that may need to wait to load the piece list
+        PieceListStore.listen(this.onChange);
+
         UserStore.listen(this.onChange);
         UserActions.fetchCurrentUser.defer();
 
@@ -75,11 +82,16 @@ let Header = React.createClass({
     },
 
     componentWillUnmount() {
+        PieceListStore.unlisten(this.onChange);
         UserStore.unlisten(this.onChange);
         WhitelabelStore.unlisten(this.onChange);
         //history.unlisten(this.onRouteChange);
     },
 
+    onChange(state) {
+        this.setState(state);
+    },
+
     getLogo() {
         let { whitelabel } = this.state;
 
@@ -93,16 +105,16 @@ let Header = React.createClass({
                     <img className="img-brand" src={whitelabel.logo} alt="Whitelabel brand"/>
                 </Link>
             );
+        } else {
+            return (
+                <span>
+                    <Link className="icon-ascribe-logo" to="/collection"/>
+                </span>
+            );
         }
-
-        return (
-            <span>
-                <Link className="icon-ascribe-logo" to="/collection"/>
-            </span>
-        );
     },
 
-    getPoweredBy(){
+    getPoweredBy() {
         return (
             <AclProxy
                 aclObject={this.state.whitelabel}
@@ -117,10 +129,6 @@ let Header = React.createClass({
         );
     },
 
-    onChange(state) {
-        this.setState(state);
-    },
-
     onMenuItemClick() {
         /*
         This is a hack to make the dropdown close after clicking on an item
@@ -156,15 +164,17 @@ let Header = React.createClass({
     },
 
     render() {
+        const { currentUser, unfilteredPieceListCount } = this.state;
         let account;
         let signup;
         let navRoutesLinks;
-        if (this.state.currentUser.username){
+
+        if (currentUser.username) {
             account = (
                 <DropdownButton
                     ref='dropdownbutton'
                     eventKey="1"
-                    title={this.state.currentUser.username}>
+                    title={currentUser.username}>
                     <LinkContainer
                         to="/settings"
                         onClick={this.onMenuItemClick}>
@@ -174,7 +184,7 @@ let Header = React.createClass({
                         </MenuItem>
                     </LinkContainer>
                     <AclProxy
-                        aclObject={this.state.currentUser.acl}
+                        aclObject={currentUser.acl}
                         aclName="acl_view_settings_contract">
                         <LinkContainer
                             to="/contract_settings"
@@ -195,9 +205,21 @@ let Header = React.createClass({
                     </LinkContainer>
                 </DropdownButton>
             );
-            navRoutesLinks = <NavRoutesLinks routes={this.props.routes} userAcl={this.state.currentUser.acl} navbar right/>;
+
-        }
+            // Let's assume that if the piece list hasn't loaded yet (ie. when unfilteredPieceListCount === -1)
-        else {
+            // then the user has pieces
+            // FIXME: this doesn't work that well as the user may not load their piece list
+            // until much later, so we would show the 'Collection' header as available until
+            // they actually click on it and get redirected to piece registration.
+            navRoutesLinks = (
+                <NavRoutesLinks
+                    navbar
+                    right
+                    hasPieces={!!unfilteredPieceListCount}
+                    routes={this.props.routes}
+                    userAcl={currentUser.acl} />
+            );
+        } else {
             account = (
                 <LinkContainer
                     to="/login">

js/components/nav_routes_links.js

@@ -11,14 +11,33 @@ import AclProxy from './acl_proxy';
 import { sanitizeList } from '../utils/general_utils';
 
 
+const DISABLE_ENUM = ['hasPieces', 'noPieces'];
+
 let NavRoutesLinks = React.createClass({
     propTypes: {
+        hasPieces: React.PropTypes.bool,
         routes: React.PropTypes.arrayOf(React.PropTypes.object),
         userAcl: React.PropTypes.object
     },
 
+    isRouteDisabled(disableOn) {
+        const { hasPieces } = this.props;
+
+        if (disableOn) {
+            if (!DISABLE_ENUM.includes(disableOn)) {
+                throw new Error(`"disableOn" must be one of: [${DISABLE_ENUM.join(', ')}] got "${disableOn}" instead`);
+            }
+
+            if (disableOn === 'hasPieces') {
+                return hasPieces;
+            } else if (disableOn === 'noPieces') {
+                return !hasPieces;
+            }
+        }
+    },
+
     /**
-     * This method generales a bunch of react-bootstrap specific links
+     * This method generates a bunch of react-bootstrap specific links
      * from the routes we defined in one of the specific routes.js file
      *
      * We can define a headerTitle as well as a aclName and according to that the
@@ -29,48 +48,50 @@ let NavRoutesLinks = React.createClass({
      * @return {Array}         Array of ReactElements that can be displayed to the user
      */
     extractLinksFromRoutes(node, userAcl, i) {
-        if(!node) {
+        if (!node) {
             return;
         }
 
-        let links = node.childRoutes.map((child, j) => {
+        const links = node.childRoutes.map((child, j) => {
-            let childrenFn = null;
+            const { aclName, disableOn, headerTitle, path, childRoutes } = child;
-            let { aclName, headerTitle, path, childRoutes } = child;
-
-            // If the node has children that could be rendered, then we want
-            // to execute this function again with the child as the root
-            //
-            // Otherwise we'll just pass childrenFn as false
-            if(child.childRoutes && child.childRoutes.length > 0) {
-                childrenFn = this.extractLinksFromRoutes(child, userAcl, i++);
-            }
 
             // We validate if the user has set the title correctly,
             // otherwise we're not going to render his route
-            if(headerTitle && typeof headerTitle === 'string') {
+            if (headerTitle && typeof headerTitle === 'string') {
+                let nestedChildren = null;
+
+                // If the node has children that could be rendered, then we want
+                // to execute this function again with the child as the root
+                //
+                // Otherwise we'll just pass nestedChildren as false
+                if (child.childRoutes && child.childRoutes.length) {
+                    nestedChildren = this.extractLinksFromRoutes(child, userAcl, i++);
+                }
+
+                const navLinkProps = {
+                    headerTitle,
+                    children: nestedChildren,
+                    depth: i,
+                    disabled: this.isRouteDisabled(disableOn),
+                    routePath: `/${path}`
+                };
+
                 // if there is an aclName present on the route definition,
                 // we evaluate it against the user's acl
-                if(aclName && typeof aclName !== 'undefined') {
+                if (aclName && typeof aclName !== 'undefined') {
                     return (
                         <AclProxy
                             key={j}
                             aclName={aclName}
                             aclObject={this.props.userAcl}>
-                            <NavRoutesLinksLink
+                            <NavRoutesLinksLink {...navLinkProps} />
-                                headerTitle={headerTitle}
-                                routePath={'/' + path}
-                                depth={i}
-                                children={childrenFn}/>
                         </AclProxy>
                     );
                 } else {
                     return (
                         <NavRoutesLinksLink
                             key={j}
-                            headerTitle={headerTitle}
+                            {...navLinkProps} />
-                            routePath={'/' + path}
-                            depth={i}
-                            children={childrenFn}/>
                     );
                 }
             } else {
@@ -84,7 +105,7 @@ let NavRoutesLinks = React.createClass({
     },
 
     render() {
-        let {routes, userAcl} = this.props;
+        const {routes, userAcl} = this.props;
 
         return (
             <Nav {...this.props}>
@@ -94,4 +115,4 @@ let NavRoutesLinks = React.createClass({
     }
 });
 
-export default NavRoutesLinks;
+export default NavRoutesLinks;

js/components/nav_routes_links_link.js

@@ -11,40 +11,45 @@ import LinkContainer from 'react-router-bootstrap/lib/LinkContainer';
 
 let NavRoutesLinksLink = React.createClass({
     propTypes: {
-        headerTitle: React.PropTypes.string,
-        routePath: React.PropTypes.string,
-
         children: React.PropTypes.oneOfType([
             React.PropTypes.arrayOf(React.PropTypes.element),
             React.PropTypes.element
         ]),
-
+        disabled: React.PropTypes.bool,
-        depth: React.PropTypes.number
+        depth: React.PropTypes.number,
+        headerTitle: React.PropTypes.string,
+        routePath: React.PropTypes.string
     },
 
     render() {
-        let { children, headerTitle, depth, routePath } = this.props;
+        const { children, headerTitle, depth, disabled, routePath } = this.props;
 
         // if the route has children, we're returning a DropdownButton that will get filled
         // with MenuItems
-        if(children) {
+        if (children) {
             return (
-                <DropdownButton title={headerTitle}>
+                <DropdownButton
+                    disabled={disabled}
+                    title={headerTitle}>
                     {children}
                 </DropdownButton>
             );
         } else {
-            if(depth === 1) {
+            if (depth === 1) {
                 // if the node's child is actually a node of level one (a child of a node), we're
                 // returning a DropdownButton matching MenuItem
                 return (
-                    <LinkContainer to={routePath}>
+                    <LinkContainer
+                        disabled={disabled}
+                        to={routePath}>
                         <MenuItem>{headerTitle}</MenuItem>
                     </LinkContainer>
                 );
-            } else if(depth === 0) {
+            } else if (depth === 0) {
                 return (
-                    <LinkContainer to={routePath}>
+                    <LinkContainer
+                        disabled={disabled}
+                        to={routePath}>
                         <NavItem>{headerTitle}</NavItem>
                     </LinkContainer>
                 );
@@ -55,4 +60,4 @@ let NavRoutesLinksLink = React.createClass({
     }
 });
 
-export default NavRoutesLinksLink;
+export default NavRoutesLinksLink;

js/components/password_reset_container.js

@@ -130,8 +130,9 @@ let PasswordResetForm = React.createClass({
     },
 
     handleSuccess() {
-        this.history.pushState(null, '/collection');
+        this.history.push('/collection');
-        let notification = new GlobalNotificationModel(getLangText('password successfully updated'), 'success', 10000);
+
+        const notification = new GlobalNotificationModel(getLangText('password successfully updated'), 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 

js/components/piece_list.js

@@ -53,7 +53,6 @@ let PieceList = React.createClass({
             accordionListItemType: AccordionListItemWallet,
             bulkModalButtonListType: AclButtonList,
             canLoadPieceList: true,
-            orderParams: ['artist_name', 'title'],
             filterParams: [{
                 label: getLangText('Show works I can'),
                 items: [
@@ -61,7 +60,10 @@ let PieceList = React.createClass({
                     'acl_consign',
                     'acl_create_editions'
                 ]
-            }]
+            }],
+            orderParams: ['artist_name', 'title'],
+            redirectTo: '/register_piece',
+            shouldRedirect: () => true
         };
     },
 
@@ -115,13 +117,13 @@ let PieceList = React.createClass({
     },
 
     componentDidUpdate() {
-        const { redirectTo, shouldRedirect } = this.props;
+        const { location: { query }, redirectTo, shouldRedirect } = this.props;
         const { unfilteredPieceListCount } = this.state;
 
         if (redirectTo && unfilteredPieceListCount === 0 &&
             (typeof shouldRedirect === 'function' && shouldRedirect(unfilteredPieceListCount))) {
             // FIXME: hack to redirect out of the dispatch cycle
-            window.setTimeout(() => this.history.pushState(null, this.props.redirectTo, this.props.location.query), 0);
+            window.setTimeout(() => this.history.push({ query, pathname: redirectTo }), 0);
         }
     },
 
@@ -174,15 +176,16 @@ let PieceList = React.createClass({
         }
     },
 
-    searchFor(searchTerm) {
+    searchFor(search) {
-        this.loadPieceList({
+        const { location: { pathname } } = this.props;
-            page: 1,
+
-            search: searchTerm
+        this.loadPieceList({ search, page: 1 });
-        });
+        this.history.push({ pathname, query: { page: 1 } });
-        this.history.pushState(null, this.props.location.pathname, {page: 1});
     },
 
-    applyFilterBy(filterBy){
+    applyFilterBy(filterBy) {
+        const { location: { pathname } } = this.props;
+
         this.setState({
             isFilterDirty: true
         });
@@ -195,31 +198,32 @@ let PieceList = React.createClass({
                 this.state.pieceList
                     .forEach((piece) => {
                         // but only if they're actually open
-                        if(this.state.isEditionListOpenForPieceId[piece.id].show) {
+                        const isEditionListOpenForPiece = this.state.isEditionListOpenForPieceId[piece.id];
+
+                        if (isEditionListOpenForPiece && isEditionListOpenForPiece.show) {
                             EditionListActions.refreshEditionList({
                                 pieceId: piece.id,
                                 filterBy
                             });
                         }
-
                     });
             });
 
         // we have to redirect the user always to page one as it could be that there is no page two
         // for filtered pieces
-        this.history.pushState(null, this.props.location.pathname, {page: 1});
+        this.history.push({ pathname, query: { page: 1 } });
     },
 
     applyOrderBy(orderBy) {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
+        const { filterBy, orderAsc, page, pageSize, search } = this.state;
-                                        orderBy, this.state.orderAsc, this.state.filterBy);
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
     },
 
     loadPieceList({ page, filterBy = this.state.filterBy, search = this.state.search }) {
+        const { orderAsc, pageSize } = this.state;
         const orderBy = this.state.orderBy || this.props.orderBy;
 
-        return PieceListActions.fetchPieceList(page, this.state.pageSize, search,
+        return PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
-                                               orderBy, this.state.orderAsc, filterBy);
     },
 
     fetchSelectedPieceEditionList() {
@@ -245,8 +249,9 @@ let PieceList = React.createClass({
     },
 
     handleAclSuccess() {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
+        const { filterBy, orderBy, orderAsc, page, pageSize, search } = this.state;
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
 
         this.fetchSelectedPieceEditionList()
             .forEach((pieceId) => {

js/components/register_piece.js

@@ -65,26 +65,21 @@ let RegisterPiece = React.createClass( {
         this.setState(state);
     },
 
-    handleSuccess(response){
+    handleSuccess(response) {
-        let notification = new GlobalNotificationModel(response.notification, 'success', 10000);
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
+
+        const notification = new GlobalNotificationModel(response.notification, 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
 
         // once the user was able to register a piece successfully, we need to make sure to keep
         // the piece list up to date
-        PieceListActions.fetchPieceList(
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
-            this.state.page,
-            this.state.pageSize,
-            this.state.searchTerm,
-            this.state.orderBy,
-            this.state.orderAsc,
-            this.state.filterBy
-        );
 
-        this.history.pushState(null, `/pieces/${response.piece.id}`);
+        this.history.push(`/pieces/${response.piece.id}`);
     },
 
     getSpecifyEditions() {
-        if(this.state.whitelabel && this.state.whitelabel.acl_create_editions || Object.keys(this.state.whitelabel).length === 0) {
+        if (this.state.whitelabel && this.state.whitelabel.acl_create_editions || Object.keys(this.state.whitelabel).length === 0) {
             return (
                 <Property
                     name="num_editions"
@@ -94,7 +89,8 @@ let RegisterPiece = React.createClass( {
                     <input
                         type="number"
                         placeholder="(e.g. 32)"
-                        min={0}/>
+                        min={1}
+                        max={100} />
                 </Property>
             );
         }

js/components/whitelabel/prize/portfolioreview/components/pr_forms/pr_register_piece_form.js

@@ -3,19 +3,21 @@
 import React from 'react';
 import { History } from 'react-router';
 
+import GlobalNotificationModel from '../../../../../../models/global_notification_model';
+import GlobalNotificationActions from '../../../../../../actions/global_notification_actions';
+
 import Form from '../../../../../ascribe_forms/form';
 import Property from '../../../../../ascribe_forms/property';
 import InputTextAreaToggable from '../../../../../ascribe_forms/input_textarea_toggable';
 
-import UploadButton from '../../../../../ascribe_uploader/ascribe_upload_button/upload_button';
 import InputFineuploader from '../../../../../ascribe_forms/input_fineuploader';
+import UploadButton from '../../../../../ascribe_uploader/ascribe_upload_button/upload_button';
+
 import AscribeSpinner from '../../../../../ascribe_spinner';
 
-import GlobalNotificationModel from '../../../../../../models/global_notification_model';
-import GlobalNotificationActions from '../../../../../../actions/global_notification_actions';
-
-import AppConstants from '../../../../../../constants/application_constants';
 import ApiUrls from '../../../../../../constants/api_urls';
+import AppConstants from '../../../../../../constants/application_constants';
+import { validationParts, validationTypes } from '../../../../../../constants/uploader_constants';
 
 import requests from '../../../../../../utils/requests';
 
@@ -106,7 +108,7 @@ const PRRegisterPieceForm = React.createClass({
                         GlobalNotificationActions.appendGlobalNotification(notificationMessage);
                     });
             })
-            .then(() => this.history.pushState(null, `/pieces/${this.state.piece.id}`))
+            .then(() => this.history.push(`/pieces/${this.state.piece.id}`))
             .catch((err) => {
                 const errMessage = (getErrorNotificationMessage(err) || getLangText("Oops! We weren't able to send your submission.")) +
                                         getLangText(' Please contact support@ascribe.io');
@@ -193,11 +195,12 @@ const PRRegisterPieceForm = React.createClass({
 
     render() {
         const { location } = this.props;
+        const maxThumbnailSize = validationTypes.workThumbnail.sizeLimit / 1000000;
 
         return (
             <div className="register-piece--form">
                 <Form
-                    buttons={{}}
+                    buttons={null}
                     className="ascribe-form-bordered"
                     ref="registerPieceForm">
                     <Property
@@ -234,7 +237,7 @@ const PRRegisterPieceForm = React.createClass({
                     </Property>
                 </Form>
                 <Form
-                    buttons={{}}
+                    buttons={null}
                     className="ascribe-form-bordered"
                     ref="additionalDataForm">
                     <Property
@@ -286,7 +289,7 @@ const PRRegisterPieceForm = React.createClass({
                     </Property>
                 </Form>
                 <Form
-                    buttons={{}}
+                    buttons={null}
                     className="ascribe-form-bordered"
                     ref="uploadersForm">
                     <Property
@@ -304,8 +307,8 @@ const PRRegisterPieceForm = React.createClass({
                                 fileClass: 'digitalwork'
                             }}
                             validation={{
-                                itemLimit: AppConstants.fineUploader.validation.registerWork.itemLimit,
+                                itemLimit: validationTypes.registerWork.itemLimit,
-                                sizeLimit: AppConstants.fineUploader.validation.additionalData.sizeLimit,
+                                sizeLimit: validationTypes.additionalData.sizeLimit,
                                 allowedExtensions: ['pdf']
                             }}
                             location={location}
@@ -317,7 +320,7 @@ const PRRegisterPieceForm = React.createClass({
                     </Property>
                     <Property
                         name="thumbnailKey"
-                        label={getLangText('Featured Cover photo (max 5MB)')}>
+                        label={`${getLangText('Featured Cover photo')} (max ${maxThumbnailSize}MB)`}>
                         <InputFineuploader
                             fileInputElement={UploadButton()}
                             createBlobRoutine={{
@@ -330,9 +333,9 @@ const PRRegisterPieceForm = React.createClass({
                                 fileClass: 'thumbnail'
                             }}
                             validation={{
-                                itemLimit: AppConstants.fineUploader.validation.workThumbnail.itemLimit,
+                                itemLimit: validationTypes.workThumbnail.itemLimit,
-                                sizeLimit: AppConstants.fineUploader.validation.workThumbnail.sizeLimit,
+                                sizeLimit: validationTypes.workThumbnail.sizeLimit,
-                                allowedExtensions: ['png', 'jpg', 'jpeg', 'gif']
+                                allowedExtensions: validationParts.allowedExtensions.images
                             }}
                             location={location}
                             fileClassToUpload={{
@@ -355,8 +358,8 @@ const PRRegisterPieceForm = React.createClass({
                                 fileClass: 'otherdata'
                             }}
                             validation={{
-                                itemLimit: AppConstants.fineUploader.validation.registerWork.itemLimit,
+                                itemLimit: validationParts.itemLimit.single,
-                                sizeLimit: AppConstants.fineUploader.validation.additionalData.sizeLimit
+                                sizeLimit: validationTypes.additionalData.sizeLimit
                             }}
                             location={location}
                             fileClassToUpload={{
@@ -377,9 +380,9 @@ const PRRegisterPieceForm = React.createClass({
                                 fileClass: 'otherdata'
                             }}
                             validation={{
-                                itemLimit: AppConstants.fineUploader.validation.registerWork.itemLimit,
+                                itemLimit: validationParts.itemLimit.single,
-                                sizeLimit: AppConstants.fineUploader.validation.additionalData.sizeLimit,
+                                sizeLimit: validationTypes.additionalData.sizeLimit,
-                                allowedExtensions: ['png', 'jpg', 'jpeg', 'gif']
+                                allowedExtensions: validationParts.allowedExtensions.images
                             }}
                             location={location}
                             fileClassToUpload={{
@@ -390,7 +393,7 @@ const PRRegisterPieceForm = React.createClass({
                     </Property>
                 </Form>
                 <Form
-                    buttons={{}}
+                    buttons={null}
                     className="ascribe-form-bordered">
                     <Property
                         name="terms"

js/components/whitelabel/prize/portfolioreview/components/pr_landing.js

@@ -14,7 +14,7 @@ import LinkContainer from 'react-router-bootstrap/lib/LinkContainer';
 import UserStore from '../../../../../stores/user_store';
 import UserActions from '../../../../../actions/user_actions';
 
-import { mergeOptions } from '../../../../../utils/general_utils';
+import { mergeOptions, omitFromObject } from '../../../../../utils/general_utils';
 import { getLangText } from '../../../../../utils/lang_utils';
 
 
@@ -34,15 +34,18 @@ const PRLanding = React.createClass({
 
     componentDidMount() {
         const { location } = this.props;
+
         UserStore.listen(this.onChange);
-        UserActions.fetchCurrentUser();
         PrizeStore.listen(this.onChange);
+
+        UserActions.fetchCurrentUser();
         PrizeActions.fetchPrize();
 
-        if(location && location.query && location.query.redirect) {
+        if (location && location.query && location.query.redirect) {
-            let queryCopy = JSON.parse(JSON.stringify(location.query));
+            window.setTimeout(() => this.history.replace({
-            delete queryCopy.redirect;
+                pathname: `/${location.query.redirect}`,
-            window.setTimeout(() => this.history.replaceState(null, `/${location.query.redirect}`, queryCopy));
+                query: omitFromObject(location.query, ['redirect'])
+            }));
         }
     },
 
@@ -125,4 +128,4 @@ const PRLanding = React.createClass({
     }
 });
 
-export default PRLanding;
+export default PRLanding;

js/components/whitelabel/prize/portfolioreview/components/pr_register_piece.js

@@ -39,7 +39,7 @@ const PRRegisterPiece = React.createClass({
         if(currentUser && currentUser.email) {
             const submittedPieceId = getCookie(currentUser.email);
             if(submittedPieceId) {
-                this.history.pushState(null, `/pieces/${submittedPieceId}`);
+                this.history.push(`/pieces/${submittedPieceId}`);
             }
         }
     },

js/components/whitelabel/prize/portfolioreview/components/pr_routes/pr_proxy_handler.js

@@ -17,7 +17,7 @@ export function AuthPrizeRoleRedirect({ to, when }) {
             .reduce((a, b) => a || b);
 
         if (exprToValidate) {
-            window.setTimeout(() => history.replaceState(null, to, query));
+            window.setTimeout(() => history.replace({ query, pathname: to }));
             return true;
         } else {
             return false;

js/components/whitelabel/prize/simple_prize/components/ascribe_accordion_list/accordion_list_item_prize.js

@@ -58,8 +58,9 @@ let AccordionListItemPrize = React.createClass({
     },
 
     handleSubmitPrizeSuccess(response) {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
 
         let notification = new GlobalNotificationModel(response.notification, 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
@@ -138,8 +139,9 @@ let AccordionListItemPrize = React.createClass({
     },
 
     refreshPieceData() {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
     },
 
     onSelectChange(){

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

@@ -60,16 +60,10 @@ let PrizePieceContainer = React.createClass({
     mixins: [ReactError],
 
     getInitialState() {
-        //FIXME: this component uses the PieceStore, but we avoid using the getState() here since it may contain stale data
+        return mergeOptions(
-        //       It should instead use something like getInitialState() where that call also resets the state.
+            PieceStore.getInitialState(),
-        return UserStore.getState();
+            UserStore.getState()
-    },
+        );
-
-    componentWillMount() {
-        // 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({});
     },
 
     componentDidMount() {
@@ -81,18 +75,19 @@ let PrizePieceContainer = React.createClass({
     },
 
     // This is done to update the container when the user clicks on the prev or next
-    // button to update the URL parameter (and therefore to switch pieces)
+    // button to update the URL parameter (and therefore to switch pieces) or
+    // when the user clicks on a notification while being in another piece view
     componentWillReceiveProps(nextProps) {
         if (this.props.params.pieceId !== nextProps.params.pieceId) {
-            PieceActions.updatePiece({});
+            PieceActions.flushPiece();
             this.loadPiece(nextProps.params.pieceId);
         }
     },
 
     componentDidUpdate() {
-        const { pieceError } = this.state;
+        const { pieceMeta: { err: pieceErr } } = this.state;
 
-        if (pieceError && pieceError.status === 404) {
+        if (pieceErr && pieceErr.status === 404) {
             this.throws(new ResourceNotFoundError(getLangText("Oops, the piece you're looking for doesn't exist.")));
         }
     },
@@ -109,25 +104,25 @@ let PrizePieceContainer = React.createClass({
     getActions() {
         const { currentUser, piece } = this.state;
 
-        if (piece && piece.notifications && piece.notifications.length > 0) {
+        if (piece.notifications && piece.notifications.length > 0) {
             return (
                 <ListRequestActions
                     pieceOrEditions={piece}
                     currentUser={currentUser}
                     handleSuccess={this.loadPiece}
-                    notifications={piece.notifications}/>);
+                    notifications={piece.notifications} />);
         }
     },
 
     loadPiece(pieceId = this.props.params.pieceId) {
-        PieceActions.fetchOne(pieceId);
+        PieceActions.fetchPiece(pieceId);
     },
 
     render() {
         const { selectedPrizeActionButton } = this.props;
         const { currentUser, piece } = this.state;
 
-        if (piece && piece.id) {
+        if (piece.id) {
             /*
 
                 This really needs a refactor!
@@ -138,16 +133,19 @@ let PrizePieceContainer = React.createClass({
             // Only show the artist name if you are the participant or if you are a judge and the piece is shortlisted
             let artistName;
             if ((currentUser.is_jury && !currentUser.is_judge) || (currentUser.is_judge && !piece.selected )) {
-                artistName = <span className="glyphicon glyphicon-eye-close" aria-hidden="true"/>;
+                artistName = <span className="glyphicon glyphicon-eye-close" aria-hidden="true" />;
                 setDocumentTitle(piece.title);
             } else {
                 artistName = piece.artist_name;
-                setDocumentTitle([artistName, piece.title].join(', '));
+                setDocumentTitle(`${artistName}, ${piece.title}`);
             }
 
             // Only show the artist email if you are a judge and the piece is shortlisted
-            const artistEmail = (currentUser.is_judge && piece.selected ) ?
+            const artistEmail = currentUser.is_judge && piece.selected ? (
-                <DetailProperty label={getLangText('REGISTREE')} value={ piece.user_registered } /> : null;
+                <DetailProperty
+                    label={getLangText('REGISTREE')}
+                    value={piece.user_registered} />
+            ) : null;
 
             return (
                 <Piece
@@ -157,16 +155,16 @@ let PrizePieceContainer = React.createClass({
                         <div className="ascribe-detail-header">
                             <NavigationHeader
                                 piece={piece}
-                                currentUser={currentUser}/>
+                                currentUser={currentUser} />
 
                             <h1 className="ascribe-detail-title">{piece.title}</h1>
                             <DetailProperty label={getLangText('BY')} value={artistName} />
                             <DetailProperty label={getLangText('DATE')} value={Moment(piece.date_created, 'YYYY-MM-DD').year()} />
                             {artistEmail}
                             {this.getActions()}
-                            <hr/>
+                            <hr />
                         </div>
-                        }
+                    }
                     subheader={
                         <PrizePieceRatings
                             loadPiece={this.loadPiece}
@@ -189,16 +187,15 @@ let PrizePieceContainer = React.createClass({
 
 let NavigationHeader = React.createClass({
     propTypes: {
-        piece: React.PropTypes.object,
+        currentUser: React.PropTypes.object.isRequired,
-        currentUser: React.PropTypes.object
+        piece: React.PropTypes.object.isRequired
     },
 
     render() {
         const { currentUser, piece } = this.props;
 
-        if (currentUser && currentUser.email && currentUser.is_judge && currentUser.is_jury &&
+        if (currentUser.email && currentUser.is_judge && currentUser.is_jury && !currentUser.is_admin && piece.navigation) {
-            !currentUser.is_admin && piece && piece.navigation) {
+            const nav = piece.navigation;
-            let nav = piece.navigation;
 
             return (
                 <div style={{marginBottom: '1em'}}>
@@ -218,17 +215,19 @@ let NavigationHeader = React.createClass({
                     <hr/>
                 </div>
             );
+        } else {
+            return null;
         }
-        return null;
     }
 });
 
 
 let PrizePieceRatings = React.createClass({
     propTypes: {
-        loadPiece: React.PropTypes.func,
+        currentUser: React.PropTypes.object.isRequired,
-        piece: React.PropTypes.object,
+        loadPiece: React.PropTypes.func.isRequired,
-        currentUser: React.PropTypes.object,
+        piece: React.PropTypes.object.isRequired,
+
         selectedPrizeActionButton: React.PropTypes.func
     },
 
@@ -241,12 +240,18 @@ let PrizePieceRatings = React.createClass({
     },
 
     componentDidMount() {
-        PieceListStore.listen(this.onChange);
-        PrizeStore.listen(this.onChange);
         PrizeRatingStore.listen(this.onChange);
+        PrizeStore.listen(this.onChange);
+        PieceListStore.listen(this.onChange);
 
         PrizeActions.fetchPrize();
-        this.fetchPrizeRatings();
+        this.fetchRatingsIfAuthorized();
+    },
+
+    componentWillReceiveProps(nextProps) {
+        if (nextProps.currentUser.email !== this.props.currentUser.email) {
+            this.fetchRatingsIfAuthorized();
+        }
     },
 
     componentWillUnmount() {
@@ -261,7 +266,7 @@ let PrizePieceRatings = React.createClass({
     // with the problem.
     onChange(state) {
         if (state.prize && state.prize.active_round != this.state.prize.active_round) {
-            this.fetchPrizeRatings(state);
+            this.fetchRatingsIfAuthorized(state);
         }
 
         this.setState(state);
@@ -276,9 +281,19 @@ let PrizePieceRatings = React.createClass({
         }
     },
 
-    fetchPrizeRatings(state = this.state) {
+    fetchRatingsIfAuthorized(state = this.state) {
-        PrizeRatingActions.fetchOne(this.props.piece.id, state.prize.active_round);
+        const {
-        PrizeRatingActions.fetchAverage(this.props.piece.id, state.prize.active_round);
+            currentUser: {
+                is_admin: isAdmin,
+                is_judge: isJudge,
+                is_jury: isJury
+            },
+            piece: { id: pieceId } } = this.props;
+
+        if (state.prize && 'active_round' in state.prize && (isAdmin || isJudge || isJury)) {
+            PrizeRatingActions.fetchOne(pieceId, state.prize.active_round);
+            PrizeRatingActions.fetchAverage(pieceId, state.prize.active_round);
+        }
     },
 
     onRatingClick(event, args) {
@@ -303,9 +318,10 @@ let PrizePieceRatings = React.createClass({
     },
 
     refreshPieceData() {
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
+
         this.props.loadPiece();
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
     },
 
     onSelectChange() {
@@ -322,7 +338,7 @@ let PrizePieceRatings = React.createClass({
     },
 
     render() {
-        if (this.props.piece && this.props.currentUser && this.props.currentUser.is_judge && this.state.average) {
+        if (this.props.piece.id && this.props.currentUser.is_judge && this.state.average) {
             // Judge sees shortlisting, average and per-jury notes
             return (
                 <div>
@@ -354,7 +370,7 @@ let PrizePieceRatings = React.createClass({
                                 size='md'
                                 step={0.5}
                                 rating={this.state.average}
-                                ratingAmount={5}/>
+                                ratingAmount={5} />
                         </div>
                         <hr />
                         {this.state.ratings.map((item, i) => {
@@ -379,7 +395,7 @@ let PrizePieceRatings = React.createClass({
                                             size='sm'
                                             step={0.5}
                                             rating={item.rating}
-                                            ratingAmount={5}/>
+                                            ratingAmount={5} />
                                     </span>
                                     <span> {item.user}</span>
                                         {note}
@@ -390,7 +406,7 @@ let PrizePieceRatings = React.createClass({
                         <hr />
                     </CollapsibleParagraph>
                 </div>);
-        } else if (this.props.currentUser && this.props.currentUser.is_jury) {
+        } else if (this.props.currentUser.is_jury) {
             // Jury can set rating and note
             return (
                 <CollapsibleParagraph
@@ -408,14 +424,14 @@ let PrizePieceRatings = React.createClass({
                             ratingAmount={5} />
                         </div>
                     <Note
-                        id={() => {return {'piece_id': this.props.piece.id}; }}
+                        id={() => ({ 'piece_id': this.props.piece.id })}
                         label={getLangText('Jury note')}
-                        defaultValue={this.props.piece && this.props.piece.note_from_user ? this.props.piece.note_from_user.note : null}
+                        defaultValue={this.props.piece.note_from_user || null}
                         placeholder={getLangText('Enter your comments ...')}
                         editable={true}
                         successMessage={getLangText('Jury note saved')}
                         url={ApiUrls.notes}
-                        currentUser={this.props.currentUser}/>
+                        currentUser={this.props.currentUser} />
                 </CollapsibleParagraph>);
         } else {
             return null;
@@ -426,39 +442,40 @@ let PrizePieceRatings = React.createClass({
 
 let PrizePieceDetails = React.createClass({
     propTypes: {
-        piece: React.PropTypes.object
+        piece: React.PropTypes.object.isRequired
     },
 
     render() {
         const { piece } = this.props;
 
-        if (piece &&
+        if (piece.prize && piece.prize.name && Object.keys(piece.extra_data).length) {
-            piece.prize &&
-            piece.prize.name &&
-            Object.keys(piece.extra_data).length !== 0) {
             return (
                 <CollapsibleParagraph
                     title={getLangText('Prize Details')}
                     defaultExpanded={true}>
-                    <Form ref='form'>
+                    <Form>
-                        {Object.keys(piece.extra_data).sort().map((data) => {
+                        {Object
-                            // Remove leading number (for sorting), if any, and underscores with spaces
+                            .keys(piece.extra_data)
-                            let label = data.replace(/^\d-/, '').replace(/_/g, ' ');
+                            .sort()
-                            const value = piece.extra_data[data] || 'N/A';
+                            .map((data) => {
+                                // Remove leading number (for sorting), if any, and underscores with spaces
+                                const label = data.replace(/^\d-/, '').replace(/_/g, ' ');
+                                const value = piece.extra_data[data] || 'N/A';
 
-                            return (
+                                return (
-                                <Property
+                                    <Property
-                                    key={label}
+                                        key={label}
-                                    name={data}
+                                        name={data}
-                                    label={label}
+                                        label={label}
-                                    editable={false}
+                                        editable={false}
-                                    overrideForm={true}>
+                                        overrideForm={true}>
-                                    <InputTextAreaToggable
+                                        <InputTextAreaToggable
-                                        rows={1}
+                                            rows={1}
-                                        defaultValue={value}/>
+                                            defaultValue={value} />
-                                </Property>
+                                    </Property>
-                            );
+                                );
-                        })}
+                            })
+                        }
                         <FurtherDetailsFileuploader
                             submitFile={() => {}}
                             setIsUploadReady={() => {}}
@@ -471,8 +488,9 @@ let PrizePieceDetails = React.createClass({
                     </Form>
                 </CollapsibleParagraph>
             );
+        } else {
+            return null;
         }
-        return null;
     }
 });
 

js/components/whitelabel/prize/simple_prize/components/prize_landing.js

@@ -46,7 +46,7 @@ let Landing = React.createClass({
         // if user is already logged in, redirect him to piece list
         if(this.state.currentUser && this.state.currentUser.email) {
             // FIXME: hack to redirect out of the dispatch cycle
-            window.setTimeout(() => this.history.replaceState(null, '/collection'), 0);
+            window.setTimeout(() => this.history.replace('/collection'), 0);
         }
     },
 

js/components/whitelabel/prize/simple_prize/components/prize_piece_list.js

@@ -75,7 +75,6 @@ let PrizePieceList = React.createClass({
             <div>
                 <PieceList
                     ref="list"
-                    redirectTo="/register_piece"
                     accordionListItemType={AccordionListItemPrize}
                     orderParams={orderParams}
                     orderBy={this.state.currentUser.is_jury ? 'rating' : null}

js/components/whitelabel/prize/simple_prize/stores/prize_rating_store.js

@@ -14,6 +14,18 @@ class PrizeRatingStore {
         });
     }
 
+    getInitialState() {
+        this.ratings = [];
+        this.currentRating = null;
+        this.average = null;
+
+        return {
+            ratings: this.ratings,
+            currentRating: this.currentRating,
+            average: this.average
+        };
+    }
+
     onUpdatePrizeRatings(ratings) {
         this.ratings = ratings;
     }
@@ -30,18 +42,6 @@ class PrizeRatingStore {
     onResetPrizeRatings() {
         this.getInitialState();
     }
-
-    getInitialState() {
-        this.ratings = [];
-        this.currentRating = null;
-        this.average = null;
-
-        return {
-            ratings: this.ratings,
-            currentRating: this.currentRating,
-            average: this.average
-        };
-    }
 }
 
-export default alt.createStore(PrizeRatingStore, 'PrizeRatingStore');
+export default alt.createStore(PrizeRatingStore, 'PrizeRatingStore');

js/components/whitelabel/wallet/components/ascribe_detail/wallet_piece_container.js

@@ -32,55 +32,62 @@ let WalletPieceContainer = React.createClass({
         ])
     },
 
-
     render() {
-        if (this.props.piece && this.props.piece.id) {
+        const {
+            children,
+            currentUser,
+            handleDeleteSuccess,
+            loadPiece,
+            piece,
+            submitButtonType } = this.props;
+
+        if (piece && piece.id) {
             return (
                 <Piece
-                    piece={this.props.piece}
+                    piece={piece}
-                    loadPiece={this.props.loadPiece}
+                    currentUser={currentUser}
                     header={
                         <div className="ascribe-detail-header">
                             <hr style={{marginTop: 0}}/>
-                            <h1 className="ascribe-detail-title">{this.props.piece.title}</h1>
+                            <h1 className="ascribe-detail-title">{piece.title}</h1>
-                            <DetailProperty label="BY" value={this.props.piece.artist_name} />
+                            <DetailProperty label="BY" value={piece.artist_name} />
-                            <DetailProperty label="DATE" value={Moment(this.props.piece.date_created, 'YYYY-MM-DD').year()} />
+                            <DetailProperty label="DATE" value={Moment(piece.date_created, 'YYYY-MM-DD').year()} />
                             <hr/>
                         </div>
                     }
                     subheader={
                         <div className="ascribe-detail-header">
-                            <DetailProperty label={getLangText('REGISTREE')} value={ this.props.piece.user_registered } />
+                            <DetailProperty label={getLangText('REGISTREE')} value={ piece.user_registered } />
-                            <DetailProperty label={getLangText('ID')} value={ this.props.piece.bitcoin_id } ellipsis={true} />
+                            <DetailProperty label={getLangText('ID')} value={ piece.bitcoin_id } ellipsis={true} />
                             <hr/>
                         </div>
                     }>
                     <WalletActionPanel
-                        piece={this.props.piece}
+                        piece={piece}
-                        currentUser={this.props.currentUser}
+                        currentUser={currentUser}
-                        loadPiece={this.props.loadPiece}
+                        loadPiece={loadPiece}
-                        handleDeleteSuccess={this.props.handleDeleteSuccess}
+                        handleDeleteSuccess={handleDeleteSuccess}
-                        submitButtonType={this.props.submitButtonType}/>
+                        submitButtonType={submitButtonType}/>
                     <CollapsibleParagraph
                         title={getLangText('Loan History')}
-                        show={this.props.piece.loan_history && this.props.piece.loan_history.length > 0}>
+                        show={piece.loan_history && piece.loan_history.length > 0}>
                         <HistoryIterator
-                            history={this.props.piece.loan_history}/>
+                            history={piece.loan_history}/>
                     </CollapsibleParagraph>
                     <CollapsibleParagraph
                         title={getLangText('Notes')}
-                        show={!!(this.props.currentUser.username || this.props.piece.public_note)}>
+                        show={!!(currentUser.username || piece.public_note)}>
                         <Note
-                            id={() => {return {'id': this.props.piece.id}; }}
+                            id={() => {return {'id': piece.id}; }}
                             label={getLangText('Personal note (private)')}
-                            defaultValue={this.props.piece.private_note || null}
+                            defaultValue={piece.private_note || null}
                             placeholder={getLangText('Enter your comments ...')}
                             editable={true}
                             successMessage={getLangText('Private note saved')}
                             url={ApiUrls.note_private_piece}
-                            currentUser={this.props.currentUser}/>
+                            currentUser={currentUser}/>
                     </CollapsibleParagraph>
-                    {this.props.children}
+                    {children}
                 </Piece>
             );
         } else {

js/components/whitelabel/wallet/components/cyland/cyland_accordion_list/cyland_accordion_list_item.js

@@ -52,8 +52,9 @@ let CylandAccordionListItem = React.createClass({
     },
 
     handleSubmitSuccess(response) {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
 
         let notification = new GlobalNotificationModel(response.notification, 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);

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

@@ -40,7 +40,7 @@ let CylandPieceContainer = React.createClass({
 
     getInitialState() {
         return mergeOptions(
-            PieceStore.getState(),
+            PieceStore.getInitialState(),
             UserStore.getState(),
             PieceListStore.getState()
         );
@@ -51,14 +51,17 @@ let CylandPieceContainer = React.createClass({
         UserStore.listen(this.onChange);
         PieceListStore.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.loadPiece();
     },
 
+    // We need this for when the user clicks on a notification while being in another piece view
+    componentWillReceiveProps(nextProps) {
+        if (this.props.params.pieceId !== nextProps.params.pieceId) {
+            PieceActions.flushPiece();
+            this.loadPiece();
+        }
+    },
+
     componentWillUnmount() {
         PieceStore.unlisten(this.onChange);
         UserStore.unlisten(this.onChange);
@@ -70,31 +73,34 @@ let CylandPieceContainer = React.createClass({
     },
 
     loadPiece() {
-        PieceActions.fetchOne(this.props.params.pieceId);
+        PieceActions.fetchPiece(this.props.params.pieceId);
     },
 
     handleDeleteSuccess(response) {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
 
         // since we're deleting a piece, we just need to close
         // all editions dialogs and not reload them
         EditionListActions.closeAllEditionLists();
         EditionListActions.clearAllEditionSelections();
 
-        let notification = new GlobalNotificationModel(response.notification, 'success');
+        const notification = new GlobalNotificationModel(response.notification, 'success');
         GlobalNotificationActions.appendGlobalNotification(notification);
 
-        this.history.pushState(null, '/collection');
+        this.history.push('/collection');
     },
 
     render() {
-        if(this.state.piece && this.state.piece.id) {
+        const { piece } = this.state;
-            setDocumentTitle([this.state.piece.artist_name, this.state.piece.title].join(', '));
+
+        if (piece.id) {
+            setDocumentTitle(`${piece.artist_name}, ${piece.title}`);
 
             return (
                 <WalletPieceContainer
-                    piece={this.state.piece}
+                    piece={piece}
                     currentUser={this.state.currentUser}
                     loadPiece={this.loadPiece}
                     handleDeleteSuccess={this.handleDeleteSuccess}
@@ -103,14 +109,13 @@ let CylandPieceContainer = React.createClass({
                         title={getLangText('Further Details')}
                         defaultExpanded={true}>
                         <CylandAdditionalDataForm
-                            piece={this.state.piece}
+                            piece={piece}
-                            disabled={!this.state.piece.acl.acl_edit}
+                            disabled={!piece.acl.acl_edit}
                             isInline={true} />
                     </CollapsibleParagraph>
                 </WalletPieceContainer>
             );
-        }
+        } else {
-        else {
             return (
                 <div className="fullpage-spinner">
                     <AscribeSpinner color='dark-blue' size='lg' />

js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js

@@ -23,9 +23,10 @@ import { formSubmissionValidation } from '../../../../../ascribe_uploader/react_
 
 let CylandAdditionalDataForm = React.createClass({
     propTypes: {
-        handleSuccess: React.PropTypes.func,
         piece: React.PropTypes.object.isRequired,
+
         disabled: React.PropTypes.bool,
+        handleSuccess: React.PropTypes.func,
         isInline: React.PropTypes.bool
     },
 
@@ -42,13 +43,13 @@ let CylandAdditionalDataForm = React.createClass({
     },
 
     handleSuccess() {
-        let notification = new GlobalNotificationModel(getLangText('Further details successfully updated'), 'success', 10000);
+        const notification = new GlobalNotificationModel(getLangText('Further details successfully updated'), 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 
     getFormData() {
-        let extradata = {};
+        const extradata = {};
-        let formRefs = this.refs.form.refs;
+        const formRefs = this.refs.form.refs;
 
         // Put additional fields in extra data object
         Object
@@ -71,10 +72,13 @@ let CylandAdditionalDataForm = React.createClass({
     },
 
     render() {
-        let { piece, isInline, disabled, handleSuccess, location } = this.props;
+        const { disabled, handleSuccess, isInline, piece } = this.props;
-        let buttons, spinner, heading;
 
-        if(!isInline) {
+        let buttons;
+        let spinner;
+        let heading;
+
+        if (!isInline) {
             buttons = (
                 <button
                     type="submit"
@@ -87,7 +91,7 @@ let CylandAdditionalDataForm = React.createClass({
             spinner = (
                 <div className="modal-footer">
                     <p className="pull-right">
-                        <AscribeSpinner color='dark-blue' size='md'/>
+                        <AscribeSpinner color='dark-blue' size='md' />
                     </p>
                 </div>
             );
@@ -101,13 +105,15 @@ let CylandAdditionalDataForm = React.createClass({
             );
         }
 
-        if(piece && piece.id) {
+        if (piece.id) {
+            const { extra_data: extraData = {} } = piece;
+
             return (
                 <Form
                     disabled={disabled}
                     className="ascribe-form-bordered"
                     ref='form'
-                    url={requests.prepareUrl(ApiUrls.piece_extradata, {piece_id: piece.id})}
+                    url={requests.prepareUrl(ApiUrls.piece_extradata, { piece_id: piece.id })}
                     handleSuccess={handleSuccess || this.handleSuccess}
                     getFormData={this.getFormData}
                     buttons={buttons}
@@ -116,65 +122,66 @@ let CylandAdditionalDataForm = React.createClass({
                     <Property
                         name='artist_bio'
                         label={getLangText('Artist Biography')}
-                        expanded={!disabled || !!piece.extra_data.artist_bio}>
+                        expanded={!disabled || !!extraData.artist_bio}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.artist_bio}
+                            defaultValue={extraData.artist_bio}
-                            placeholder={getLangText('Enter the artist\'s biography...')}/>
+                            placeholder={getLangText('Enter the artist\'s biography...')} />
                     </Property>
                     <Property
                         name='artist_contact_information'
                         label={getLangText('Artist Contact Information')}
-                        expanded={!disabled || !!piece.extra_data.artist_contact_information}>
+                        expanded={!disabled || !!extraData.artist_contact_information}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.artist_contact_information}
+                            convertLinks
-                            placeholder={getLangText('Enter the artist\'s contact information...')}/>
+                            defaultValue={extraData.artist_contact_information}
+                            placeholder={getLangText('Enter the artist\'s contact information...')} />
                     </Property>
                     <Property
                         name='conceptual_overview'
                         label={getLangText('Conceptual Overview')}
-                        expanded={!disabled || !!piece.extra_data.conceptual_overview}>
+                        expanded={!disabled || !!extraData.conceptual_overview}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.conceptual_overview}
+                            defaultValue={extraData.conceptual_overview}
-                            placeholder={getLangText('Enter a conceptual overview...')}/>
+                            placeholder={getLangText('Enter a conceptual overview...')} />
                     </Property>
                     <Property
                         name='medium'
                         label={getLangText('Medium (technical specifications)')}
-                        expanded={!disabled || !!piece.extra_data.medium}>
+                        expanded={!disabled || !!extraData.medium}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.medium}
+                            defaultValue={extraData.medium}
-                            placeholder={getLangText('Enter the medium (and other technical specifications)...')}/>
+                            placeholder={getLangText('Enter the medium (and other technical specifications)...')} />
                     </Property>
                     <Property
                         name='size_duration'
                         label={getLangText('Size / Duration')}
-                        expanded={!disabled || !!piece.extra_data.size_duration}>
+                        expanded={!disabled || !!extraData.size_duration}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.size_duration}
+                            defaultValue={extraData.size_duration}
-                            placeholder={getLangText('Enter the size / duration...')}/>
+                            placeholder={getLangText('Enter the size / duration...')} />
                     </Property>
                     <Property
                         name='display_instructions'
                         label={getLangText('Display instructions')}
-                        expanded={!disabled || !!piece.extra_data.display_instructions}>
+                        expanded={!disabled || !!extraData.display_instructions}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.display_instructions}
+                            defaultValue={extraData.display_instructions}
-                            placeholder={getLangText('Enter the display instructions...')}/>
+                            placeholder={getLangText('Enter the display instructions...')} />
                     </Property>
                     <Property
                         name='additional_details'
                         label={getLangText('Additional details')}
-                        expanded={!disabled || !!piece.extra_data.additional_details}>
+                        expanded={!disabled || !!extraData.additional_details}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.additional_details}
+                            defaultValue={extraData.additional_details}
-                            placeholder={getLangText('Enter additional details...')}/>
+                            placeholder={getLangText('Enter additional details...')} />
                     </Property>
                     <FurtherDetailsFileuploader
                         label={getLangText('Additional files (e.g. still images, pdf)')}
@@ -189,7 +196,7 @@ let CylandAdditionalDataForm = React.createClass({
         } else {
             return (
                 <div className="ascribe-loading-position">
-                    <AscribeSpinner color='dark-blue' size='md'/>
+                    <AscribeSpinner color='dark-blue' size='md' />
                 </div>
             );
         }

js/components/whitelabel/wallet/components/cyland/cyland_landing.js

@@ -49,7 +49,7 @@ let CylandLanding = React.createClass({
         // if user is already logged in, redirect him to piece list
         if(this.state.currentUser && this.state.currentUser.email) {
             // FIXME: hack to redirect out of the dispatch cycle
-            window.setTimeout(() => this.history.replaceState(null, '/collection'), 0);
+            window.setTimeout(() => this.history.replace('/collection'), 0);
         }
     },
 

js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js

@@ -52,7 +52,7 @@ let CylandRegisterPiece = React.createClass({
         return mergeOptions(
             UserStore.getState(),
             PieceListStore.getState(),
-            PieceStore.getState(),
+            PieceStore.getInitialState(),
             WhitelabelStore.getState(),
             {
                 step: 0
@@ -67,7 +67,7 @@ let CylandRegisterPiece = React.createClass({
         UserActions.fetchCurrentUser();
         WhitelabelActions.fetchWhitelabel();
 
-        let queryParams = this.props.location.query;
+        const queryParams = this.props.location.query;
 
         // Since every step of this register process is atomic,
         // we may need to enter the process at step 1 or 2.
@@ -76,8 +76,8 @@ let CylandRegisterPiece = React.createClass({
         //
         // We're using 'in' here as we want to know if 'piece_id' is present in the url,
         // we don't care about the value.
-        if(queryParams && 'piece_id' in queryParams) {
+        if ('piece_id' in queryParams) {
-            PieceActions.fetchOne(queryParams.piece_id);
+            PieceActions.fetchPiece(queryParams.piece_id);
         }
     },
 
@@ -92,64 +92,50 @@ let CylandRegisterPiece = React.createClass({
         this.setState(state);
     },
 
-    handleRegisterSuccess(response){
+    handleRegisterSuccess(response) {
-
         this.refreshPieceList();
 
-        // also start loading the piece for the next step
+        // Also load the newly registered piece for the next step
-        if(response && response.piece) {
+        if (response && response.piece) {
-            PieceActions.updatePiece({});
             PieceActions.updatePiece(response.piece);
         }
 
-        this.incrementStep();
+        this.nextSlide({ piece_id: response.piece.id });
-
-        this.refs.slidesContainer.nextSlide({ piece_id: response.piece.id });
     },
 
     handleAdditionalDataSuccess() {
-
         // We need to refetch the piece again after submitting the additional data
-        // since we want it's otherData to be displayed when the user choses to click
+        // since we want its otherData to be displayed when the user choses to click
         // on the browsers back button.
-        PieceActions.fetchOne(this.state.piece.id);
+        PieceActions.fetchPiece(this.state.piece.id);
 
         this.refreshPieceList();
 
-        this.incrementStep();
+        this.nextSlide();
-
-        this.refs.slidesContainer.nextSlide();
     },
 
     handleLoanSuccess(response) {
-        let notification = new GlobalNotificationModel(response.notification, 'success', 10000);
+        const notification = new GlobalNotificationModel(response.notification, 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
 
         this.refreshPieceList();
 
-        PieceActions.fetchOne(this.state.piece.id);
+        this.history.push(`/pieces/${this.state.piece.id}`);
-
-        this.history.pushState(null, `/pieces/${this.state.piece.id}`);
     },
 
-    // We need to increase the step to lock the forms that are already filled out
+    nextSlide(queryParams) {
-    incrementStep() {
+        // We need to increase the step to lock the forms that are already filled out
-        // also increase step
-        let newStep = this.state.step + 1;
         this.setState({
-            step: newStep
+            step: this.state.step + 1
         });
+
+        this.refs.slidesContainer.nextSlide(queryParams);
     },
 
     refreshPieceList() {
-        PieceListActions.fetchPieceList(
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
-            this.state.page,
+
-            this.state.pageSize,
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
-            this.state.searchTerm,
-            this.state.orderBy,
-            this.state.orderAsc,
-            this.state.filterBy
-        );
     },
 
     render() {
@@ -157,8 +143,7 @@ let CylandRegisterPiece = React.createClass({
         const { currentUser, piece, step, whitelabel } = this.state;
 
         const today = new Moment();
-        const datetimeWhenWeAllWillBeFlyingCoolHoverboardsAndDinosaursWillLiveAgain = new Moment();
+        const datetimeWhenWeAllWillBeFlyingCoolHoverboardsAndDinosaursWillLiveAgain = new Moment().add(1000, 'years');
-        datetimeWhenWeAllWillBeFlyingCoolHoverboardsAndDinosaursWillLiveAgain.add(1000, 'years');
 
         const loanHeading = getLangText('Loan to Cyland archive');
         const loanButtons = (
@@ -201,7 +186,7 @@ let CylandRegisterPiece = React.createClass({
                                 submitMessage={getLangText('Submit')}
                                 isFineUploaderActive={true}
                                 handleSuccess={this.handleRegisterSuccess}
-                                location={location}/>
+                                location={location} />
                         </Col>
                     </Row>
                 </div>

js/components/whitelabel/wallet/components/ikonotv/ikonotv_accordion_list/ikonotv_accordion_list_item.js

@@ -53,8 +53,9 @@ let IkonotvAccordionListItem = React.createClass({
     },
 
     handleSubmitSuccess(response) {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
 
         let notification = new GlobalNotificationModel(response.notification, 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);

js/components/whitelabel/wallet/components/ikonotv/ikonotv_contract_notifications.js

@@ -119,7 +119,7 @@ let IkonotvContractNotifications = React.createClass({
         NotificationActions.flushContractAgreementListNotifications();
         NotificationActions.fetchContractAgreementListNotifications();
 
-        this.history.pushState(null, '/collection');
+        this.history.push('/collection');
     },
 
     handleDeny() {
@@ -132,7 +132,7 @@ let IkonotvContractNotifications = React.createClass({
     handleDenySuccess() {
         let notification = new GlobalNotificationModel(getLangText('You have denied the conditions'), 'success', 5000);
         GlobalNotificationActions.appendGlobalNotification(notification);
-        this.history.pushState(null, '/collection');
+        this.history.push('/collection');
     },
 
     getCopyrightAssociationForm(){

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

@@ -41,7 +41,7 @@ let IkonotvPieceContainer = React.createClass({
 
     getInitialState() {
         return mergeOptions(
-            PieceStore.getState(),
+            PieceStore.getInitialState(),
             UserStore.getState(),
             PieceListStore.getState()
         );
@@ -52,19 +52,14 @@ let IkonotvPieceContainer = React.createClass({
         UserStore.listen(this.onChange);
         PieceListStore.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.loadPiece();
     },
 
-     // We need this for when the user clicks on a notification while being in another piece view
+    // We need this for when the user clicks on a notification while being in another piece view
     componentWillReceiveProps(nextProps) {
-        if(this.props.params.pieceId !== nextProps.params.pieceId) {
+        if (this.props.params.pieceId !== nextProps.params.pieceId) {
-            PieceActions.updatePiece({});
+            PieceActions.flushPiece();
-            PieceActions.fetchOne(nextProps.params.pieceId);
+            this.loadPiece();
         }
     },
 
@@ -79,25 +74,28 @@ let IkonotvPieceContainer = React.createClass({
     },
 
     loadPiece() {
-        PieceActions.fetchOne(this.props.params.pieceId);
+        PieceActions.fetchPiece(this.props.params.pieceId);
     },
 
     handleDeleteSuccess(response) {
-        PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
-                                        this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
 
         // since we're deleting a piece, we just need to close
         // all editions dialogs and not reload them
         EditionListActions.closeAllEditionLists();
         EditionListActions.clearAllEditionSelections();
 
-        let notification = new GlobalNotificationModel(response.notification, 'success');
+        const notification = new GlobalNotificationModel(response.notification, 'success');
         GlobalNotificationActions.appendGlobalNotification(notification);
 
-        this.history.pushState(null, '/collection');
+        this.history.push('/collection');
     },
 
     render() {
+        const { piece } = this.state;
+
         let furtherDetails = (
             <CollapsibleParagraph
                 title={getLangText('Further Details')}
@@ -106,28 +104,29 @@ let IkonotvPieceContainer = React.createClass({
             </CollapsibleParagraph>
         );
 
-        if(this.state.piece.extra_data && Object.keys(this.state.piece.extra_data).length > 0 && this.state.piece.acl) {
+        if (piece.extra_data && Object.keys(piece.extra_data).length && piece.acl) {
             furtherDetails = (
                 <CollapsibleParagraph
                     title={getLangText('Further Details')}
                     defaultExpanded={true}>
                     <IkonotvArtistDetailsForm
-                        piece={this.state.piece}
+                        piece={piece}
                         isInline={true}
-                        disabled={!this.state.piece.acl.acl_edit} />
+                        disabled={!piece.acl.acl_edit} />
                     <IkonotvArtworkDetailsForm
-                        piece={this.state.piece}
+                        piece={piece}
                         isInline={true}
-                        disabled={!this.state.piece.acl.acl_edit} />
+                        disabled={!piece.acl.acl_edit} />
                 </CollapsibleParagraph>
             );
         }
 
-        if(this.state.piece && this.state.piece.id) {
+        if (piece.id) {
-            setDocumentTitle([this.state.piece.artist_name, this.state.piece.title].join(', '));
+            setDocumentTitle(`${piece.artist_name}, ${piece.title}`);
+
             return (
                 <WalletPieceContainer
-                    piece={this.state.piece}
+                    piece={piece}
                     currentUser={this.state.currentUser}
                     loadPiece={this.loadPiece}
                     handleDeleteSuccess={this.handleDeleteSuccess}
@@ -135,8 +134,7 @@ let IkonotvPieceContainer = React.createClass({
                     {furtherDetails}
                 </WalletPieceContainer>
             );
-        }
+        } else {
-        else {
             return (
                 <div className="fullpage-spinner">
                     <AscribeSpinner color='dark-blue' size='lg' />

js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js

@@ -20,11 +20,10 @@ import { getLangText } from '../../../../../../utils/lang_utils';
 
 let IkonotvArtistDetailsForm = React.createClass({
     propTypes: {
-        handleSuccess: React.PropTypes.func,
         piece: React.PropTypes.object.isRequired,
 
         disabled: React.PropTypes.bool,
-
+        handleSuccess: React.PropTypes.func,
         isInline: React.PropTypes.bool
     },
 
@@ -35,8 +34,8 @@ let IkonotvArtistDetailsForm = React.createClass({
     },
 
     getFormData() {
-        let extradata = {};
+        const extradata = {};
-        let formRefs = this.refs.form.refs;
+        const formRefs = this.refs.form.refs;
 
         // Put additional fields in extra data object
         Object
@@ -53,20 +52,23 @@ let IkonotvArtistDetailsForm = React.createClass({
     },
 
     handleSuccess() {
-        let notification = new GlobalNotificationModel('Artist details successfully updated', 'success', 10000);
+        const notification = new GlobalNotificationModel(getLangText('Artist details successfully updated'), 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 
     render() {
-        let buttons, spinner, heading;
+        const { disabled, isInline, handleSuccess, piece } = this.props;
-        let { isInline, handleSuccess } = this.props;
+
+        let buttons;
+        let spinner;
+        let heading;
 
         if (!isInline) {
             buttons = (
                 <button
                     type="submit"
                     className="btn btn-default btn-wide"
-                    disabled={this.props.disabled}>
+                    disabled={disabled}>
                     {getLangText('Proceed to loan')}
                 </button>
             );
@@ -74,7 +76,7 @@ let IkonotvArtistDetailsForm = React.createClass({
             spinner = (
                 <div className="modal-footer">
                     <p className="pull-right">
-                        <AscribeSpinner color='dark-blue' size='md'/>
+                        <AscribeSpinner color='dark-blue' size='md' />
                     </p>
                 </div>
             );
@@ -88,13 +90,15 @@ let IkonotvArtistDetailsForm = React.createClass({
             );
         }
 
-        if (this.props.piece && this.props.piece.id && this.props.piece.extra_data) {
+        if (piece.id) {
+            const { extra_data: extraData = {} } = piece;
+
             return (
                 <Form
-                    disabled={this.props.disabled}
+                    disabled={disabled}
                     className="ascribe-form-bordered"
                     ref='form'
-                    url={requests.prepareUrl(ApiUrls.piece_extradata, {piece_id: this.props.piece.id})}
+                    url={requests.prepareUrl(ApiUrls.piece_extradata, { piece_id: piece.id })}
                     handleSuccess={handleSuccess || this.handleSuccess}
                     getFormData={this.getFormData}
                     buttons={buttons}
@@ -103,39 +107,41 @@ let IkonotvArtistDetailsForm = React.createClass({
                     <Property
                         name='artist_website'
                         label={getLangText('Artist Website')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.artist_website}>
+                        expanded={!disabled || !!extraData.artist_website}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.artist_website}
+                            convertLinks
-                            placeholder={getLangText('The artist\'s website if present...')}/>
+                            defaultValue={extraData.artist_website}
+                            placeholder={getLangText('The artist\'s website if present...')} />
                     </Property>
                     <Property
                         name='gallery_website'
                         label={getLangText('Website of related Gallery, Museum, etc.')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.gallery_website}>
+                        expanded={!disabled || !!extraData.gallery_website}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.gallery_website}
+                            convertLinks
-                            placeholder={getLangText('The website of any related Gallery or Museum')}/>
+                            defaultValue={extraData.gallery_website}
+                            placeholder={getLangText('The website of any related Gallery or Museum')} />
                     </Property>
                     <Property
                         name='additional_websites'
                         label={getLangText('Additional Websites/Publications/Museums/Galleries')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.additional_websites}>
+                        expanded={!disabled || !!extraData.additional_websites}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.additional_websites}
+                            convertLinks
-                            placeholder={getLangText('Enter additional Websites/Publications if any')}/>
+                            defaultValue={extraData.additional_websites}
+                            placeholder={getLangText('Enter additional Websites/Publications if any')} />
                     </Property>
                     <Property
                         name='conceptual_overview'
                         label={getLangText('Short text about the Artist')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.conceptual_overview}>
+                        expanded={!disabled || !!extraData.conceptual_overview}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.conceptual_overview}
+                            defaultValue={extraData.conceptual_overview}
-                            placeholder={getLangText('Enter a short bio about the Artist')}
+                            placeholder={getLangText('Enter a short bio about the Artist')} />
-                            />
                     </Property>
                 </Form>
             );

js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js

@@ -20,11 +20,10 @@ import { getLangText } from '../../../../../../utils/lang_utils';
 
 let IkonotvArtworkDetailsForm = React.createClass({
     propTypes: {
-        handleSuccess: React.PropTypes.func,
         piece: React.PropTypes.object.isRequired,
 
         disabled: React.PropTypes.bool,
-
+        handleSuccess: React.PropTypes.func,
         isInline: React.PropTypes.bool
     },
 
@@ -35,8 +34,8 @@ let IkonotvArtworkDetailsForm = React.createClass({
     },
 
     getFormData() {
-        let extradata = {};
+        const extradata = {};
-        let formRefs = this.refs.form.refs;
+        const formRefs = this.refs.form.refs;
 
         // Put additional fields in extra data object
         Object
@@ -53,20 +52,23 @@ let IkonotvArtworkDetailsForm = React.createClass({
     },
 
     handleSuccess() {
-        let notification = new GlobalNotificationModel('Artwork details successfully updated', 'success', 10000);
+        const notification = new GlobalNotificationModel(getLangText('Artwork details successfully updated'), 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 
     render() {
-        let buttons, spinner, heading;
+        const { disabled, isInline, handleSuccess, piece } = this.props;
-        let { isInline, handleSuccess } = this.props;
+
+        let buttons;
+        let spinner;
+        let heading;
 
         if (!isInline) {
             buttons = (
                 <button
                     type="submit"
                     className="btn btn-default btn-wide"
-                    disabled={this.props.disabled}>
+                    disabled={disabled}>
                     {getLangText('Proceed to artist details')}
                 </button>
             );
@@ -74,7 +76,7 @@ let IkonotvArtworkDetailsForm = React.createClass({
             spinner = (
                 <div className="modal-footer">
                     <p className="pull-right">
-                        <AscribeSpinner color='dark-blue' size='md'/>
+                        <AscribeSpinner color='dark-blue' size='md' />
                     </p>
                 </div>
             );
@@ -88,13 +90,15 @@ let IkonotvArtworkDetailsForm = React.createClass({
             );
         }
 
-        if (this.props.piece && this.props.piece.id && this.props.piece.extra_data) {
+        if (piece.id && piece.extra_data) {
+            const { extra_data: extraData = {} } = piece;
+
             return (
                 <Form
-                    disabled={this.props.disabled}
+                    disabled={disabled}
                     className="ascribe-form-bordered"
                     ref='form'
-                    url={requests.prepareUrl(ApiUrls.piece_extradata, {piece_id: this.props.piece.id})}
+                    url={requests.prepareUrl(ApiUrls.piece_extradata, { piece_id: piece.id })}
                     handleSuccess={handleSuccess || this.handleSuccess}
                     getFormData={this.getFormData}
                     buttons={buttons}
@@ -103,56 +107,56 @@ let IkonotvArtworkDetailsForm = React.createClass({
                     <Property
                         name='medium'
                         label={getLangText('Medium')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.medium}>
+                        expanded={!disabled || !!extraData.medium}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.medium}
+                            defaultValue={extraData.medium}
-                            placeholder={getLangText('The medium of the file (i.e. photo, video, other, ...)')}/>
+                            placeholder={getLangText('The medium of the file (i.e. photo, video, other, ...)')} />
                     </Property>
                     <Property
                         name='size_duration'
                         label={getLangText('Size/Duration')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.size_duration}>
+                        expanded={!disabled || !!extraData.size_duration}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.size_duration}
+                            defaultValue={extraData.size_duration}
-                            placeholder={getLangText('Size in centimeters. Duration in minutes.')}/>
+                            placeholder={getLangText('Size in centimeters. Duration in minutes.')} />
                     </Property>
                     <Property
                         name='copyright'
                         label={getLangText('Copyright')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.copyright}>
+                        expanded={!disabled || !!extraData.copyright}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.copyright}
+                            defaultValue={extraData.copyright}
-                            placeholder={getLangText('Which copyright is attached to this work?')}/>
+                            placeholder={getLangText('Which copyright is attached to this work?')} />
                     </Property>
                     <Property
                         name='courtesy_of'
                         label={getLangText('Courtesy of')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.courtesy_of}>
+                        expanded={!disabled || !!extraData.courtesy_of}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.courtesy_of}
+                            defaultValue={extraData.courtesy_of}
-                            placeholder={getLangText('The current owner of the artwork')}/>
+                            placeholder={getLangText('The current owner of the artwork')} />
                     </Property>
                     <Property
                         name='copyright_of_photography'
                         label={getLangText('Copyright of Photography')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.copyright_of_photography}>
+                        expanded={!disabled || !!extraData.copyright_of_photography}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.copyright_of_photography}
+                            defaultValue={extraData.copyright_of_photography}
-                            placeholder={getLangText('Who should be attributed for the photography?')}/>
+                            placeholder={getLangText('Who should be attributed for the photography?')} />
                     </Property>
                     <Property
                         name='additional_details'
                         label={getLangText('Additional Details about the artwork')}
-                        expanded={!this.props.disabled || !!this.props.piece.extra_data.additional_details}>
+                        expanded={!disabled || !!extraData.additional_details}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={this.props.piece.extra_data.additional_details}
+                            defaultValue={extraData.additional_details}
-                            placeholder={getLangText('Insert artwork overview')}/>
+                            placeholder={getLangText('Insert artwork overview')} />
                     </Property>
                 </Form>
             );

js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js

@@ -49,7 +49,7 @@ let IkonotvRegisterPiece = React.createClass({
         return mergeOptions(
             UserStore.getState(),
             PieceListStore.getState(),
-            PieceStore.getState(),
+            PieceStore.getInitialState(),
             WhitelabelStore.getState(),
             {
                 step: 0,
@@ -65,11 +65,7 @@ let IkonotvRegisterPiece = React.createClass({
         UserActions.fetchCurrentUser();
         WhitelabelActions.fetchWhitelabel();
 
-        // Before we load the new piece, we reset the piece store to delete old data that we do
+        const queryParams = this.props.location.query;
-        // not want to display to the user.
-        PieceActions.updatePiece({});
-
-        let queryParams = this.props.location.query;
 
         // Since every step of this register process is atomic,
         // we may need to enter the process at step 1 or 2.
@@ -78,8 +74,8 @@ let IkonotvRegisterPiece = React.createClass({
         //
         // We're using 'in' here as we want to know if 'piece_id' is present in the url,
         // we don't care about the value.
-        if (queryParams && 'piece_id' in queryParams) {
+        if ('piece_id' in queryParams) {
-            PieceActions.fetchOne(queryParams.piece_id);
+            PieceActions.fetchPiece(queryParams.piece_id);
         }
     },
 
@@ -95,72 +91,62 @@ let IkonotvRegisterPiece = React.createClass({
     },
 
 
-    handleRegisterSuccess(response){
+    handleRegisterSuccess(response) {
         this.refreshPieceList();
 
-        // also start loading the piece for the next step
+        // Also load the newly registered piece for the next step
-        if(response && response.piece) {
+        if (response && response.piece) {
             PieceActions.updatePiece(response.piece);
         }
+
         if (!this.canSubmit()) {
-            this.history.pushState(null, '/collection');
+            this.history.push('/collection');
-        }
+        } else {
-        else {
+            this.nextSlide({ piece_id: response.piece.id });
-            this.incrementStep();
-            this.refs.slidesContainer.nextSlide();
         }
     },
 
     handleAdditionalDataSuccess() {
-
         // We need to refetch the piece again after submitting the additional data
         // since we want it's otherData to be displayed when the user choses to click
         // on the browsers back button.
-        PieceActions.fetchOne(this.state.piece.id);
+        PieceActions.fetchPiece(this.state.piece.id);
 
         this.refreshPieceList();
 
-        this.incrementStep();
+        this.nextSlide();
-
-        this.refs.slidesContainer.nextSlide();
     },
 
     handleLoanSuccess(response) {
         this.setState({ pageExitWarning: null });
 
-        let notification = new GlobalNotificationModel(response.notification, 'success', 10000);
+        const notification = new GlobalNotificationModel(response.notification, 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
 
         this.refreshPieceList();
 
-        PieceActions.fetchOne(this.state.piece.id);
+        this.history.push(`/pieces/${this.state.piece.id}`);
-        this.history.pushState(null, `/pieces/${this.state.piece.id}`);
     },
 
-    // We need to increase the step to lock the forms that are already filled out
+    nextSlide(queryParams) {
-    incrementStep() {
+        // We need to increase the step to lock the forms that are already filled out
-        // also increase step
-        let newStep = this.state.step + 1;
         this.setState({
-            step: newStep
+            step: this.state.step + 1
         });
+
+        this.refs.slidesContainer.nextSlide(queryParams);
     },
 
     refreshPieceList() {
-        PieceListActions.fetchPieceList(
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
-            this.state.page,
+
-            this.state.pageSize,
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
-            this.state.searchTerm,
-            this.state.orderBy,
-            this.state.orderAsc,
-            this.state.filterBy
-        );
     },
 
     canSubmit() {
         let currentUser = this.state.currentUser;
         let whitelabel = this.state.whitelabel;
-        return currentUser && currentUser.acl && currentUser.acl.acl_wallet_submit && whitelabel && whitelabel.user;
+        return currentUser.acl && currentUser.acl.acl_wallet_submit && whitelabel.user;
     },
 
     getSlideArtistDetails() {
@@ -171,13 +157,14 @@ let IkonotvRegisterPiece = React.createClass({
                         <Col xs={12} sm={10} md={8} smOffset={1} mdOffset={2}>
                             <IkonotvArtistDetailsForm
                                 handleSuccess={this.handleAdditionalDataSuccess}
-                                piece={this.state.piece}/>
+                                piece={this.state.piece} />
                         </Col>
                     </Row>
                 </div>
             );
+        } else {
+            return null;
         }
-        return null;
     },
 
     getSlideArtworkDetails() {
@@ -188,21 +175,21 @@ let IkonotvRegisterPiece = React.createClass({
                         <Col xs={12} sm={10} md={8} smOffset={1} mdOffset={2}>
                             <IkonotvArtworkDetailsForm
                                 handleSuccess={this.handleAdditionalDataSuccess}
-                                piece={this.state.piece}/>
+                                piece={this.state.piece} />
                         </Col>
                     </Row>
                 </div>
             );
+        } else {
+            return null;
         }
-        return null;
     },
 
     getSlideLoan() {
         if (this.canSubmit()) {
             const { piece, whitelabel } = this.state;
-            let today = new Moment();
+            const today = new Moment();
-            let endDate = new Moment();
+            const endDate = new Moment().add(2, 'years');
-            endDate.add(2, 'years');
 
             return (
                 <div data-slide-title={getLangText('Loan')}>
@@ -225,8 +212,9 @@ let IkonotvRegisterPiece = React.createClass({
                     </Row>
                 </div>
             );
+        } else {
+            return null;
         }
-        return null;
     },
 
     render() {
@@ -252,7 +240,7 @@ let IkonotvRegisterPiece = React.createClass({
                                 submitMessage={getLangText('Register')}
                                 isFineUploaderActive={true}
                                 handleSuccess={this.handleRegisterSuccess}
-                                location={this.props.location}/>
+                                location={this.props.location} />
                         </Col>
                     </Row>
                 </div>

js/components/whitelabel/wallet/components/market/market_buttons/market_acl_button_list.js

@@ -30,7 +30,7 @@ let MarketAclButtonList = React.createClass({
 
     componentDidMount() {
         UserStore.listen(this.onChange);
-        UserActions.fetchCurrentUser();
+        UserActions.fetchCurrentUser.defer();
     },
 
     componentWillUnmount() {

js/components/whitelabel/wallet/components/market/market_buttons/market_submit_button.js

@@ -3,6 +3,11 @@
 import React from 'react';
 import classNames from 'classnames';
 
+import EditionActions from '../../../../../../actions/edition_actions';
+
+import WhitelabelActions from '../../../../../../actions/whitelabel_actions';
+import WhitelabelStore from '../../../../../../stores/whitelabel_store';
+
 import MarketAdditionalDataForm from '../market_forms/market_additional_data_form';
 
 import AclFormFactory from '../../../../../ascribe_forms/acl_form_factory';
@@ -11,10 +16,7 @@ import ConsignForm from '../../../../../ascribe_forms/form_consign';
 import ModalWrapper from '../../../../../ascribe_modal/modal_wrapper';
 
 import AclProxy from '../../../../../acl_proxy';
-
+import AscribeSpinner from '../../../../../ascribe_spinner';
-import PieceActions from '../../../../../../actions/piece_actions';
-import WhitelabelActions from '../../../../../../actions/whitelabel_actions';
-import WhitelabelStore from '../../../../../../stores/whitelabel_store';
 
 import ApiUrls from '../../../../../../constants/api_urls';
 
@@ -26,8 +28,9 @@ let MarketSubmitButton = React.createClass({
         availableAcls: React.PropTypes.object.isRequired,
         currentUser: React.PropTypes.object,
         editions: React.PropTypes.array.isRequired,
-        handleSuccess: React.PropTypes.func.isRequired,
+
         className: React.PropTypes.string,
+        handleSuccess: React.PropTypes.func
     },
 
     getInitialState() {
@@ -50,22 +53,21 @@ let MarketSubmitButton = React.createClass({
 
     canEditionBeSubmitted(edition) {
         if (edition && edition.extra_data && edition.other_data) {
-            const { extra_data, other_data } = edition;
+            const {
+                extra_data: {
+                    artist_bio: artistBio,
+                    display_instructions: displayInstructions,
+                    technology_details: technologyDetails,
+                    work_description: workDescription
+                },
+                other_data: otherData } = edition;
 
-            if (extra_data.artist_bio && extra_data.work_description &&
+            return artistBio && displayInstructions && technologyDetails && workDescription && otherData.length;
-                extra_data.technology_details && extra_data.display_instructions &&
-                other_data.length > 0) {
-                return true;
-            }
         }
 
         return false;
     },
 
-    getFormDataId() {
-        return getAclFormDataId(false, this.props.editions);
-    },
-
     getAggregateEditionDetails() {
         const { editions } = this.props;
 
@@ -82,13 +84,20 @@ let MarketSubmitButton = React.createClass({
         });
     },
 
-    handleAdditionalDataSuccess(pieceId) {
+    getFormDataId() {
-        // Fetch newly updated piece to update the views
+        return getAclFormDataId(false, this.props.editions);
-        PieceActions.fetchOne(pieceId);
+    },
 
+    handleAdditionalDataSuccess() {
         this.refs.consignModal.show();
     },
 
+    refreshEdition() {
+        if (this.props.editions.length === 1) {
+            EditionActions.fetchEdition(this.props.editions[0].bitcoin_id);
+        }
+    },
+
     render() {
         const { availableAcls, currentUser, className, editions, handleSuccess } = this.props;
         const { whitelabel: { name: whitelabelName = 'Market', user: whitelabelAdminEmail } } = this.state;
@@ -101,6 +110,10 @@ let MarketSubmitButton = React.createClass({
             senderName: currentUser.username
         });
 
+        // If only a single piece is selected, all the edition's extra_data and other_data will
+        // be the same, so we just take the first edition's
+        const { extra_data: extraData, other_data: otherData } = solePieceId ? editions[0] : {};
+
         const triggerButton = (
             <button className={classNames('btn', 'btn-default', 'btn-sm', className)}>
                 {getLangText('CONSIGN TO %s', whitelabelName.toUpperCase())}
@@ -126,16 +139,25 @@ let MarketSubmitButton = React.createClass({
                     aclName='acl_consign'>
                     <ModalWrapper
                         trigger={triggerButton}
-                        handleSuccess={this.handleAdditionalDataSuccess.bind(this, solePieceId)}
+                        handleSuccess={this.handleAdditionalDataSuccess}
                         title={getLangText('Add additional information')}>
                         <MarketAdditionalDataForm
+                            extraData={extraData}
+                            otherData={otherData}
                             pieceId={solePieceId}
                             submitLabel={getLangText('Continue to consignment')} />
                     </ModalWrapper>
 
                     <ModalWrapper
                         ref="consignModal"
-                        handleSuccess={handleSuccess}
+                        handleCancel={this.refreshEdition}
+                        handleSuccess={(...params) => {
+                            if (typeof handleSuccess === 'function') {
+                                handleSuccess(...params);
+                            }
+
+                            this.refreshEdition();
+                        }}
                         title={getLangText('Consign artwork')}>
                         {consignForm}
                     </ModalWrapper>

js/components/whitelabel/wallet/components/market/market_detail/market_further_details.js

@@ -6,8 +6,12 @@ import MarketAdditionalDataForm from '../market_forms/market_additional_data_for
 
 let MarketFurtherDetails = React.createClass({
     propTypes: {
-        pieceId: React.PropTypes.number,
+        pieceId: React.PropTypes.number.isRequired,
+
+        editable: React.PropTypes.bool,
+        extraData: React.PropTypes.object,
         handleSuccess: React.PropTypes.func,
+        otherData: React.PropTypes.arrayOf(React.PropTypes.object)
     },
 
     render() {

js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js

@@ -2,42 +2,39 @@
 
 import React from 'react';
 
-import Form from '../../../../../ascribe_forms/form';
-import Property from '../../../../../ascribe_forms/property';
-
-import InputTextAreaToggable from '../../../../../ascribe_forms/input_textarea_toggable';
-
-import FurtherDetailsFileuploader from '../../../../../ascribe_detail/further_details_fileuploader';
-import AscribeSpinner from '../../../../../ascribe_spinner';
-
 import GlobalNotificationModel from '../../../../../../models/global_notification_model';
 import GlobalNotificationActions from '../../../../../../actions/global_notification_actions';
 
-import { formSubmissionValidation } from '../../../../../ascribe_uploader/react_s3_fine_uploader_utils';
+import FurtherDetailsFileuploader from '../../../../../ascribe_detail/further_details_fileuploader';
 
-import PieceActions from '../../../../../../actions/piece_actions';
+import InputTextAreaToggable from '../../../../../ascribe_forms/input_textarea_toggable';
-import PieceStore from '../../../../../../stores/piece_store';
+import Form from '../../../../../ascribe_forms/form';
+import Property from '../../../../../ascribe_forms/property';
+
+import AscribeSpinner from '../../../../../ascribe_spinner';
 
 import ApiUrls from '../../../../../../constants/api_urls';
-import AppConstants from '../../../../../../constants/application_constants';
+import { validationParts, validationTypes } from '../../../../../../constants/uploader_constants';
 
 import requests from '../../../../../../utils/requests';
+
+import { formSubmissionValidation } from '../../../../../ascribe_uploader/react_s3_fine_uploader_utils';
 import { mergeOptions } from '../../../../../../utils/general_utils';
 import { getLangText } from '../../../../../../utils/lang_utils';
 
 
 let MarketAdditionalDataForm = React.createClass({
     propTypes: {
-        pieceId: React.PropTypes.oneOfType([
+        pieceId: React.PropTypes.number.isRequired,
-            React.PropTypes.number,
+
-            React.PropTypes.string
-        ]),
         editable: React.PropTypes.bool,
+        extraData: React.PropTypes.object,
+        handleSuccess: React.PropTypes.func,
         isInline: React.PropTypes.bool,
+        otherData: React.PropTypes.arrayOf(React.PropTypes.object),
         showHeading: React.PropTypes.bool,
         showNotification: React.PropTypes.bool,
-        submitLabel: React.PropTypes.string,
+        submitLabel: React.PropTypes.string
-        handleSuccess: React.PropTypes.func
     },
 
     getDefaultProps() {
@@ -48,50 +45,34 @@ let MarketAdditionalDataForm = React.createClass({
     },
 
     getInitialState() {
-        const pieceStore = PieceStore.getState();
+        return {
-
+            // Allow the form to be submitted if there's already an additional image uploaded
-        return mergeOptions(
+            isUploadReady: this.isUploadReadyOnChange(),
-            pieceStore,
+            forceUpdateKey: 0
-            {
-                // Allow the form to be submitted if there's already an additional image uploaded
-                isUploadReady: this.isUploadReadyOnChange(pieceStore.piece),
-                forceUpdateKey: 0
-            });
-    },
-
-    componentDidMount() {
-        PieceStore.listen(this.onChange);
-
-        if (this.props.pieceId) {
-            PieceActions.fetchOne(this.props.pieceId);
         }
     },
 
-    componentWillUnmount() {
+    componentWillReceiveProps(nextProps) {
-        PieceStore.unlisten(this.onChange);
+        if (this.props.extraData !== nextProps.extraData || this.props.otherData !== nextProps.otherData) {
-    },
+            this.setState({
+                // Allow the form to be submitted if the updated piece has an additional image uploaded
+                isUploadReady: this.isUploadReadyOnChange(),
 
-    onChange(state) {
+                /**
-        Object.assign({}, state, {
+                 * Increment the forceUpdateKey to force the form to rerender on each change
-            // Allow the form to be submitted if the updated piece already has an additional image uploaded
+                 *
-            isUploadReady: this.isUploadReadyOnChange(state.piece),
+                 * THIS IS A HACK TO MAKE SURE THE FORM ALWAYS DISPLAYS THE MOST RECENT STATE
-
+                 * BECAUSE SOME OF OUR FORM ELEMENTS DON'T UPDATE FROM PROP CHANGES (ie.
-            /**
+                 * InputTextAreaToggable).
-             * Increment the forceUpdateKey to force the form to rerender on each change
+                 */
-             *
+                forceUpdateKey: this.state.forceUpdateKey + 1
-             * THIS IS A HACK TO MAKE SURE THE FORM ALWAYS DISPLAYS THE MOST RECENT STATE
+            });
-             * BECAUSE SOME OF OUR FORM ELEMENTS DON'T UPDATE FROM PROP CHANGES (ie.
+        }
-             * InputTextAreaToggable).
-             */
-            forceUpdateKey: this.state.forceUpdateKey + 1
-        });
-
-        this.setState(state);
     },
 
     getFormData() {
-        let extradata = {};
+        const extradata = {};
-        let formRefs = this.refs.form.refs;
+        const formRefs = this.refs.form.refs;
 
         // Put additional fields in extra data object
         Object
@@ -102,12 +83,12 @@ let MarketAdditionalDataForm = React.createClass({
 
         return {
             extradata: extradata,
-            piece_id: this.state.piece.id
+            piece_id: this.props.pieceId
         };
     },
 
-    isUploadReadyOnChange(piece) {
+    isUploadReadyOnChange() {
-        return piece && piece.other_data && piece.other_data.length > 0;
+        return this.props.otherData && this.props.otherData.length;
     },
 
     handleSuccessWithNotification() {
@@ -115,7 +96,7 @@ let MarketAdditionalDataForm = React.createClass({
             this.props.handleSuccess();
         }
 
-        let notification = new GlobalNotificationModel(getLangText('Further details successfully updated'), 'success', 10000);
+        const notification = new GlobalNotificationModel(getLangText('Further details successfully updated'), 'success', 10000);
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 
@@ -126,11 +107,20 @@ let MarketAdditionalDataForm = React.createClass({
     },
 
     render() {
-        const { editable, isInline, handleSuccess, showHeading, showNotification, submitLabel } = this.props;
+        const {
-        const { piece } = this.state;
+            editable,
-        let buttons, heading;
+            extraData = {},
+            isInline,
+            handleSuccess,
+            otherData,
+            pieceId,
+            showHeading,
+            showNotification,
+            submitLabel } = this.props;
 
-        let spinner = <AscribeSpinner color='dark-blue' size='lg' />;
+        let buttons;
+        let heading;
+        let spinner;
 
         if (!isInline) {
             buttons = (
@@ -145,7 +135,7 @@ let MarketAdditionalDataForm = React.createClass({
             spinner = (
                 <div className="modal-footer">
                     <p className="pull-right">
-                        {spinner}
+                        <AscribeSpinner color='dark-blue' size='md' />
                     </p>
                 </div>
             );
@@ -159,64 +149,70 @@ let MarketAdditionalDataForm = React.createClass({
             ) : null;
         }
 
-        if (piece && piece.id) {
+        if (pieceId) {
             return (
                 <Form
                     className="ascribe-form-bordered"
                     ref='form'
                     key={this.state.forceUpdateKey}
-                    url={requests.prepareUrl(ApiUrls.piece_extradata, {piece_id: piece.id})}
+                    url={requests.prepareUrl(ApiUrls.piece_extradata, { piece_id: pieceId })}
                     handleSuccess={showNotification ? this.handleSuccessWithNotification : handleSuccess}
                     getFormData={this.getFormData}
                     buttons={buttons}
                     spinner={spinner}
-                    disabled={!this.props.editable || !piece.acl.acl_edit}>
+                    disabled={!this.props.editable}>
                     {heading}
                     <FurtherDetailsFileuploader
-                        label={getLangText('Marketplace Thumbnail Image')}
+                        areAssetsDownloadable={!!isInline}
-                        submitFile={function () {}}
+                        editable={editable}
-                        setIsUploadReady={this.setIsUploadReady}
                         isReadyForFormSubmission={formSubmissionValidation.atLeastOneUploadedFile}
-                        pieceId={piece.id}
+                        label={getLangText('Marketplace Thumbnail Image')}
-                        otherData={piece.other_data}
+                        otherData={otherData}
-                        editable={editable} />
+                        pieceId={pieceId}
+                        setIsUploadReady={this.setIsUploadReady}
+                        submitFile={function () {}}
+                        validation={{
+                            itemLimit: validationTypes.workThumbnail.itemLimit,
+                            sizeLimit: validationTypes.workThumbnail.sizeLimit,
+                            allowedExtensions: validationParts.allowedExtensions.images
+                        }} />
                     <Property
                         name='artist_bio'
                         label={getLangText('Artist Bio')}
-                        expanded={editable || !!piece.extra_data.artist_bio}>
+                        expanded={editable || !!extraData.artist_bio}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.artist_bio}
+                            defaultValue={extraData.artist_bio}
                             placeholder={getLangText('Enter a biography of the artist...')}
                             required />
                     </Property>
                     <Property
                         name='work_description'
                         label={getLangText('Work Description')}
-                        expanded={editable || !!piece.extra_data.work_description}>
+                        expanded={editable || !!extraData.work_description}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.work_description}
+                            defaultValue={extraData.work_description}
                             placeholder={getLangText('Enter a description of the work...')}
                             required />
                     </Property>
                     <Property
                         name='technology_details'
                         label={getLangText('Technology Details')}
-                        expanded={editable || !!piece.extra_data.technology_details}>
+                        expanded={editable || !!extraData.technology_details}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.technology_details}
+                            defaultValue={extraData.technology_details}
                             placeholder={getLangText('Enter technological details about the work...')}
                             required />
                     </Property>
                     <Property
                         name='display_instructions'
                         label={getLangText('Display Instructions')}
-                        expanded={editable || !!piece.extra_data.display_instructions}>
+                        expanded={editable || !!extraData.display_instructions}>
                         <InputTextAreaToggable
                             rows={1}
-                            defaultValue={piece.extra_data.display_instructions}
+                            defaultValue={extraData.display_instructions}
                             placeholder={getLangText('Enter instructions on how to best display the work...')}
                             required />
                     </Property>
@@ -225,7 +221,7 @@ let MarketAdditionalDataForm = React.createClass({
         } else {
             return (
                 <div className="ascribe-loading-position">
-                    {spinner}
+                    <AscribeSpinner color='dark-blue' size='lg' />
                 </div>
             );
         }

js/components/whitelabel/wallet/components/market/market_register_piece.js

@@ -6,19 +6,23 @@ import { History } from 'react-router';
 import Col from 'react-bootstrap/lib/Col';
 import Row from 'react-bootstrap/lib/Row';
 
+import PieceStore from '../../../../../stores/piece_store';
+import PieceActions from '../../../../../actions/piece_actions';
+
+import PieceListStore from '../../../../../stores/piece_list_store';
+import PieceListActions from '../../../../../actions/piece_list_actions';
+
+import UserStore from '../../../../../stores/user_store';
+import UserActions from '../../../../../actions/user_actions';
+
+import WhitelabelActions from '../../../../../actions/whitelabel_actions';
+import WhitelabelStore from '../../../../../stores/whitelabel_store';
+
 import MarketAdditionalDataForm from './market_forms/market_additional_data_form';
 
 import Property from '../../../../ascribe_forms/property';
 import RegisterPieceForm from '../../../../ascribe_forms/form_register_piece';
 
-import PieceActions from '../../../../../actions/piece_actions';
-import PieceListStore from '../../../../../stores/piece_list_store';
-import PieceListActions from '../../../../../actions/piece_list_actions';
-import UserStore from '../../../../../stores/user_store';
-import UserActions from '../../../../../actions/user_actions';
-import WhitelabelActions from '../../../../../actions/whitelabel_actions';
-import WhitelabelStore from '../../../../../stores/whitelabel_store';
-
 import SlidesContainer from '../../../../ascribe_slides_container/slides_container';
 
 import { getLangText } from '../../../../../utils/lang_utils';
@@ -35,6 +39,7 @@ let MarketRegisterPiece = React.createClass({
     getInitialState(){
         return mergeOptions(
             PieceListStore.getState(),
+            PieceStore.getInitialState(),
             UserStore.getState(),
             WhitelabelStore.getState(),
             {
@@ -44,19 +49,27 @@ let MarketRegisterPiece = React.createClass({
 
     componentDidMount() {
         PieceListStore.listen(this.onChange);
+        PieceStore.listen(this.onChange);
         UserStore.listen(this.onChange);
         WhitelabelStore.listen(this.onChange);
 
         UserActions.fetchCurrentUser();
         WhitelabelActions.fetchWhitelabel();
 
-        // Reset the piece store to make sure that we don't display old data
+        const queryParams = this.props.location.query;
-        // if the user repeatedly registers works
+
-        PieceActions.updatePiece({});
+        // Load the correct piece if the user loads the second step directly
+        // by pressing on the back button or using the url
+        // We're using 'in' here as we want to know if 'piece_id' is present in the url,
+        // we don't care about the value.
+        if ('piece_id' in queryParams) {
+            PieceActions.fetchPiece(queryParams.piece_id);
+        }
     },
 
     componentWillUnmount() {
         PieceListStore.unlisten(this.onChange);
+        PieceStore.unlisten(this.onChange);
         UserStore.unlisten(this.onChange);
         WhitelabelStore.unlisten(this.onChange);
     },
@@ -68,53 +81,39 @@ let MarketRegisterPiece = React.createClass({
     handleRegisterSuccess(response) {
         this.refreshPieceList();
 
-        // Use the response's piece for the next step if available
+        // Also load the newly registered piece for the next step
-        let pieceId = null;
         if (response && response.piece) {
-            pieceId = response.piece.id;
             PieceActions.updatePiece(response.piece);
         }
 
-        this.incrementStep();
+        this.nextSlide({ piece_id: response.piece.id });
-        this.refs.slidesContainer.nextSlide({ piece_id: pieceId });
     },
 
     handleAdditionalDataSuccess() {
         this.refreshPieceList();
 
-        this.history.pushState(null, '/collection');
+        this.history.push('/collection');
     },
 
-    // We need to increase the step to lock the forms that are already filled out
+    nextSlide(queryParams) {
-    incrementStep() {
+        // We need to increase the step to lock the forms that are already filled out
         this.setState({
             step: this.state.step + 1
         });
-    },
 
-    getPieceFromQueryParam() {
+        this.refs.slidesContainer.nextSlide(queryParams);
-        const queryParams = this.props.location.query;
-
-        // Since every step of this register process is atomic,
-        // we may need to enter the process at step 1 or 2.
-        // If this is the case, we'll need the piece number to complete submission.
-        // It is encoded in the URL as a queryParam and we're checking for it here.
-        return queryParams && queryParams.piece_id;
     },
 
     refreshPieceList() {
-        PieceListActions.fetchPieceList(
+        const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
-            this.state.page,
+
-            this.state.pageSize,
+        PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
-            this.state.searchTerm,
-            this.state.orderBy,
-            this.state.orderAsc,
-            this.state.filterBy
-        );
     },
 
     render() {
+        const { location } = this.props;
         const {
+            piece,
             step,
             whitelabel: {
                 name: whitelabelName = 'Market'
@@ -130,7 +129,7 @@ let MarketRegisterPiece = React.createClass({
                     pending: 'glyphicon glyphicon-chevron-right',
                     completed: 'glyphicon glyphicon-lock'
                 }}
-                location={this.props.location}>
+                location={location}>
                 <div data-slide-title={getLangText('Register work')}>
                     <Row className="no-margin">
                         <Col xs={12} sm={10} md={8} smOffset={1} mdOffset={2}>
@@ -142,7 +141,7 @@ let MarketRegisterPiece = React.createClass({
                                 isFineUploaderActive={true}
                                 enableSeparateThumbnail={false}
                                 handleSuccess={this.handleRegisterSuccess}
-                                location={this.props.location}>
+                                location={location}>
                                 <Property
                                     name="num_editions"
                                     label={getLangText('Specify editions')}>
@@ -160,8 +159,10 @@ let MarketRegisterPiece = React.createClass({
                     <Row className="no-margin">
                         <Col xs={12} sm={10} md={8} smOffset={1} mdOffset={2}>
                             <MarketAdditionalDataForm
+                                extraData={piece.extra_data}
                                 handleSuccess={this.handleAdditionalDataSuccess}
-                                pieceId={this.getPieceFromQueryParam()}
+                                otherData={piece.other_data}
+                                pieceId={piece.id}
                                 showHeading />
                         </Col>
                     </Row>

js/components/whitelabel/wallet/wallet_routes.js

@@ -75,7 +75,8 @@ let ROUTES = {
             <Route
                 path='collection'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(CylandPieceList)}
-                headerTitle='COLLECTION' />
+                headerTitle='COLLECTION'
+                disableOn='noPieces' />
             <Route path='editions/:editionId' component={EditionContainer} />
             <Route path='verify' component={CoaVerifyContainer} />
             <Route path='pieces/:pieceId' component={CylandPieceContainer} />
@@ -109,7 +110,8 @@ let ROUTES = {
             <Route
                 path='collection'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PieceList)}
-                headerTitle='COLLECTION' />
+                headerTitle='COLLECTION'
+                disableOn='noPieces' />
             <Route path='pieces/:pieceId' component={PieceContainer} />
             <Route path='editions/:editionId' component={EditionContainer} />
             <Route path='verify' component={CoaVerifyContainer} />
@@ -150,7 +152,8 @@ let ROUTES = {
             <Route
                 path='collection'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(IkonotvPieceList)}
-                headerTitle='COLLECTION' />
+                headerTitle='COLLECTION'
+                disableOn='noPieces' />
             <Route
                 path='contract_notifications'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(IkonotvContractNotifications)} />
@@ -189,7 +192,8 @@ let ROUTES = {
             <Route
                 path='collection'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(MarketPieceList)}
-                headerTitle='COLLECTION' />
+                headerTitle='COLLECTION'
+                disableOn='noPieces' />
             <Route path='pieces/:pieceId' component={MarketPieceContainer} />
             <Route path='editions/:editionId' component={MarketEditionContainer} />
             <Route path='verify' component={CoaVerifyContainer} />
@@ -225,7 +229,8 @@ let ROUTES = {
             <Route
                 path='collection'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(Vivi23PieceList)}
-                headerTitle='COLLECTION' />
+                headerTitle='COLLECTION'
+                disableOn='noPieces' />
             <Route path='pieces/:pieceId' component={MarketPieceContainer} />
             <Route path='editions/:editionId' component={MarketEditionContainer} />
             <Route path='verify' component={CoaVerifyContainer} />

js/constants/api_urls.js

@@ -76,8 +76,7 @@ let ApiUrls = {
     'webhooks': AppConstants.apiEndpoint + 'webhooks/',
     'webhooks_events': AppConstants.apiEndpoint + 'webhooks/events/',
     'whitelabel_settings': AppConstants.apiEndpoint + 'whitelabel/settings/${subdomain}/',
-    'delete_s3_file': AppConstants.serverUrl + 's3/delete/',
+    'delete_s3_file': AppConstants.serverUrl + 's3/delete/'
-    'prize_list': AppConstants.apiEndpoint + 'prize/'
 };
 
 

js/constants/application_constants.js

@@ -24,52 +24,38 @@ const constants = {
         {
             'subdomain': 'cc',
             'name': 'Creative Commons France',
-            'logo': 'https://s3-us-west-2.amazonaws.com/ascribe0/public/creativecommons/cc.logo.sm.png',
-            'permissions': ['register', 'edit', 'share', 'del_from_collection'],
             'type': 'wallet',
             'ga': 'UA-60614729-4'
         },
         {
             'subdomain': 'sluice',
             'name': 'Sluice Art Fair',
-            'logo': 'http://sluice.info/images/logo.gif',
-            'permissions': ['register', 'edit', 'share', 'del_from_collection'],
             'type': 'prize',
             'ga': 'UA-60614729-5'
         },
         {
             'subdomain': 'cyland',
             'name': 'Cyland media art lab',
-            'logo': 'https://s3-us-west-2.amazonaws.com/ascribe0/whitelabel/cyland/logo.gif',
-            'permissions': ['register', 'edit', 'share', 'del_from_collection'],
             'type': 'wallet'
         },
         {
             'subdomain': 'ikonotv',
             'name': 'IkonoTV',
-            'logo': 'https://s3-us-west-2.amazonaws.com/ascribe0/whitelabel/ikonotv/ikono-logo-black.png',
-            'permissions': ['register', 'edit', 'share', 'del_from_collection'],
             'type': 'wallet'
         },
         {
             'subdomain': 'lumenus',
             'name': 'Lumenus',
-            'logo': 'https://s3-us-west-2.amazonaws.com/ascribe0/whitelabel/lumenus/lumenus-logo.png',
-            'permissions': ['register', 'edit', 'share', 'del_from_collection'],
             'type': 'wallet'
         },
         {
             'subdomain': '23vivi',
             'name': '23VIVI',
-            'logo': 'https://s3-us-west-2.amazonaws.com/ascribe0/whitelabel/23vivi/23vivi-logo.png',
-            'permissions': ['register', 'edit', 'share', 'del_from_collection'],
             'type': 'wallet'
         },
         {
             'subdomain': 'portfolioreview',
             'name': 'Portfolio Review',
-            'logo': 'http://notfoundlogo.de',
-            'permissions': ['register', 'edit', 'share', 'del_from_collection'],
             'type': 'prize'
         }
     ],
@@ -82,23 +68,6 @@ const constants = {
     // Source: http://www.w3schools.com/tags/att_input_type.asp
     'possibleInputTypes': ['button', 'checkbox', 'color', 'date', 'datetime', 'datetime-local', 'email', 'file', 'hidden', 'image', 'month', 'number', 'password', 'radio', 'range', 'reset', 'search', 'submit', 'tel', 'text', 'time', 'url', 'week'],
 
-    'fineUploader': {
-        'validation': {
-            'additionalData': {
-                'itemLimit': 100,
-                'sizeLimit': '25000000000'
-            },
-            'registerWork': {
-                'itemLimit': 1,
-                'sizeLimit': '25000000000'
-            },
-            'workThumbnail': {
-                'itemLimit': 1,
-                'sizeLimit': '5000000'
-            }
-        }
-    },
-
     'copyrightAssociations': ['ARS', 'DACS', 'Bildkunst', 'Pictoright', 'SODRAC', 'Copyright Agency/Viscopy', 'SAVA',
         'Bildrecht GmbH', 'SABAM', 'AUTVIS', 'CREAIMAGEN', 'SONECA', 'Copydan', 'EAU', 'Kuvasto', 'GCA', 'HUNGART',
         'IVARO', 'SIAE', 'JASPAR-SPDA', 'AKKA/LAA', 'LATGA-A', 'SOMAAP', 'ARTEGESTION', 'CARIER', 'BONO', 'APSAV',

js/constants/uploader_constants.js

@@ -0,0 +1,32 @@
+'use strict';
+
+export const validationParts = {
+    allowedExtensions: {
+        images: ['png', 'jpg', 'jpeg', 'gif']
+    },
+    itemLimit: {
+        single: 1,
+        multiple: 100
+    },
+    sizeLimit: {
+        default: 50000000000,
+        thumbnail: 5000000
+    }
+};
+
+const { allowedExtensions, itemLimit, sizeLimit } = validationParts;
+
+export const validationTypes = {
+    additionalData: {
+        itemLimit: itemLimit.multiple,
+        sizeLimit: sizeLimit.default
+    },
+    registerWork: {
+        itemLimit: itemLimit.single,
+        sizeLimit: sizeLimit.default
+    },
+    workThumbnail: {
+        itemLimit: itemLimit.single,
+        sizeLimit: sizeLimit.thumbnail
+    }
+};

js/fetchers/edition_list_fetcher.js

@@ -9,10 +9,10 @@ let EditionListFetcher = {
     /**
      * Fetches a list of editions from the API.
      */
-    fetch(pieceId, page, pageSize, orderBy, orderAsc, filterBy) {
+    fetch({ pieceId, page, pageSize, orderBy, orderAsc, filterBy }) {
-        let ordering = generateOrderingQueryParams(orderBy, orderAsc);
+        const ordering = generateOrderingQueryParams(orderBy, orderAsc);
 
-        let queryParams = mergeOptions(
+        const queryParams = mergeOptions(
             {
                 page,
                 pageSize,

js/fetchers/ownership_fetcher.js

@@ -15,7 +15,7 @@ let OwnershipFetcher = {
     /**
      * Fetch the contracts of the logged-in user from the API.
      */
-    fetchContractList(isActive, isPublic, issuer){
+    fetchContractList(isActive, isPublic, issuer) {
         let queryParams = {
             isActive,
             isPublic,
@@ -28,7 +28,7 @@ let OwnershipFetcher = {
     /**
      * Create a contractagreement between the logged-in user and the email from the API with contract.
      */
-    createContractAgreement(signee, contractObj){
+    createContractAgreement(signee, contractObj) {
         return requests.post(ApiUrls.ownership_contract_agreements, { body: {signee: signee, contract: contractObj.id }});
     },
 
@@ -44,23 +44,23 @@ let OwnershipFetcher = {
         return requests.get(ApiUrls.ownership_contract_agreements, queryParams);
     },
 
-    confirmContractAgreement(contractAgreement){
+    confirmContractAgreement(contractAgreement) {
         return requests.put(ApiUrls.ownership_contract_agreements_confirm, {contract_agreement_id: contractAgreement.id});
     },
 
-    denyContractAgreement(contractAgreement){
+    denyContractAgreement(contractAgreement) {
         return requests.put(ApiUrls.ownership_contract_agreements_deny, {contract_agreement_id: contractAgreement.id});
     },
 
-    fetchLoanPieceRequestList(){
+    fetchLoanPieceRequestList() {
         return requests.get(ApiUrls.ownership_loans_pieces_request);
     },
 
-    changeContract(contractObj){
+    changeContract(contractObj) {
         return requests.put(ApiUrls.ownership_contract, { body: contractObj, contract_id: contractObj.id });
     },
 
-    deleteContract(contractObjId){
+    deleteContract(contractObjId) {
         return requests.delete(ApiUrls.ownership_contract, {contract_id: contractObjId});
     }
 };

js/fetchers/piece_fetcher.js

@@ -1,15 +0,0 @@
-'use strict';
-
-import requests from '../utils/requests';
-
-
-let PieceFetcher = {
-    /**
-     * Fetch a piece from the API.
-     */
-    fetchOne(id) {
-        return requests.get('piece', {'piece_id': id});
-    }
-};
-
-export default PieceFetcher;

js/fetchers/piece_list_fetcher.js

@@ -10,12 +10,12 @@ let PieceListFetcher = {
      * Fetches a list of pieces from the API.
      * Can be called with all supplied queryparams the API.
      */
-    fetch(page, pageSize, search, orderBy, orderAsc, filterBy) {
+    fetch({ page, pageSize, search, orderBy, orderAsc, filterBy }) {
-        let ordering = generateOrderingQueryParams(orderBy, orderAsc);
+        const ordering = generateOrderingQueryParams(orderBy, orderAsc);
 
         // filterBy is an object of acl key-value pairs.
         // The values are booleans
-        let queryParams = mergeOptions(
+        const queryParams = mergeOptions(
             {
                 page,
                 pageSize,

js/fetchers/prize_list_fetcher.js

@@ -1,12 +0,0 @@
-'use strict';
-
-import requests from '../utils/requests';
-
-
-let PrizeListFetcher = {
-    fetch() {
-        return requests.get('prize_list');
-    }
-};
-
-export default PrizeListFetcher;

js/history.js

@@ -1,6 +1,7 @@
 'use strict';
 
 import useBasename from 'history/lib/useBasename';
+import useQueries from 'history/lib/useQueries';
 import createBrowserHistory from 'history/lib/createBrowserHistory';
 import AppConstants from './constants/application_constants';
 
@@ -8,7 +9,7 @@ import AppConstants from './constants/application_constants';
 // Remove the trailing slash if present
 const baseUrl = AppConstants.baseUrl.replace(/\/$/, '');
 
-const history = useBasename(createBrowserHistory)({
+const history = useBasename(useQueries(createBrowserHistory))({
     basename: baseUrl
 });
 

js/routes.js

@@ -28,7 +28,7 @@ import RegisterPiece from './components/register_piece';
 import { ProxyHandler, AuthRedirect } from './components/ascribe_routes/proxy_handler';
 
 
-let COMMON_ROUTES = (
+const COMMON_ROUTES = (
     <Route path='/' component={App}>
         <Route
             path='login'
@@ -40,7 +40,8 @@ let COMMON_ROUTES = (
         <Route
             path='collection'
             component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PieceList)}
-            headerTitle='COLLECTION'/>
+            headerTitle='COLLECTION'
+            disableOn='noPieces' />
         <Route
             path='signup'
             component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
@@ -65,17 +66,13 @@ let COMMON_ROUTES = (
 
 
 function getRoutes(type, subdomain) {
-    let routes = null;
-
     if (type === 'prize') {
-        routes = getPrizeRoutes(COMMON_ROUTES, subdomain);
+        return getPrizeRoutes(COMMON_ROUTES, subdomain);
     } else if(type === 'wallet') {
-        routes = getWalletRoutes(COMMON_ROUTES, subdomain);
+        return getWalletRoutes(COMMON_ROUTES, subdomain);
     } else {
-        routes = COMMON_ROUTES;
+        return COMMON_ROUTES;
     }
-
-    return routes;
 }
 
 

js/sources/NAMING_CONVENTIONS.md

@@ -22,12 +22,8 @@ refreshApplicationToken
 we cannot repeat this for a sources' methods as patterns like this would emerge in the stores:
 
 ```javascript
-onFetchCurrentUser(invalidateCache) {
+onFetchCurrentUser() {
-    this.invalidateCache = invalidateCache;
+    this.getInstance().fetchCurrentUser(); // does not call a flux "action" but a method in user_source.js - which is confusing
-
-    if(!this.getInstance().isLoading()) {
-        this.getInstance().fetchCurrentUser(); // does not call a flux "action" but a method in user_source.js - which is confusing
-    }
 }
 ```
 
@@ -67,4 +63,4 @@ lookupCurrentUser: {
 UserActions.logoutCurrentUser
 UserStore.onLogoutCurrentUser
 UserSource.performLogoutCurrentUser
-```
+```

js/sources/coa_source.js

@@ -7,9 +7,9 @@ import EditionActions from '../actions/edition_actions';
 
 const CoaSource = {
     lookupCoa: {
-        remote(state) {
+        remote(state, coaId) {
             return requests
-                .get('coa', { id: state.edition.coa })
+                .get('coa', { id: coaId })
                 .then((res) => {
                     // If no coa is found here, fake a 404 error so the error action can pick it up
                     return (res && res.coa) ? res : Promise.reject({ json: { status: 404 } });
@@ -20,10 +20,11 @@ const CoaSource = {
         error: EditionActions.errorCoa
     },
 
-    performCreateCoa: {
+    performCreateCoaForEdition: {
-        remote(state) {
+        remote(state, editionId) {
-            return requests.post('coa_create', {body: { bitcoin_id: state.edition.bitcoin_id }});
+            return requests.post('coa_create', { body: { bitcoin_id: editionId } });
         },
+
         success: EditionActions.successFetchCoa,
         error: EditionActions.errorCoa
     }

js/sources/edition_source.js

@@ -7,8 +7,8 @@ import EditionActions from '../actions/edition_actions';
 
 const EditionSource = {
     lookupEdition: {
-        remote(state) {
+        remote(state, editionId) {
-            return requests.get('edition', { bitcoin_id: state.editionMeta.idToFetch });
+            return requests.get('edition', { bitcoin_id: editionId });
         },
 
         success: EditionActions.successFetchEdition,
@@ -16,4 +16,4 @@ const EditionSource = {
     }
 };
 
-export default EditionSource;
+export default EditionSource;

js/sources/piece_source.js

@@ -0,0 +1,19 @@
+'use strict';
+
+import requests from '../utils/requests';
+
+import PieceActions from '../actions/piece_actions';
+
+
+const PieceSource = {
+    lookupPiece: {
+        remote(state, pieceId) {
+            return requests.get('piece', { piece_id: pieceId });
+        },
+
+        success: PieceActions.successFetchPiece,
+        error: PieceActions.errorPiece
+    }
+};
+
+export default PieceSource;

js/sources/user_source.js

@@ -13,12 +13,14 @@ const UserSource = {
         },
 
         local(state) {
-            return state.currentUser && state.currentUser.email ? state : {};
+            return !Object.keys(state.currentUser).length ? state : {};
         },
+
         success: UserActions.successFetchCurrentUser,
         error: UserActions.errorCurrentUser,
-        shouldFetch(state) {
+
-            return state.userMeta.invalidateCache || state.currentUser && !state.currentUser.email;
+        shouldFetch(state, invalidateCache) {
+            return invalidateCache || !Object.keys(state.currentUser).length;
         }
     },
 
@@ -26,9 +28,10 @@ const UserSource = {
         remote() {
             return requests.get(ApiUrls.users_logout);
         },
+
         success: UserActions.successLogoutCurrentUser,
         error: UserActions.errorCurrentUser
     }
 };
 
-export default UserSource;
+export default UserSource;