refactor: replace isLoading with isSuccess

This commit is contained in:
Tristan Yang
2022-12-14 16:47:01 +08:00
parent 50e839c001
commit 703ea8716c
5 changed files with 8 additions and 8 deletions
+4 -3
View File
@@ -16,12 +16,13 @@ const RequireAuth: FC<Props> = ({ children, redirectTo = "/login" }) => {
const location = useLocation();
const matchs = matchRoutes(GuestAllows, location);
const allowGuest = matchs ? !!matchs[0].pathname : false;
const { data: loginConfig, isLoading: fetchingLoginConfig } = useGetLoginConfigQuery();
const { isLoading: checkingInitial } = useGetInitializedQuery();
const { data: loginConfig, isSuccess: loginConfigSuccess } = useGetLoginConfigQuery();
const { isSuccess: checkInitialSuccess } = useGetInitializedQuery();
const { token, guest, initialized } = useAppSelector((store) => store.authData);
// console.log("auth route", { checkInitialSuccess, loginConfigSuccess, initialized, guest: loginConfig?.guest, token, allowGuest, guest });
// 初始化和login配置检查
if (checkingInitial || fetchingLoginConfig) return null;
if (!checkInitialSuccess || !loginConfigSuccess) return null;
// 未初始化 则先走setup 流程
if (!initialized) return <Navigate to={`/onboarding`} replace />;
// 开启guest 并且没token 而且是允许guest访问的路由 则先去过渡页登录