-
- )
+ );
}
});
let ShareModal = React.createClass({
- mixins : [ModalMixin],
+ mixins: [ModalMixin],
render() {
return (
@@ -36,7 +36,7 @@ let ShareModal = React.createClass({
onRequestHide={this.onRequestHide}/>
+
-
+ className="ascribe-table"
+ columnList={this.props.columnList}
+ itemList={this.props.itemList}
+ changeOrder={this.props.changeOrder}
+ orderBy={this.props.orderBy}
+ orderAsc={this.props.orderAsc}>
{this.props.itemList.map((item, i) => {
return (
diff --git a/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js b/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js
index 70391e2d..c975500e 100644
--- a/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js
+++ b/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js
@@ -1,18 +1,18 @@
+'use strict';
+
import React from 'react';
import Router from 'react-router';
import EditionListStore from '../../stores/edition_list_store';
import EditionListActions from '../../actions/edition_list_actions';
-import PieceListStore from '../../stores/piece_list_store';
import PieceListActions from '../../actions/piece_list_actions';
import AccordionListItemTable from './accordion_list_item_table';
import AccordionListItemTableToggle from './accordion_list_item_table_toggle';
import AccordionListItemTableSelectAllEditionsToggle from './accordion_list_item_table_select_all_editions_toggle';
-import TableColumnContentModel from '../../models/table_column_content_model';
+import { ColumnModel, TransitionModel } from '../ascribe_table/models/table_models';
-import TableItemImg from '../ascribe_table/table_item_img';
import TableItemText from '../ascribe_table/table_item_text';
import TableItemCheckbox from '../ascribe_table/table_item_checkbox';
import TableItemAclFiltered from '../ascribe_table/table_item_acl_filtered';
@@ -34,18 +34,18 @@ let AccordionListItemTableEditions = React.createClass({
return EditionListStore.getState();
},
- onChange(state) {
- this.setState(state);
- },
-
componentDidMount() {
EditionListStore.listen(this.onChange);
},
- componentDidUnmount() {
+ componentWillUnmount() {
EditionListStore.unlisten(this.onChange);
},
+ onChange(state) {
+ this.setState(state);
+ },
+
selectItem(pieceId, editionId) {
EditionListActions.selectEdition({pieceId, editionId});
},
@@ -65,7 +65,7 @@ let AccordionListItemTableEditions = React.createClass({
toggleTable() {
PieceListActions.showEditionList(this.props.parentId);
- EditionListActions.fetchEditionList(this.props.parentId, this.state.orderBy, this.state.orderAsc);
+ EditionListActions.fetchEditionList(this.props.parentId);
},
changeEditionListOrder(orderBy, orderAsc) {
@@ -75,6 +75,8 @@ let AccordionListItemTableEditions = React.createClass({
render() {
let selectedEditionsCount = 0;
let allEditionsCount = 0;
+ let orderBy;
+ let orderAsc;
// here we need to check if all editions of a specific
// piece are already defined. Otherwise .length will throw an error and we'll not
@@ -82,17 +84,21 @@ let AccordionListItemTableEditions = React.createClass({
if(this.state.editionList[this.props.parentId]) {
selectedEditionsCount = this.filterSelectedEditions().length;
allEditionsCount = this.state.editionList[this.props.parentId].length;
+ orderBy = this.state.editionList[this.props.parentId].orderBy;
+ orderAsc = this.state.editionList[this.props.parentId].orderAsc;
}
+ let transition = new TransitionModel('edition', 'editionId', 'bitcoin_id', PieceListActions.closeAllEditionLists);
+
let columnList = [
- new TableColumnContentModel(
+ new ColumnModel(
(item) => {
return {
'editionId': item.id,
'pieceId': this.props.parentId,
'selectItem': this.selectItem,
'selected': item.selected
- }},
+ }; },
'',
{
+ new ColumnModel(
+ (item) => {
return {
'content': item.edition_number
- }},
+ }; },
'edition_number',
'#',
TableItemText,
1,
true,
- {to: 'edition', paramsKey: 'editionId', contentKey: 'bitcoin_id'}
+ transition
),
- new TableColumnContentModel(
+ new ColumnModel(
(item) => {
return {
'content': item.bitcoin_id
- }},
+ }; },
'bitcoin_id',
getLangText('Bitcoin Address'),
TableItemText,
5,
true,
- {to: 'edition', paramsKey: 'editionId', contentKey: 'bitcoin_id'}
+ transition
),
- new TableColumnContentModel(
- (item) => {
+ new ColumnModel(
+ (item) => {
return {
'content': item.acl
- }},
+ }; },
'acl',
getLangText('Actions'),
TableItemAclFiltered,
4,
false,
- {to: 'edition', paramsKey: 'editionId', contentKey: 'bitcoin_id'}
+ transition
)
];
@@ -149,11 +155,11 @@ let AccordionListItemTableEditions = React.createClass({
columnList={columnList}
numOfTableItems={this.props.numOfEditions}
show={this.props.show}
- orderBy={this.state.orderBy}
- orderAsc={this.state.orderAsc}
+ orderBy={orderBy}
+ orderAsc={orderAsc}
changeOrder={this.changeEditionListOrder}>
);
}
});
diff --git a/js/components/ascribe_forms/alert.js b/js/components/ascribe_forms/alert.js
index 482afdfe..4d5bae64 100644
--- a/js/components/ascribe_forms/alert.js
+++ b/js/components/ascribe_forms/alert.js
@@ -1,3 +1,5 @@
+'use strict';
+
import React from 'react';
import Alert from 'react-bootstrap/lib/Alert';
@@ -7,12 +9,15 @@ let AlertDismissable = React.createClass({
alertVisible: true
};
},
+
show() {
this.setState({alertVisible: true});
},
+
hide() {
this.setState({alertVisible: false});
},
+
render() {
if (this.state.alertVisible) {
let key = this.props.error;
diff --git a/js/components/ascribe_forms/button_submit_close.js b/js/components/ascribe_forms/button_submit_close.js
index e811cab5..7430f484 100644
--- a/js/components/ascribe_forms/button_submit_close.js
+++ b/js/components/ascribe_forms/button_submit_close.js
@@ -1,5 +1,13 @@
+'use strict';
+
import React from 'react';
+
+/*
+ Is this even used somewhere?
+ Deprecate? 5.6.15 - Tim
+
+ */
let ButtonSubmitOrClose = React.createClass({
render() {
if (this.props.submitted){
@@ -14,7 +22,7 @@ let ButtonSubmitOrClose = React.createClass({
- )
+ );
}
});
diff --git a/js/components/ascribe_forms/form_consign.js b/js/components/ascribe_forms/form_consign.js
index dbb1eee0..85c21467 100644
--- a/js/components/ascribe_forms/form_consign.js
+++ b/js/components/ascribe_forms/form_consign.js
@@ -1,4 +1,4 @@
-import fetch from 'isomorphic-fetch';
+'use strict';
import React from 'react';
@@ -12,19 +12,20 @@ let ConsignForm = React.createClass({
mixins: [FormMixin],
url() {
- return ApiUrls.ownership_consigns
+ return ApiUrls.ownership_consigns;
},
+
getFormData() {
return {
bitcoin_id: this.getBitcoinIds().join(),
consignee: this.refs.consignee.state.value,
consign_message: this.refs.consign_message.state.value,
password: this.refs.password.state.value
- }
+ };
},
renderForm() {
- let title = this.getTitlesString().join("");
+ let title = this.getTitlesString().join('');
let username = this.props.currentUser.username;
let message =
`Hi,
diff --git a/js/components/ascribe_forms/form_loan.js b/js/components/ascribe_forms/form_loan.js
index 483d0f0a..3b9dc5e3 100644
--- a/js/components/ascribe_forms/form_loan.js
+++ b/js/components/ascribe_forms/form_loan.js
@@ -1,4 +1,4 @@
-import fetch from 'isomorphic-fetch';
+'use strict';
import React from 'react';
@@ -9,39 +9,47 @@ import InputHidden from './input_hidden';
import InputCheckbox from './input_checkbox';
import InputDate from './input_date';
import InputTextArea from './input_textarea';
-import OwnershipFetcher from '../../fetchers/ownership_fetcher'
+import OwnershipFetcher from '../../fetchers/ownership_fetcher';
import ButtonSubmitOrClose from './button_submit_close';
let LoanForm = React.createClass({
+
+ getInitialState() {
+ this.setState({
+ contract_key: null,
+ contract_url: null,
+ loaneeHasContract: false
+ });
+ },
+
mixins: [FormMixin],
url() {
- return ApiUrls.ownership_loans
- },
- componentDidMount(){
- this.setState({contract_key: null,
- contract_url: null,
- loaneeHasContract: false});
+ return ApiUrls.ownership_loans;
},
+
getFormData() {
return {
bitcoin_id: this.getBitcoinIds().join(),
loanee: this.refs.loanee.state.value,
gallery_name: this.refs.gallery_name.state.value,
- startdate: this.refs.startdate.state.value.format("YYYY-MM-DD"),
- enddate: this.refs.enddate.state.value.format("YYYY-MM-DD"),
+ startdate: this.refs.startdate.state.value.format('YYYY-MM-DD'),
+ enddate: this.refs.enddate.state.value.format('YYYY-MM-DD'),
loan_message: this.refs.loan_message.state.value,
password: this.refs.password.state.value,
terms: this.refs.terms.state.value
- }
+ };
},
- handleLoanEmailBlur(e){
+
+ handleLoanEmailBlur(){
OwnershipFetcher.fetchLoanContract(this.refs.loanee.state.value)
.then((res) => {
if (res && res.length > 0) {
- this.setState({contract_key: res[0].s3Key,
- contract_url: res[0].s3Url,
- loaneeHasContract: true});
+ this.setState({
+ contract_key: res[0].s3Key,
+ contract_url: res[0].s3Url,
+ loaneeHasContract: true
+ });
}
else{
this.resetLoanContract();
@@ -52,14 +60,16 @@ let LoanForm = React.createClass({
this.resetLoanContract();
});
},
+
resetLoanContract(){
this.setState({contract_key: null,
contract_url: null,
loaneeHasContract: false
});
},
+
renderForm() {
- let title = this.getTitlesString().join("");
+ let title = this.getTitlesString().join('');
let username = this.props.currentUser.username;
let message =
`Hi,
@@ -72,18 +82,19 @@ ${username}`;
let contract =
+
diff --git a/js/components/ascribe_accordion_list/accordion_list_item_table.js b/js/components/ascribe_accordion_list/accordion_list_item_table.js
index 82b9a23a..4ead1eeb 100644
--- a/js/components/ascribe_accordion_list/accordion_list_item_table.js
+++ b/js/components/ascribe_accordion_list/accordion_list_item_table.js
@@ -1,18 +1,18 @@
+'use strict';
+
import React from 'react';
import Table from '../ascribe_table/table';
import TableItem from '../ascribe_table/table_item';
-import TableColumnContentModel from '../../models/table_column_content_model';
-
-import { getLangText } from '../../utils/lang_utils';
+import { ColumnModel } from '../ascribe_table/models/table_models';
let AccordionListItemTable = React.createClass({
propTypes: {
className: React.PropTypes.string,
parentId: React.PropTypes.number,
itemList: React.PropTypes.array,
- columnList: React.PropTypes.arrayOf(React.PropTypes.instanceOf(TableColumnContentModel)),
+ columnList: React.PropTypes.arrayOf(React.PropTypes.instanceOf(ColumnModel)),
numOfTableItems: React.PropTypes.number,
show: React.PropTypes.bool,
changeOrder: React.PropTypes.func,
@@ -25,17 +25,17 @@ let AccordionListItemTable = React.createClass({
return (
{this.props.content.title}
{getLangText('by %s', this.props.content.artist_name)}
+{this.props.content.date_created.split('-')[0]}
+ let label = ();
+ contract = (
- )
+ );
}
});
diff --git a/js/components/ascribe_modal/modal_share.js b/js/components/ascribe_modal/modal_share.js
index 4ada244c..2cce53ad 100644
--- a/js/components/ascribe_modal/modal_share.js
+++ b/js/components/ascribe_modal/modal_share.js
@@ -1,13 +1,13 @@
+'use strict';
+
import React from 'react';
import Modal from 'react-bootstrap/lib/Modal';
import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger';
import ModalTrigger from 'react-bootstrap/lib/ModalTrigger';
import Tooltip from 'react-bootstrap/lib/Tooltip';
-import ModalMixin from '../../mixins/modal_mixin'
-
-
-import ShareForm from '../ascribe_forms/form_share_email'
+import ModalMixin from '../../mixins/modal_mixin';
+import ShareForm from '../ascribe_forms/form_share_email';
let ShareModalButton = React.createClass({
render() {
@@ -20,12 +20,12 @@ let ShareModalButton = React.createClass({
I agree to the
terms of {this.refs.loanee.state.value}
-
;
- contract =