From 19879ef2790bc5f60d16d1ac1913419cc0d50636 Mon Sep 17 00:00:00 2001
From: Louis <louis@jan.ai>
Date: Mon, 11 Nov 2024 10:30:22 +0700
Subject: [PATCH 1/4] fix: model import name and id is wrong on Windows

---
 web/hooks/useImportModel.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/hooks/useImportModel.ts b/web/hooks/useImportModel.ts
index 093385f0d..ee66c9e8f 100644
--- a/web/hooks/useImportModel.ts
+++ b/web/hooks/useImportModel.ts
@@ -5,11 +5,11 @@ import {
   ImportingModel,
   LocalImportModelEvent,
   Model,
-  ModelEvent,
   ModelExtension,
   OptionType,
   events,
   fs,
+  baseName
 } from '@janhq/core'
 
 import { atom, useSetAtom } from 'jotai'
@@ -61,8 +61,8 @@ const useImportModel = () => {
 
   const importModels = useCallback(
     (models: ImportingModel[], optionType: OptionType) => {
-      models.map((model) => {
-        const modelId = model.modelId ?? model.path.split('/').pop()
+      models.map(async (model) => {
+        const modelId = model.modelId ?? await baseName(model.path)
         if (modelId) {
           addDownloadingModel(modelId)
           extensionManager

From 67aa89c94851e05620d0e28b64426fad9e0d0034 Mon Sep 17 00:00:00 2001
From: Louis <louis@jan.ai>
Date: Mon, 11 Nov 2024 10:53:35 +0700
Subject: [PATCH 2/4] fix: run mode takes effect immediately

---
 web/screens/Settings/Advanced/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/screens/Settings/Advanced/index.tsx b/web/screens/Settings/Advanced/index.tsx
index 50e2a72a6..a5de6c6bd 100644
--- a/web/screens/Settings/Advanced/index.tsx
+++ b/web/screens/Settings/Advanced/index.tsx
@@ -306,7 +306,7 @@ const Advanced = () => {
                           })
                         }
                         // Stop any running model to apply the changes
-                        if (e.target.checked !== gpuEnabled) stopModel()
+                        if (e.target.checked !== gpuEnabled) stopModel().then(() => window.core?.api?.relaunch())
                       }}
                     />
                   }

From 9530c695d39741ec07bb1ee949c71b92039ba28c Mon Sep 17 00:00:00 2001
From: Louis <louis@jan.ai>
Date: Mon, 11 Nov 2024 11:47:04 +0700
Subject: [PATCH 3/4] chore: lint fix

---
 web/hooks/useImportModel.ts             | 4 ++--
 web/screens/Settings/Advanced/index.tsx | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/hooks/useImportModel.ts b/web/hooks/useImportModel.ts
index ee66c9e8f..a2b1f09cb 100644
--- a/web/hooks/useImportModel.ts
+++ b/web/hooks/useImportModel.ts
@@ -9,7 +9,7 @@ import {
   OptionType,
   events,
   fs,
-  baseName
+  baseName,
 } from '@janhq/core'
 
 import { atom, useSetAtom } from 'jotai'
@@ -62,7 +62,7 @@ const useImportModel = () => {
   const importModels = useCallback(
     (models: ImportingModel[], optionType: OptionType) => {
       models.map(async (model) => {
-        const modelId = model.modelId ?? await baseName(model.path)
+        const modelId = model.modelId ?? (await baseName(model.path))
         if (modelId) {
           addDownloadingModel(modelId)
           extensionManager
diff --git a/web/screens/Settings/Advanced/index.tsx b/web/screens/Settings/Advanced/index.tsx
index a5de6c6bd..0b1438c47 100644
--- a/web/screens/Settings/Advanced/index.tsx
+++ b/web/screens/Settings/Advanced/index.tsx
@@ -306,7 +306,8 @@ const Advanced = () => {
                           })
                         }
                         // Stop any running model to apply the changes
-                        if (e.target.checked !== gpuEnabled) stopModel().then(() => window.core?.api?.relaunch())
+                        if (e.target.checked !== gpuEnabled)
+                          stopModel().then(() => window.core?.api?.relaunch())
                       }}
                     />
                   }

From e636bc5bd0948a5fa078d59dc04379a45beecc12 Mon Sep 17 00:00:00 2001
From: Louis <louis@jan.ai>
Date: Mon, 11 Nov 2024 12:08:52 +0700
Subject: [PATCH 4/4] fix: react-dropzone new version is broken

---
 electron/utils/migration.ts | 3 +++
 web/package.json            | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/electron/utils/migration.ts b/electron/utils/migration.ts
index 7295fa15d..80851f9de 100644
--- a/electron/utils/migration.ts
+++ b/electron/utils/migration.ts
@@ -61,6 +61,9 @@ async function checkAndMigrateTheme(
   )
   if (existingTheme) {
     const desTheme = join(janDataThemesFolder, existingTheme)
+    if (!lstatSync(desTheme).isDirectory()) {
+      return
+    }
     console.debug('Updating theme', existingTheme)
     rmdirSync(desTheme, { recursive: true })
     cpSync(sourceThemePath, join(janDataThemesFolder, sourceThemeName), {
diff --git a/web/package.json b/web/package.json
index af3bce5d1..d3ee82a33 100644
--- a/web/package.json
+++ b/web/package.json
@@ -38,7 +38,7 @@
     "react": "18.2.0",
     "react-circular-progressbar": "^2.1.0",
     "react-dom": "18.2.0",
-    "react-dropzone": "^14.2.3",
+    "react-dropzone": "14.2.3",
     "react-hook-form": "^7.47.0",
     "react-hot-toast": "^2.4.1",
     "react-icons": "^4.12.0",