Small cleanups and fixes for spacing, unused props, etc

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) => {
-                    resolve(res);
-                })
+                .then(resolve)
                 .catch((err)=> {
                     console.logGlobal(err);
                     reject(err);
@@ -41,13 +39,11 @@ class ContractListActions {
         });
     }
 
-    removeContract(contractId){
-        return Q.Promise( (resolve, reject) => {
+    removeContract(contractId) {
+        return Q.Promise((resolve, reject) => {
             OwnershipFetcher.deleteContract(contractId)
-                .then((res) => {
-                    resolve(res);
-                })
-                .catch( (err) => {
+                .then(resolve)
+                .catch((err) => {
                     console.logGlobal(err);
                     reject(err);
                 });

js/components/ascribe_settings/contract_settings.js

@@ -28,11 +28,7 @@ import { mergeOptions, truncateTextAtCharIndex } from '../../utils/general_utils
 
 
 let ContractSettings = React.createClass({
-    propTypes: {
-        location: React.PropTypes.object
-    },
-
-    getInitialState(){
+    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();
-        let privateContracts = this.getPrivateContracts();
+        const publicContracts = this.getPublicContracts();
+        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}
-                                                        location={this.props.location}/>
+                                                        contract={contract} />
                                                 </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}
-                                                        location={this.props.location}/>
+                                                        contract={contract} />
                                                 </AclProxy>
                                                 <a
                                                     className="btn btn-default btn-sm margin-left-2px"

js/components/ascribe_settings/contract_settings_update_button.js

@@ -55,40 +55,40 @@ let ContractSettingsUpdateButton = React.createClass({
     render() {
         return (
            <ReactS3FineUploader
-                fileInputElement={UploadButton()}
-                keyRoutine={{
-                    url: AppConstants.serverUrl + 's3/key/',
-                    fileClass: 'contract'
-                }}
-                createBlobRoutine={{
-                    url: ApiUrls.blob_contracts
-                }}
-                validation={{
-                    itemLimit: AppConstants.fineUploader.validation.registerWork.itemLimit,
-                    sizeLimit: AppConstants.fineUploader.validation.additionalData.sizeLimit,
-                    allowedExtensions: ['pdf']
-                }}
-                setIsUploadReady={() =>{/* So that ReactS3FineUploader is not complaining */}}
-                signature={{
-                    endpoint: AppConstants.serverUrl + 's3/signature/',
-                    customHeaders: {
-                       'X-CSRFToken': getCookie(AppConstants.csrftoken)
-                    }
-                }}
-                deleteFile={{
-                    enabled: true,
-                    method: 'DELETE',
-                    endpoint: AppConstants.serverUrl + 's3/delete',
-                    customHeaders: {
-                       'X-CSRFToken': getCookie(AppConstants.csrftoken)
-                    }
-                }}
-                fileClassToUpload={{
-                    singular: getLangText('UPDATE'),
-                    plural: getLangText('UPDATE')
-                }}
-                isReadyForFormSubmission={formSubmissionValidation.atLeastOneUploadedFile}
-                submitFile={this.submitFile} />
+               fileInputElement={UploadButton({ showLabel: false })}
+               keyRoutine={{
+                   url: AppConstants.serverUrl + 's3/key/',
+                   fileClass: 'contract'
+               }}
+               createBlobRoutine={{
+                   url: ApiUrls.blob_contracts
+               }}
+               validation={{
+                   itemLimit: AppConstants.fineUploader.validation.registerWork.itemLimit,
+                   sizeLimit: AppConstants.fineUploader.validation.additionalData.sizeLimit,
+                   allowedExtensions: ['pdf']
+               }}
+               setIsUploadReady={() =>{/* So that ReactS3FineUploader is not complaining */}}
+               signature={{
+                   endpoint: AppConstants.serverUrl + 's3/signature/',
+                   customHeaders: {
+                      'X-CSRFToken': getCookie(AppConstants.csrftoken)
+                   }
+               }}
+               deleteFile={{
+                   enabled: true,
+                   method: 'DELETE',
+                   endpoint: AppConstants.serverUrl + 's3/delete',
+                   customHeaders: {
+                      'X-CSRFToken': getCookie(AppConstants.csrftoken)
+                   }
+               }}
+               fileClassToUpload={{
+                   singular: getLangText('UPDATE'),
+                   plural: getLangText('UPDATE')
+               }}
+               isReadyForFormSubmission={formSubmissionValidation.atLeastOneUploadedFile}
+               submitFile={this.submitFile} />
         );
     }
 });

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});
     }
 };