Remove Attachements for now and bug fixes

0xGingi · 0xGingi · commit 49041bf0b220 · 2025-03-03T12:03:23.000-05:00
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ Windows/Linux/Android Builds: https://github.com/toolworks-dev/trusty-notes/rele
 - [x] Improved Sync
 - [x] Rich Text
 - [x] Browser Extension
-- [x] Attachments/Files (In Progress but working)
+- [ ] Attachments/Files
 - [x] Desktop Application
 - [x] Mobile Application
 
diff --git a/browser-extension/background.js b/browser-extension/background.js
@@ -68,23 +68,14 @@ async function encryptAndStoreNotes(notes) {
       cryptoService = await CryptoService.new(settings.seed_phrase);
     }
 
-    // Filter out attachment data to save storage space in extension
     const notesWithoutAttachments = notes.map(note => ({
       id: note.id,
       title: note.title,
       content: note.content,
       created_at: note.created_at,
       updated_at: note.updated_at,
       deleted: note.deleted,
-      pending_sync: note.pending_sync,
-      // Keep minimal attachment metadata
-      attachments: note.attachments?.map(att => ({
-        id: att.id,
-        name: att.name,
-        type: att.type,
-        size: att.size,
-        timestamp: att.timestamp
-      })) || []
+      pending_sync: note.pending_sync
     }));
 
     const encrypted = await cryptoService.encrypt(notesWithoutAttachments);
diff --git a/browser-extension/popup/popup.js b/browser-extension/popup/popup.js
@@ -373,8 +373,7 @@ async function saveNote() {
     content: contentInput.innerHTML || '',
     created_at: currentEditingNote?.created_at || now,
     updated_at: now,
-    pending_sync: true,
-    attachments: currentEditingNote?.attachments || []
+    pending_sync: true
   };
 
   try {
diff --git a/src/App.tsx b/src/App.tsx
@@ -314,39 +314,34 @@ function App() {
     }
   }, []);
 
