Commit fb106104 authored by Viacheslav Pavlov's avatar Viacheslav Pavlov
Browse files

fixed subRequests after rebase

parent 907b96e9
......@@ -19,6 +19,7 @@ const INITIAL_STATE: {
count: number,
accessionUuids: string[],
loaded: Accession[],
loadedAll: boolean,
paged: ApiCall<Page<Accession>>,
};
} = {
......@@ -26,6 +27,7 @@ const INITIAL_STATE: {
count: 0,
accessionUuids: [],
loaded: [],
loadedAll: undefined,
paged: null,
},
};
......
import * as React from 'react';
import { translate } from 'react-i18next';
import { withTranslation } from 'react-i18next';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import * as _ from 'lodash';
......@@ -171,4 +171,4 @@ const mapDispatchToProps = (dispatch) => bindActionCreators({
addToSelected,
}, dispatch);
export default translate()(connect(mapStateToProps, mapDispatchToProps)(SubRequestBrowsePage));
export default connect(mapStateToProps, mapDispatchToProps)(withTranslation()(SubRequestBrowsePage));
import * as React from 'react';
import {translate} from 'react-i18next';
import {withStyles} from '@material-ui/core/styles';
import {WithTranslation, withTranslation} from 'react-i18next';
import {withStyles, WithStyles} from '@material-ui/core/styles';
import {RequestLink} from 'ui/genesys/Links';
import Card, {CardContent, CardActions} from 'ui/common/Card';
......@@ -18,11 +18,9 @@ const styles = () => ({
},
});
interface ISubrequestCardProps extends React.ClassAttributes<any> {
interface ISubrequestCardProps extends React.ClassAttributes<any>, WithTranslation, WithStyles {
index?: number;
subRequest: MaterialSubRequest;
classes: any;
t: any;
isEditMode: boolean;
inEditLis: boolean;
addToEditAction: any;
......@@ -97,4 +95,4 @@ class SubrequestCard extends React.Component<ISubrequestCardProps & any> {
}
}
export default translate()(withStyles(styles)(SubrequestCard));
export default withStyles(styles)(withTranslation()(SubrequestCard));
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment