🐛 fix: fix redirect to welcome problem when there are topics in inbox (…

…#422) * 🐛 fix: fix home redirect when is new user * 🎨 chore: improve code
lobehub · Nov 7, 2023 · 3d2588a · 3d2588a
1 parent 9af165c
commit 3d2588a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/src/app/chat/features/Conversation/ChatList/Plugins/Render/StandaloneType/Iframe.tsx b/src/app/chat/features/Conversation/ChatList/Plugins/Render/StandaloneType/Iframe.tsx
@@ -2,8 +2,6 @@ import { PluginRequestPayload } from '@lobehub/chat-plugin-sdk';
 import { Skeleton } from 'antd';
 import { memo, useRef, useState } from 'react';
 
-import { useOnPluginSettingsUpdate } from '@/app/chat/features/Conversation/ChatList/Plugins/Render/utils/pluginSettings';
-import { useOnPluginStateUpdate } from '@/app/chat/features/Conversation/ChatList/Plugins/Render/utils/pluginState';
 import { pluginSelectors, usePluginStore } from '@/store/plugin';
 import { useSessionStore } from '@/store/session';
 import { chatSelectors } from '@/store/session/selectors';
@@ -15,6 +13,8 @@ import {
   useOnPluginFetchPluginState,
   useOnPluginFillContent,
 } from '../utils/listenToPlugin';
+import { useOnPluginSettingsUpdate } from '../utils/pluginSettings';
+import { useOnPluginStateUpdate } from '../utils/pluginState';
 import {
   sendMessageContentToPlugin,
   sendPayloadToPlugin,

diff --git a/src/app/home/Redirect.tsx b/src/app/home/Redirect.tsx
@@ -12,9 +12,9 @@ const Redirect = memo(() => {
   useEffect(() => {
     useSessionStore.persist.onFinishHydration(() => {
       const store = useSessionStore.getState();
-      const hasSession = sessionSelectors.hasSessionList(store);
+      const hasConversion = sessionSelectors.hasConversion(store);
 
-      if (hasSession) {
+      if (hasConversion) {
         router.push('/chat');
         store.switchSession();
       } else {

diff --git a/src/store/session/hooks/useSessionHydrated.ts b/src/store/session/hooks/useSessionHydrated.ts
@@ -1,11 +1,11 @@
 import { useState } from 'react';
 
+import { sessionSelectors } from '../selectors';
 import { useSessionStore } from '../store';
 import { useEffectAfterSessionHydrated } from './useEffectAfterHydrated';
 
 export const useSessionHydrated = () => {
-  // 根据 sessions 是否有值来判断是否已经初始化
-  const hasInited = !!Object.values(useSessionStore.getState().sessions).length;
+  const hasInited = sessionSelectors.hasConversion(useSessionStore.getState());
 
   const [isInit, setInit] = useState(hasInited);
 

diff --git a/src/store/session/slices/session/selectors/index.ts b/src/store/session/slices/session/selectors/index.ts
@@ -7,6 +7,7 @@ import {
   currentSessionSafe,
   getSessionById,
   getSessionMetaById,
+  hasConversion,
   hasPinnedSessionList,
   hasSessionList,
   pinnedSessionList,
@@ -24,6 +25,7 @@ export const sessionSelectors = {
   getExportAgent,
   getSessionById,
   getSessionMetaById,
+  hasConversion,
   hasPinnedSessionList,
   hasSessionList,
   isInboxSession,

diff --git a/src/store/session/slices/session/selectors/list.ts b/src/store/session/slices/session/selectors/list.ts
@@ -92,3 +92,10 @@ export const getSessionMetaById =
 //
 //   return sessionTree;
 // };
+
+export const hasConversion = (s: SessionStore) => {
+  const hasCustomAgents = !!Object.keys(s.sessions).length;
+  const hasMessageInInbox = !!Object.keys(s.inbox.chats).length;
+
+  return hasCustomAgents || hasMessageInInbox;
+};