Merge branch 'master' into add-tests

migtools · May 28, 2019 · 44b6a87 · 44b6a87
2 parents f001449 + f0593b5
commit 44b6a87
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "img-loader": "3.0.1",
     "jest": "24.7.1",
     "lodash": "4.17.11",
-    "node-sass": "4.11.0",
+    "node-sass": "4.12.0",
     "prettier": "1.16.4",
     "react-loader-spinner": "2.3.0",
     "react-select": "2.4.2",

diff --git a/src/app/cluster/components/AddClusterModal/AddClusterForm.tsx b/src/app/cluster/components/AddClusterModal/AddClusterForm.tsx
@@ -52,6 +52,7 @@ class WrappedAddClusterForm extends React.Component<any, any> {
       setFieldTouched,
       setFieldValue,
       checkConnection,
+      onHandleModalToggle,
     } = this.props;
     const dynamicTokenSecurity = this.state.tokenHidden ? 'disc' : 'inherit';
     const customCss = css`
@@ -131,6 +132,7 @@ class WrappedAddClusterForm extends React.Component<any, any> {
           touched={touched}
           connectionState={connectionState}
           checkConnection={checkConnection}
+          onHandleModalToggle={onHandleModalToggle}
         />
       </Form >
     );

diff --git a/src/app/common/components/CheckConnection.tsx b/src/app/common/components/CheckConnection.tsx
@@ -17,13 +17,15 @@ interface IProps {
   errors: any;
   touched: any;
   checkConnection: () => void;
+  onHandleModalToggle: (arg0?: any) => void;
 }
 
 const CheckConnection: React.FunctionComponent<IProps> = ({
   connectionState,
   checkConnection,
   errors,
   touched,
+  onHandleModalToggle,
   ...props
 }) => {
 
@@ -68,7 +70,7 @@ const CheckConnection: React.FunctionComponent<IProps> = ({
           <Button
             key="cancel"
             variant="secondary"
-            onClick={() => this.props.onHandleModalToggle(null)}
+            onClick={() => onHandleModalToggle(null)}
           >
             Cancel
           </Button>

diff --git a/src/app/storage/components/AddStorageModal/AddStorageForm.tsx b/src/app/storage/components/AddStorageModal/AddStorageForm.tsx
@@ -174,6 +174,7 @@ class WrappedAddStorageForm extends React.Component<any, any> {
           touched={touched}
           connectionState={connectionState}
           checkConnection={checkConnection}
+          onHandleModalToggle={this.props.onHandleModalToggle}
         />
       </Form >
 

diff --git a/src/index.tsx b/src/index.tsx
@@ -16,7 +16,7 @@ import Loader from 'react-loader-spinner';
 const onBeforeLift = () => {
   // take some action before the gate lifts
 };
-// Some amount of meta data is delievered to the app by the server
+// Some amount of meta data is delivered to the app by the server
 /* tslint:disable:no-string-literal */
 const migMeta = window['_mig_meta'];
 /* tslint:enable:no-string-literal */

diff --git a/yarn.lock b/yarn.lock
@@ -6341,16 +6341,6 @@ lodash-es@^4.17.11:
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.11.tgz#145ab4a7ac5c5e52a3531fb4f310255a152b4be0"
   integrity sha512-DHb1ub+rMjjrxqlB3H56/6MXtm1lSksDp2rA2cNWjG8mlDUYFhUj3Di2Zn5IwSU87xLv8tNIQ7sSwE/YOX/D/Q==
 
-lodash.assign@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
-
-lodash.clonedeep@^4.3.2:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
-
 lodash.includes@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
@@ -6780,11 +6770,16 @@ multipipe@^1.0.2:
     duplexer2 "^0.1.2"
     object-assign "^4.1.0"
 
-nan@^2.10.0, nan@^2.12.1:
+nan@^2.12.1:
   version "2.13.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
   integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
 
+nan@^2.13.2:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
+  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -6947,10 +6942,10 @@ node-releases@^1.1.14:
   dependencies:
     semver "^5.3.0"
 
-node-sass@4.11.0:
-  version "4.11.0"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
-  integrity sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==
+node-sass@4.12.0:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017"
+  integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -6959,12 +6954,10 @@ node-sass@4.11.0:
     get-stdin "^4.0.1"
     glob "^7.0.3"
     in-publish "^2.0.0"
-    lodash.assign "^4.2.0"
-    lodash.clonedeep "^4.3.2"
-    lodash.mergewith "^4.6.0"
+    lodash "^4.17.11"
     meow "^3.7.0"
     mkdirp "^0.5.1"
-    nan "^2.10.0"
+    nan "^2.13.2"
     node-gyp "^3.8.0"
     npmlog "^4.0.0"
     request "^2.88.0"