Merged in AD-984-disable-contracts-for-regular-asc (pull request #64)

acl on contract settings

js/components/ascribe_settings/account_settings.js

@@ -2,9 +2,6 @@
 
 import React from 'react';
 
-import UserStore from '../../stores/user_store';
-import UserActions from '../../actions/user_actions';
-
 import GlobalNotificationModel from '../../models/global_notification_model';
 import GlobalNotificationActions from '../../actions/global_notification_actions';
 
@@ -19,38 +16,26 @@ import AppConstants from '../../constants/application_constants';
 import { getLangText } from '../../utils/lang_utils';
 
 let AccountSettings = React.createClass({
-    getInitialState() {
+    propTypes: {
-        return UserStore.getState();
+        currentUser: React.PropTypes.object.required,
-    },
+        loadUser: React.PropTypes.func.required
-
-    componentDidMount() {
-        UserStore.listen(this.onChange);
-        UserActions.fetchCurrentUser();
-    },
-
-    componentWillUnmount() {
-        UserStore.unlisten(this.onChange);
-    },
-
-    onChange(state) {
-        this.setState(state);
     },
 
     handleSuccess(){
-        UserActions.fetchCurrentUser();
+        this.props.loadUser();
         let notification = new GlobalNotificationModel(getLangText('Settings succesfully updated'), 'success', 5000);
         GlobalNotificationActions.appendGlobalNotification(notification);
     },
 
     getFormDataProfile(){
-        return {'email': this.state.currentUser.email};
+        return {'email': this.props.currentUser.email};
     },
     
     render() {
         let content = <img src={AppConstants.baseUrl + 'static/img/ascribe_animated_medium.gif'} />;
         let profile = null;
 
-        if (this.state.currentUser.username) {
+        if (this.props.currentUser.username) {
             content = (
                 <Form
                     url={ApiUrls.users_username}
@@ -60,7 +45,7 @@ let AccountSettings = React.createClass({
                         label={getLangText('Username')}>
                         <input
                             type="text"
-                            defaultValue={this.state.currentUser.username}
+                            defaultValue={this.props.currentUser.username}
                             placeholder={getLangText('Enter your username')}
                             required/>
                     </Property>
@@ -70,7 +55,7 @@ let AccountSettings = React.createClass({
                         editable={false}>
                         <input
                             type="text"
-                            defaultValue={this.state.currentUser.email}
+                            defaultValue={this.props.currentUser.email}
                             placeholder={getLangText('Enter your username')}
                             required/>
                     </Property>
@@ -87,7 +72,7 @@ let AccountSettings = React.createClass({
                         className="ascribe-settings-property-collapsible-toggle"
                         style={{paddingBottom: 0}}>
                         <InputCheckbox
-                            defaultChecked={this.state.currentUser.profile.hash_locally}>
+                            defaultChecked={this.props.currentUser.profile.hash_locally}>
                             <span>
                                 {' ' + getLangText('Enable hash option, e.g. slow connections or to keep piece private')}
                             </span>

js/components/ascribe_settings/contract_settings.js

@@ -14,11 +14,14 @@ import ContractSettingsUpdateButton from './contract_settings_update_button';
 import GlobalNotificationModel from '../../models/global_notification_model';
 import GlobalNotificationActions from '../../actions/global_notification_actions';
 
+import AclProxy from '../acl_proxy';
+
 import { getLangText } from '../../utils/lang_utils';
 
 
 let ContractSettings = React.createClass({
     propTypes: {
+        currentUser: React.PropTypes.object,
         defaultExpanded: React.PropTypes.bool
     },
 
@@ -72,21 +75,24 @@ let ContractSettings = React.createClass({
                 <CreateContractForm
                     isPublic={true}
                     fileClassToUpload={{
-                        singular: 'new public contract',
+                        singular: 'new contract',
-                        plural: 'new public contracts'
+                        plural: 'new contracts'
                     }}/>
             );
         }
 
         return (
+            <AclProxy
+                aclName="acl_view_contract_settings"
+                aclObject={this.props.currentUser.acl}>
                 <CollapsibleParagraph
                     title={getLangText('Contracts')}
                     show={true}
                     defaultExpanded={true}>
-                <CollapsibleParagraph
+                    <AclProxy
-                    title={getLangText('Public Contracts')}
+                        aclName="acl_edit_public_contract"
-                    show={true}
+                        aclObject={this.props.currentUser.acl}>
-                    defaultExpanded={true}>
+                        <div>
                             {createPublicContractForm}
                             {publicContracts.map((contract, i) => {
                                 return (
@@ -114,16 +120,17 @@ let ContractSettings = React.createClass({
                                         rightColumnWidth="60%"/>
                                 );
                             })}
-                </CollapsibleParagraph>
+                        </div>
-                <CollapsibleParagraph
+                    </AclProxy>
-                    title={getLangText('Private Contracts')}
+                    <AclProxy
-                    show={true}
+                        aclName="acl_edit_private_contract"
-                    defaultExpanded={true}>
+                        aclObject={this.props.currentUser.acl}>
+                        <div>
                             <CreateContractForm
                             isPublic={false}
                             fileClassToUpload={{
-                            singular: getLangText('new private contract'),
+                                singular: getLangText('new contract'),
-                            plural: getLangText('new private contracts')
+                                plural: getLangText('new contracts')
                             }}/>
                             {privateContracts.map((contract, i) => {
                                 return (
@@ -151,8 +158,10 @@ let ContractSettings = React.createClass({
                                        rightColumnWidth="60%"/>
                                 );
                             })}
+                        </div>
+                    </AclProxy>
                 </CollapsibleParagraph>
-            </CollapsibleParagraph>
+            </AclProxy>
         );
     }
 });

js/components/ascribe_settings/settings_container.js

@@ -3,6 +3,9 @@
 import React from 'react';
 import Router from 'react-router';
 
+import UserStore from '../../stores/user_store';
+import UserActions from '../../actions/user_actions';
+
 import AccountSettings from './account_settings';
 import BitcoinWalletSettings from './bitcoin_wallet_settings';
 import ContractSettings from './contract_settings';
@@ -18,14 +21,35 @@ let SettingsContainer = React.createClass({
 
     mixins: [Router.Navigation],
 
+    getInitialState() {
+        return UserStore.getState();
+    },
+
+    componentDidMount() {
+        UserStore.listen(this.onChange);
+        UserActions.fetchCurrentUser();
+    },
+
+    componentWillUnmount() {
+        UserStore.unlisten(this.onChange);
+    },
+
+    loadUser(){
+        UserActions.fetchCurrentUser();
+    },
+
+    onChange(state) {
+        this.setState(state);
+    },
+
     render() {
         return (
             <div className="settings-container">
-                <AccountSettings />
+                <AccountSettings currentUser={this.state.currentUser} loadUser={this.loadUser}/>
                 {this.props.children}
                 <APISettings />
                 <BitcoinWalletSettings />
-                <ContractSettings />
+                <ContractSettings currentUser={this.state.currentUser} loadUser={this.loadUser}/>
             </div>
         );
     }

js/components/whitelabel/wallet/constants/wallet_api_urls.js

@@ -8,7 +8,8 @@ function getWalletApiUrls(subdomain) {
         return {
             'pieces_list': walletConstants.walletApiEndpoint + subdomain + '/pieces/',
             'piece': walletConstants.walletApiEndpoint + subdomain + '/pieces/${piece_id}/',
-            'piece_extradata': walletConstants.walletApiEndpoint + subdomain + '/pieces/${piece_id}/extradata/'
+            'piece_extradata': walletConstants.walletApiEndpoint + subdomain + '/pieces/${piece_id}/extradata/',
+            'user': walletConstants.walletApiEndpoint + subdomain + '/users/'
         };
     }
     else if (subdomain === 'ikonotv'){