diff --git a/src/frontend/src/constants/constants.ts b/src/frontend/src/constants/constants.ts index b30e4e9b7..e18de3327 100644 --- a/src/frontend/src/constants/constants.ts +++ b/src/frontend/src/constants/constants.ts @@ -504,7 +504,7 @@ export const USER_PROJECTS_HEADER = "My Collection"; * @constant * */ -export const ADMIN_HEADER_TITLE = "Welcome back!"; +export const ADMIN_HEADER_TITLE = "Admin Page"; /** * Header description for admin page diff --git a/src/frontend/src/contexts/tabsContext.tsx b/src/frontend/src/contexts/tabsContext.tsx index 49de70974..6190a6e56 100644 --- a/src/frontend/src/contexts/tabsContext.tsx +++ b/src/frontend/src/contexts/tabsContext.tsx @@ -238,7 +238,6 @@ export function TabsProvider({ children }: { children: ReactNode }) { function hardReset() { newNodeId.current = uid(); setTabId(""); - setFlows([]); setIsLoading(true); setId(uid()); diff --git a/src/frontend/src/controllers/API/index.ts b/src/frontend/src/controllers/API/index.ts index 12e60bb72..764658b7b 100644 --- a/src/frontend/src/controllers/API/index.ts +++ b/src/frontend/src/controllers/API/index.ts @@ -400,7 +400,7 @@ export async function renewAccessToken(token: string) { } } -export async function getLoggedUser(): Promise> { +export async function getLoggedUser(): Promise { try { const res = await api.get(`${BASE_URL_API}user`); @@ -411,7 +411,7 @@ export async function getLoggedUser(): Promise> { console.log("Error:", error); throw error; } - return []; + return null; } export async function addUser(user: UserInputType): Promise> { diff --git a/src/frontend/src/pages/AdminPage/LoginPage/index.tsx b/src/frontend/src/pages/AdminPage/LoginPage/index.tsx index 3a56b8e99..e0ceaad49 100644 --- a/src/frontend/src/pages/AdminPage/LoginPage/index.tsx +++ b/src/frontend/src/pages/AdminPage/LoginPage/index.tsx @@ -48,7 +48,7 @@ export default function LoginAdminPage() { } function getUser() { - if (getAuthentication) { + if (getAuthentication()) { setTimeout(() => { getLoggedUser() .then((user) => { diff --git a/src/frontend/src/pages/AdminPage/index.tsx b/src/frontend/src/pages/AdminPage/index.tsx index 86ae63f36..2a4dd9bac 100644 --- a/src/frontend/src/pages/AdminPage/index.tsx +++ b/src/frontend/src/pages/AdminPage/index.tsx @@ -22,6 +22,7 @@ import { } from "../../constants/constants"; import { alertContext } from "../../contexts/alertContext"; import { AuthContext } from "../../contexts/authContext"; +import { TabsContext } from "../../contexts/tabsContext"; import { addUser, deleteUser, @@ -43,6 +44,13 @@ export default function AdminPage() { const { userData } = useContext(AuthContext); const [totalRowsCount, setTotalRowsCount] = useState(0); + const { setTabId } = useContext(TabsContext); + + // set null id + useEffect(() => { + setTabId(""); + }, []); + const userList = useRef([]); useEffect(() => { diff --git a/src/frontend/src/pages/MainPage/index.tsx b/src/frontend/src/pages/MainPage/index.tsx index 9582d4c57..8365eb3f5 100644 --- a/src/frontend/src/pages/MainPage/index.tsx +++ b/src/frontend/src/pages/MainPage/index.tsx @@ -35,10 +35,6 @@ export default function HomePage(): JSX.Element { }, []); const navigate = useNavigate(); - useEffect(() => { - console.log(isLoading); - }, [isLoading]); - // Personal flows display return ( <>