From 8cc24df90263a544e6925c6d4d6a9932a78cd6f6 Mon Sep 17 00:00:00 2001
From: Louis <louis@jan.ai>
Date: Mon, 16 Dec 2024 20:48:10 +0700
Subject: [PATCH] chore: clean up

---
 electron/tests/config/fixtures.ts                          | 4 ++--
 electron/tests/e2e/navigation.e2e.spec.ts                  | 7 ++-----
 web/hooks/useCreateNewThread.ts                            | 2 +-
 web/next.config.js                                         | 2 +-
 .../Thread/ThreadCenterPanel/MessageToolbar/index.tsx      | 2 +-
 web/screens/Thread/ThreadLeftPanel/index.tsx               | 5 +----
 web/screens/Thread/ThreadRightPanel/index.tsx              | 4 +---
 web/utils/file.ts                                          | 6 +++++-
 8 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/electron/tests/config/fixtures.ts b/electron/tests/config/fixtures.ts
index 642af4800..f61eddfae 100644
--- a/electron/tests/config/fixtures.ts
+++ b/electron/tests/config/fixtures.ts
@@ -108,7 +108,7 @@ export const test = base.extend<
 })
 
 test.beforeAll(async () => {
-  await rmSync(path.join(__dirname, '../../test-data'), {
+  rmSync(path.join(__dirname, '../../test-data'), {
     recursive: true,
     force: true,
   })
@@ -122,5 +122,5 @@ test.beforeAll(async () => {
 })
 
 test.afterAll(async () => {
-  teardownElectron()
+  // teardownElectron()
 })
diff --git a/electron/tests/e2e/navigation.e2e.spec.ts b/electron/tests/e2e/navigation.e2e.spec.ts
index b599a951c..1b463d381 100644
--- a/electron/tests/e2e/navigation.e2e.spec.ts
+++ b/electron/tests/e2e/navigation.e2e.spec.ts
@@ -2,11 +2,8 @@ import { expect } from '@playwright/test'
 import { page, test, TIMEOUT } from '../config/fixtures'
 
 test('renders left navigation panel', async () => {
-  const settingsBtn = await page
-    .getByTestId('Thread')
-    .first()
-    .isEnabled({ timeout: TIMEOUT })
-  expect([settingsBtn].filter((e) => !e).length).toBe(0)
+  const threadBtn = page.getByTestId('Thread').first()
+  await expect(threadBtn).toBeVisible({ timeout: TIMEOUT })
   // Chat section should be there
   await page.getByTestId('Local API Server').first().click({
     timeout: TIMEOUT,
diff --git a/web/hooks/useCreateNewThread.ts b/web/hooks/useCreateNewThread.ts
index 5ecfb649a..02f3cd371 100644
--- a/web/hooks/useCreateNewThread.ts
+++ b/web/hooks/useCreateNewThread.ts
@@ -158,7 +158,7 @@ export const useCreateNewThread = () => {
     //TODO: Why do we have thread list then thread states? Should combine them
     try {
       const createdThread = await persistNewThread(thread, assistantInfo)
-      if (!createdThread) throw 'Thread creation failed'
+      if (!createdThread) throw 'Thread created failed.'
       createNewThread(createdThread)
 
       setSelectedModel(defaultModel)
diff --git a/web/next.config.js b/web/next.config.js
index 48ea0703e..b1a7728da 100644
--- a/web/next.config.js
+++ b/web/next.config.js
@@ -33,7 +33,7 @@ const nextConfig = {
         ANALYTICS_ID: JSON.stringify(process.env.ANALYTICS_ID),
         ANALYTICS_HOST: JSON.stringify(process.env.ANALYTICS_HOST),
         API_BASE_URL: JSON.stringify(
-          process.env.API_BASE_URL ?? 'http://localhost:1337'
+          process.env.API_BASE_URL ?? 'http://127.0.0.1:39291'
         ),
         isMac: process.platform === 'darwin',
         isWindows: process.platform === 'win32',
diff --git a/web/screens/Thread/ThreadCenterPanel/MessageToolbar/index.tsx b/web/screens/Thread/ThreadCenterPanel/MessageToolbar/index.tsx
index 63c60a8af..a15f0ec58 100644
--- a/web/screens/Thread/ThreadCenterPanel/MessageToolbar/index.tsx
+++ b/web/screens/Thread/ThreadCenterPanel/MessageToolbar/index.tsx
@@ -55,7 +55,7 @@ const MessageToolbar = ({ message }: { message: ThreadMessage }) => {
       .slice(-1)[0]
 
     if (thread) {
-      // Should also delete error messages to clear out the error state
+      // TODO: Should also delete error messages to clear out the error state
       await extensionManager
         .get<ConversationalExtension>(ExtensionTypeEnum.Conversational)
         ?.deleteMessage(thread.id, message.id)
diff --git a/web/screens/Thread/ThreadLeftPanel/index.tsx b/web/screens/Thread/ThreadLeftPanel/index.tsx
index 140ae2f28..46763e555 100644
--- a/web/screens/Thread/ThreadLeftPanel/index.tsx
+++ b/web/screens/Thread/ThreadLeftPanel/index.tsx
@@ -81,10 +81,7 @@ const ThreadLeftPanel = () => {
       )
       const selectedModel = model[0] || recommendedModel
       requestCreateNewThread(
-        {
-          ...assistants[0],
-          ...activeAssistant,
-        },
+        { ...assistants[0], ...activeAssistant },
         selectedModel
       )
     } else if (threadDataReady && !activeThreadId) {
diff --git a/web/screens/Thread/ThreadRightPanel/index.tsx b/web/screens/Thread/ThreadRightPanel/index.tsx
index 04205329f..939bb3fe7 100644
--- a/web/screens/Thread/ThreadRightPanel/index.tsx
+++ b/web/screens/Thread/ThreadRightPanel/index.tsx
@@ -176,9 +176,7 @@ const ThreadRightPanel = () => {
 
   const onValueChanged = useCallback(
     (key: string, value: string | number | boolean | string[]) => {
-      if (!activeThread || !activeAssistant) {
-        return
-      }
+      if (!activeThread || !activeAssistant) return
 
       setEngineParamsUpdate(true)
       resetModel()
diff --git a/web/utils/file.ts b/web/utils/file.ts
index 2eb6d9f64..83c9107c6 100644
--- a/web/utils/file.ts
+++ b/web/utils/file.ts
@@ -30,9 +30,13 @@ export const getFileInfoFromFile = async (
   return result
 }
 
+/**
+ * This function creates an Uppy instance with XHR plugin for file upload to the server.
+ * @returns Uppy instance
+ */
 export const uploader = () => {
   const uppy = new Uppy().use(XHR, {
-    endpoint: 'http://127.0.0.1:39291/v1/files',
+    endpoint: `${API_BASE_URL}/v1/files`,
     method: 'POST',
     fieldName: 'file',
     formData: true,