Skip to content

Commit

Permalink
Update mds to v0.6.0 (#2862)
Browse files Browse the repository at this point in the history 
Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>
  • Loading branch information
@bexsoft
bexsoft authored Jun 12, 2023
1 parent 6432681 commit a5066fe
Show file tree
Hide file tree
Showing 3 changed files with 105 additions and 96 deletions.
2 changes: 1 addition & 1 deletion portal-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
183 changes: 96 additions & 87 deletions portal-ui/src/screens/Console/Console.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -480,100 +480,109 @@ const Console = ({ classes }: IConsoleProps) => {
return (
<Fragment>
{session && session.status === "ok" ? (
<MainContainer menu={!hideMenu ? <Menu /> : null}>
{needsRestart && (
<div className={classes.warningBar}>
{isServerLoading ? (
<Fragment>
The server is restarting.
<LinearProgress className={classes.progress} />
</Fragment>
) : (
<Fragment>
The instance needs to be restarted for configuration changes
to take effect.{" "}
<Button
id={"restart-server"}
variant="secondary"
onClick={() => {
restartServer();
}}
label={"Restart"}
/>
</Fragment>
)}
<MainContainer
menu={!hideMenu ? <Menu /> : <Fragment />}
mobileModeAuto={false}
>
<Fragment>
{needsRestart && (
<div className={classes.warningBar}>
{isServerLoading ? (
<Fragment>
The server is restarting.
<LinearProgress className={classes.progress} />
</Fragment>
) : (
<Fragment>
The instance needs to be restarted for configuration changes
to take effect.{" "}
<Button
id={"restart-server"}
variant="secondary"
onClick={() => {
restartServer();
}}
label={"Restart"}
/>
</Fragment>
)}
</div>
)}
{loadingProgress < 100 && (
<LinearProgress
className={classes.progress}
variant="determinate"
value={loadingProgress}
/>
)}
<MainError />
<div className={classes.snackDiv}>
<Snackbar
open={openSnackbar}
onClose={() => {
closeSnackBar();
}}
autoHideDuration={
snackBarMessage.type === "error" ? 10000 : 5000
}
message={snackBarMessage.message}
className={classes.snackBarExternal}
ContentProps={{
className: `${classes.snackBar} ${
snackBarMessage.type === "error"
? classes.errorSnackBar
: ""
}`,
}}
/>
</div>
)}
{loadingProgress < 100 && (
<LinearProgress
className={classes.progress}
variant="determinate"
value={loadingProgress}
/>
)}
<MainError />
<div className={classes.snackDiv}>
<Snackbar
open={openSnackbar}
onClose={() => {
closeSnackBar();
}}
autoHideDuration={snackBarMessage.type === "error" ? 10000 : 5000}
message={snackBarMessage.message}
className={classes.snackBarExternal}
ContentProps={{
className: `${classes.snackBar} ${
snackBarMessage.type === "error" ? classes.errorSnackBar : ""
}`,
}}
/>
</div>
<Suspense fallback={<LoadingComponent />}>
<ObjectManager />
</Suspense>
<Routes>
{allowedRoutes.map((route: any) => (
<Suspense fallback={<LoadingComponent />}>
<ObjectManager />
</Suspense>
<Routes>
{allowedRoutes.map((route: any) => (
<Route
key={route.path}
path={`${route.path}/*`}
element={
<Suspense fallback={<LoadingComponent />}>
<route.component {...route.props} />
</Suspense>
}
/>
))}
<Route
key={route.path}
path={`${route.path}/*`}
key={"icons"}
path={"icons"}
element={
<Suspense fallback={<LoadingComponent />}>
<route.component {...route.props} />
<IconsScreen />
</Suspense>
}
/>
))}
<Route
key={"icons"}
path={"icons"}
element={
<Suspense fallback={<LoadingComponent />}>
<IconsScreen />
</Suspense>
}
/>
<Route
key={"components"}
path={"components"}
element={
<Suspense fallback={<LoadingComponent />}>
<ComponentsScreen />
</Suspense>
}
/>
<Route
path={"*"}
element={
<Fragment>
{allowedRoutes.length > 0 ? (
<Navigate to={allowedRoutes[0].path} />
) : (
<Fragment />
)}
</Fragment>
}
/>
</Routes>
<Route
key={"components"}
path={"components"}
element={
<Suspense fallback={<LoadingComponent />}>
<ComponentsScreen />
</Suspense>
}
/>
<Route
path={"*"}
element={
<Fragment>
{allowedRoutes.length > 0 ? (
<Navigate to={allowedRoutes[0].path} />
) : (
<Fragment />
)}
</Fragment>
}
/>
</Routes>
</Fragment>
</MainContainer>
) : null}
</Fragment>
Expand Down
16 changes: 8 additions & 8 deletions portal-ui/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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"

Expand Down

0 comments on commit a5066fe

Please sign in to comment.