Commit 7d53c53b authored by Viacheslav Pavlov's avatar Viacheslav Pavlov

fixed map page, several merge conflicts solved

parent 767cab0b
......@@ -176,7 +176,7 @@ export const loadAccessionsMapInfo = (filters: string | AccessionFilter, viewPor
viewPort && viewPort.center && `/@${viewPort.center[0].toFixed(6)},${viewPort.center[1].toFixed(6)},${viewPort.zoom}z`),
);
} else {
dispatch(updateRouteWithFilterCode(mapInfo.filterCode, '/a/map'));
dispatch(updateRouteWithFilterCode(mapInfo.filterCode, '/a/map', null, '/@0,0,3z'));
}
});
};
......
......@@ -194,7 +194,7 @@ const styles = (theme) => ({
/* eslint-enable */
});
class BrowsePage extends React.Component<IMapPageProps, any> {
class MapPage extends React.Component<IMapPageProps, any> {
private clickTimeout;
private mapRef = null;
......@@ -890,4 +890,4 @@ const mapDispatchToProps = (dispatch) => bindActionCreators({
toggleMyMap,
}, dispatch);
export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(withTranslation()(BrowsePage)));
export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(withTranslation()(MapPage)));
import * as React from 'react';
import { translate } from 'react-i18next';
import {WithTranslation, withTranslation} from 'react-i18next';
import FormControlLabel from '@material-ui/core/FormControlLabel';
import FormLabel from '@material-ui/core/FormLabel';
import FormControl from '@material-ui/core/FormControl';
import RadioGroup from '@material-ui/core/RadioGroup';
import { withStyles } from '@material-ui/core/styles';
import { withStyles, WithStyles } from '@material-ui/core/styles';
import Checkbox from '@material-ui/core/Checkbox';
import { cleanFilters } from 'utilities';
......@@ -17,13 +17,11 @@ const styles = (theme) =>({
});
/* tslint:enable */
interface IBooleanArrCheckbox extends React.ClassAttributes<any> {
interface IBooleanArrCheckbox extends React.ClassAttributes<any>, WithTranslation, WithStyles {
formLabel: string;
options: any[];
renderOptionLabel: any;
input: any;
classes: any;
t: any;
customHandleChange: any;
isNotNull: boolean;
isNull: boolean;
......@@ -95,4 +93,4 @@ class BooleanArrCheckbox extends React.Component<IBooleanArrCheckbox> {
}
}
export default withStyles(styles)(translate()(BooleanArrCheckbox));
export default withStyles(styles)(withTranslation()(BooleanArrCheckbox));
import * as React from 'react';
import { translate } from 'react-i18next';
import {withTranslation, WithTranslation} from 'react-i18next';
import { Field } from 'redux-form';
import Number from 'ui/common/Number';
......@@ -7,15 +7,14 @@ import BooleanArrCheckbox from './BooleanCheckbox';
import TextField from '@material-ui/core/TextField';
import { cleanFilters } from 'utilities';
interface IBooleanArrFilter extends React.ClassAttributes<any> {
interface IBooleanArrFilter extends React.ClassAttributes<any>, WithTranslation {
name: string;
label?: string;
terms: Map<string, any>;
t: any;
notNull: boolean;
notNull?: boolean;
isNull: boolean;
isNotNull: boolean;
isNull?: boolean;
isNotNull?: boolean;
}
class NullableFilterInternal extends React.Component<any> {
......@@ -170,5 +169,5 @@ class BooleanArrFilter extends React.Component<IBooleanArrFilter, any> {
}
}
export default translate()(BooleanArrFilter);
export default withTranslation()(BooleanArrFilter);
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