chore: sync on boarding state across windows (#2304)

Signed-off-by: James <james@jan.ai> Co-authored-by: James <james@jan.ai>
janhq · Mar 11, 2024 · 2598bf9 · 2598bf9
1 parent addbfaf
commit 2598bf9
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 12 deletions.
diff --git a/core/src/api/index.ts b/core/src/api/index.ts
@@ -18,6 +18,7 @@ export enum NativeRoute {
 
   quickAskSizeUpdated = 'quickAskSizeUpdated',
   setQuickAskHotKey = 'setQuickAskHotKey',
+  notifyOnboardingComplete = 'notifyOnboardingComplete',
 }
 
 /**
@@ -43,6 +44,7 @@ export enum AppEvent {
 
   onUserSubmitQuickAsk = 'onUserSubmitQuickAsk',
   onSelectedText = 'onSelectedText',
+  onboardingComplete = 'onboardingComplete',
 }
 
 export enum DownloadRoute {

diff --git a/electron/handlers/native.ts b/electron/handlers/native.ts
@@ -139,4 +139,11 @@ export function handleAppIPCs() {
       windowManager.setQuickAskHotKey(hotKey)
     }
   )
+
+  ipcMain.handle(
+    NativeRoute.notifyOnboardingComplete,
+    async (): Promise<void> => {
+      windowManager.notifyQuickAskOnboardingComplete()
+    }
+  )
 }
diff --git a/electron/managers/window.ts b/electron/managers/window.ts
@@ -131,6 +131,10 @@ class WindowManager {
     }
   }
 
+  notifyQuickAskOnboardingComplete(): void {
+    this._quickAskWindow?.webContents.send(AppEvent.onboardingComplete)
+  }
+
   cleanUp(): void {
     this.mainWindow?.destroy()
     this._quickAskWindow?.destroy()

diff --git a/web/containers/OnBoarding/AllSet/index.tsx b/web/containers/OnBoarding/AllSet/index.tsx
@@ -2,15 +2,19 @@
 import { SubmitHandler, useForm } from 'react-hook-form'
 
 import { Button, Input } from '@janhq/uikit'
-import { useAtom, useSetAtom } from 'jotai'
+import { useAtom, useAtomValue, useSetAtom } from 'jotai'
 
 import { ArrowLeftIcon, ExternalLinkIcon } from 'lucide-react'
 import { AiOutlineGithub } from 'react-icons/ai'
 import { BiLogoDiscordAlt, BiLogoLinkedin } from 'react-icons/bi'
 import { FaSquareXTwitter } from 'react-icons/fa6'
 
+import { defaultQuickAskHotKey } from '@/utils/config'
+
 import { modalOnboardingAccesibilityAtom, onBoardingStepAtom } from '..'
 
+import { appConfigurationAtom } from '@/helpers/atoms/AppConfig.atom'
+
 type FormMail = {
   email: string
 }
@@ -43,12 +47,19 @@ const socials = [
 const AllSetOnBoarding = () => {
   const [onBoardingStep, setOnBoardingStep] = useAtom(onBoardingStepAtom)
   const setAccessibilityCheckbox = useSetAtom(modalOnboardingAccesibilityAtom)
+  const appConfiguration = useAtomValue(appConfigurationAtom)
   const { register, handleSubmit } = useForm<FormMail>()
 
-  const onFinish = () => {
-    window.core?.api?.updateAppConfiguration({
+  const onFinish = async () => {
+    const quickAskHotKey =
+      appConfiguration?.quick_ask_hotkey ?? defaultQuickAskHotKey
+    await window.core?.api?.setQuickAskHotKey(quickAskHotKey)
+    await window.core?.api?.updateAppConfiguration({
+      quick_ask_hotkey: quickAskHotKey,
       finish_onboarding: true,
     })
+    await window.core?.api?.notifyOnboardingComplete()
+
     window.core?.api?.relaunch()
   }
 

diff --git a/web/containers/OnBoarding/Hotkey/index.tsx b/web/containers/OnBoarding/Hotkey/index.tsx
@@ -25,8 +25,11 @@ import { onBoardingStepAtom, modalOnboardingAccesibilityAtom } from '..'
 
 import ModalAccesibility from './ModalAccesibility'
 
+import { updateAppConfigurationAtom } from '@/helpers/atoms/AppConfig.atom'
+
 const HotkeyOnBoarding = () => {
   const [onBoardingStep, setOnBoardingStep] = useAtom(onBoardingStepAtom)
+  const updateAppConfiguration = useSetAtom(updateAppConfigurationAtom)
   const setModalOnboardingAccesibility = useSetAtom(
     modalOnboardingAccesibilityAtom
   )
@@ -56,16 +59,9 @@ const HotkeyOnBoarding = () => {
 
     if (isValid && keys.size > 0) {
       const keyCombination = convertKeyToAccelerator(Array.from(keys)).join('+')
-
-      await window.core?.api?.setQuickAskHotKey(keyCombination)
-      await window.core?.api?.updateAppConfiguration({
-        quick_ask_hotkey: keyCombination,
-      })
+      updateAppConfiguration({ quick_ask_hotkey: keyCombination })
     } else {
-      await window.core?.api?.setQuickAskHotKey(defaultQuickAskHotKey)
-      await window.core?.api?.updateAppConfiguration({
-        quick_ask_hotkey: defaultQuickAskHotKey,
-      })
+      updateAppConfiguration({ quick_ask_hotkey: defaultQuickAskHotKey })
     }
   }
 

diff --git a/web/containers/OnBoarding/Welcome/index.tsx b/web/containers/OnBoarding/Welcome/index.tsx
@@ -26,6 +26,7 @@ const WelcomeOnBoarding = () => {
     }
     await window.core?.api?.setQuickAskHotKey(defaultQuickAskHotKey)
     await window.core?.api?.updateAppConfiguration(configuration)
+    await window.core?.api?.notifyOnboardingComplete()
     updateAppConfig(configuration)
   }, [updateAppConfig])
 

diff --git a/web/containers/Providers/QuickAskListener.tsx b/web/containers/Providers/QuickAskListener.tsx
@@ -11,6 +11,7 @@ import { showRightSideBarAtom } from '@/screens/Chat/Sidebar'
 import { showLeftSideBarAtom } from './KeyListener'
 
 import { mainViewStateAtom } from '@/helpers/atoms/App.atom'
+import { updateAppConfigurationAtom } from '@/helpers/atoms/AppConfig.atom'
 
 type Props = {
   children: ReactNode
@@ -21,6 +22,7 @@ const QuickAskListener: React.FC<Props> = ({ children }) => {
   const setShowRightSideBar = useSetAtom(showRightSideBarAtom)
   const setShowLeftSideBar = useSetAtom(showLeftSideBarAtom)
   const setMainState = useSetAtom(mainViewStateAtom)
+  const updateAppConfig = useSetAtom(updateAppConfigurationAtom)
 
   const previousMessage = useRef('')
 
@@ -33,6 +35,11 @@ const QuickAskListener: React.FC<Props> = ({ children }) => {
     previousMessage.current = input
   })
 
+  window.electronAPI.onboardingComplete(() => {
+    console.debug('Onboarding complete')
+    updateAppConfig({ finish_onboarding: true })
+  })
+
   return <Fragment>{children}</Fragment>
 }