Merge branch 'release/v5.2.0'

package.json

@@ -1,70 +1,70 @@
 {
   "name": "webapi-admin-panel",
-  "version": "5.1.3",
+  "version": "5.2.0",
   "homepage": ".",
   "proxy": "http://localhost:8080/",
   "devDependencies": {
-    "@types/chart.js": "2.7.18",
+    "@types/chart.js": "2.7.27",
     "@types/i18next": "8.4.3",
-    "@types/jest": "22.2.3",
+    "@types/jest": "23.1.5",
     "@types/jsoneditor": "5.5.2",
-    "@types/lodash": "4.14.108",
-    "@types/node": "10.1.1",
+    "@types/lodash": "4.14.111",
+    "@types/node": "10.5.2",
     "@types/raven-for-redux": "1.1.0",
     "@types/rc-slider": "8.2.3",
-    "@types/react": "16.3.14",
+    "@types/react": "16.4.6",
     "@types/react-click-outside": "3.0.1",
-    "@types/react-dom": "16.0.5",
+    "@types/react-dom": "16.0.6",
     "@types/react-i18next": "7.6.1",
     "@types/react-loadable": "5.4.0",
     "@types/react-notification-system": "0.2.37",
-    "@types/react-redux": "6.0.0",
-    "@types/react-router": "4.0.25",
-    "@types/react-router-dom": "4.2.6",
-    "@types/react-router-redux": "5.0.14",
-    "@types/superagent": "3.5.8",
+    "@types/react-redux": "6.0.4",
+    "@types/react-router": "4.0.28",
+    "@types/react-router-dom": "4.2.7",
+    "@types/react-router-redux": "5.0.15",
+    "@types/superagent": "3.8.2",
     "file-loader": "1.1.11",
     "gulp": "3.9.1",
     "gulp-concat": "2.6.1",
     "gulp-sass": "4.0.1",
-    "typescript": "2.8.3"
+    "typescript": "2.9.2"
   },
   "dependencies": {
     "chart.js": "2.7.2",
     "copy-to-clipboard": "3.0.8",
     "history": "4.7.2",
-    "i18next": "11.3.2",
+    "i18next": "11.3.6",
     "i18next-browser-languagedetector": "2.2.0",
-    "jsoneditor": "5.15.0",
-    "konva": "2.1.3",
+    "jsoneditor": "5.18.0",
+    "konva": "2.1.7",
     "lodash": "4.17.10",
-    "moment": "2.22.1",
+    "moment": "2.22.2",
     "normalizr": "3.2.4",
     "portable-fetch": "3.0.0",
     "raven-for-redux": "1.3.1",
-    "raven-js": "3.25.2",
+    "raven-js": "3.26.3",
     "rc-slider": "8.6.1",
-    "react": "16.3.2",
+    "react": "16.4.1",
     "react-addons-css-transition-group": "15.6.2",
     "react-addons-transition-group": "15.6.2",
     "react-chartjs-2": "2.7.2",
     "react-click-outside": "3.0.1",
-    "react-dom": "16.3.2",
-    "react-i18next": "7.6.1",
-    "react-konva": "1.7.3",
+    "react-dom": "16.4.1",
+    "react-i18next": "7.8.0",
+    "react-konva": "1.7.9",
     "react-loadable": "5.4.0",
     "react-notification-system": "0.2.17",
     "react-redux": "5.0.7",
-    "react-router-dom": "4.2.2",
+    "react-router-dom": "4.3.1",
     "react-router-redux": "5.0.0-alpha.6",
     "react-scripts-ts": "2.16.0",
-    "react-transition-group": "2.3.1",
+    "react-transition-group": "2.4.0",
     "redux": "4.0.0",
     "reselect": "3.0.1",
-    "semantic-ui-css": "2.3.1",
-    "semantic-ui-react": "0.80.0",
+    "semantic-ui-css": "2.3.3",
+    "semantic-ui-react": "0.82.0",
     "source-map-explorer": "1.5.0",
-    "styled-components": "3.2.6",
+    "styled-components": "3.3.3",
     "superagent": "3.8.3"
   },
   "scripts": {
@@ -74,4 +74,4 @@
     "eject": "react-scripts-ts eject",
     "analyze": "source-map-explorer build/static/js/main.*"
   }
-}
+}

