Maintenance: Upgrade packages (#200)

* Upgrade dependencies * Upgrade base node image * Add stop propogation fix for upgrade bug * Fix paging bug * Upgrade react, react-dom, pagination * Upgrade babel, webpack, extract-text-webpack-plugin; add prop-types in prep for React 16
djenriquez · Oct 1, 2017 · 35ab0d0 · 35ab0d0
1 parent cb16d0f
commit 35ab0d0
Show file tree

Hide file tree

Showing 25 changed files with 676 additions and 608 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:8.5-alpine
+FROM node:8.6-alpine
 
 LABEL maintainer="Vault-UI Contributors"
 

diff --git a/app/components/App/App.jsx b/app/components/App/App.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import _ from 'lodash';
 import { Tabs, Tab } from 'material-ui/Tabs';
 import Menu from '../shared/Menu/Menu.jsx';

diff --git a/app/components/Authentication/AppRole/AppRole.jsx b/app/components/Authentication/AppRole/AppRole.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 // Material UI
 import Dialog from 'material-ui/Dialog';
 import TextField from 'material-ui/TextField';

diff --git a/app/components/Authentication/Aws/Aws.jsx b/app/components/Authentication/Aws/Aws.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 // Material UI
 import Dialog from 'material-ui/Dialog';
 import TextField from 'material-ui/TextField';

diff --git a/app/components/Authentication/AwsEc2/AwsEc2.jsx b/app/components/Authentication/AwsEc2/AwsEc2.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 // Material UI
 import Dialog from 'material-ui/Dialog';
 import TextField from 'material-ui/TextField';

diff --git a/app/components/Authentication/Github/Github.jsx b/app/components/Authentication/Github/Github.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 // Material UI
 import Dialog from 'material-ui/Dialog';
 import TextField from 'material-ui/TextField';

diff --git a/app/components/Authentication/Okta/Okta.jsx b/app/components/Authentication/Okta/Okta.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 // Material UI
 import Dialog from 'material-ui/Dialog';
 import TextField from 'material-ui/TextField';

diff --git a/app/components/Authentication/Radius/Radius.jsx b/app/components/Authentication/Radius/Radius.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { Tabs, Tab } from 'material-ui/Tabs';
 import { Toolbar, ToolbarGroup } from 'material-ui/Toolbar';
 import Subheader from 'material-ui/Subheader';

diff --git a/app/components/Authentication/UserPass/UserPass.jsx b/app/components/Authentication/UserPass/UserPass.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 // Material UI
 import Dialog from 'material-ui/Dialog';
 import TextField from 'material-ui/TextField';

diff --git a/app/components/Login/Login.jsx b/app/components/Login/Login.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types';
 import styles from './login.css';
 import TextField from 'material-ui/TextField';
 import IconButton from 'material-ui/IconButton';

diff --git a/app/components/Policies/Manage.jsx b/app/components/Policies/Manage.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types';
 import _ from 'lodash';
 import { Tabs, Tab } from 'material-ui/Tabs';
 import { Toolbar, ToolbarGroup } from 'material-ui/Toolbar';

diff --git a/app/components/Secrets/Generic/Generic.jsx b/app/components/Secrets/Generic/Generic.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { Tabs, Tab } from 'material-ui/Tabs';
 import { Toolbar, ToolbarGroup } from 'material-ui/Toolbar';
 import Subheader from 'material-ui/Subheader';

diff --git a/app/components/shared/DeleteObject/DeleteObject.jsx b/app/components/shared/DeleteObject/DeleteObject.jsx
@@ -1,6 +1,7 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import _ from 'lodash';
-import { callVaultApi } from '../VaultUtils.jsx'
+import { callVaultApi } from '../VaultUtils.jsx';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
 

diff --git a/app/components/shared/Header/Header.jsx b/app/components/shared/Header/Header.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import _ from 'lodash';
 import { Toolbar, ToolbarGroup, ToolbarTitle } from 'material-ui/Toolbar';
 import FlatButton from 'material-ui/FlatButton';

diff --git a/app/components/shared/Header/countdown.js b/app/components/shared/Header/countdown.js
@@ -1,6 +1,7 @@
 // Based on https://raw.githubusercontent.com/rogermarkussen/react.timer/master/src/countdown.js
 
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class CountDown extends Component {
 

diff --git a/app/components/shared/ItemList/ItemList.jsx b/app/components/shared/ItemList/ItemList.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import Avatar from 'material-ui/Avatar';
 
 import FileFolder from 'material-ui/svg-icons/file/folder';
@@ -83,7 +84,7 @@ export default class ItemList extends React.Component {
             var action = this.isPathDirectory(item) ? (<IconButton />) : (
                 <IconButton
                     tooltip='Delete'
-                    onTouchTap={() => this.setState({ deletePath: `${this.props.itemUri}/${item}`, openDelete: true })}
+                    onTouchTap={(e) => { e.stopPropagation(); this.setState({ deletePath: `${this.props.itemUri}/${item}`, openDelete: true }); } }
                 >
                     {window.localStorage.getItem('showDeleteModal') === 'false' ? <ActionDeleteForever color={red500} /> : <ActionDelete color={red500} />}
                 </IconButton>
@@ -144,18 +145,20 @@ export default class ItemList extends React.Component {
 
         let sortedItems = _.orderBy(this.filteredItemList, _.identity, sortDirection);
         let parsedItems = _.chunk(sortedItems, maxItemsPerPage);
+        let totalPages = Math.ceil(sortedItems.length / maxItemsPerPage);
         this.setState(
             {
                 currentPage: page,
-                totalPages: Math.ceil(sortedItems.length / maxItemsPerPage),
+                totalPages: 1 > totalPages ? 1 : totalPages,
                 parsedItems: parsedItems,
                 pageItems: parsedItems[page - 1]
             });
     }
 
     resetPage() {
         this.setState({
-            currentPage: 1
+            currentPage: 1,
+            totalPages: 1
         });
     }
 

diff --git a/app/components/shared/ItemPicker/ItemPicker.jsx b/app/components/shared/ItemPicker/ItemPicker.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { callVaultApi, tokenHasCapabilities } from '../VaultUtils.jsx'
 import _ from 'lodash';
 import { List, ListItem } from 'material-ui/List';

diff --git a/app/components/shared/JsonEditor.jsx b/app/components/shared/JsonEditor.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import JSONEditor from 'jsoneditor';
 import JsonDiffReact from 'jsondiffpatch-for-react';
 import Checkbox from 'material-ui/Checkbox';

diff --git a/app/components/shared/Menu/Menu.jsx b/app/components/shared/Menu/Menu.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import _ from 'lodash';
 import styles from './menu.css';
 import Drawer from 'material-ui/Drawer';

diff --git a/app/components/shared/MountUtils/MountTuneDelete.jsx b/app/components/shared/MountUtils/MountTuneDelete.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types';
 import _ from 'lodash';
 import { callVaultApi } from '../VaultUtils.jsx'
 import Dialog from 'material-ui/Dialog';

diff --git a/app/components/shared/MountUtils/NewMount.jsx b/app/components/shared/MountUtils/NewMount.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types';
 import _ from 'lodash';
 import { callVaultApi } from '../VaultUtils.jsx'
 import Dialog from 'material-ui/Dialog';

diff --git a/app/components/shared/Wrapping/Unwrapper.jsx b/app/components/shared/Wrapping/Unwrapper.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types';
 import { callVaultApi } from '../VaultUtils.jsx'
 import JsonEditor from '../JsonEditor.jsx';
 import styles from './wrapping.css';

diff --git a/app/components/shared/Wrapping/Wrapper.jsx b/app/components/shared/Wrapping/Wrapper.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types';
 import _ from 'lodash';
 import { callVaultApi } from '../VaultUtils.jsx'
 import Dialog from 'material-ui/Dialog';

diff --git a/package.json b/package.json
@@ -45,41 +45,42 @@
   "homepage": "https://github.com/djenriquez/vault-ui#readme",
   "devDependencies": {
     "autoprefixer": "^6.5.3",
-    "babel-core": "^6.18.2",
+    "babel-core": "^6.26.0",
     "babel-eslint": "^7.1.1",
-    "babel-loader": "^6.4.1",
+    "babel-loader": "^7.1.2",
     "babel-preset-es2015": "^6.18.0",
     "babel-preset-react": "^6.16.0",
     "babel-preset-stage-0": "^6.22.0",
     "babel-preset-stage-2": "^6.18.0",
     "copy-to-clipboard": "^3.0.5",
     "cross-env": "^3.1.4",
     "css-loader": "^0.28.0",
-    "electron": "^1.6.6",
-    "electron-builder": "^13.3.2",
+    "electron": "^1.6.14",
+    "electron-builder": "^19.33.0",
     "eslint": "^3.14.0",
     "eslint-plugin-react": "^6.10.3",
-    "extract-text-webpack-plugin": "^2.1.0",
+    "extract-text-webpack-plugin": "^3.0.0",
     "extract-zip": "1.6.0",
     "file-loader": "^0.11.1",
     "flexboxgrid": "^6.3.1",
     "gopher-hcl": "^0.1.0",
     "immutability-helper": "^2.1.2",
     "jsondiffpatch": "^0.2.4",
     "jsondiffpatch-for-react": "^1.0.1",
-    "jsoneditor": "^5.5.11",
-    "lodash": "^4.16.6",
-    "material-ui": "^0.16.7",
+    "jsoneditor": "^5.9.6",
+    "lodash": "^4.17.4",
+    "material-ui": "^0.19.2",
     "mui-icons": "^1.2.1",
     "postcss-loader": "^1.3.3",
-    "react": "^15.4.0",
-    "react-dom": "^15.4.0",
+    "prop-types": "^15.6.0",
+    "react": "^15.6.2",
+    "react-dom": "^15.6.2",
     "react-router": "^3.0.0",
     "react-tap-event-plugin": "^2.0.0",
-    "react-ultimate-pagination-material-ui": "^0.5.0",
+    "react-ultimate-pagination-material-ui": "^1.0.3",
     "style-loader": "^0.16.1",
     "url-loader": "^0.5.8",
-    "webpack": "^2.3.3"
+    "webpack": "^3.6.0"
   },
   "dependencies": {
     "axios": "^0.16.1",