From 07e3046e2b950c6271ac434ac528743c9746d287 Mon Sep 17 00:00:00 2001 From: generall Date: Mon, 9 Sep 2024 23:12:55 +0200 Subject: [PATCH 1/2] hide jwt page if special key is used --- src/components/Sidebar/Sidebar.jsx | 6 ++++-- src/pages/Home.jsx | 8 +++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/components/Sidebar/Sidebar.jsx b/src/components/Sidebar/Sidebar.jsx index 1191d816..087ccc21 100644 --- a/src/components/Sidebar/Sidebar.jsx +++ b/src/components/Sidebar/Sidebar.jsx @@ -57,7 +57,7 @@ const Drawer = styled(MuiDrawer, { }), })); -export default function Sidebar({ open, version, jwtEnabled }) { +export default function Sidebar({ open, version, jwtEnabled, jwtVisible }) { return ( @@ -69,7 +69,8 @@ export default function Sidebar({ open, version, jwtEnabled }) { {sidebarItem('Datasets', , '/datasets', open)} - {sidebarItem('Access Tokens', , '/jwt', open, jwtEnabled)} + + {jwtVisible && sidebarItem('Access Tokens', , '/jwt', open, jwtEnabled)} @@ -116,4 +117,5 @@ Sidebar.propTypes = { open: PropTypes.bool, version: PropTypes.string, jwtEnabled: PropTypes.bool, + jwtVisible: PropTypes.bool, }; diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx index 7d69d48f..fcd84bc9 100644 --- a/src/pages/Home.jsx +++ b/src/pages/Home.jsx @@ -28,6 +28,7 @@ export default function MiniDrawer() { const [open, setOpen] = React.useState(false); const [version, setVersion] = useState('???'); const [jwtEnabled, setJwtEnabled] = useState(false); + const [jwtVisible, setJwtVisible] = useState(true); const colorMode = React.useContext(ColorModeContext); const [apiKeyDialogOpen, setApiKeyDialogOpen] = useState(false); @@ -38,6 +39,11 @@ export default function MiniDrawer() { const telemetry = await qdrantClient.api('service').telemetry(); setVersion(telemetry.data.result.app.version); setJwtEnabled(telemetry.data.result.app?.jwt_rbac || false); + + if (telemetry.data.result.app?.hide_jwt_dashboard) { + setJwtVisible(false); + } + } catch (error) { if (error.status === 403 || error.status === 401) { setApiKeyDialogOpen(true); @@ -98,7 +104,7 @@ export default function MiniDrawer() { - + From 62a970c954f1b36a2ed4878b7737ee473768d569 Mon Sep 17 00:00:00 2001 From: generall Date: Tue, 10 Sep 2024 00:27:12 +0200 Subject: [PATCH 2/2] fmt --- src/pages/Home.jsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx index fcd84bc9..c8501e8d 100644 --- a/src/pages/Home.jsx +++ b/src/pages/Home.jsx @@ -43,7 +43,6 @@ export default function MiniDrawer() { if (telemetry.data.result.app?.hide_jwt_dashboard) { setJwtVisible(false); } - } catch (error) { if (error.status === 403 || error.status === 401) { setApiKeyDialogOpen(true); @@ -104,7 +103,7 @@ export default function MiniDrawer() { - +