fix: janhq#1183 Reveal in finder does not work on windows (janhq#1239)

* fix(OpenFile): janhq#1183 reveal in finder does not work on windows Signed-off-by: James <[email protected]> --------- Signed-off-by: James <[email protected]>
SamPatt · Dec 28, 2023 · cbc63da · cbc63da
1 parent c580b4c
commit cbc63da
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 19 deletions.
diff --git a/core/src/api/index.ts b/core/src/api/index.ts
@@ -10,6 +10,7 @@ export enum AppRoute {
   openAppDirectory = 'openAppDirectory',
   openFileExplore = 'openFileExplorer',
   relaunch = 'relaunch',
+  joinPath = 'joinPath'
 }
 
 export enum AppEvent {

diff --git a/core/src/core.ts b/core/src/core.ts
@@ -44,6 +44,13 @@ const getUserSpace = (): Promise<string> => global.core.api?.getUserSpace()
 const openFileExplorer: (path: string) => Promise<any> = (path) =>
   global.core.api?.openFileExplorer(path)
 
+/**
+ * Joins multiple paths together.
+ * @param paths - The paths to join.
+ * @returns {Promise<string>} A promise that resolves with the joined path.
+ */
+const joinPath: (paths: string[]) => Promise<string> = (paths) => global.core.api?.joinPath(paths)
+
 const getResourcePath: () => Promise<string> = () => global.core.api?.getResourcePath()
 
 /**
@@ -66,4 +73,5 @@ export {
   getUserSpace,
   openFileExplorer,
   getResourcePath,
+  joinPath,
 }
diff --git a/electron/handlers/app.ts b/electron/handlers/app.ts
@@ -48,6 +48,13 @@ export function handleAppIPCs() {
     shell.openPath(url)
   })
 
+  /**
+   * Joins multiple paths together, respect to the current OS.
+   */
+  ipcMain.handle(AppRoute.joinPath, async (_event, paths: string[]) =>
+    join(...paths)
+  )
+
   /**
    * Relaunches the app in production - reload window in development.
    * @param _event - The IPC event object.

diff --git a/web/containers/CardSidebar/index.tsx b/web/containers/CardSidebar/index.tsx
@@ -29,6 +29,13 @@ export default function CardSidebar({
 
   useClickOutside(() => setMore(false), null, [menu, toggle])
 
+  let openFolderTitle: string = 'Open Containing Folder'
+  if (isMac) {
+    openFolderTitle = 'Reveal in Finder'
+  } else if (isWindows) {
+    openFolderTitle = 'Reveal in File Explorer'
+  }
+
   return (
     <div
       className={twMerge(
@@ -74,7 +81,7 @@ export default function CardSidebar({
             >
               <FolderOpenIcon size={16} className="text-muted-foreground" />
               <span className="text-bold text-black dark:text-muted-foreground">
-                Reveal in Finder
+                {openFolderTitle}
               </span>
             </div>
             <div

diff --git a/web/next.config.js b/web/next.config.js
@@ -32,6 +32,9 @@ const nextConfig = {
           JSON.stringify(process.env.ANALYTICS_ID) ?? JSON.stringify('xxx'),
         ANALYTICS_HOST:
           JSON.stringify(process.env.ANALYTICS_HOST) ?? JSON.stringify('xxx'),
+        isMac: process.platform === 'darwin',
+        isWindows: process.platform === 'win32',
+        isLinux: process.platform === 'linux',
       }),
     ]
     return config

diff --git a/web/screens/Chat/Sidebar/index.tsx b/web/screens/Chat/Sidebar/index.tsx
@@ -1,8 +1,6 @@
-import { join } from 'path'
-
 import React from 'react'
 
-import { getUserSpace, openFileExplorer } from '@janhq/core'
+import { getUserSpace, openFileExplorer, joinPath } from '@janhq/core'
 
 import { Input, Textarea } from '@janhq/uikit'
 
@@ -54,23 +52,22 @@ const Sidebar: React.FC = () => {
     const assistantId = activeThread.assistants[0]?.assistant_id
     switch (type) {
       case 'Thread':
-        filePath = join('threads', activeThread.id)
+        filePath = await joinPath(['threads', activeThread.id])
         break
       case 'Model':
         if (!selectedModel) return
-        filePath = join('models', selectedModel.id)
+        filePath = await joinPath(['models', selectedModel.id])
         break
       case 'Assistant':
         if (!assistantId) return
-        filePath = join('assistants', assistantId)
+        filePath = await joinPath(['assistants', assistantId])
         break
       default:
         break
     }
 
     if (!filePath) return
-
-    const fullPath = join(userSpace, filePath)
+    const fullPath = await joinPath([userSpace, filePath])
     openFileExplorer(fullPath)
   }
 
@@ -87,23 +84,22 @@ const Sidebar: React.FC = () => {
     const assistantId = activeThread.assistants[0]?.assistant_id
     switch (type) {
       case 'Thread':
-        filePath = join('threads', activeThread.id, 'thread.json')
+        filePath = await joinPath(['threads', activeThread.id, 'thread.json'])
         break
       case 'Model':
         if (!selectedModel) return
-        filePath = join('models', selectedModel.id, 'model.json')
+        filePath = await joinPath(['models', selectedModel.id, 'model.json'])
         break
       case 'Assistant':
         if (!assistantId) return
-        filePath = join('assistants', assistantId, 'assistant.json')
+        filePath = await joinPath(['assistants', assistantId, 'assistant.json'])
         break
       default:
         break
     }
 
     if (!filePath) return
-
-    const fullPath = join(userSpace, filePath)
+    const fullPath = await joinPath([userSpace, filePath])
     openFileExplorer(fullPath)
   }
 

diff --git a/web/screens/Settings/CoreExtensions/ExtensionsCatalog/index.tsx b/web/screens/Settings/CoreExtensions/ExtensionsCatalog/index.tsx
@@ -5,8 +5,6 @@ import React, { useState, useEffect, useRef, useContext } from 'react'
 
 import { Button } from '@janhq/uikit'
 
-import Loader from '@/containers/Loader'
-
 import { FeatureToggleContext } from '@/context/FeatureToggle'
 
 import { useGetAppVersion } from '@/hooks/useGetAppVersion'
@@ -18,7 +16,6 @@ import { extensionManager } from '@/extension'
 const ExtensionCatalog = () => {
   const [activeExtensions, setActiveExtensions] = useState<any[]>([])
   const [extensionCatalog, setExtensionCatalog] = useState<any[]>([])
-  const [isLoading, setIsLoading] = useState<boolean>(false)
   const fileInputRef = useRef<HTMLInputElement | null>(null)
   const { version } = useGetAppVersion()
   const { experimentalFeatureEnabed } = useContext(FeatureToggleContext)
@@ -95,8 +92,6 @@ const ExtensionCatalog = () => {
     }
   }
 
-  if (isLoading) return <Loader description="Installing ..." />
-
   return (
     <div className="block w-full">
       {extensionCatalog

diff --git a/web/types/index.d.ts b/web/types/index.d.ts
@@ -8,6 +8,9 @@ declare global {
   declare const VERSION: string
   declare const ANALYTICS_ID: string
   declare const ANALYTICS_HOST: string
+  declare const isMac: boolean
+  declare const isWindows: boolean
+  declare const isLinux: boolean
   interface Core {
     api: APIFunctions
     events: EventEmitter