diff --git a/dashboard/src/styles/header.scss b/dashboard/src/styles/header.scss index b58637c4e66..3dfc8d3afd5 100644 --- a/dashboard/src/styles/header.scss +++ b/dashboard/src/styles/header.scss @@ -19,6 +19,7 @@ .header-logo { width: 180px; + padding-left: 12px; } .header-menu { diff --git a/dashboard/src/views/Layout/Header.tsx b/dashboard/src/views/Layout/Header.tsx index 11f919cc4da..ead1780e6e2 100644 --- a/dashboard/src/views/Layout/Header.tsx +++ b/dashboard/src/views/Layout/Header.tsx @@ -144,7 +144,7 @@ const Header: React.FC
= ({ }; const handleLogout = () => { - localStorage.setItem("atlas_ui", "v3"); + localStorage.setItem("last_ui_load", "v3"); let path = getBaseUrl(window.location.pathname); window.location.href = path + "/logout.html"; handleClose(); diff --git a/dashboard/src/views/Layout/Layout.tsx b/dashboard/src/views/Layout/Layout.tsx index 98dcc4e8830..d9af526a741 100644 --- a/dashboard/src/views/Layout/Layout.tsx +++ b/dashboard/src/views/Layout/Layout.tsx @@ -89,7 +89,7 @@ const Layout: React.FC = () => { }, [getRemainingTime, isPrompted]); const handleLogout = () => { - localStorage.setItem("atlas_ui", "v3"); + localStorage.setItem("last_ui_load", "v3"); let path = getBaseUrl(window.location.pathname); window.location.href = path + "/logout.html"; handleCloseSessionModal(); diff --git a/dashboard/src/views/SideBar/SideBarBody.tsx b/dashboard/src/views/SideBar/SideBarBody.tsx index f5de41a1c4f..65d8861e584 100644 --- a/dashboard/src/views/SideBar/SideBarBody.tsx +++ b/dashboard/src/views/SideBar/SideBarBody.tsx @@ -25,6 +25,7 @@ import { useRef, } from "react"; import atlasLogo from "/img/atlas_logo.svg"; +import apacheAtlasLogo from "/img/apache-atlas-logo.svg"; import { matchRoutes, Outlet, @@ -221,6 +222,43 @@ const SideBarBody = (props: { backgroundColor: "#034858", }} > + {/* Collapsed sidebar logo */} + {!open && ( +
{ + navigate( + { + pathname: "/search", + }, + { replace: true } + ); + }} + data-cy="apache-atlas-logo-collapsed" + > + Apache Atlas logo +
+ )} + {open && (