Optimize passport loading effect
cgen-ddc2b4a08aea48dd90cdccf874022ea9
This commit is contained in:
parent
ab9880bdea
commit
1d160086c1
1 changed files with 110 additions and 48 deletions
|
|
@ -72,10 +72,60 @@ const ProfilePassport = () => {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const normalizedUsername = requestedUsername?.toLowerCase() ?? null;
|
||||||
|
const targetKey = isSelfRoute
|
||||||
|
? user?.id
|
||||||
|
? `id:${user.id}`
|
||||||
|
: authProfile?.username
|
||||||
|
? `username:${authProfile.username.toLowerCase()}`
|
||||||
|
: "self"
|
||||||
|
: normalizedUsername
|
||||||
|
? `username:${normalizedUsername}`
|
||||||
|
: null;
|
||||||
|
|
||||||
|
if (targetKey && lastLoadedKeyRef.current === targetKey && profile) {
|
||||||
|
setLoading(false);
|
||||||
|
setNotFound(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (targetKey && lastLoadedKeyRef.current !== targetKey) {
|
||||||
|
activationAttemptedRef.current = false;
|
||||||
|
}
|
||||||
|
|
||||||
let cancelled = false;
|
let cancelled = false;
|
||||||
|
|
||||||
const loadPassport = async () => {
|
const profileMatchesCurrentTarget = (() => {
|
||||||
|
if (!profile) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (normalizedUsername) {
|
||||||
|
return (
|
||||||
|
profile.username?.toLowerCase() === normalizedUsername ||
|
||||||
|
profile.id === requestedUsername
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (isSelfRoute) {
|
||||||
|
if (user?.id && profile.id === user.id) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
authProfile?.username &&
|
||||||
|
profile.username &&
|
||||||
|
authProfile.username.toLowerCase() ===
|
||||||
|
profile.username.toLowerCase()
|
||||||
|
) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
})();
|
||||||
|
|
||||||
|
if (!profileMatchesCurrentTarget) {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
const loadPassport = async () => {
|
||||||
try {
|
try {
|
||||||
let resolvedProfile:
|
let resolvedProfile:
|
||||||
| (AethexUserProfile & { email?: string | null })
|
| (AethexUserProfile & { email?: string | null })
|
||||||
|
|
@ -92,8 +142,8 @@ const ProfilePassport = () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (
|
if (
|
||||||
currentUser.username.toLowerCase() ===
|
normalizedUsername &&
|
||||||
requestedUsername.toLowerCase() &&
|
currentUser.username.toLowerCase() === normalizedUsername &&
|
||||||
currentUser.username !== requestedUsername
|
currentUser.username !== requestedUsername
|
||||||
) {
|
) {
|
||||||
navigate(`/passport/${currentUser.username}`, { replace: true });
|
navigate(`/passport/${currentUser.username}`, { replace: true });
|
||||||
|
|
@ -113,7 +163,7 @@ const ProfilePassport = () => {
|
||||||
resolvedId = currentUser.id ?? user?.id ?? null;
|
resolvedId = currentUser.id ?? user?.id ?? null;
|
||||||
}
|
}
|
||||||
} else if (requestedUsername) {
|
} else if (requestedUsername) {
|
||||||
let fetchedProfile =
|
const fetchedProfile =
|
||||||
(await aethexUserService.getProfileByUsername(requestedUsername)) ??
|
(await aethexUserService.getProfileByUsername(requestedUsername)) ??
|
||||||
(isUuid(requestedUsername)
|
(isUuid(requestedUsername)
|
||||||
? await aethexUserService.getProfileById(requestedUsername)
|
? await aethexUserService.getProfileById(requestedUsername)
|
||||||
|
|
@ -121,8 +171,7 @@ const ProfilePassport = () => {
|
||||||
|
|
||||||
if (
|
if (
|
||||||
fetchedProfile?.username &&
|
fetchedProfile?.username &&
|
||||||
fetchedProfile.username.toLowerCase() ===
|
fetchedProfile.username.toLowerCase() === normalizedUsername &&
|
||||||
requestedUsername.toLowerCase() &&
|
|
||||||
fetchedProfile.username !== requestedUsername
|
fetchedProfile.username !== requestedUsername
|
||||||
) {
|
) {
|
||||||
navigate(`/passport/${fetchedProfile.username}`, { replace: true });
|
navigate(`/passport/${fetchedProfile.username}`, { replace: true });
|
||||||
|
|
@ -145,6 +194,7 @@ const ProfilePassport = () => {
|
||||||
setInterests([]);
|
setInterests([]);
|
||||||
setProjects([]);
|
setProjects([]);
|
||||||
setNotFound(true);
|
setNotFound(true);
|
||||||
|
lastLoadedKeyRef.current = null;
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -153,37 +203,42 @@ const ProfilePassport = () => {
|
||||||
resolvedProfile.username &&
|
resolvedProfile.username &&
|
||||||
resolvedProfile.username.toLowerCase() === "mrpiglr"
|
resolvedProfile.username.toLowerCase() === "mrpiglr"
|
||||||
) {
|
) {
|
||||||
try {
|
if (!activationAttemptedRef.current) {
|
||||||
await aethexAchievementService.activateCommunityRewards({
|
activationAttemptedRef.current = true;
|
||||||
email:
|
try {
|
||||||
resolvedProfile.email ??
|
await aethexAchievementService.activateCommunityRewards({
|
||||||
user?.email ??
|
|
||||||
authProfile?.email ??
|
|
||||||
undefined,
|
|
||||||
username: resolvedProfile.username,
|
|
||||||
});
|
|
||||||
|
|
||||||
const refreshedProfile =
|
|
||||||
(await aethexUserService.getProfileByUsername(
|
|
||||||
resolvedProfile.username,
|
|
||||||
)) ??
|
|
||||||
(resolvedId
|
|
||||||
? await aethexUserService.getProfileById(resolvedId)
|
|
||||||
: null);
|
|
||||||
|
|
||||||
if (refreshedProfile) {
|
|
||||||
resolvedProfile = {
|
|
||||||
...refreshedProfile,
|
|
||||||
email:
|
email:
|
||||||
(refreshedProfile as any)?.email ??
|
|
||||||
resolvedProfile.email ??
|
resolvedProfile.email ??
|
||||||
null,
|
user?.email ??
|
||||||
} as AethexUserProfile & { email?: string | null };
|
authProfile?.email ??
|
||||||
resolvedId = refreshedProfile.id ?? resolvedId;
|
undefined,
|
||||||
|
username: resolvedProfile.username,
|
||||||
|
});
|
||||||
|
|
||||||
|
const refreshedProfile =
|
||||||
|
(await aethexUserService.getProfileByUsername(
|
||||||
|
resolvedProfile.username,
|
||||||
|
)) ??
|
||||||
|
(resolvedId
|
||||||
|
? await aethexUserService.getProfileById(resolvedId)
|
||||||
|
: null);
|
||||||
|
|
||||||
|
if (refreshedProfile) {
|
||||||
|
resolvedProfile = {
|
||||||
|
...refreshedProfile,
|
||||||
|
email:
|
||||||
|
(refreshedProfile as any)?.email ??
|
||||||
|
resolvedProfile.email ??
|
||||||
|
null,
|
||||||
|
} as AethexUserProfile & { email?: string | null };
|
||||||
|
resolvedId = refreshedProfile.id ?? resolvedId;
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
activationAttemptedRef.current = false;
|
||||||
}
|
}
|
||||||
} catch (error) {
|
|
||||||
console.warn("Failed to activate legendary passport status", error);
|
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
activationAttemptedRef.current = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
const viewingSelf =
|
const viewingSelf =
|
||||||
|
|
@ -197,18 +252,13 @@ const ProfilePassport = () => {
|
||||||
const [achievementList, interestList, projectList] = await Promise.all([
|
const [achievementList, interestList, projectList] = await Promise.all([
|
||||||
aethexAchievementService
|
aethexAchievementService
|
||||||
.getUserAchievements(resolvedId)
|
.getUserAchievements(resolvedId)
|
||||||
.catch((error) => {
|
.catch(() => [] as AethexAchievement[]),
|
||||||
console.error("Failed to load achievements", error);
|
aethexUserService
|
||||||
return [] as AethexAchievement[];
|
.getUserInterests(resolvedId)
|
||||||
}),
|
.catch(() => [] as string[]),
|
||||||
aethexUserService.getUserInterests(resolvedId).catch((error) => {
|
aethexProjectService
|
||||||
console.error("Failed to load interests", error);
|
.getUserProjects(resolvedId)
|
||||||
return [] as string[];
|
.catch(() => [] as ProjectPreview[]),
|
||||||
}),
|
|
||||||
aethexProjectService.getUserProjects(resolvedId).catch((error) => {
|
|
||||||
console.error("Failed to load projects", error);
|
|
||||||
return [] as ProjectPreview[];
|
|
||||||
}),
|
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if (cancelled) {
|
if (cancelled) {
|
||||||
|
|
@ -219,7 +269,7 @@ const ProfilePassport = () => {
|
||||||
...resolvedProfile,
|
...resolvedProfile,
|
||||||
email:
|
email:
|
||||||
resolvedProfile.email ??
|
resolvedProfile.email ??
|
||||||
(viewingSelf ? (user?.email ?? authProfile?.email ?? null) : null),
|
(viewingSelf ? user?.email ?? authProfile?.email ?? null : null),
|
||||||
});
|
});
|
||||||
setAchievements(achievementList ?? []);
|
setAchievements(achievementList ?? []);
|
||||||
setInterests(interestList ?? []);
|
setInterests(interestList ?? []);
|
||||||
|
|
@ -233,9 +283,21 @@ const ProfilePassport = () => {
|
||||||
})),
|
})),
|
||||||
);
|
);
|
||||||
setNotFound(false);
|
setNotFound(false);
|
||||||
} catch (error) {
|
|
||||||
console.error("Failed to load passport", error);
|
lastLoadedKeyRef.current =
|
||||||
|
targetKey ??
|
||||||
|
(resolvedProfile.username
|
||||||
|
? `username:${resolvedProfile.username.toLowerCase()}`
|
||||||
|
: resolvedId
|
||||||
|
? `id:${resolvedId}`
|
||||||
|
: null);
|
||||||
|
} catch {
|
||||||
if (!cancelled) {
|
if (!cancelled) {
|
||||||
|
lastLoadedKeyRef.current = null;
|
||||||
|
setProfile(null);
|
||||||
|
setAchievements([]);
|
||||||
|
setInterests([]);
|
||||||
|
setProjects([]);
|
||||||
setNotFound(true);
|
setNotFound(true);
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue