From a5066fecc8b3c62593e141fc945c9063369951bd Mon Sep 17 00:00:00 2001 From: Alex <33497058+bexsoft@users.noreply.github.com> Date: Mon, 12 Jun 2023 12:55:23 -0600 Subject: [PATCH] Update mds to v0.6.0 (#2862) Signed-off-by: Benjamin Perez --- portal-ui/package.json | 2 +- portal-ui/src/screens/Console/Console.tsx | 183 ++++++++++++---------- portal-ui/yarn.lock | 16 +- 3 files changed, 105 insertions(+), 96 deletions(-) diff --git a/portal-ui/package.json b/portal-ui/package.json index 47c19799f..f10232ad2 100644 --- a/portal-ui/package.json +++ b/portal-ui/package.json @@ -19,7 +19,7 @@ "local-storage-fallback": "^4.1.1", "lodash": "^4.17.21", "luxon": "^3.3.0", - "mds": "https://github.com/minio/mds.git#v0.5.1", + "mds": "https://github.com/minio/mds.git#v0.6.0", "react": "^18.1.0", "react-component-export-image": "^1.0.6", "react-copy-to-clipboard": "^5.0.2", diff --git a/portal-ui/src/screens/Console/Console.tsx b/portal-ui/src/screens/Console/Console.tsx index f7049b887..b9573f22d 100644 --- a/portal-ui/src/screens/Console/Console.tsx +++ b/portal-ui/src/screens/Console/Console.tsx @@ -480,100 +480,109 @@ const Console = ({ classes }: IConsoleProps) => { return ( {session && session.status === "ok" ? ( - : null}> - {needsRestart && ( -
- {isServerLoading ? ( - - The server is restarting. - - - ) : ( - - The instance needs to be restarted for configuration changes - to take effect.{" "} -
+ )} + {loadingProgress < 100 && ( + + )} + +
+ { + closeSnackBar(); + }} + autoHideDuration={ + snackBarMessage.type === "error" ? 10000 : 5000 + } + message={snackBarMessage.message} + className={classes.snackBarExternal} + ContentProps={{ + className: `${classes.snackBar} ${ + snackBarMessage.type === "error" + ? classes.errorSnackBar + : "" + }`, + }} + />
- )} - {loadingProgress < 100 && ( - - )} - -
- { - closeSnackBar(); - }} - autoHideDuration={snackBarMessage.type === "error" ? 10000 : 5000} - message={snackBarMessage.message} - className={classes.snackBarExternal} - ContentProps={{ - className: `${classes.snackBar} ${ - snackBarMessage.type === "error" ? classes.errorSnackBar : "" - }`, - }} - /> -
- }> - - - - {allowedRoutes.map((route: any) => ( + }> + + + + {allowedRoutes.map((route: any) => ( + }> + + + } + /> + ))} }> - + } /> - ))} - }> - - - } - /> - }> - - - } - /> - - {allowedRoutes.length > 0 ? ( - - ) : ( - - )} - - } - /> - + }> + + + } + /> + + {allowedRoutes.length > 0 ? ( + + ) : ( + + )} + + } + /> + +
) : null} diff --git a/portal-ui/yarn.lock b/portal-ui/yarn.lock index 1d2507d80..100982a2c 100644 --- a/portal-ui/yarn.lock +++ b/portal-ui/yarn.lock @@ -4847,10 +4847,10 @@ destroy@1.2.0: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== -detect-gpu@^5.0.26: - version "5.0.27" - resolved "https://registry.yarnpkg.com/detect-gpu/-/detect-gpu-5.0.27.tgz#821d9331c87e32568c483d85e12a9adee43d7bb2" - integrity sha512-IDjjqTkS+f0xm/ntbD21IPYiF0srzpePC/hhUMmctEsoklZwJwStJiMi/KN0pnH0LjSsgjwbP+QwW7y+Qf4/SQ== +detect-gpu@^5.0.27: + version "5.0.28" + resolved "https://registry.yarnpkg.com/detect-gpu/-/detect-gpu-5.0.28.tgz#e7762c04cc3b5a33d902eb5719add195494df60a" + integrity sha512-sdT5Ti9ZHBBq39mK0DRwnm/5xZOVAz2+vxYLdPcFP83+3DGkzucEK0lzw1XFwct4zWDAXYrSTFUjC33qsoRAoQ== dependencies: webgl-constants "^1.1.1" @@ -8187,12 +8187,12 @@ mdn-data@2.0.4: resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA== -"mds@https://github.com/minio/mds.git#v0.5.1": - version "0.5.0" - resolved "https://github.com/minio/mds.git#4f88eb1b77a2c10fa4e187d6da49c9107214a92c" +"mds@https://github.com/minio/mds.git#v0.6.0": + version "0.6.0" + resolved "https://github.com/minio/mds.git#f66cf711b5e7d65250e81a9fcc9f588aa081b7fc" dependencies: "@types/styled-components" "^5.1.25" - detect-gpu "^5.0.26" + detect-gpu "^5.0.27" react-virtualized "^9.22.5" styled-components "^5.3.11"