From c1959033c04fee739dda1fb10f38ef8f1fedf91a Mon Sep 17 00:00:00 2001
From: Brett Sun <brett@ascribe.io>
Date: Fri, 4 Dec 2015 16:34:25 +0100
Subject: [PATCH] Fix comments in PR

---
 ...cordion_list_item_thumbnail_placeholder.js |  4 +--
 .../ascribe_detail/edition_action_panel.js    |  6 +++--
 js/components/ascribe_forms/form_consign.js   |  4 +--
 js/components/ascribe_forms/form_loan.js      |  2 +-
 .../input_contract_agreement_checkbox.js      | 15 +++++++----
 .../ascribe_forms/input_fineuploader.js       | 27 ++++++++++---------
 js/components/ascribe_forms/property.js       |  8 +++---
 .../piece_list_bulk_modal.js                  |  2 +-
 .../components/23vivi/23vivi_piece_list.js    |  4 +--
 .../ikonotv/ikonotv_register_piece.js         |  2 +-
 .../market_buttons/market_submit_button.js    |  3 +--
 .../market_additional_data_form.js            | 18 ++++++++-----
 .../market/market_register_piece.js           |  2 +-
 13 files changed, 55 insertions(+), 42 deletions(-)

diff --git a/js/components/ascribe_accordion_list/accordion_list_item_thumbnail_placeholder.js b/js/components/ascribe_accordion_list/accordion_list_item_thumbnail_placeholder.js
index 6ba4d6ab..37c98371 100644
--- a/js/components/ascribe_accordion_list/accordion_list_item_thumbnail_placeholder.js
+++ b/js/components/ascribe_accordion_list/accordion_list_item_thumbnail_placeholder.js
@@ -2,7 +2,7 @@
 
 import React from 'react';
 
