fix: empty tooltip on attachment icon, also fix z-index

janhq · Dec 18, 2024 · ce35cc9 · ce35cc9
1 parent 0cd0ff0
commit ce35cc9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/web/screens/Hub/ModelList/ModelHeader/index.tsx b/web/screens/Hub/ModelList/ModelHeader/index.tsx
@@ -71,7 +71,6 @@ const ModelItemHeader = ({ model, onClick, open }: Props) => {
 
   let downloadButton = (
     <Button
-      className="z-50"
       onClick={(e) => {
         e.stopPropagation()
         onDownloadClick()

diff --git a/web/screens/Thread/ThreadCenterPanel/ChatInput/index.tsx b/web/screens/Thread/ThreadCenterPanel/ChatInput/index.tsx
@@ -94,9 +94,9 @@ const ChatInput = () => {
     stopInference()
   }
 
-  const isModelSupportRagAndTools =
-    selectedModel?.engine === InferenceEngine.openai ||
-    isLocalEngine(selectedModel?.engine as InferenceEngine)
+  const isModelSupportRagAndTools = isLocalEngine(
+    selectedModel?.engine as InferenceEngine
+  )
 
   /**
    * Handles the change event of the extension file input element by setting the file name state.
@@ -182,7 +182,7 @@ const ChatInput = () => {
               </Button>
             }
             disabled={
-              isModelSupportRagAndTools &&
+              !isModelSupportRagAndTools &&
               activeAssistant?.tools &&
               activeAssistant?.tools[0]?.enabled
             }
@@ -231,7 +231,8 @@ const ChatInput = () => {
                   <li
                     className={twMerge(
                       'text-[hsla(var(--text-secondary)] hover:bg-secondary flex w-full items-center space-x-2 px-4 py-2 hover:bg-[hsla(var(--dropdown-menu-hover-bg))]',
-                      activeAssistant?.model.settings?.vision_model
+                      activeAssistant?.model.settings?.vision_model ||
+                        isModelSupportRagAndTools
                         ? 'cursor-pointer'
                         : 'cursor-not-allowed opacity-50'
                     )}
@@ -255,11 +256,15 @@ const ChatInput = () => {
                   <li
                     className={twMerge(
                       'text-[hsla(var(--text-secondary)] hover:bg-secondary flex w-full cursor-pointer items-center space-x-2 px-4 py-2 hover:bg-[hsla(var(--dropdown-menu-hover-bg))]',
-                      'cursor-pointer'
+                      isModelSupportRagAndTools
+                        ? 'cursor-pointer'
+                        : 'cursor-not-allowed opacity-50'
                     )}
                     onClick={() => {
-                      fileInputRef.current?.click()
-                      setShowAttacmentMenus(false)
+                      if (isModelSupportRagAndTools) {
+                        fileInputRef.current?.click()
+                        setShowAttacmentMenus(false)
+                      }
                     }}
                   >
                     <FileTextIcon size={16} />