Skip to content

Commit a5066fe

Browse files
bexsoftbexsoft
authored
Update mds to v0.6.0 (#2862)
Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>
1 parent 6432681 commit a5066fe

File tree

3 files changed

+105
-96
lines changed

3 files changed

+105
-96
lines changed

‎portal-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"local-storage-fallback": "^4.1.1",
2020
"lodash": "^4.17.21",
2121
"luxon": "^3.3.0",
22-
"mds": "https://github.com/minio/mds.git#v0.5.1",
22+
"mds": "https://github.com/minio/mds.git#v0.6.0",
2323
"react": "^18.1.0",
2424
"react-component-export-image": "^1.0.6",
2525
"react-copy-to-clipboard": "^5.0.2",

‎portal-ui/src/screens/Console/Console.tsx

Lines changed: 96 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -480,100 +480,109 @@ const Console = ({ classes }: IConsoleProps) => {
480480
return (
481481
<Fragment>
482482
{session && session.status === "ok" ? (
483-
<MainContainer menu={!hideMenu ? <Menu /> : null}>
484-
{needsRestart && (
485-
<div className={classes.warningBar}>
486-
{isServerLoading ? (
487-
<Fragment>
488-
The server is restarting.
489-
<LinearProgress className={classes.progress} />
490-
</Fragment>
491-
) : (
492-
<Fragment>
493-
The instance needs to be restarted for configuration changes
494-
to take effect.{" "}
495-
<Button
496-
id={"restart-server"}
497-
variant="secondary"
498-
onClick={() => {
499-
restartServer();
500-
}}
501-
label={"Restart"}
502-
/>
503-
</Fragment>
504-
)}
483+
<MainContainer
484+
menu={!hideMenu ? <Menu /> : <Fragment />}
485+
mobileModeAuto={false}
486+
>
487+
<Fragment>
488+
{needsRestart && (
489+
<div className={classes.warningBar}>
490+
{isServerLoading ? (
491+
<Fragment>
492+
The server is restarting.
493+
<LinearProgress className={classes.progress} />
494+
</Fragment>
495+
) : (
496+
<Fragment>
497+
The instance needs to be restarted for configuration changes
498+
to take effect.{" "}
499+
<Button
500+
id={"restart-server"}
501+
variant="secondary"
502+
onClick={() => {
503+
restartServer();
504+
}}
505+
label={"Restart"}
506+
/>
507+
</Fragment>
508+
)}
509+
</div>
510+
)}
511+
{loadingProgress < 100 && (
512+
<LinearProgress
513+
className={classes.progress}
514+
variant="determinate"
515+
value={loadingProgress}
516+
/>
517+
)}
518+
<MainError />
519+
<div className={classes.snackDiv}>
520+
<Snackbar
521+
open={openSnackbar}
522+
onClose={() => {
523+
closeSnackBar();
524+
}}
525+
autoHideDuration={
526+
snackBarMessage.type === "error" ? 10000 : 5000
527+
}
528+
message={snackBarMessage.message}
529+
className={classes.snackBarExternal}
530+
ContentProps={{
531+
className: `${classes.snackBar} ${
532+
snackBarMessage.type === "error"
533+
? classes.errorSnackBar
534+
: ""
535+
}`,
536+
}}
537+
/>
505538
</div>
506-
)}
507-
{loadingProgress < 100 && (
508-
<LinearProgress
509-
className={classes.progress}
510-
variant="determinate"
511-
value={loadingProgress}
512-
/>
513-
)}
514-
<MainError />
515-
<div className={classes.snackDiv}>
516-
<Snackbar
517-
open={openSnackbar}
518-
onClose={() => {
519-
closeSnackBar();
520-
}}
521-
autoHideDuration={snackBarMessage.type === "error" ? 10000 : 5000}
522-
message={snackBarMessage.message}
523-
className={classes.snackBarExternal}
524-
ContentProps={{
525-
className: `${classes.snackBar} ${
526-
snackBarMessage.type === "error" ? classes.errorSnackBar : ""
527-
}`,
528-
}}
529-
/>
530-
</div>
531-
<Suspense fallback={<LoadingComponent />}>
532-
<ObjectManager />
533-
</Suspense>
534-
<Routes>
535-
{allowedRoutes.map((route: any) => (
539+
<Suspense fallback={<LoadingComponent />}>
540+
<ObjectManager />
541+
</Suspense>
542+
<Routes>
543+
{allowedRoutes.map((route: any) => (
544+
<Route
545+
key={route.path}
546+
path={`${route.path}/*`}
547+
element={
548+
<Suspense fallback={<LoadingComponent />}>
549+
<route.component {...route.props} />
550+
</Suspense>
551+
}
552+
/>
553+
))}
536554
<Route
537-
key={route.path}
538-
path={`${route.path}/*`}
555+
key={"icons"}
556+
path={"icons"}
539557
element={
540558
<Suspense fallback={<LoadingComponent />}>
541-
<route.component {...route.props} />
559+
<IconsScreen />
542560
</Suspense>
543561
}
544562
/>
545-
))}
546-
<Route
547-
key={"icons"}
548-
path={"icons"}
549-
element={
550-
<Suspense fallback={<LoadingComponent />}>
551-
<IconsScreen />
552-
</Suspense>
553-
}
554-
/>
555-
<Route
556-
key={"components"}
557-
path={"components"}
558-
element={
559-
<Suspense fallback={<LoadingComponent />}>
560-
<ComponentsScreen />
561-
</Suspense>
562-
}
563-
/>
564-
<Route
565-
path={"*"}
566-
element={
567-
<Fragment>
568-
{allowedRoutes.length > 0 ? (
569-
<Navigate to={allowedRoutes[0].path} />
570-
) : (
571-
<Fragment />
572-
)}
573-
</Fragment>
574-
}
575-
/>
576-
</Routes>
563+
<Route
564+
key={"components"}
565+
path={"components"}
566+
element={
567+
<Suspense fallback={<LoadingComponent />}>
568+
<ComponentsScreen />
569+
</Suspense>
570+
}
571+
/>
572+
<Route
573+
path={"*"}
574+
element={
575+
<Fragment>
576+
{allowedRoutes.length > 0 ? (
577+
<Navigate to={allowedRoutes[0].path} />
578+
) : (
579+
<Fragment />
580+
)}
581+
</Fragment>
582+
}
583+
/>
584+
</Routes>
585+
</Fragment>
577586
</MainContainer>
578587
) : null}
579588
</Fragment>

‎portal-ui/yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4847,10 +4847,10 @@ destroy@1.2.0:
48474847
resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
48484848
integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
48494849

4850-
detect-gpu@^5.0.26:
4851-
version "5.0.27"
4852-
resolved "https://registry.yarnpkg.com/detect-gpu/-/detect-gpu-5.0.27.tgz#821d9331c87e32568c483d85e12a9adee43d7bb2"
4853-
integrity sha512-IDjjqTkS+f0xm/ntbD21IPYiF0srzpePC/hhUMmctEsoklZwJwStJiMi/KN0pnH0LjSsgjwbP+QwW7y+Qf4/SQ==
4850+
detect-gpu@^5.0.27:
4851+
version "5.0.28"
4852+
resolved "https://registry.yarnpkg.com/detect-gpu/-/detect-gpu-5.0.28.tgz#e7762c04cc3b5a33d902eb5719add195494df60a"
4853+
integrity sha512-sdT5Ti9ZHBBq39mK0DRwnm/5xZOVAz2+vxYLdPcFP83+3DGkzucEK0lzw1XFwct4zWDAXYrSTFUjC33qsoRAoQ==
48544854
dependencies:
48554855
webgl-constants "^1.1.1"
48564856

@@ -8187,12 +8187,12 @@ mdn-data@2.0.4:
81878187
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
81888188
integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==
81898189

8190-
"mds@https://github.com/minio/mds.git#v0.5.1":
8191-
version "0.5.0"
8192-
resolved "https://github.com/minio/mds.git#4f88eb1b77a2c10fa4e187d6da49c9107214a92c"
8190+
"mds@https://github.com/minio/mds.git#v0.6.0":
8191+
version "0.6.0"
8192+
resolved "https://github.com/minio/mds.git#f66cf711b5e7d65250e81a9fcc9f588aa081b7fc"
81938193
dependencies:
81948194
"@types/styled-components" "^5.1.25"
8195-
detect-gpu "^5.0.26"
8195+
detect-gpu "^5.0.27"
81968196
react-virtualized "^9.22.5"
81978197
styled-components "^5.3.11"
81988198

0 commit comments

Comments
 (0)