From 7c30c56277422bae1ecdfa3665a14d2254924895 Mon Sep 17 00:00:00 2001
From: Louis <louis@jan.ai>
Date: Mon, 29 Jan 2024 12:44:32 +0700
Subject: [PATCH] chore: resolve (#1833)

---
 .../inference-openai-extension/src/index.ts   |  8 ++++----
 web/containers/Layout/TopBar/index.tsx        | 19 ++++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/extensions/inference-openai-extension/src/index.ts b/extensions/inference-openai-extension/src/index.ts
index 44525b631..da06d5dc6 100644
--- a/extensions/inference-openai-extension/src/index.ts
+++ b/extensions/inference-openai-extension/src/index.ts
@@ -31,7 +31,7 @@ import { join } from "path";
  * It also subscribes to events emitted by the @janhq/core package and handles new message requests.
  */
 export default class JanInferenceOpenAIExtension extends BaseExtension {
-  private static readonly _homeDir = "file://engines";
+  private static readonly _engineDir = "file://engines";
   private static readonly _engineMetadataFileName = "openai.json";
 
   private static _currentModel: OpenAIModel;
@@ -48,9 +48,9 @@ export default class JanInferenceOpenAIExtension extends BaseExtension {
    * Subscribes to events emitted by the @janhq/core package.
    */
   async onLoad() {
-    if (!(await fs.existsSync(JanInferenceOpenAIExtension._homeDir))) {
+    if (!(await fs.existsSync(JanInferenceOpenAIExtension._engineDir))) {
       await fs
-        .mkdirSync(JanInferenceOpenAIExtension._homeDir)
+        .mkdirSync(JanInferenceOpenAIExtension._engineDir)
         .catch((err) => console.debug(err));
     }
 
@@ -81,7 +81,7 @@ export default class JanInferenceOpenAIExtension extends BaseExtension {
   static async writeDefaultEngineSettings() {
     try {
       const engineFile = join(
-        JanInferenceOpenAIExtension._homeDir,
+        JanInferenceOpenAIExtension._engineDir,
         JanInferenceOpenAIExtension._engineMetadataFileName,
       );
       if (await fs.existsSync(engineFile)) {
diff --git a/web/containers/Layout/TopBar/index.tsx b/web/containers/Layout/TopBar/index.tsx
index ab67cb3b7..807b8be55 100644
--- a/web/containers/Layout/TopBar/index.tsx
+++ b/web/containers/Layout/TopBar/index.tsx
@@ -120,13 +120,14 @@ const TopBar = () => {
               </span>
             </div>
           </div>
-          {activeThread && (
-            <div
-              className={twMerge(
-                'absolute right-0 h-full w-80',
-                showing && 'border-l border-border'
-              )}
-            >
+          <div
+            className={twMerge(
+              'absolute right-0 h-full w-80',
+              showing && 'border-l border-border'
+            )}
+          >
+            {((activeThread && mainViewState === MainViewState.Thread) ||
+              mainViewState === MainViewState.LocalServer) && (
               <div className="flex h-full w-52 items-center justify-between px-4">
                 {showing && (
                   <div className="relative flex h-full items-center">
@@ -227,8 +228,8 @@ const TopBar = () => {
                   />
                 </div>
               </div>
-            </div>
-          )}
+            )}
+          </div>
         </div>
       )}
       <CommandSearch />