diff --git a/js/components/ascribe_forms/form_consign.js b/js/components/ascribe_forms/form_consign.js
index 6f85adc2..de4a4788 100644
--- a/js/components/ascribe_forms/form_consign.js
+++ b/js/components/ascribe_forms/form_consign.js
@@ -56,10 +56,10 @@ let ConsignForm = React.createClass({
+ editable={true}
+ overrideForm={true}>
+
+ {contractList.map((contract, i) => {
+ return (
+
+ { contract.name }
+
+ );
+ })}
+
+ );
+ }
+ return null;
+ },
+
+ render() {
+ if (this.state.contractList && this.state.contractList.length > 0) {
+ return (
+
+ );
+ }
+ return (
+
+ );
+ }
+});
+
+export default ContractAgreementForm;
\ No newline at end of file
diff --git a/js/components/ascribe_forms/form_copyright_association.js b/js/components/ascribe_forms/form_copyright_association.js
new file mode 100644
index 00000000..da14e76d
--- /dev/null
+++ b/js/components/ascribe_forms/form_copyright_association.js
@@ -0,0 +1,80 @@
+'use strict';
+
+import React from 'react';
+
+import GlobalNotificationModel from '../../models/global_notification_model';
+import GlobalNotificationActions from '../../actions/global_notification_actions';
+
+import Form from './form';
+import Property from './property';
+
+import ApiUrls from '../../constants/api_urls';
+import AppConstants from '../../constants/application_constants';
+
+import { getLangText } from '../../utils/lang_utils';
+
+let CopyrightAssociationForm = React.createClass({
+ propTypes: {
+ currentUser: React.PropTypes.object
+ },
+
+ handleSubmitSuccess(){
+ let notification = getLangText('Copyright association updated');
+ notification = new GlobalNotificationModel(notification, 'success', 10000);
+ GlobalNotificationActions.appendGlobalNotification(notification);
+ },
+
+ getProfileFormData(){
+ return {email: this.props.currentUser.email};
+ },
+
+ render() {
+ let selectedState;
+ let selectDefaultValue = ' -- ' + getLangText('select an association') + ' -- ';
+
+ if (this.props.currentUser && this.props.currentUser.profile
+ && this.props.currentUser.profile.copyright_association) {
+ selectedState = AppConstants.copyrightAssociations.indexOf(this.props.currentUser.profile.copyright_association);
+ selectedState = selectedState !== -1 ? AppConstants.copyrightAssociations[selectedState] : selectDefaultValue;
+ }
+
+ if (this.props.currentUser && this.props.currentUser.email){
+ return (
+
+ );
+ }
+ return null;
+ }
+});
+
+export default CopyrightAssociationForm;
\ No newline at end of file
diff --git a/js/components/ascribe_forms/form_create_contract.js b/js/components/ascribe_forms/form_create_contract.js
new file mode 100644
index 00000000..b19cb050
--- /dev/null
+++ b/js/components/ascribe_forms/form_create_contract.js
@@ -0,0 +1,111 @@
+'use strict';
+
+import React from 'react';
+
+import Form from '../ascribe_forms/form';
+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 { getLangText } from '../../utils/lang_utils';
+import { formSubmissionValidation } from '../ascribe_uploader/react_s3_fine_uploader_utils';
+
+
+let CreateContractForm = React.createClass({
+ propTypes: {
+ isPublic: React.PropTypes.bool,
+
+ // A class of a file the user has to upload
+ // Needs to be defined both in singular as well as in plural
+ fileClassToUpload: React.PropTypes.shape({
+ singular: React.PropTypes.string,
+ plural: React.PropTypes.string
+ })
+ },
+
+ getInitialState() {
+ return {
+ isUploadReady: false,
+ contractName: ''
+ };
+ },
+
+ setIsUploadReady(isReady) {
+ this.setState({
+ isUploadReady: isReady
+ });
+ },
+
+ handleCreateSuccess(response) {
+ ContractListActions.fetchContractList(true);
+ let notification = new GlobalNotificationModel(getLangText('Contract %s successfully created', response.name), 'success', 5000);
+ GlobalNotificationActions.appendGlobalNotification(notification);
+ this.refs.form.reset();
+ },
+
+ submitFileName(fileName) {
+ this.setState({
+ contractName: fileName
+ });
+
+ this.refs.form.submit();
+ },
+
+ render() {
+ return (
+
+ );
+ }
+});
+
+export default CreateContractForm;
\ No newline at end of file
diff --git a/js/components/ascribe_forms/form_loan.js b/js/components/ascribe_forms/form_loan.js
index 60dad486..ef2fbd13 100644
--- a/js/components/ascribe_forms/form_loan.js
+++ b/js/components/ascribe_forms/form_loan.js
@@ -12,11 +12,12 @@ import InputTextAreaToggable from './input_textarea_toggable';
import InputDate from './input_date';
import InputCheckbox from './input_checkbox';
-import LoanContractStore from '../../stores/loan_contract_store';
-import LoanContractActions from '../../actions/loan_contract_actions';
+import ContractAgreementListStore from '../../stores/contract_agreement_list_store';
+import ContractAgreementListActions from '../../actions/contract_agreement_list_actions';
import AppConstants from '../../constants/application_constants';
+import { mergeOptions } from '../../utils/general_utils';
import { getLangText } from '../../utils/lang_utils';
@@ -34,6 +35,7 @@ let LoanForm = React.createClass({
url: React.PropTypes.string,
id: React.PropTypes.object,
message: React.PropTypes.string,
+ createPublicContractAgreement: React.PropTypes.bool,
handleSuccess: React.PropTypes.func
},
@@ -43,62 +45,117 @@ let LoanForm = React.createClass({
showPersonalMessage: true,
showEndDate: true,
showStartDate: true,
- showPassword: true
+ showPassword: true,
+ createPublicContractAgreement: true
};
},
getInitialState() {
- return LoanContractStore.getState();
+ return ContractAgreementListStore.getState();
},
componentDidMount() {
- LoanContractStore.listen(this.onChange);
- LoanContractActions.flushLoanContract.defer();
+ ContractAgreementListStore.listen(this.onChange);
+ this.getContractAgreementsOrCreatePublic(this.props.email);
+ },
+
+ /**
+ * This method needs to be in form_loan as some whitelabel pages (Cyland) load
+ * the loanee's email async!
+ *
+ * SO LEAVE IT IN!
+ */
+ componentWillReceiveProps(nextProps) {
+ if(nextProps && nextProps.email && this.props.email !== nextProps.email) {
+ this.getContractAgreementsOrCreatePublic(nextProps.email);
+ }
},
componentWillUnmount() {
- LoanContractStore.unlisten(this.onChange);
+ ContractAgreementListStore.unlisten(this.onChange);
},
onChange(state) {
this.setState(state);
},
+ getContractAgreementsOrCreatePublic(email){
+ ContractAgreementListActions.flushContractAgreementList.defer();
+ if (email) {
+ // fetch the available contractagreements (pending/accepted)
+ ContractAgreementListActions.fetchAvailableContractAgreementList(email, true);
+ }
+ },
+
getFormData(){
- return this.props.id;
+ return mergeOptions(
+ this.props.id,
+ this.getContractAgreementId()
+ );
},
handleOnChange(event) {
// event.target.value is the submitted email of the loanee
- if(event && event.target && event.target.value && event.target.value.match(/.*@.*/)) {
- LoanContractActions.fetchLoanContract(event.target.value);
+ if(event && event.target && event.target.value && event.target.value.match(/.*@.*\..*/)) {
+ this.getContractAgreementsOrCreatePublic(event.target.value);
} else {
- LoanContractActions.flushLoanContract();
+ ContractAgreementListActions.flushContractAgreementList();
}
},
+ getContractAgreementId() {
+ if (this.state.contractAgreementList && this.state.contractAgreementList.length > 0) {
+ return {'contract_agreement_id': this.state.contractAgreementList[0].id};
+ }
+ return {};
+ },
+
getContractCheckbox() {
- if(this.state.contractKey && this.state.contractUrl) {
+ if(this.state.contractAgreementList && this.state.contractAgreementList.length > 0) {
// we need to define a key on the InputCheckboxes as otherwise
// react is not rerendering them on a store switch and is keeping
// the default value of the component (which is in that case true)
- return (
-
-
-
- {getLangText('I agree to the')}
-
- {getLangText('terms of')} {this.state.contractEmail}
-
-
-
-
- );
+ let contractAgreement = this.state.contractAgreementList[0];
+ let contract = contractAgreement.contract;
+
+ if(contractAgreement.datetime_accepted) {
+ return (
+
+
+ );
+ } else {
+ return (
+
+
+
+ {getLangText('I agree to the')}
+
+ {getLangText('terms of ')} {contract.issuer}
+
+
+
+
+ );
+ }
} else {
return (
0) {
+ let appendix = this.state.contractAgreementList[0].appendix;
+ if (appendix && appendix.default) {
+ return (
+
+ {appendix.default}
+
+ );
+ }
+ }
+ return null;
+ },
+
getButtons() {
if(this.props.loanHeading) {
return (
@@ -157,8 +230,8 @@ let LoanForm = React.createClass({
+ {this.getContractCheckbox()}
+ {this.getAppendix()}
- {this.getContractCheckbox()}
{this.props.children}
);
diff --git a/js/components/ascribe_forms/form_loan_request_answer.js b/js/components/ascribe_forms/form_loan_request_answer.js
index 2ebdb439..1bfe90db 100644
--- a/js/components/ascribe_forms/form_loan_request_answer.js
+++ b/js/components/ascribe_forms/form_loan_request_answer.js
@@ -18,7 +18,7 @@ let LoanRequestAnswerForm = React.createClass({
url: React.PropTypes.string,
id: React.PropTypes.object,
message: React.PropTypes.string,
- handleSuccess: React.PropTypes.func.required
+ handleSuccess: React.PropTypes.func.isRequired
},
getDefaultProps() {
diff --git a/js/components/ascribe_forms/form_login.js b/js/components/ascribe_forms/form_login.js
index 86a20119..79bced6c 100644
--- a/js/components/ascribe_forms/form_login.js
+++ b/js/components/ascribe_forms/form_login.js
@@ -27,7 +27,7 @@ let LoginForm = React.createClass({
onLogin: React.PropTypes.func
},
- mixins: [Router.Navigation],
+ mixins: [Router.Navigation, Router.State],
getDefaultProps() {
return {
@@ -95,6 +95,7 @@ let LoginForm = React.createClass({
},
render() {
+ let email = this.getQuery().email || null;
return (
+ getFormData={this.getFormData}
+ disabled={!this.props.editable}>
+ label={this.props.title}>
{
let message = getLangText('You have successfully') + ' ' + option + ' the ' + action + ' request ' + getLangText('from') + ' ' + owner;
- let notification = new GlobalNotificationModel(message, 'success');
- GlobalNotificationActions.appendGlobalNotification(notification);
+ let notifications = new GlobalNotificationModel(message, 'success');
+ GlobalNotificationActions.appendGlobalNotification(notifications);
+
+ this.handleSuccess();
- if(this.props.handleSuccess) {
- this.props.handleSuccess();
- }
};
},
- getContent() {
- let pieceOrEditionStr = this.isPiece() ? getLangText('this work%s', '.') : getLangText('this edition%s', '.');
- let message = this.props.requestUser + ' ' + getLangText('requests you') + ' ' + this.props.requestAction + ' ' + pieceOrEditionStr;
- if (this.props.requestAction === 'loan_request'){
- message = this.props.requestUser + ' ' + getLangText('requests you to loan') + ' ' + pieceOrEditionStr;
+ handleSuccess() {
+ if (this.isPiece()){
+ NotificationActions.fetchPieceListNotifications();
}
+ else {
+ NotificationActions.fetchEditionListNotifications();
+ }
+ if(this.props.handleSuccess) {
+ this.props.handleSuccess();
+ }
+ },
+
+ getContent() {
return (
- {message}
+ {this.props.notifications.action_str + ' by ' + this.props.notifications.by}
);
},
getAcceptButtonForm(urls) {
- if(this.props.requestAction === 'unconsign') {
+ if(this.props.notifications.action === 'unconsign') {
return (
+ editable={true}
+ overrideForm={true}>