Fix alert issues
This commit is contained in:
@@ -42,8 +42,8 @@ export function Homepage({
|
|||||||
if (isAuthenticated) {
|
if (isAuthenticated) {
|
||||||
const jwt = getCookie("jwt");
|
const jwt = getCookie("jwt");
|
||||||
if (jwt) {
|
if (jwt) {
|
||||||
Promise.all([getUserInfo(), getDatabaseHealth()])
|
getUserInfo()
|
||||||
.then(([meRes]) => {
|
.then((meRes) => {
|
||||||
setIsAdmin(!!meRes.is_admin);
|
setIsAdmin(!!meRes.is_admin);
|
||||||
setUsername(meRes.username || null);
|
setUsername(meRes.username || null);
|
||||||
setUserId(meRes.userId || null);
|
setUserId(meRes.userId || null);
|
||||||
@@ -58,12 +58,20 @@ export function Homepage({
|
|||||||
if (errorCode === "SESSION_EXPIRED") {
|
if (errorCode === "SESSION_EXPIRED") {
|
||||||
console.warn("Session expired - please log in again");
|
console.warn("Session expired - please log in again");
|
||||||
setDbError("Session expired - please log in again");
|
setDbError("Session expired - please log in again");
|
||||||
} else if (err?.response?.data?.error?.includes("Database")) {
|
} else {
|
||||||
|
setDbError(null);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
getDatabaseHealth()
|
||||||
|
.then(() => {
|
||||||
|
setDbError(null);
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
if (err?.response?.data?.error?.includes("Database")) {
|
||||||
setDbError(
|
setDbError(
|
||||||
"Could not connect to the database. Please try again later.",
|
"Could not connect to the database. Please try again later.",
|
||||||
);
|
);
|
||||||
} else {
|
|
||||||
setDbError(null);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user