From cd7770e722fb58c49cd4be1188ea2b4317558be6 Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Mon, 31 Jul 2023 01:04:37 +0800 Subject: [PATCH] refactor: add some debug code --- client/shared/redux/hooks/useGroup.ts | 3 ++- client/web/src/components/modals/SettingsView/Account.tsx | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/client/shared/redux/hooks/useGroup.ts b/client/shared/redux/hooks/useGroup.ts index affb1483..f575099e 100644 --- a/client/shared/redux/hooks/useGroup.ts +++ b/client/shared/redux/hooks/useGroup.ts @@ -6,6 +6,7 @@ import { isValidStr } from '../../utils/string-helper'; import { useAppSelector } from './useAppSelector'; import { useUnread } from './useUnread'; import { useUserId } from './useUserInfo'; +import _compact from 'lodash/compact'; /** * 获取群组信息 @@ -32,7 +33,7 @@ export function useGroupMemberInfos(groupId: string): UserBaseInfo[] { const groupMemberIds = useGroupMemberIds(groupId); const userInfos = useUserInfoList(groupMemberIds); - return userInfos; + return _compact(userInfos); // 开发环境,可能会出现member里面id为不存在的脏数据,生产环境原则上不会出现,兼容一下 } /** diff --git a/client/web/src/components/modals/SettingsView/Account.tsx b/client/web/src/components/modals/SettingsView/Account.tsx index 126f9708..15e87611 100644 --- a/client/web/src/components/modals/SettingsView/Account.tsx +++ b/client/web/src/components/modals/SettingsView/Account.tsx @@ -8,7 +8,6 @@ import { closeModal, pluginUserExtraInfo } from '@/plugin/common'; import { setUserJWT } from '@/utils/jwt-helper'; import { Button, Divider, message, Tag, Typography } from 'antd'; import React, { useCallback } from 'react'; -import { useNavigate } from 'react-router'; import { Avatar } from 'tailchat-design'; import { model, @@ -17,6 +16,7 @@ import { showToasts, t, UploadFileResult, + useAlphaMode, useAppDispatch, useAsyncRequest, userActions, @@ -29,6 +29,7 @@ import { isBuiltinEmail } from '@/utils/user-helper'; export const SettingsAccount: React.FC = React.memo(() => { const userInfo = useUserInfo(); const dispatch = useAppDispatch(); + const { isAlphaMode } = useAlphaMode(); const userExtra = userInfo?.extra ?? {}; const [, handleUserAvatarChange] = useAsyncRequest( @@ -100,6 +101,9 @@ export const SettingsAccount: React.FC = React.memo(() => {
+ {isAlphaMode && ( + + )}