fix: update feedback missing state when refrash app

janhq · May 27, 2024 · 5fa8bb6 · 5fa8bb6
1 parent d653ea2
commit 5fa8bb6
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 43 deletions.
diff --git a/web/containers/ModelDropdown/index.tsx b/web/containers/ModelDropdown/index.tsx
@@ -157,6 157,8 @@ const ModelDropdown = ({ chatInputMode, strictedThread = true }: Props) => {
 
  const inActiveEngineProvider = useAtomValue(inActiveEngineProviderAtom)
 
  console.log(inActiveEngineProvider)
 
  useEffect(() => {
  const getAllSettings = async () => {
  const extensionsMenu: {

diff --git a/web/containers/Providers/index.tsx b/web/containers/Providers/index.tsx
@@ -74,18 74,18 @@ const Providers = ({ children }: PropsWithChildren) => {
  <Umami />
  {settingUp && <Loader description="Preparing Update..." />}
  {setupCore && activated && (
- <Responsive>
- <KeyListener>
- <EventListenerWrapper>
- <DataLoader>
- <ThemeWrapper>
  <ThemeWrapper>
  <Responsive>
  <KeyListener>
  <EventListenerWrapper>
  <DataLoader>
  <DeepLinkListener>{children}</DeepLinkListener>
- </ThemeWrapper>
- </DataLoader>
- </EventListenerWrapper>
- <Toaster />
- </KeyListener>
- </Responsive>
  </DataLoader>
  </EventListenerWrapper>
   <Toaster />
  </KeyListener>
  </Responsive>
  </ThemeWrapper>
  )}
  </JotaiWrapper>
  )

diff --git a/web/helpers/atoms/Extension.atom.ts b/web/helpers/atoms/Extension.atom.ts
@@ -1,4 1,5 @@
 import { atom } from 'jotai'
 import { atomWithStorage } from 'jotai/utils'
 
 type ExtensionId = string
 
@@ -39,4 40,8 @@ export const removeInstallingExtensionAtom = atom(
  }
 )
 
-export const inActiveEngineProviderAtom = atom<string[]>([])
 const INACTIVE_ENGINE_PROVIDER = 'inActiveEngineProvider'
 export const inActiveEngineProviderAtom = atomWithStorage<string[]>(
  INACTIVE_ENGINE_PROVIDER,
  []
 )
diff --git a/web/screens/LocalServer/LocalServerRightPanel/index.tsx b/web/screens/LocalServer/LocalServerRightPanel/index.tsx
@@ -1,4 1,4 @@
-import { useCallback, useMemo, useState } from 'react'
 import { useCallback, useEffect, useMemo, useState } from 'react'
 
 import { Accordion, AccordionItem } from '@janhq/joi'
 import { useAtomValue, useSetAtom } from 'jotai'
@@ -30,16 30,23 @@ const LocalServerRightPanel = () => {
  toSettingParams(selectedModel?.settings)
  )
 
  useEffect(() => {
  if (Object.keys(currentModelSettingParams).length === 0) {
  setCurrentModelSettingParams(toSettingParams(selectedModel?.settings))
  }
  }, [currentModelSettingParams, selectedModel?.settings])
 
  const modelRuntimeParams = toRuntimeParams(selectedModel?.settings)
 
- const componentDataEngineSetting = getConfigurationsData(
- currentModelSettingParams
- )
  const componentDataRuntimeSetting = getConfigurationsData(
  modelRuntimeParams,
  selectedModel
  )
 
  const componentDataEngineSetting = getConfigurationsData(
  currentModelSettingParams
  )
 
  const engineSettings = useMemo(
  () =>
  componentDataEngineSetting.filter(

diff --git a/web/screens/Settings/CoreExtensions/index.tsx b/web/screens/Settings/CoreExtensions/index.tsx
@@ -113,40 113,18 @@ const ExtensionCatalog = () => {
  }
  }
 
- const INACTIVE_ENGINE_PROVIDER = 'inActiveEngineProvider'
-
  const [inActiveEngineProvider, setInActiveEngineProvider] = useAtom(
  inActiveEngineProviderAtom
  )
 
- useEffect(() => {
- if (localStorage.getItem(INACTIVE_ENGINE_PROVIDER) === null) {
- localStorage.setItem(INACTIVE_ENGINE_PROVIDER, '[]')
- setInActiveEngineProvider([])
- } else {
- setInActiveEngineProvider(
- JSON.parse(String(localStorage.getItem(INACTIVE_ENGINE_PROVIDER)))
- )
- }
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [])
-
  const onSwitchChange = useCallback(
  (name: string) => {
  if (inActiveEngineProvider.includes(name)) {
  setInActiveEngineProvider(
  [...inActiveEngineProvider].filter((x) => x !== name)
  )
- localStorage.setItem(
- INACTIVE_ENGINE_PROVIDER,
- JSON.stringify([...inActiveEngineProvider].filter((x) => x !== name))
- )
  } else {
  setInActiveEngineProvider([...inActiveEngineProvider, name])
- localStorage.setItem(
- INACTIVE_ENGINE_PROVIDER,
- JSON.stringify([...inActiveEngineProvider, name])
- )
  }
  },
  [inActiveEngineProvider, setInActiveEngineProvider]

diff --git a/web/screens/Thread/ThreadRightPanel/Tools/index.tsx b/web/screens/Thread/ThreadRightPanel/Tools/index.tsx
@@ -1,12 1,14 @@
-import { Fragment, useCallback } from 'react'
 import { Fragment, useCallback, useEffect } from 'react'
 
 import { Tooltip, Switch, Input } from '@janhq/joi'
-import { useAtomValue } from 'jotai'
 import { useAtom, useAtomValue } from 'jotai'
 
 import { InfoIcon } from 'lucide-react'
 
 import { useCreateNewThread } from '@/hooks/useCreateNewThread'
 
 import useRecommendedModel from '@/hooks/useRecommendedModel'
 
 import AssistantSetting from '@/screens/Thread/ThreadCenterPanel/AssistantSetting'
 
 import { getConfigurationsData } from '@/utils/componentSettings'
@@ -18,15 20,27 @@ import { activeThreadAtom } from '@/helpers/atoms/Thread.atom'
 const Tools = () => {
  const experimentalFeature = useAtomValue(experimentalFeatureEnabledAtom)
  const activeThread = useAtomValue(activeThreadAtom)
- const selectedModel = useAtomValue(selectedModelAtom)
  const [selectedModel, setSelectedModel] = useAtom(selectedModelAtom)
  const { updateThreadMetadata } = useCreateNewThread()
  const { recommendedModel, downloadedModels } = useRecommendedModel()
 
  const componentDataAssistantSetting = getConfigurationsData(
  (activeThread?.assistants[0]?.tools &&
  activeThread?.assistants[0]?.tools[0]?.settings) ??
  {}
  )
 
  useEffect(() => {
  if (!activeThread) return
  let model = downloadedModels.find(
  (model) => model.id === activeThread.assistants[0].model.id
  )
  if (!model) {
  model = recommendedModel
  }
  setSelectedModel(model)
  }, [recommendedModel, activeThread, downloadedModels, setSelectedModel])
 
  const onRetrievalSwitchUpdate = useCallback(
  (enabled: boolean) => {
  if (!activeThread) return
@@ -115,7 129,11 @@ const Tools = () => {
  />
  </div>
  <div className="w-full">
- <Input value={selectedModel?.name} disabled />
  <Input
  value={selectedModel?.name || ''}
  disabled
  readOnly
  />
  </div>
  </div>
  <div className="mb-4">
@@ -142,7 160,7 @@ const Tools = () => {
  </div>
 
  <div className="w-full">
- <Input value="HNSWLib" disabled />
  <Input value="HNSWLib" disabled readOnly />
  </div>
  </div>
  <AssistantSetting