From 5b8eab64698ed5d35d99cfbdddc52028c52acde2 Mon Sep 17 00:00:00 2001
From: Louis <louis@jan.ai>
Date: Wed, 26 Mar 2025 13:10:25 +0700
Subject: [PATCH] chore: clean up logs opening

---
 src-tauri/src/handlers/cmd.rs                 |  2 +-
 .../BottomPanel/SystemMonitor/index.tsx       |  2 +-
 web/containers/ModalTroubleShoot/AppLogs.tsx  |  2 +-
 .../ModalTroubleShoot/CortexLogs.tsx          |  2 +-
 web/containers/ServerLogs/index.tsx           |  2 +-
 web/hooks/usePath.ts                          | 35 ++-----------------
 web/screens/Settings/Privacy/index.tsx        |  2 +-
 7 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/src-tauri/src/handlers/cmd.rs b/src-tauri/src/handlers/cmd.rs
index 9a96f1082..c8bd7aaf0 100644
--- a/src-tauri/src/handlers/cmd.rs
+++ b/src-tauri/src/handlers/cmd.rs
@@ -177,7 +177,7 @@ pub fn open_app_directory(app: AppHandle) {
 }
 
 #[tauri::command]
-pub fn open_file_explorer(app: AppHandle, path: String) {
+pub fn open_file_explorer(path: String) {
     let path = PathBuf::from(path);
     if cfg!(target_os = "windows") {
         std::process::Command::new("explorer")
diff --git a/web/containers/Layout/BottomPanel/SystemMonitor/index.tsx b/web/containers/Layout/BottomPanel/SystemMonitor/index.tsx
index d9a0b289a..05ec643fe 100644
--- a/web/containers/Layout/BottomPanel/SystemMonitor/index.tsx
+++ b/web/containers/Layout/BottomPanel/SystemMonitor/index.tsx
@@ -91,7 +91,7 @@ const SystemMonitor = () => {
             <div className="unset-drag flex cursor-pointer items-center gap-x-2">
               <div
                 className="flex cursor-pointer items-center gap-x-1 rounded px-1 py-0.5 hover:bg-[hsla(var(--secondary-bg))]"
-                onClick={() => onRevealInFinder('Logs')}
+                onClick={() => onRevealInFinder('logs')}
               >
                 <FolderOpenIcon size={12} /> App Log
               </div>
diff --git a/web/containers/ModalTroubleShoot/AppLogs.tsx b/web/containers/ModalTroubleShoot/AppLogs.tsx
index 7b0a31a5d..0dedb540f 100644
--- a/web/containers/ModalTroubleShoot/AppLogs.tsx
+++ b/web/containers/ModalTroubleShoot/AppLogs.tsx
@@ -41,7 +41,7 @@ const AppLogs = () => {
           <Button
             theme="ghost"
             variant="outline"
-            onClick={() => onRevealInFinder('Logs')}
+            onClick={() => onRevealInFinder('logs')}
           >
             <div className="flex items-center space-x-2">
               <>
diff --git a/web/containers/ModalTroubleShoot/CortexLogs.tsx b/web/containers/ModalTroubleShoot/CortexLogs.tsx
index 3323a1694..6205e82d0 100644
--- a/web/containers/ModalTroubleShoot/CortexLogs.tsx
+++ b/web/containers/ModalTroubleShoot/CortexLogs.tsx
@@ -41,7 +41,7 @@ const CortexLogs = () => {
           <Button
             theme="ghost"
             variant="outline"
-            onClick={() => onRevealInFinder('Logs')}
+            onClick={() => onRevealInFinder('logs')}
           >
             <div className="flex items-center space-x-2">
               <>
diff --git a/web/containers/ServerLogs/index.tsx b/web/containers/ServerLogs/index.tsx
index c9074808c..8b230c424 100644
--- a/web/containers/ServerLogs/index.tsx
+++ b/web/containers/ServerLogs/index.tsx
@@ -103,7 +103,7 @@ const ServerLogs = (props: ServerLogsProps) => {
               <Button
                 theme="ghost"
                 variant="outline"
-                onClick={() => onRevealInFinder('Logs')}
+                onClick={() => onRevealInFinder('logs')}
               >
                 <div className="flex items-center space-x-2">
                   <>
diff --git a/web/hooks/usePath.ts b/web/hooks/usePath.ts
index 464ff0b58..6ff1a73bd 100644
--- a/web/hooks/usePath.ts
+++ b/web/hooks/usePath.ts
@@ -4,45 +4,14 @@ import { useAtomValue } from 'jotai'
 import { getFileInfo } from '@/utils/file'
 
 import { janDataFolderPathAtom } from '@/helpers/atoms/AppConfig.atom'
-import { activeAssistantAtom } from '@/helpers/atoms/Assistant.atom'
-import { selectedModelAtom } from '@/helpers/atoms/Model.atom'
 import { activeThreadAtom } from '@/helpers/atoms/Thread.atom'
 
 export const usePath = () => {
   const janDataFolderPath = useAtomValue(janDataFolderPathAtom)
   const activeThread = useAtomValue(activeThreadAtom)
-  const selectedModel = useAtomValue(selectedModelAtom)
-  const activeAssistant = useAtomValue(activeAssistantAtom)
 
-  const onRevealInFinder = async (type: string) => {
-    // TODO: this logic should be refactored.
-    if (type !== 'Model' && !activeThread) return
-
-    let filePath = undefined
-    const assistantId = activeAssistant?.assistant_id
-    switch (type) {
-      case 'Engine':
-      case 'Thread':
-        filePath = await joinPath(['threads', activeThread?.id ?? ''])
-        break
-      case 'Model':
-        if (!selectedModel) return
-        filePath = await joinPath(['models', selectedModel.id])
-        break
-      case 'Tools':
-      case 'Assistant':
-        if (!assistantId) return
-        filePath = await joinPath(['assistants', assistantId])
-        break
-      case 'Logs':
-        filePath = 'logs'
-        break
-      default:
-        break
-    }
-
-    if (!filePath) return
-    const fullPath = await joinPath([janDataFolderPath, filePath])
+  const onRevealInFinder = async (path: string) => {
+    const fullPath = await joinPath([janDataFolderPath, path])
     openFileExplorer(fullPath)
   }
 
diff --git a/web/screens/Settings/Privacy/index.tsx b/web/screens/Settings/Privacy/index.tsx
index c77ac0447..bfc1d53fa 100644
--- a/web/screens/Settings/Privacy/index.tsx
+++ b/web/screens/Settings/Privacy/index.tsx
@@ -125,7 +125,7 @@ const Privacy = () => {
               <FolderOpenIcon
                 size={16}
                 className="absolute right-2 top-1/2 z-10 -translate-y-1/2 cursor-pointer"
-                onClick={() => onRevealInFinder('Logs')}
+                onClick={() => onRevealInFinder('logs')}
               />
             </div>
           </div>