-  async function handleSave() {
+  const handleSave = async () => {
     try {
       const now = Date.now();
-      
-      const recentNote = notes.find(note => 
-        note.title === title && 
-        note.content === content && 
-        now - note.updated_at < 2000
-      );
-      
-      if (recentNote) {
-        console.debug('Preventing duplicate save');
-        return;
-      }
-      
-      const note: Note = {
-        id: selectedNote?.id || now,
+      const noteToSave = {
+        id: selectedNote?.id,
         title: title.trim() === '' ? 'Untitled' : title,
         content,
         created_at: selectedNote?.created_at || now,
-        updated_at: now,
+        updated_at: now
       };
 
-      await WebStorageService.saveNote(note);
+      await WebStorageService.saveNote(noteToSave);
       await loadNotes();
       
-      // Always select the saved note to prevent duplicate creation
-      setSelectedNote(note);
+      if (!selectedNote) {
+        const updatedNotes = await WebStorageService.getNotes();
+        const newNote = updatedNotes.find(note => 
+          note.title === noteToSave.title && 
+          note.content === noteToSave.content
+        );
+        if (newNote) {
+          setSelectedNote(newNote);
+        }
+      }
     } catch (error) {
       console.error('Failed to save note:', error);
-      alert(`Failed to save note: ${error}`);
     }
-  }
+  };
 
   async function deleteNote(noteId: number) {
     if (!window.confirm('Are you sure you want to delete this note?')) return;
diff --git a/src/components/NoteEditor.tsx b/src/components/NoteEditor.tsx
@@ -1,6 +1,5 @@
 import { useState, useEffect } from 'react';
 import { 
-  Stack, 
   Text,
   Button, 
   Group,
@@ -9,70 +8,25 @@ import {
   Box,
   TextInput
 } from '@mantine/core';
-import { notifications } from '@mantine/notifications';
-import { IconTrash, IconChevronLeft, IconPaperclip, IconDownload } from '@tabler/icons-react';
+import { IconTrash, IconChevronLeft } from '@tabler/icons-react';
 import { WebStorageService } from '../services/webStorage';
 import { Note } from '../types/sync';
 import { MarkdownEditor } from './MarkdownEditor';
 
-interface AttachmentsListProps {
-  note: Note;
-  onRemove: (attachmentId: string) => void;
-  onDownload: (attachmentId: string) => void;
-  isSyncing: boolean;
-}
-
-function AttachmentsList({ note, onRemove, onDownload, isSyncing }: AttachmentsListProps) {
-  if (!note.attachments?.length) return null;
-
-  return (
-    <Stack gap="xs" mt="md">
-      <Text fw={500} size="sm">Attachments</Text>
-      {note.attachments.map(attachment => (
-        <Group key={attachment.id} justify="space-between">
-          <Text size="sm">{attachment.name}</Text>
-          <Group gap="xs">
-            <ActionIcon 
-              variant="subtle"
-              size="sm"
-              onClick={() => onDownload(attachment.id)}
-              disabled={isSyncing}
-            >
-              <IconDownload size={16} />
-            </ActionIcon>
-            <ActionIcon 
-              color="red" 
-              variant="subtle"
-              size="sm"
-              onClick={() => onRemove(attachment.id)}
-              disabled={isSyncing}
-            >
-              <IconTrash size={16} />
-            </ActionIcon>
-          </Group>
-        </Group>
-      ))}
-    </Stack>
-  );
-}
-
-interface NoteEditorProps {
+export interface NoteEditorProps {
   note: Note;
   isMobile?: boolean;
   isKeyboardVisible?: boolean;
   onBack?: () => void;
-  loadNotes: () => void;
+  loadNotes: () => Promise<void>;
 }
 
 export function NoteEditor({ note, isMobile = false, isKeyboardVisible = false, onBack, loadNotes }: NoteEditorProps) {
-  const [currentNote, setCurrentNote] = useState(note);
   const [title, setTitle] = useState(note.title || 'Untitled');
   const [content, setContent] = useState(note.content || '');
   const [saveStatus, setSaveStatus] = useState<'saved' | 'saving' | null>('saved');
-  const [isSyncing, setIsSyncing] = useState(false);
 
   useEffect(() => {
-    setCurrentNote(note);
     setTitle(note.title || 'Untitled');
     setContent(note.content || '');
   }, [note]);
@@ -109,88 +63,14 @@ export function NoteEditor({ note, isMobile = false, isKeyboardVisible = false,
     }
   }, [isMobile]);
 
-  const handleFileUpload = async (event: React.ChangeEvent<HTMLInputElement>) => {
-    const file = event.target.files?.[0];
-    if (!file || !currentNote?.id) return;
-
-    try {
-      setIsSyncing(true);
-      
-      if (file.size > 10 * 1024 * 1024) {
-        throw new Error('File size exceeds 10MB limit');
-      }
-
-      const updatedNote = await WebStorageService.addAttachment(currentNote.id, file);
-      setCurrentNote(updatedNote);
-      await loadNotes();
-      
-      notifications.show({
-        title: 'Success',
-        message: 'File attached successfully',
-        color: 'green',
-      });
-    } catch (error) {
-      console.error('Failed to attach file:', error);
-      notifications.show({
-        title: 'Error',
-        message: error instanceof Error ? error.message : 'Failed to attach file',
-        color: 'red',
-      });
-    } finally {
-      setIsSyncing(false);
-    }
-  };
-
-  const handleDownload = async (attachmentId: string) => {
-    try {
-      setIsSyncing(true);
-      await WebStorageService.downloadAttachment(note.id!, attachmentId);
-    } catch (error) {
-      console.error('Failed to download file:', error);
-      notifications.show({
-        title: 'Error',
-        message: error instanceof Error ? error.message : 'Failed to download file',
-        color: 'red',
-      });
-    } finally {
-      setIsSyncing(false);
-    }
-  };
-
-  const handleRemoveAttachment = async (attachmentId: string) => {
-    if (!confirm('Are you sure you want to remove this attachment?')) return;
-    
-    try {
-      setIsSyncing(true);
-      await WebStorageService.removeAttachment(note.id!, attachmentId);
-      
-      // Get the updated note after attachment removal
-      const notes = await WebStorageService.getNotes();
-      const updated = notes.find(n => n.id === note.id);
-      if (updated) {
-        setCurrentNote(updated);
-      }
-      
-      await loadNotes();
-    } catch (error) {
-      console.error('Failed to remove attachment:', error);
-      notifications.show({
-        title: 'Error',
-        message: error instanceof Error ? error.message : 'Failed to remove attachment',
-        color: 'red',
-      });
-    } finally {
-      setIsSyncing(false);
-    }
-  };
-
   const saveNote = async () => {
     setSaveStatus('saving');
     const updatedNote = {
       ...note,
       title,
       content,
-      updated_at: Date.now()
+      updated_at: Date.now(),
+      pending_sync: true
     };
     
     await WebStorageService.saveNote(updatedNote);
@@ -250,18 +130,6 @@ export function NoteEditor({ note, isMobile = false, isKeyboardVisible = false,
                 size="md"
                 onBlur={saveNote}
               />
-              <label htmlFor="file-upload">
-                <ActionIcon component="span" variant="subtle" radius="xl">
-                  <IconPaperclip size={20} />
-                </ActionIcon>
-              </label>
-              <input
-                id="file-upload"
-                type="file"
-                onChange={handleFileUpload}
-                style={{ display: 'none' }}
-                disabled={isSyncing}
-              />
             </Group>
           </Paper>
           
@@ -282,17 +150,6 @@ export function NoteEditor({ note, isMobile = false, isKeyboardVisible = false,
             />
           </Box>
           
-          {currentNote.attachments && currentNote.attachments.length > 0 && (
-            <Paper p="md" mb="md" withBorder>
-              <AttachmentsList
-                note={currentNote}
-                onRemove={handleRemoveAttachment}
-                onDownload={handleDownload}
-                isSyncing={isSyncing}
-              />
-            </Paper>
-          )}
-          
           <Paper className="mobile-fixed-bottom" style={{ 
             position: 'fixed', 
             bottom: 0, 
diff --git a/src/services/cryptoService.ts b/src/services/cryptoService.ts
@@ -1,6 +1,6 @@
 import { Buffer } from 'buffer/';
 import { mnemonicToSeedSync, wordlists } from 'bip39';
-import { Note, Attachment } from '../types/sync';
+import { Note } from '../types/sync';
 const WORDLIST = wordlists.english;
 
 interface EncryptedNote {
@@ -10,7 +10,6 @@ interface EncryptedNote {
   timestamp: number;
   signature: string;
   deleted?: boolean;
-  attachments?: Attachment[];
 }
 
 export class CryptoService {
@@ -91,8 +90,7 @@ export class CryptoService {
       content: note.content,
       created_at: note.created_at,
       updated_at: note.updated_at,
-      deleted: note.deleted,
-      attachments: note.attachments
+      deleted: note.deleted
     });
     
     const key = await crypto.subtle.importKey(
@@ -164,60 +162,4 @@ export class CryptoService {
     const keyData = await crypto.subtle.exportKey('raw', this.verifyingKey!);
     return Buffer.from(keyData).toString('base64');
   }
-
-  async encryptFile(file: File): Promise<Attachment> {
-    const arrayBuffer = await file.arrayBuffer();
-    const nonceBytes = crypto.getRandomValues(new Uint8Array(12));
-    
-    const key = await crypto.subtle.importKey(
-      'raw',
-      this.encryptionKey,
-      { name: 'AES-GCM' },
-      false,
-      ['encrypt']
-    );
-
-    const encryptedData = await crypto.subtle.encrypt(
-      {
-        name: 'AES-GCM',
-        iv: nonceBytes
-      },
-      key,
-      arrayBuffer
-    );
-
-    return {
-      id: crypto.randomUUID(),
-      name: file.name,
-      type: file.type,
-      size: file.size,
-      data: Buffer.from(encryptedData).toString('base64'),
-      nonce: Buffer.from(nonceBytes).toString('base64'),
-      timestamp: Date.now()
-    };
-  }
-
-  async decryptFile(attachment: Attachment): Promise<Blob> {
-    const encryptedData = Buffer.from(attachment.data, 'base64');
-    const nonce = Buffer.from(attachment.nonce, 'base64');
-
-    const key = await crypto.subtle.importKey(
-      'raw',
-      this.encryptionKey,
-      { name: 'AES-GCM' },
-      false,
-      ['decrypt']
-    );
-
-    const decryptedData = await crypto.subtle.decrypt(
-      {
-        name: 'AES-GCM',
-        iv: nonce
-      },
-      key,
-      encryptedData
-    );
-
-    return new Blob([decryptedData], { type: attachment.type });
-  }
 }
diff --git a/src/services/webStorage.ts b/src/services/webStorage.ts
diff --git a/src/types/sync.ts b/src/types/sync.ts