-let accordionListItemThumbnailPlaceholder = React.createClass({
+let AccordionListItemThumbnailPlaceholder = React.createClass({
     render() {
         return (
             <span className="ascribe-logo-circle">
@@ -12,4 +12,4 @@ let accordionListItemThumbnailPlaceholder = React.createClass({
     }
 });
 
-export default accordionListItemThumbnailPlaceholder;
+export default AccordionListItemThumbnailPlaceholder;
diff --git a/js/components/ascribe_detail/edition_action_panel.js b/js/components/ascribe_detail/edition_action_panel.js
index fbc56bee..36a79e7c 100644
--- a/js/components/ascribe_detail/edition_action_panel.js
+++ b/js/components/ascribe_detail/edition_action_panel.js
@@ -94,8 +94,10 @@ let EditionActionPanel = React.createClass({
     },
 
     render(){
-        let { edition, currentUser } = this.props;
-        let ActionPanelButtonListType = this.props.actionPanelButtonListType;
+        const {
+            actionPanelButtonListType: ActionPanelButtonListType,
+            edition,
+            currentUser } = this.props;
 
         if (edition &&
             edition.notifications &&
diff --git a/js/components/ascribe_forms/form_consign.js b/js/components/ascribe_forms/form_consign.js
index a7c8f016..2f0ebf05 100644
--- a/js/components/ascribe_forms/form_consign.js
+++ b/js/components/ascribe_forms/form_consign.js
@@ -37,7 +37,7 @@ let ConsignForm = React.createClass({
 
     getInitialState() {
         return {
-            email: this.props.email
+            email: this.props.email || ''
         };
     },
 
@@ -69,7 +69,7 @@ let ConsignForm = React.createClass({
                 ref='form'
                 url={url}
                 getFormData={this.getFormData}
-                handleSuccess={this.props.handleSuccess}
+                handleSuccess={handleSuccess}
                 buttons={
                     <div className="modal-footer">
                         <p className="pull-right">
diff --git a/js/components/ascribe_forms/form_loan.js b/js/components/ascribe_forms/form_loan.js
index eb709714..a204fb87 100644
--- a/js/components/ascribe_forms/form_loan.js
+++ b/js/components/ascribe_forms/form_loan.js
@@ -210,7 +210,7 @@ let LoanForm = React.createClass({
                     <input
                         type="password"
                         placeholder={getLangText('Enter your password')}
-                        required={showPassword ? 'required' : ''}/>
+                        required={showPassword}/>
                 </Property>
                 {children}
             </Form>
diff --git a/js/components/ascribe_forms/input_contract_agreement_checkbox.js b/js/components/ascribe_forms/input_contract_agreement_checkbox.js
index c609786e..61235631 100644
--- a/js/components/ascribe_forms/input_contract_agreement_checkbox.js
+++ b/js/components/ascribe_forms/input_contract_agreement_checkbox.js
@@ -53,12 +53,10 @@ const InputContractAgreementCheckbox = React.createClass({
     },
 
     componentWillReceiveProps({ email: nextEmail }) {
-        const { contractAgreementList } = this.state;
-
         if (this.props.email !== nextEmail) {
             if (isEmail(nextEmail)) {
                 this.getContractAgreementsOrCreatePublic(nextEmail);
-            } else if (contractAgreementList && contractAgreementList.length > 0) {
+            } else if (this.getContractAgreement()) {
                 ContractAgreementListActions.flushContractAgreementList();
             }
         }
@@ -69,7 +67,9 @@ const InputContractAgreementCheckbox = React.createClass({
     },
 
     onStoreChange(state) {
-       const contractAgreement = this.getContractAgreement(state.contractAgreementList);
+        const contractAgreement = this.getContractAgreement(state.contractAgreementList);
+
+        // If there is no contract available, hide this `Property` from the user
         this.props.setExpanded(!!contractAgreement);
 
         state = mergeOptions(state, {
@@ -97,16 +97,21 @@ const InputContractAgreementCheckbox = React.createClass({
     },
 
     onChange(event) {
+        // Sync the value between our `InputCheckbox` and this component's `terms`
+        // so the parent `Property` is able to get the correct value of this component
+        // when the `Form` queries it.
         this.setState({
             value: React.addons.update(this.state.value, {
                 terms: { $set: event.target.value }
             })
         });
+
+        // Propagate change events from the checkbox up to the parent `Property`
         this.props.onChange(event);
     },
 
     getContractAgreement(contractAgreementList = this.state.contractAgreementList) {
-        if (contractAgreementList && contractAgreementList.length > 0) {
+        if (contractAgreementList && contractAgreementList.length) {
             return contractAgreementList[0];
         }
     },
diff --git a/js/components/ascribe_forms/input_fineuploader.js b/js/components/ascribe_forms/input_fineuploader.js
index 1a9889db..6d3a3e81 100644
--- a/js/components/ascribe_forms/input_fineuploader.js
+++ b/js/components/ascribe_forms/input_fineuploader.js
@@ -96,18 +96,21 @@ const InputFineUploader = React.createClass({
     },
 
     render() {
-        const { fileInputElement,
-                keyRoutine,
-                createBlobRoutine,
-                validation,
-                setIsUploadReady,
-                isReadyForFormSubmission,
-                areAssetsDownloadable,
-                enableLocalHashing,
-                uploadMethod,
-                fileClassToUpload,
-                disabled } = this.props;
-        let editable = this.props.isFineUploaderActive;
+        const {
+            areAssetsDownloadable,
+            enableLocalHashing,
+            createBlobRoutine,
+            disabled,
+            fileClassToUpload,
+            fileInputElement,
+            isFineUploaderActive,
+            isReadyForFormSubmission,
+            keyRoutine,
+            setIsUploadReady,
+            uploadMethod,
+            validation } = this.props;
+
+        let editable = isFineUploaderActive;
 
         // if disabled is actually set by property, we want to override
         // isFineUploaderActive
diff --git a/js/components/ascribe_forms/property.js b/js/components/ascribe_forms/property.js
index e57c8b3c..479c9602 100644
--- a/js/components/ascribe_forms/property.js
+++ b/js/components/ascribe_forms/property.js
@@ -239,6 +239,10 @@ const Property = React.createClass({
         this.setState({ expanded });
     },
 
+    handleCheckboxToggle() {
+        this.setExpanded(!this.state.expanded);
+    },
+
     renderChildren(style) {
         // Input's props should only be cloned and propagated down the tree,
         // if the component is actually being shown (!== 'expanded === false')
@@ -280,10 +284,6 @@ const Property = React.createClass({
         }
     },
 
-    handleCheckboxToggle() {
-        this.setState({expanded: !this.state.expanded});
-    },
-
     getCheckbox() {
         const { checkboxLabel } = this.props;
 
diff --git a/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js b/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js
index bb8d4ccc..c9c7f9f4 100644
--- a/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js
+++ b/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js
@@ -30,7 +30,7 @@ let PieceListBulkModal = React.createClass({
     },
 
     render() {
-        if (Object.keys(this.props.availableAcls).length > 0) {
+        if (Object.keys(this.props.availableAcls).length) {
             return (
                 <div className={this.props.className}>
                     <div className="row no-margin">
diff --git a/js/components/whitelabel/wallet/components/23vivi/23vivi_piece_list.js b/js/components/whitelabel/wallet/components/23vivi/23vivi_piece_list.js
index d889a9a0..0bfb8aa0 100644
--- a/js/components/whitelabel/wallet/components/23vivi/23vivi_piece_list.js
+++ b/js/components/whitelabel/wallet/components/23vivi/23vivi_piece_list.js
@@ -6,7 +6,7 @@ import Vivi23AccordionListItemThumbnailPlaceholder from './23vivi_accordion_list
 
 import MarketPieceList from '../market/market_piece_list';
 
-let vivi23PieceList = React.createClass({
+let Vivi23PieceList = React.createClass({
     propTypes: {
         location: React.PropTypes.object
     },
@@ -21,4 +21,4 @@ let vivi23PieceList = React.createClass({
 
 });
 
-export default vivi23PieceList;
+export default Vivi23PieceList;
diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js
index c4636911..c40d779d 100644
--- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js
+++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js
@@ -199,7 +199,7 @@ let IkonotvRegisterPiece = React.createClass({
 
     getSlideLoan() {
         if (this.canSubmit()) {
-            const {piece, whitelabel} = this.state;
+            const { piece, whitelabel } = this.state;
             let today = new Moment();
             let endDate = new Moment();
             endDate.add(2, 'years');
diff --git a/js/components/whitelabel/wallet/components/market/market_buttons/market_submit_button.js b/js/components/whitelabel/wallet/components/market/market_buttons/market_submit_button.js
index 8e7775a2..d8ef4c41 100644
--- a/js/components/whitelabel/wallet/components/market/market_buttons/market_submit_button.js
+++ b/js/components/whitelabel/wallet/components/market/market_buttons/market_submit_button.js
@@ -144,8 +144,7 @@ let MarketSubmitButton = React.createClass({
         } else {
             return (
                 <AclProxy
-                    aclObject={{'acl_consign': availableAcls.acl_consign && canSubmit}}
-                    aclName='acl_consign'>
+                    show={availableAcls.acl_consign && canSubmit}>
                     <ModalWrapper
                         trigger={triggerButton}
                         handleSuccess={handleSuccess}
diff --git a/js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js b/js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js
index b762022c..2a6e7add 100644
--- a/js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js
+++ b/js/components/whitelabel/wallet/components/market/market_forms/market_additional_data_form.js
@@ -55,7 +55,7 @@ let MarketAdditionalDataForm = React.createClass({
             {
                 // Allow the form to be submitted if there's already an additional image uploaded
                 isUploadReady: this.isUploadReadyOnChange(pieceStore.piece),
-                forceUpdateKey: 0,
+                forceUpdateKey: 0
             });
     },
 
@@ -72,9 +72,7 @@ let MarketAdditionalDataForm = React.createClass({
     },
 
     onChange(state) {
-        this.setState(state);
-
-        this.setState({
+        Object.assign({}, state, {
             // Allow the form to be submitted if the updated piece already has an additional image uploaded
             isUploadReady: this.isUploadReadyOnChange(state.piece),
 
@@ -87,6 +85,8 @@ let MarketAdditionalDataForm = React.createClass({
              */
             forceUpdateKey: this.state.forceUpdateKey + 1
         });
+
+        this.setState(state);
     },
 
     getFormData() {
@@ -134,7 +134,9 @@ let MarketAdditionalDataForm = React.createClass({
     render() {
         const { editable, isInline, handleSuccess, showHeading, showNotification, submitLabel } = this.props;
         const { piece } = this.state;
-        let buttons, spinner, heading;
+        let buttons, heading;
+
+        let spinner = <AscribeSpinner color='dark-blue' size='lg' />;
 
         if (!isInline) {
             buttons = (
@@ -148,7 +150,9 @@ let MarketAdditionalDataForm = React.createClass({
 
             spinner = (
                 <div className="modal-footer">
-                    <img src={AppConstants.baseUrl + 'static/img/ascribe_animated_small.gif'} />
+                    <p className="pull-right">
+                        {spinner}
+                    </p>
                 </div>
             );
 
@@ -228,7 +232,7 @@ let MarketAdditionalDataForm = React.createClass({
         } else {
             return (
                 <div className="ascribe-loading-position">
-                    <AscribeSpinner color='dark-blue' size='lg' />
+                    {spinner}
                 </div>
             );
         }
diff --git a/js/components/whitelabel/wallet/components/market/market_register_piece.js b/js/components/whitelabel/wallet/components/market/market_register_piece.js
index e02df80c..eed17477 100644
--- a/js/components/whitelabel/wallet/components/market/market_register_piece.js
+++ b/js/components/whitelabel/wallet/components/market/market_register_piece.js
@@ -82,7 +82,7 @@ let MarketRegisterPiece = React.createClass({
     handleAdditionalDataSuccess() {
         this.refreshPieceList();
 
-        this.history.pushState(null, `/collection`);
+        this.history.pushState(null, '/collection');
     },
 
     // We need to increase the step to lock the forms that are already filled out