src/components/Inventory/index.tsx

@@ -3,7 +3,7 @@ import * as React from 'react';
 import { translate } from 'react-i18next';
 import { Accordion, Button, Radio } from 'semantic-ui-react';
 
-import { ItemStack } from '../../fetch';
+import { Inventory, ItemStack } from '../../fetch';
 import ItemStackComp from '../ItemStack';
 
 const customizer: (
@@ -17,7 +17,7 @@ const customizer: (
 };
 
 export interface AppProps extends reactI18Next.InjectedTranslateProps {
-	items: ItemStack[];
+	inventory: Inventory;
 	dontStack?: boolean;
 	stackOption?: boolean;
 	dontCollapse?: boolean;
@@ -28,7 +28,7 @@ interface AppState {
 	stacked: boolean;
 }
 
-class Inventory extends React.Component<AppProps, AppState> {
+class InventoryComp extends React.Component<AppProps, AppState> {
 	constructor(props: AppProps) {
 		super(props);
 
@@ -47,17 +47,17 @@ class Inventory extends React.Component<AppProps, AppState> {
 	}
 
 	render() {
-		const _t = this.props.t;
+		const { t, inventory } = this.props;
 
-		if (this.props.items.length === 0) {
+		if (inventory.slots.length === 0) {
 			return (
 				<Button primary disabled>
-					{_t('EmptyInventory')}
+					{t('EmptyInventory')}
 				</Button>
 			);
 		}
 
-		let items = _.sortBy(this.props.items, 'type.name');
+		let items = _.sortBy(inventory.slots.map(s => s.stack), 'type.name');
 		if (!this.props.dontStack && this.state.stacked) {
 			const itemGroups = _.groupBy(items, 'type.id');
 			items = _.map(itemGroups, itemGroup => {
@@ -96,7 +96,7 @@ class Inventory extends React.Component<AppProps, AppState> {
 					active={this.state.shown}
 					onClick={this.toggle}
 				>
-					{this.state.shown ? _t('HideInventory') : _t('ShowInventory')}
+					{this.state.shown ? t('HideInventory') : t('ShowInventory')}
 				</Accordion.Title>
 				<Accordion.Content active={this.state.shown}>
 					{content}
@@ -106,4 +106,4 @@ class Inventory extends React.Component<AppProps, AppState> {
 	}
 }
 
-export default translate('Inventory')(Inventory);
+export default translate('Inventory')(InventoryComp);

src/containers/Full/index.tsx

@@ -2,10 +2,10 @@ import * as _ from 'lodash';
 import * as Raven from 'raven-js';
 import * as React from 'react';
 import { translate } from 'react-i18next';
-import { connect, Dispatch } from 'react-redux';
+import { connect } from 'react-redux';
 import { RouteComponentProps } from 'react-router';
 import { Redirect, Route, Switch } from 'react-router-dom';
-import { Action } from 'redux';
+import { Action, Dispatch } from 'redux';
 import { Button, Message, Segment, Sidebar } from 'semantic-ui-react';
 
 import { AppAction } from '../../actions';

src/containers/Login/index.tsx

@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { translate } from 'react-i18next';
-import { connect, Dispatch } from 'react-redux';
+import { connect } from 'react-redux';
 import { Redirect } from 'react-router-dom';
+import { Dispatch } from 'redux';
 import {
 	Button,
 	Dropdown,
@@ -198,6 +199,7 @@ const mapDispatchToProps = (dispatch: Dispatch<AppAction>) => {
 	};
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(
-	translate('Login')(Login)
-);
+export default connect(
+	mapStateToProps,
+	mapDispatchToProps
+)(translate('Login')(Login));