api |
diff --git a/js/components/global_action.js b/js/components/global_action.js
deleted file mode 100644
index 80df0c75..00000000
--- a/js/components/global_action.js
+++ /dev/null
@@ -1,43 +0,0 @@
-'use strict';
-
-import React from 'react';
-
-let GlobalAction = React.createClass({
- propTypes: {
- requestActions: React.PropTypes.object
- },
-
- render() {
- let pieceActions = null;
- if (this.props.requestActions && this.props.requestActions.pieces){
- pieceActions = this.props.requestActions.pieces.map((item) => {
- return (
-
- {item}
-
);
- });
- }
- let editionActions = null;
- if (this.props.requestActions && this.props.requestActions.editions){
- editionActions = Object.keys(this.props.requestActions.editions).map((pieceId) => {
- return this.props.requestActions.editions[pieceId].map((item) => {
- return (
-
- {item}
-
);
- });
- });
- }
-
- if (pieceActions || editionActions) {
- return (
-
- {pieceActions}
- {editionActions}
-
);
- }
- return null;
- }
-});
-
-export default GlobalAction;
\ No newline at end of file
diff --git a/js/components/header.js b/js/components/header.js
index 797684ec..c16cba86 100644
--- a/js/components/header.js
+++ b/js/components/header.js
@@ -219,10 +219,11 @@ let Header = React.createClass({
return (
+ className="hidden-print">
+
+
+
);
}
diff --git a/js/components/password_reset_container.js b/js/components/password_reset_container.js
index 31275a08..6d2d089e 100644
--- a/js/components/password_reset_container.js
+++ b/js/components/password_reset_container.js
@@ -130,8 +130,9 @@ let PasswordResetForm = React.createClass({
},
handleSuccess() {
- this.history.pushState(null, '/collection');
- let notification = new GlobalNotificationModel(getLangText('password successfully updated'), 'success', 10000);
+ this.history.push('/collection');
+
+ const notification = new GlobalNotificationModel(getLangText('password successfully updated'), 'success', 10000);
GlobalNotificationActions.appendGlobalNotification(notification);
},
diff --git a/js/components/piece_list.js b/js/components/piece_list.js
index 9424117c..666d1b54 100644
--- a/js/components/piece_list.js
+++ b/js/components/piece_list.js
@@ -37,6 +37,7 @@ let PieceList = React.createClass({
bulkModalButtonListType: React.PropTypes.func,
canLoadPieceList: React.PropTypes.bool,
redirectTo: React.PropTypes.string,
+ shouldRedirect: React.PropTypes.func,
customSubmitButton: React.PropTypes.element,
customThumbnailPlaceholder: React.PropTypes.func,
filterParams: React.PropTypes.array,
@@ -114,9 +115,13 @@ let PieceList = React.createClass({
},
componentDidUpdate() {
- if (this.props.redirectTo && this.state.unfilteredPieceListCount === 0) {
+ const { location: { query }, redirectTo, shouldRedirect } = this.props;
+ const { unfilteredPieceListCount } = this.state;
+
+ if (redirectTo && unfilteredPieceListCount === 0 &&
+ (typeof shouldRedirect === 'function' && shouldRedirect(unfilteredPieceListCount))) {
// FIXME: hack to redirect out of the dispatch cycle
- window.setTimeout(() => this.history.pushState(null, this.props.redirectTo, this.props.location.query), 0);
+ window.setTimeout(() => this.history.push({ query, pathname: redirectTo }), 0);
}
},
@@ -169,15 +174,16 @@ let PieceList = React.createClass({
}
},
- searchFor(searchTerm) {
- this.loadPieceList({
- page: 1,
- search: searchTerm
- });
- this.history.pushState(null, this.props.location.pathname, {page: 1});
+ searchFor(search) {
+ const { location: { pathname } } = this.props;
+
+ this.loadPieceList({ search, page: 1 });
+ this.history.push({ pathname, query: { page: 1 } });
},
- applyFilterBy(filterBy){
+ applyFilterBy(filterBy) {
+ const { location: { pathname } } = this.props;
+
this.setState({
isFilterDirty: true
});
@@ -190,31 +196,32 @@ let PieceList = React.createClass({
this.state.pieceList
.forEach((piece) => {
// but only if they're actually open
- if(this.state.isEditionListOpenForPieceId[piece.id].show) {
+ const isEditionListOpenForPiece = this.state.isEditionListOpenForPieceId[piece.id];
+
+ if (isEditionListOpenForPiece && isEditionListOpenForPiece.show) {
EditionListActions.refreshEditionList({
pieceId: piece.id,
filterBy
});
}
-
});
});
// we have to redirect the user always to page one as it could be that there is no page two
// for filtered pieces
- this.history.pushState(null, this.props.location.pathname, {page: 1});
+ this.history.push({ pathname, query: { page: 1 } });
},
applyOrderBy(orderBy) {
- PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
- orderBy, this.state.orderAsc, this.state.filterBy);
+ const { filterBy, orderAsc, page, pageSize, search } = this.state;
+ PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
},
loadPieceList({ page, filterBy = this.state.filterBy, search = this.state.search }) {
+ const { orderAsc, pageSize } = this.state;
const orderBy = this.state.orderBy || this.props.orderBy;
- return PieceListActions.fetchPieceList(page, this.state.pageSize, search,
- orderBy, this.state.orderAsc, filterBy);
+ return PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
},
fetchSelectedPieceEditionList() {
@@ -240,8 +247,9 @@ let PieceList = React.createClass({
},
handleAclSuccess() {
- PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
- this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+ const { filterBy, orderBy, orderAsc, page, pageSize, search } = this.state;
+
+ PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
this.fetchSelectedPieceEditionList()
.forEach((pieceId) => {
diff --git a/js/components/register_piece.js b/js/components/register_piece.js
index 8211e91e..3f268760 100644
--- a/js/components/register_piece.js
+++ b/js/components/register_piece.js
@@ -65,26 +65,21 @@ let RegisterPiece = React.createClass( {
this.setState(state);
},
- handleSuccess(response){
- let notification = new GlobalNotificationModel(response.notification, 'success', 10000);
+ handleSuccess(response) {
+ const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
+
+ const notification = new GlobalNotificationModel(response.notification, 'success', 10000);
GlobalNotificationActions.appendGlobalNotification(notification);
// once the user was able to register a piece successfully, we need to make sure to keep
// the piece list up to date
- PieceListActions.fetchPieceList(
- this.state.page,
- this.state.pageSize,
- this.state.searchTerm,
- this.state.orderBy,
- this.state.orderAsc,
- this.state.filterBy
- );
+ PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
- this.history.pushState(null, `/pieces/${response.piece.id}`);
+ this.history.push(`/pieces/${response.piece.id}`);
},
getSpecifyEditions() {
- if(this.state.whitelabel && this.state.whitelabel.acl_create_editions || Object.keys(this.state.whitelabel).length === 0) {
+ if (this.state.whitelabel && this.state.whitelabel.acl_create_editions || Object.keys(this.state.whitelabel).length === 0) {
return (
+ min={1}
+ max={100} />
);
}
diff --git a/js/components/whitelabel/prize/portfolioreview/components/pr_forms/pr_register_piece_form.js b/js/components/whitelabel/prize/portfolioreview/components/pr_forms/pr_register_piece_form.js
index a8d946b5..2ef96661 100644
--- a/js/components/whitelabel/prize/portfolioreview/components/pr_forms/pr_register_piece_form.js
+++ b/js/components/whitelabel/prize/portfolioreview/components/pr_forms/pr_register_piece_form.js
@@ -19,8 +19,10 @@ import ApiUrls from '../../../../../../constants/api_urls';
import requests from '../../../../../../utils/requests';
-import { getLangText } from '../../../../../../utils/lang_utils';
+import { getErrorNotificationMessage } from '../../../../../../utils/error_utils';
import { setCookie } from '../../../../../../utils/fetch_api_utils';
+import { validateForms } from '../../../../../../utils/form_utils';
+import { getLangText } from '../../../../../../utils/lang_utils';
import { formSubmissionValidation } from '../../../../../ascribe_uploader/react_s3_fine_uploader_utils';
@@ -35,7 +37,7 @@ const PRRegisterPieceForm = React.createClass({
mixins: [History],
- getInitialState(){
+ getInitialState() {
return {
digitalWorkKeyReady: true,
thumbnailKeyReady: true,
@@ -54,16 +56,16 @@ const PRRegisterPieceForm = React.createClass({
* second adding all the additional details
*/
submit() {
- if(!this.validateForms()) {
+ if (!this.validateForms()) {
return;
- } else {
- // disable the submission button right after the user
- // clicks on it to avoid double submission
- this.setState({
- submitted: true
- });
}
+ // disable the submission button right after the user
+ // clicks on it to avoid double submission
+ this.setState({
+ submitted: true
+ });
+
const { currentUser } = this.props;
const { registerPieceForm,
additionalDataForm,
@@ -104,12 +106,20 @@ const PRRegisterPieceForm = React.createClass({
GlobalNotificationActions.appendGlobalNotification(notificationMessage);
});
})
- .then(() => this.history.pushState(null, `/pieces/${this.state.piece.id}`))
+ .then(() => this.history.push(`/pieces/${this.state.piece.id}`))
.catch((err) => {
- const notificationMessage = new GlobalNotificationModel(getLangText("Oops! We weren't able to send your submission. Contact: support@ascribe.io"), 'danger', 5000);
+ const errMessage = (getErrorNotificationMessage(err) || getLangText("Oops! We weren't able to send your submission.")) +
+ getLangText(' Please contact support@ascribe.io');
+
+ const notificationMessage = new GlobalNotificationModel(errMessage, 'danger', 10000);
GlobalNotificationActions.appendGlobalNotification(notificationMessage);
console.logGlobal(new Error('Portfolio Review piece registration failed'), err);
+
+ // Reset the submit button
+ this.setState({
+ submitted: false
+ });
});
},
@@ -118,11 +128,7 @@ const PRRegisterPieceForm = React.createClass({
additionalDataForm,
uploadersForm } = this.refs;
- const registerPieceFormValidation = registerPieceForm.validate();
- const additionalDataFormValidation = additionalDataForm.validate();
- const uploaderFormValidation = uploadersForm.validate();
-
- return registerPieceFormValidation && additionalDataFormValidation && uploaderFormValidation;
+ return validateForms([registerPieceForm, additionalDataForm, uploadersForm], true);
},
getCreateBlobRoutine() {
@@ -139,7 +145,7 @@ const PRRegisterPieceForm = React.createClass({
},
/**
- * This method is overloaded so that we can track the ready-state
+ * These two methods are overloaded so that we can track the ready-state
* of each uploader in the component
* @param {string} uploaderKey Name of the uploader's key to track
*/
@@ -151,6 +157,14 @@ const PRRegisterPieceForm = React.createClass({
};
},
+ handleOptionalFileValidationFailed(uploaderKey) {
+ return () => {
+ this.setState({
+ [uploaderKey]: true
+ });
+ };
+ },
+
getSubmitButton() {
const { digitalWorkKeyReady,
thumbnailKeyReady,
@@ -179,11 +193,12 @@ const PRRegisterPieceForm = React.createClass({
render() {
const { location } = this.props;
+ const maxThumbnailSize = AppConstants.fineUploader.validation.workThumbnail.sizeLimit / 1000000;
return (
- }
+ }
subheader={
+ piece={piece}
+ currentUser={currentUser}
+ selectedPrizeActionButton={selectedPrizeActionButton} />
}>
-
+
);
} else {
@@ -186,16 +187,15 @@ let PieceContainer = React.createClass({
let NavigationHeader = React.createClass({
propTypes: {
- piece: React.PropTypes.object,
- currentUser: React.PropTypes.object
+ currentUser: React.PropTypes.object.isRequired,
+ piece: React.PropTypes.object.isRequired
},
render() {
const { currentUser, piece } = this.props;
- if (currentUser && currentUser.email && currentUser.is_judge && currentUser.is_jury &&
- !currentUser.is_admin && piece && piece.navigation) {
- let nav = piece.navigation;
+ if (currentUser.email && currentUser.is_judge && currentUser.is_jury && !currentUser.is_admin && piece.navigation) {
+ const nav = piece.navigation;
return (
@@ -215,41 +215,49 @@ let NavigationHeader = React.createClass({
);
+ } else {
+ return null;
}
- return null;
}
});
let PrizePieceRatings = React.createClass({
propTypes: {
- loadPiece: React.PropTypes.func,
- piece: React.PropTypes.object,
- currentUser: React.PropTypes.object
+ currentUser: React.PropTypes.object.isRequired,
+ loadPiece: React.PropTypes.func.isRequired,
+ piece: React.PropTypes.object.isRequired,
+
+ selectedPrizeActionButton: React.PropTypes.func
},
getInitialState() {
return mergeOptions(
PieceListStore.getState(),
- PrizeRatingStore.getState()
+ PrizeStore.getState(),
+ PrizeRatingStore.getInitialState()
);
},
componentDidMount() {
PrizeRatingStore.listen(this.onChange);
- PrizeRatingActions.fetchOne(this.props.piece.id);
- PrizeRatingActions.fetchAverage(this.props.piece.id);
+ PrizeStore.listen(this.onChange);
PieceListStore.listen(this.onChange);
+
+ PrizeActions.fetchPrize();
+ this.fetchRatingsIfAuthorized();
+ },
+
+ componentWillReceiveProps(nextProps) {
+ if (nextProps.currentUser.email !== this.props.currentUser.email) {
+ this.fetchRatingsIfAuthorized();
+ }
},
componentWillUnmount() {
- // Every time we're leaving the piece detail page,
- // just reset the piece that is saved in the piece store
- // as it will otherwise display wrong/old data once the user loads
- // the piece detail a second time
- PrizeRatingActions.updateRating({});
- PrizeRatingStore.unlisten(this.onChange);
PieceListStore.unlisten(this.onChange);
+ PrizeStore.unlisten(this.onChange);
+ PrizeRatingStore.unlisten(this.onChange);
},
// The StarRating component does not have a property that lets us set
@@ -257,7 +265,12 @@ let PrizePieceRatings = React.createClass({
// every mouseover be overridden, we need to set it ourselves initially to deal
// with the problem.
onChange(state) {
+ if (state.prize && state.prize.active_round != this.state.prize.active_round) {
+ this.fetchRatingsIfAuthorized(state);
+ }
+
this.setState(state);
+
if (this.refs.rating) {
this.refs.rating.state.ratingCache = {
pos: this.refs.rating.state.pos,
@@ -268,74 +281,64 @@ let PrizePieceRatings = React.createClass({
}
},
+ fetchRatingsIfAuthorized(state = this.state) {
+ const {
+ currentUser: {
+ is_admin: isAdmin,
+ is_judge: isJudge,
+ is_jury: isJury
+ },
+ piece: { id: pieceId } } = this.props;
+
+ if (state.prize && 'active_round' in state.prize && (isAdmin || isJudge || isJury)) {
+ PrizeRatingActions.fetchOne(pieceId, state.prize.active_round);
+ PrizeRatingActions.fetchAverage(pieceId, state.prize.active_round);
+ }
+ },
+
onRatingClick(event, args) {
event.preventDefault();
- PrizeRatingActions.createRating(this.props.piece.id, args.rating).then(
- this.refreshPieceData()
- );
+ PrizeRatingActions
+ .createRating(this.props.piece.id, args.rating, this.state.prize.active_round)
+ .then(this.refreshPieceData);
},
- handleLoanRequestSuccess(message){
- let notification = new GlobalNotificationModel(message, 'success', 4000);
- GlobalNotificationActions.appendGlobalNotification(notification);
- },
+ getSelectedActionButton() {
+ const { currentUser, piece, selectedPrizeActionButton: SelectedPrizeActionButton } = this.props;
- getLoanButton(){
- let today = new Moment();
- let endDate = new Moment();
- endDate.add(6, 'months');
- return (
-
- {getLangText('SEND LOAN REQUEST')}
-
- }
- handleSuccess={this.handleLoanRequestSuccess}
- title='REQUEST LOAN'>
-
- );
- },
-
- handleShortlistSuccess(message){
- let notification = new GlobalNotificationModel(message, 'success', 2000);
- GlobalNotificationActions.appendGlobalNotification(notification);
+ if (piece.selected && SelectedPrizeActionButton) {
+ return (
+
+
+
+ );
+ }
},
refreshPieceData() {
+ const { filterBy, orderAsc, orderBy, page, pageSize, search } = this.state;
+
this.props.loadPiece();
- PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search,
- this.state.orderBy, this.state.orderAsc, this.state.filterBy);
+ PieceListActions.fetchPieceList({ page, pageSize, search, orderBy, orderAsc, filterBy });
},
onSelectChange() {
- PrizeRatingActions.toggleShortlist(this.props.piece.id)
- .then(
- (res) => {
+ PrizeRatingActions
+ .toggleShortlist(this.props.piece.id)
+ .then((res) => {
this.refreshPieceData();
- return res;
- })
- .then(
- (res) => {
- this.handleShortlistSuccess(res.notification);
- }
- );
+
+ if (res && res.notification) {
+ const notification = new GlobalNotificationModel(res.notification, 'success', 2000);
+ GlobalNotificationActions.appendGlobalNotification(notification);
+ }
+ });
},
- render(){
- if (this.props.piece && this.props.currentUser && this.props.currentUser.is_judge && this.state.average) {
+ render() {
+ if (this.props.piece.id && this.props.currentUser.is_judge && this.state.average) {
// Judge sees shortlisting, average and per-jury notes
return (
@@ -352,9 +355,7 @@ let PrizePieceRatings = React.createClass({
-
- {this.props.piece.selected ? this.getLoanButton() : null}
-
+ {this.getSelectedActionButton()}
@@ -369,17 +370,23 @@ let PrizePieceRatings = React.createClass({
size='md'
step={0.5}
rating={this.state.average}
- ratingAmount={5}/>
+ ratingAmount={5} />
{this.state.ratings.map((item, i) => {
- let note = item.note ?
+ let note = item.note ? (
note: {item.note}
-