Merge pull request #449 from reorproject/file-explorer-improvements

initial changes for context menu fix

Author: samlhuillier

electron/main/electron-store/storeConfig.ts

@@ -25,20 +25,15 @@ export type EmbeddingModelConfig = EmbeddingModelWithRepo | EmbeddingModelWithLo
 export interface EmbeddingModelWithRepo {
   type: 'repo'
   repoName: string
+  description?: string
+  readableName?: string
 }
 
 export interface EmbeddingModelWithLocalPath {
   type: 'local'
   localPath: string
-}
-
-export type Tab = {
-  id: string // Unique ID for the tab, useful for operations
-  path: string // Path to the content open in the tab
-  title: string // Title of the tab
-  lastAccessed: boolean
-  // timeOpened: Date; // Timestamp to preserve order
-  // isDirty: boolean; // Flag to indicate unsaved changes
+  description?: string
+  readableName?: string
 }
 
 export interface StoreSchema {
@@ -65,7 +60,6 @@ export interface StoreSchema {
   isSBCompact: boolean
   spellCheck: string
   EditorFlexCenter: boolean
-  OpenTabs: Tab[]
   showDocumentStats: boolean
 }
 
@@ -87,6 +81,5 @@ export enum StoreKeys {
   IsSBCompact = 'isSBCompact',
   SpellCheck = 'spellCheck',
   EditorFlexCenter = 'editorFlexCenter',
-  OpenTabs = 'OpenTabs',
   showDocumentStats = 'showDocumentStats',
 }

electron/main/vector-database/embeddings.ts

@@ -15,15 +15,36 @@ import { splitDirectoryPathIntoBaseAndRepo } from '../filesystem/filesystem'
 import DownloadModelFilesFromHFRepo from './downloadModelsFromHF'
 import { DBEntry } from './schema'
 
-export const defaultEmbeddingModelRepos = {
-  'Xenova/UAE-Large-V1': { type: 'repo', repoName: 'Xenova/UAE-Large-V1' },
-  'Xenova/bge-base-en-v1.5': {
+export const defaultEmbeddingModelRepos: Record<string, EmbeddingModelConfig> = {
+  'Xenova/UAE-Large-V1': {
     type: 'repo',
-    repoName: 'Xenova/bge-base-en-v1.5',
+    repoName: 'Xenova/UAE-Large-V1',
+    readableName: 'UAE-Large-V1',
+    description: 'Recommended for English content',
   },
   'Xenova/bge-small-en-v1.5': {
     type: 'repo',
     repoName: 'Xenova/bge-small-en-v1.5',
+    readableName: 'bge-small-en-v1.5',
+    description: 'Recommended for low-power devices',
+  },
+  'Xenova/multilingual-e5-large': {
+    type: 'repo',
+    repoName: 'Xenova/multilingual-e5-large',
+    readableName: 'multilingual-e5-large',
+    description: 'Recommended for non-English content',
+  },
+  'Xenova/jina-embeddings-v2-base-zh': {
+    type: 'repo',
+    repoName: 'Xenova/jina-embeddings-v2-base-zh',
+    readableName: 'jina-embeddings-v2-base-zh',
+    description: 'Recommended for Chinese content',
+  },
+  'Xenova/jina-embeddings-v2-base-de': {
+    type: 'repo',
+    repoName: 'Xenova/jina-embeddings-v2-base-de',
+    readableName: 'jina-embeddings-v2-base-de',
+    description: 'Recommended for German content',
   },
 }
 

package-lock.json

@@ -44,17 +44,20 @@
     "@radix-ui/colors": "^3.0.0",
     "@radix-ui/react-checkbox": "^1.1.1",
     "@radix-ui/react-collapsible": "^1.1.0",
+    "@radix-ui/react-context-menu": "^2.2.2",
     "@radix-ui/react-dialog": "^1.1.1",
     "@radix-ui/react-dropdown-menu": "^2.1.2",
     "@radix-ui/react-hover-card": "^1.1.1",
     "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-popover": "^1.1.1",
+    "@radix-ui/react-progress": "^1.1.0",
     "@radix-ui/react-scroll-area": "^1.2.0",
     "@radix-ui/react-select": "^2.1.1",
     "@radix-ui/react-slider": "^1.2.0",
     "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-switch": "^1.1.0",
+    "@radix-ui/react-tabs": "^1.1.1",
     "@radix-ui/react-tooltip": "^1.1.3",
     "@sentry/electron": "^5.3.0",
     "@tailwindcss/typography": "^0.5.10",

package.json

@@ -1,12 +1,12 @@
 import React from 'react'
 
 import { useModalOpeners } from '@/contexts/ModalContext'
-import NewDirectoryComponent from '../File/NewDirectory'
 import SettingsModal from '../Settings/Settings'
 import FlashcardMenuModal from '../Flashcard/FlashcardMenuModal'
 import { useFileContext } from '@/contexts/FileContext'
 import RenameNoteModal from '../File/RenameNote'
 import RenameDirModal from '../File/RenameDirectory'
+import NewDirectoryComponent from '../File/NewDirectory'
 
 const CommonModals: React.FC = () => {
   const {
@@ -26,7 +26,7 @@ const CommonModals: React.FC = () => {
 
   return (
     <div>
-      <NewDirectoryComponent isOpen={isNewDirectoryModalOpen} onClose={() => setIsNewDirectoryModalOpen(false)} />
+      <NewDirectoryComponent isOpen={isNewDirectoryModalOpen} onClose={() => setIsNewDirectoryModalOpen(false)} />{' '}
       {noteToBeRenamed && <RenameNoteModal />}
       {fileDirToBeRenamed && <RenameDirModal />}
       <SettingsModal isOpen={isSettingsModalOpen} onClose={() => setIsSettingsModalOpen(false)} />

src/components/Common/CommonModals.tsx

@@ -17,7 +17,7 @@ const EmptyPage: React.FC = () => {
       <div className="m-0 flex max-w-md flex-col gap-2">
         <button
           className="cursor-pointer border-0 bg-transparent pb-1 pr-0 text-left text-2lg text-blue-500"
-          onClick={createUntitledNote}
+          onClick={() => createUntitledNote()}
           type="button"
         >
           Create a File

src/components/Common/EmptyPage.tsx

@@ -1,4 +1,5 @@
 import React, { useRef, useEffect } from 'react'
+import ReactDOM from 'react-dom'
 
 interface ModalProps {
   isOpen: boolean
@@ -33,9 +34,9 @@ const ReorModal: React.FC<ModalProps> = ({
     return null
   }
 
-  return (
+  const modalContent = (
     <div
-      className={`fixed inset-0 z-50 flex h-full items-center justify-center bg-black/40 ${tailwindStylesOnBackground}`}
+      className={`fixed inset-0 flex h-screen w-screen items-center justify-center bg-black/40 ${tailwindStylesOnBackground}`}
     >
       <div
         ref={modalRef}
@@ -58,6 +59,8 @@ const ReorModal: React.FC<ModalProps> = ({
       </div>
     </div>
   )
+
+  return ReactDOM.createPortal(modalContent, document.body)
 }
 
 export default ReorModal

src/components/Common/Modal.tsx

@@ -10,9 +10,10 @@ import { useFileContext } from '@/contexts/FileContext'
 interface NewDirectoryComponentProps {
   isOpen: boolean
   onClose: () => void
+  parentDirectoryPath?: string
 }
 
-const NewDirectoryComponent: React.FC<NewDirectoryComponentProps> = ({ isOpen, onClose }) => {
+const NewDirectoryComponent: React.FC<NewDirectoryComponentProps> = ({ isOpen, onClose, parentDirectoryPath }) => {
   const [directoryName, setDirectoryName] = useState<string>('')
   const [errorMessage, setErrorMessage] = useState<string | null>(null)
 
@@ -45,10 +46,16 @@ const NewDirectoryComponent: React.FC<NewDirectoryComponentProps> = ({ isOpen, o
     const validName = await handleValidName(directoryName)
     if (!directoryName || errorMessage || !validName) return
 
-    const directoryPath =
-      currentlyOpenFilePath === '' || currentlyOpenFilePath === null
-        ? await window.electronStore.getVaultDirectoryForWindow()
-        : await window.path.dirname(currentlyOpenFilePath as string)
+    let directoryPath: string
+
+    if (parentDirectoryPath) {
+      directoryPath = parentDirectoryPath
+    } else if (currentlyOpenFilePath && currentlyOpenFilePath !== '') {
+      directoryPath = await window.path.dirname(currentlyOpenFilePath)
+    } else {
+      directoryPath = await window.electronStore.getVaultDirectoryForWindow()
+    }
+
     const finalPath = await window.path.join(directoryPath, directoryName)
     window.fileSystem.createDirectory(finalPath)
     posthog.capture('created_new_directory_from_new_directory_modal')
@@ -70,6 +77,8 @@ const NewDirectoryComponent: React.FC<NewDirectoryComponentProps> = ({ isOpen, o
             }
           }}
           placeholder="Directory Name"
+          // eslint-disable-next-line jsx-a11y/no-autofocus
+          autoFocus
         />
 
         <div className="flex items-center gap-3">

src/components/File/NewDirectory.tsx

@@ -34,8 +34,8 @@ const AnalyticsSettings: React.FC<AnalyticsSettingsProps> = () => {
     <div className="w-full rounded bg-dark-gray-c-three pb-7 ">
       <h2 className="mb-0 text-2xl font-semibold text-white">Analytics</h2>{' '}
       <p className="mb-2 mt-5 text-sm text-gray-200">
-        Reor tracks anonymous usage data to help improve the app. We never share this personal data. This is solely to
-        track which features are popular. You can disable this at any time:
+        Reor tracks anonymous usage data to help us understand how the app is used and which features are popular. You
+        can disable this at any time:
       </p>
       <Switch
         checked={isAnalyticsEnabled}