Use AclButton in LumenusSubmitButton

Instead of copying functionality from AclButton to add a default email,
LumenusSubmitButton just returns one with preset settings.

js/components/ascribe_buttons/acl_button.js

@@ -30,6 +30,7 @@ let AclButton = React.createClass({
         currentUser: React.PropTypes.object,
         buttonAcceptName: React.PropTypes.string,
         buttonAcceptClassName: React.PropTypes.string,
+        email: React.PropTypes.string,
         handleSuccess: React.PropTypes.func.isRequired,
         className: React.PropTypes.string
     },
@@ -52,6 +53,7 @@ let AclButton = React.createClass({
                 tooltip: getLangText('Have someone else sell the artwork'),
                 form: (
                     <ConsignForm
+                        email={this.props.email}
                         message={message}
                         id={this.getFormDataId()}
                         url={ApiUrls.ownership_consigns}/>
@@ -88,6 +90,7 @@ let AclButton = React.createClass({
                 tooltip: getLangText('Loan your artwork for a limited period of time'),
                 form: (
                     <LoanForm
+                        email={this.props.email}
                         message={message}
                         id={this.getFormDataId()}
                         url={this.isPiece() ? ApiUrls.ownership_loans_pieces

js/components/whitelabel/wallet/components/lumenus/lumenus_buttons/lumenus_acl_button_list.js

@@ -4,10 +4,12 @@ import React from 'react';
 
 import LumenusSubmitButton from './lumenus_submit_button';
 
-import AclProxy from '../../../../../acl_proxy';
+import AclButton from '../../../../../ascribe_buttons/acl_button';
-
 import DeleteButton from '../../../../../ascribe_buttons/delete_button';
 
+import UserActions from '../../../../../../actions/user_actions';
+import UserStore from '../../../../../../stores/user_store';
+
 let LumenusAclButtonList = React.createClass({
     propTypes: {
         availableAcls: React.PropTypes.object.isRequired,
@@ -20,16 +22,38 @@ let LumenusAclButtonList = React.createClass({
         ])
     },
 
+    getInitialState() {
+        return UserStore.getState();
+    },
+
+    componentDidMount() {
+        UserStore.listen(this.onChange);
+        UserActions.fetchCurrentUser();
+    },
+
+    componentWillUnmount() {
+        UserStore.unlisten(this.onChange);
+    },
+
+    onChange(state) {
+        this.setState(state);
+    },
+
     render() {
+        let { availableAcls, className, editions, handleSuccess } = this.props;
         return (
-            <div className={this.props.className}>
+            <div className={className}>
-                <AclProxy
+                <LumenusSubmitButton
-                    aclObject={this.props.availableAcls}
+                    availableAcls={availableAcls}
-                    aclName={'acl_consign'}>
+                    currentUser={this.state.currentUser}
-                    <LumenusSubmitButton
+                    editions={editions}
-                        editions={this.props.editions}
+                    handleSuccess={handleSuccess} />
-                        handleSuccess={this.props.handleSuccess} />
+                <AclButton
-                </AclProxy>
+                    action="acl_share"
+                    availableAcls={availableAcls}
+                    currentUser={this.state.currentUser}
+                    pieceOrEditions={editions}
+                    handleSuccess={handleSuccess} />
                 {this.props.children}
             </div>
         );

js/components/whitelabel/wallet/components/lumenus/lumenus_buttons/lumenus_submit_button.js

@@ -3,47 +3,32 @@
 import React from 'react';
 import classNames from 'classnames';
 
+import AclButton from '../../../../../ascribe_buttons/acl_button';
 
-import GlobalNotificationModel from '../../../../../../models/global_notification_model';
-import GlobalNotificationActions from '../../../../../../actions/global_notification_actions';
-import UserActions from '../../../../../../actions/user_actions';
-import UserStore from '../../../../../../stores/user_store';
 import WhitelabelActions from '../../../../../../actions/whitelabel_actions';
 import WhitelabelStore from '../../../../../../stores/whitelabel_store';
 
-import ConsignForm from '../../../../../ascribe_forms/form_consign';
-
-import ModalWrapper from '../../../../../ascribe_modal/modal_wrapper';
-
-import ApiUrls from '../../../../../../constants/api_urls';
-
-import { getAclFormMessage, getAclFormDataId } from '../../../../../../utils/form_utils';
-import { mergeOptions } from '../../../../../../utils/general_utils';
 import { getLangText } from '../../../../../../utils/lang_utils';
 
 let LumenusSubmitButton = React.createClass({
     propTypes: {
-        className: React.PropTypes.string,
+        availableAcls: React.PropTypes.object.isRequired,
+        currentUser: React.PropTypes.object,
         editions: React.PropTypes.array,
         handleSuccess: React.PropTypes.func,
+        className: React.PropTypes.string,
     },
 
     getInitialState() {
-        return mergeOptions(
+        return WhitelabelStore.getState();
-            UserStore.getState(),
-            WhitelabelStore.getState()
-        );
     },
 
     componentDidMount() {
-        UserStore.listen(this.onChange);
-        UserActions.fetchCurrentUser();
         WhitelabelStore.listen(this.onChange);
         WhitelabelActions.fetchWhitelabel();
     },
 
     componentWillUnmount() {
-        UserStore.unlisten(this.onChange);
         WhitelabelStore.unlisten(this.onChange);
     },
 
@@ -51,39 +36,19 @@ let LumenusSubmitButton = React.createClass({
         this.setState(state);
     },
 
-    showNotification(response) {
-        this.props.handleSuccess();
-        if (response.notification) {
-            let notification = new GlobalNotificationModel(response.notification, 'success');
-            GlobalNotificationActions.appendGlobalNotification(notification);
-        }
-    },
-
     render() {
-        const { className, editions, handleSuccess } = this.props;
+        const { availableAcls, currentUser, className, editions, handleSuccess } = this.props;
-        const title = getLangText('Consign to Lumenus');
-        const message = getAclFormMessage({
-            aclName: 'acl_consign',
-            entities: editions,
-            isPiece: false,
-            senderName: this.state.currentUser.username
-        });
 
         return (
-            <ModalWrapper
+            <AclButton
-                trigger={
+                action='acl_consign'
-                    <button className={classNames('btn', 'btn-default', 'btn-sm', className)}>
+                availableAcls={availableAcls}
-                        {title}
+                buttonAcceptName={getLangText('CONSIGN TO LUMENUS')}
-                    </button>
+                email={this.state.whitelabel.user}
-                }
+                currentUser={currentUser}
-                handleSuccess={this.showNotification}
+                handleSuccess={handleSuccess}
-                title={title}>
+                pieceOrEditions={editions}
-                <ConsignForm
+                className={className} />
-                    email={this.state.whitelabel.user}
-                    message={message}
-                    id={getAclFormDataId(false, editions)}
-                    url={ApiUrls.ownership_consigns}/>
-            </ModalWrapper>
         );
     }
 });