Merge pull request #459 from reorproject/migrate-to-dialog

migrate new directory to dialog

electron/main/index.ts

@@ -15,9 +15,11 @@ import { ollamaService, registerLLMSessionHandlers } from './llm/ipcHandlers'
 import registerPathHandlers from './path/ipcHandlers'
 import { registerDBSessionHandlers } from './vector-database/ipcHandlers'
 
-Sentry.init({
-  dsn: 'https://a764a6135d25ba91f0b25c0252be52f3@o4507840138903552.ingest.us.sentry.io/4507840140410880',
-})
+if (process.env.NODE_ENV === 'production') {
+  Sentry.init({
+    dsn: 'https://a764a6135d25ba91f0b25c0252be52f3@o4507840138903552.ingest.us.sentry.io/4507840140410880',
+  })
+}
 
 const store = new Store<StoreSchema>()
 // store.clear() // clear store for testing CAUTION: THIS WILL DELETE YOUR CHAT HISTORY

src/components/Chat/ChatSidebar.tsx

@@ -19,6 +19,14 @@ export const ChatItem: React.FC<ChatItemProps> = ({ chatMetadata }) => {
     transition-colors duration-150 ease-in-out
     ${chatMetadata.id === currentChat?.id ? 'bg-neutral-700 text-white' : 'text-gray-300 hover:bg-neutral-800'}
   `
+
+  const handleDeleteChat = () => {
+    const isConfirmed = window.confirm(`Are you sure you want to delete the chat "${chatMetadata.displayName}"?`)
+    if (isConfirmed) {
+      deleteChat(chatMetadata.id)
+    }
+  }
+
   return (
     <ContextMenu>
       <ContextMenuTrigger>
@@ -28,7 +36,7 @@ export const ChatItem: React.FC<ChatItemProps> = ({ chatMetadata }) => {
         </div>
       </ContextMenuTrigger>
       <ContextMenuContent>
-        <ContextMenuItem onClick={() => deleteChat(chatMetadata.id)}>Delete Chat</ContextMenuItem>
+        <ContextMenuItem onClick={handleDeleteChat}>Delete Chat</ContextMenuItem>
       </ContextMenuContent>
     </ContextMenu>
   )

src/components/Common/CommonModals.tsx

@@ -6,12 +6,9 @@ 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 {
-    isNewDirectoryModalOpen,
-    setIsNewDirectoryModalOpen,
     isSettingsModalOpen,
     setIsSettingsModalOpen,
     isFlashcardModeOpen,
@@ -26,7 +23,6 @@ const CommonModals: React.FC = () => {
 
   return (
     <div>
-      <NewDirectoryComponent isOpen={isNewDirectoryModalOpen} onClose={() => setIsNewDirectoryModalOpen(false)} />{' '}
       {noteToBeRenamed && <RenameNoteModal />}
       {fileDirToBeRenamed && <RenameDirModal />}
       <SettingsModal isOpen={isSettingsModalOpen} onClose={() => setIsSettingsModalOpen(false)} />

src/components/Common/EmptyPage.tsx

@@ -1,10 +1,10 @@
-import React from 'react'
+import React, { useState } from 'react'
 import { ImFileEmpty } from 'react-icons/im'
-import { useModalOpeners } from '../../contexts/ModalContext'
 import { useContentContext } from '@/contexts/ContentContext'
+import NewDirectoryComponent from '../File/NewDirectory'
 
 const EmptyPage: React.FC = () => {
-  const { setIsNewDirectoryModalOpen } = useModalOpeners()
+  const [isNewDirectoryModalOpen, setIsNewDirectoryModalOpen] = useState(false)
   const { createUntitledNote } = useContentContext()
 
   return (
@@ -29,6 +29,7 @@ const EmptyPage: React.FC = () => {
         >
           Create a Folder
         </button>
+        <NewDirectoryComponent isOpen={isNewDirectoryModalOpen} onClose={() => setIsNewDirectoryModalOpen(false)} />
       </div>
     </div>
   )

src/components/Sidebars/FileSideBar/FileItemRows.tsx

@@ -71,6 +71,17 @@ const FileItemRows: React.FC<ListChildComponentProps> = ({ index, style, data })
     setIsNewDirectoryModalOpen(true)
   }, [file.path, isDirectory])
 
+  const handleDelete = useCallback(() => {
+    const itemType = isDirectory ? 'directory' : 'file'
+    const confirmMessage = `Are you sure you want to delete this ${itemType}?${
+      isDirectory ? ' This will delete all contents of the directory.' : ''
+    }`
+
+    if (window.confirm(confirmMessage)) {
+      deleteFile(file.path)
+    }
+  }, [deleteFile, file.path, isDirectory])
+
   const itemClasses = `flex items-center cursor-pointer px-2 py-1 border-b border-gray-200 hover:bg-neutral-700 h-full mt-0 mb-0 text-cyan-100 font-sans text-xs leading-relaxed rounded-md ${
     isSelected ? 'bg-neutral-700 text-white font-semibold' : 'text-gray-200'
   } ${isDragOver ? 'bg-neutral-500' : ''}`
@@ -82,7 +93,7 @@ const FileItemRows: React.FC<ListChildComponentProps> = ({ index, style, data })
       </ContextMenuItem>
       <ContextMenuItem onClick={openNewDirectoryModal}>New Folder</ContextMenuItem>
       <ContextMenuItem onClick={() => setNoteToBeRenamed(file.path)}>Rename</ContextMenuItem>
-      <ContextMenuItem onClick={() => deleteFile(file.path)}>Delete</ContextMenuItem>
+      <ContextMenuItem onClick={handleDelete}>Delete</ContextMenuItem>
     </>
   )
 

src/components/Sidebars/IconsSidebar.tsx

@@ -11,13 +11,14 @@ import { HiOutlinePencilAlt } from 'react-icons/hi'
 import { useModalOpeners } from '../../contexts/ModalContext'
 import { useChatContext } from '@/contexts/ChatContext'
 import { useContentContext } from '@/contexts/ContentContext'
+import NewDirectoryComponent from '../File/NewDirectory'
 
 const IconsSidebar: React.FC = () => {
   const { sidebarShowing, setSidebarShowing } = useChatContext()
   const [sidebarWidth, setSidebarWidth] = useState<number>(40)
+  const [isNewDirectoryModalOpen, setIsNewDirectoryModalOpen] = useState(false)
 
-  const { setIsNewDirectoryModalOpen, isSettingsModalOpen, setIsSettingsModalOpen, setIsFlashcardModeOpen } =
-    useModalOpeners()
+  const { isSettingsModalOpen, setIsSettingsModalOpen, setIsFlashcardModeOpen } = useModalOpeners()
   const { createUntitledNote } = useContentContext()
 
   useEffect(() => {
@@ -119,6 +120,11 @@ const IconsSidebar: React.FC = () => {
       >
         <MdSettings color="gray" size={18} className="mb-3 size-6 text-gray-100" title="Settings" />
       </button>
+      <NewDirectoryComponent
+        isOpen={isNewDirectoryModalOpen}
+        onClose={() => setIsNewDirectoryModalOpen(false)}
+        // parentDirectoryPath={parentDirectoryPathForNewDirectory}
+      />
     </div>
   )
 }

src/contexts/ModalContext.tsx

@@ -8,8 +8,6 @@ interface ModalProviderProps {
  * Every modal requires a setter and opener
  */
 interface ModalOpenContextType {
-  isNewDirectoryModalOpen: boolean
-  setIsNewDirectoryModalOpen: (newDir: boolean) => void
   isSettingsModalOpen: boolean
   setIsSettingsModalOpen: (settingsOpen: boolean) => void
   isFlashcardModeOpen: boolean
@@ -31,7 +29,6 @@ export const useModalOpeners = (): ModalOpenContextType => {
 }
 
 export const ModalProvider: React.FC<ModalProviderProps> = ({ children }) => {
-  const [isNewDirectoryModalOpen, setIsNewDirectoryModalOpen] = useState(false)
   const [isSettingsModalOpen, setIsSettingsModalOpen] = useState(false)
   const [isFlashcardModeOpen, setIsFlashcardModeOpen] = useState(false)
   const [initialFileToCreateFlashcard, setInitialFileToCreateFlashcard] = useState('')
@@ -51,15 +48,8 @@ export const ModalProvider: React.FC<ModalProviderProps> = ({ children }) => {
     }
   }, [setIsFlashcardModeOpen, setInitialFileToCreateFlashcard])
 
-  // const renameDirectory = useCallback((parentDirectory?: string) => {
-  //   setIsNewDirectoryModalOpen(true)
-  //   setInitialFileToCreateFlashcard(parentDirectory)
-  // }, [])
-
   const modalOpenContextValue = useMemo(
     () => ({
-      isNewDirectoryModalOpen,
-      setIsNewDirectoryModalOpen,
       isSettingsModalOpen,
       setIsSettingsModalOpen,
       isFlashcardModeOpen,
@@ -69,13 +59,7 @@ export const ModalProvider: React.FC<ModalProviderProps> = ({ children }) => {
       initialFileToReviewFlashcard,
       setInitialFileToReviewFlashcard,
     }),
-    [
-      isNewDirectoryModalOpen,
-      isSettingsModalOpen,
-      isFlashcardModeOpen,
-      initialFileToReviewFlashcard,
-      initialFileToCreateFlashcard,
-    ],
+    [isSettingsModalOpen, isFlashcardModeOpen, initialFileToReviewFlashcard, initialFileToCreateFlashcard],
   )
 
   return <ModalContext.Provider value={modalOpenContextValue}>{children}</ModalContext.Provider>

src/main.tsx

@@ -1,16 +1,18 @@
 import React from 'react'
 
 import ReactDOM from 'react-dom/client'
-import { toast } from 'react-toastify'
 import * as Sentry from '@sentry/electron/renderer'
+import { toast } from 'react-toastify'
 
 import App from './App'
 import './styles/global.css'
 import errorToStringRendererProcess from './lib/error'
 
-Sentry.init({
-  integrations: [],
-})
+if (process.env.NODE_ENV === 'production') {
+  Sentry.init({
+    integrations: [],
+  })
+}
 
 window.addEventListener('error', (event) => {
   event.preventDefault()