fix: redirect to extension setting (#2626)

janhq · Apr 8, 2024 · 762d887 · 762d887
1 parent f8cf93a
commit 762d887
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/web/screens/Chat/ErrorMessage/index.tsx b/web/screens/Chat/ErrorMessage/index.tsx
@@ -1,4 +1,9 @@
-import { ErrorCode, MessageStatus, ThreadMessage } from '@janhq/core'
+import {
+ EngineManager,
+ ErrorCode,
+ MessageStatus,
+ ThreadMessage,
+} from '@janhq/core'
 import { Button } from '@janhq/uikit'
 import { useAtomValue, useSetAtom } from 'jotai'
 import { RefreshCcw } from 'lucide-react'
@@ -14,12 +19,16 @@ import useSendChatMessage from '@/hooks/useSendChatMessage'
 
 import { mainViewStateAtom } from '@/helpers/atoms/App.atom'
 import { getCurrentChatMessagesAtom } from '@/helpers/atoms/ChatMessage.atom'
+import { selectedSettingAtom } from '@/helpers/atoms/Setting.atom'
+import { activeThreadAtom } from '@/helpers/atoms/Thread.atom'
 
 const ErrorMessage = ({ message }: { message: ThreadMessage }) => {
  const messages = useAtomValue(getCurrentChatMessagesAtom)
  const { resendChatMessage } = useSendChatMessage()
  const setModalTroubleShooting = useSetAtom(modalTroubleShootingAtom)
  const setMainState = useSetAtom(mainViewStateAtom)
+ const setSelectedSettingScreen = useSetAtom(selectedSettingAtom)
+ const activeThread = useAtomValue(activeThreadAtom)
 
  const regenerateMessage = async () => {
  const lastMessageIndex = messages.length - 1
@@ -37,7 +46,16 @@ const ErrorMessage = ({ message }: { message: ThreadMessage }) => {
  Invalid API key. Please check your API key from{' '}
  <button
  className="font-medium text-primary dark:text-blue-400"
- onClick={() => setMainState(MainViewState.Settings)}
+ onClick={() => {
+ setMainState(MainViewState.Settings)
+
+ if (activeThread?.assistants[0]?.model.engine) {
+ const engine = EngineManager.instance().get(
+ activeThread.assistants[0].model.engine
+ )
+ engine?.name && setSelectedSettingScreen(engine.name)
+ }
+ }}
  >
  Settings
  </button>{' '}

diff --git a/web/screens/Chat/LoadModelError/index.tsx b/web/screens/Chat/LoadModelError/index.tsx
@@ -1,3 +1,4 @@
+import { EngineManager } from '@janhq/core'
 import { useAtomValue, useSetAtom } from 'jotai'
 
 import ModalTroubleShooting, {
@@ -9,11 +10,15 @@ import { MainViewState } from '@/constants/screens'
 import { loadModelErrorAtom } from '@/hooks/useActiveModel'
 
 import { mainViewStateAtom } from '@/helpers/atoms/App.atom'
+import { selectedSettingAtom } from '@/helpers/atoms/Setting.atom'
+import { activeThreadAtom } from '@/helpers/atoms/Thread.atom'
 
 const LoadModelError = () => {
  const setModalTroubleShooting = useSetAtom(modalTroubleShootingAtom)
  const loadModelError = useAtomValue(loadModelErrorAtom)
  const setMainState = useSetAtom(mainViewStateAtom)
+ const activeThread = useAtomValue(activeThreadAtom)
+ const setSelectedSettingScreen = useSetAtom(selectedSettingAtom)
  const PORT_NOT_AVAILABLE = 'PORT_NOT_AVAILABLE'
 
  return (
@@ -42,7 +47,15 @@ const LoadModelError = () => {
  or install the{' '}
  <button
  className="font-medium text-primary dark:text-blue-400"
- onClick={() => setMainState(MainViewState.Settings)}
+ onClick={() => {
+ setMainState(MainViewState.Settings)
+ if (activeThread?.assistants[0]?.model.engine) {
+ const engine = EngineManager.instance().get(
+ activeThread.assistants[0].model.engine
+ )
+ engine?.name && setSelectedSettingScreen(engine.name)
+ }
+ }}
  >
  {loadModelError.split('::')[1] ?? ''}
  </button>{' '}