Accessible notes

components/modals/ApplyToGrantModal.tsx

@@ -11,7 +11,6 @@ import AnimatedProposal from '@/components/Proposal/AnimatedProposal';
 import { NoteService } from '@/services/note.service';
 import { setPendingGrant } from '@/components/Editor/lib/utils/publishingFormStorage';
 import { useUser } from '@/contexts/UserContext';
-import { useOrganizationContext } from '@/contexts/OrganizationContext';
 import { useRouter } from 'next/navigation';
 import { cn } from '@/utils/styles';
 import type { GrantApplicationVisibility } from '@/types/grant';
@@ -63,7 +62,6 @@ export const ApplyToGrantModal: React.FC<ApplyToGrantModalProps> = ({
   const [draftNewSelected, setDraftNewSelected] = useState(false);
   const [loading, setLoading] = useState(false);
   const { user } = useUser();
-  const { selectedOrg } = useOrganizationContext();
   const router = useRouter();
 
   const selectedDraftNote = draftNotes.find((n) => n.id.toString() === selectedDraftNoteId);
@@ -121,17 +119,17 @@ export const ApplyToGrantModal: React.FC<ApplyToGrantModalProps> = ({
         fetchDraftNotes();
       }
     }
-  }, [isOpen, user?.id, selectedOrg?.slug]);
+  }, [isOpen, user?.id]);
 
   const fetchDraftNotes = async () => {
-    if (!user?.id || !selectedOrg?.slug) {
+    if (!user?.id) {
       setDraftNotes([]);
       return;
     }
 
     setLoading(true);
     try {
-      const response = await NoteService.getOrganizationNotes(selectedOrg.slug, {
+      const response = await NoteService.getAccessibleNotes({
         status: 'DRAFT',
         documentType: 'PREREGISTRATION',
       });

contexts/NotebookContext.tsx

@@ -85,17 +85,12 @@ export function NotebookProvider({ children, noteId: explicitNoteId }: NotebookP
   // Editor state
   const [editor, setEditor] = useState<Editor | null>(null);
 
-  const fetchNotes = useCallback(async (slug?: string) => {
-    if (!slug) {
-      setNotesError(new Error('No organization slug provided'));
-      return;
-    }
-
+  const fetchNotes = useCallback(async () => {
     setIsLoadingNotes(true);
     setNotesError(null);
 
     try {
-      const data = await NoteService.getOrganizationNotes(slug);
+      const data = await NoteService.getAccessibleNotes();
 
       setNotes(data.results);
       setTotalCount(data.count);
@@ -142,12 +137,8 @@ export function NotebookProvider({ children, noteId: explicitNoteId }: NotebookP
   );
 
   const refreshNotes = useCallback(async () => {
-    if (!selectedOrg?.slug) {
-      setNotesError(new Error('No organization slug provided'));
-      return;
-    }
-    await fetchNotes(selectedOrg.slug);
-  }, [selectedOrg?.slug, fetchNotes]);
+    await fetchNotes();
+  }, [fetchNotes]);
 
   const loadNote = useCallback(async (noteId: string) => {
     if (noteId === lastLoadedNoteIdRef.current) {
@@ -193,15 +184,16 @@ export function NotebookProvider({ children, noteId: explicitNoteId }: NotebookP
   );
 
   const refreshAll = useCallback(async () => {
-    if (!selectedOrg?.slug || !selectedOrg?.id) return;
-
-    const promises = [fetchNotes(selectedOrg.slug), fetchUsers(selectedOrg.id.toString())];
+    const promises = [fetchNotes()];
+    if (selectedOrg?.id) {
+      promises.push(fetchUsers(selectedOrg.id.toString()));
+    }
     if (activeNoteId) {
       promises.push(loadNote(activeNoteId));
     }
 
     await Promise.all(promises);
-  }, [selectedOrg?.slug, selectedOrg?.id, activeNoteId, fetchNotes, fetchUsers, loadNote]);
+  }, [selectedOrg?.id, activeNoteId, fetchNotes, fetchUsers, loadNote]);
 
   // Initial data loading when organization changes
   useEffect(() => {
@@ -211,20 +203,17 @@ export function NotebookProvider({ children, noteId: explicitNoteId }: NotebookP
       return;
     }
 
+    fetchNotes();
+
     if (!selectedOrg) {
-      setNotes([]);
-      setTotalCount(0);
       setUsers(null);
-      setNotesError(null);
       setUsersError(null);
-      setIsLoadingNotes(false);
       setIsLoadingUsers(false);
       return;
     }
 
-    fetchNotes(selectedOrg.slug);
     fetchUsers(selectedOrg.id.toString());
-  }, [selectedOrg?.slug, selectedOrg?.id, isLoadingOrg, fetchNotes, fetchUsers]);
+  }, [selectedOrg?.id, isLoadingOrg, fetchNotes, fetchUsers]);
 
   useEffect(() => {
     if (activeNoteId) {

services/note.service.ts

@@ -46,7 +46,7 @@
   title: string;
 }
 
-export interface GetOrganizationNotesParams {
+export interface GetNotesParams {
   status?: 'DRAFT' | 'PUBLISHED';
   documentType?: 'PREREGISTRATION' | 'GRANT' | 'DISCUSSION';
 }
@@ -141,7 +141,7 @@
    */
   static async getOrganizationNotes(
     orgSlug: string,
-    params?: GetOrganizationNotesParams
+    params?: GetNotesParams
   ): Promise<NoteListResponse> {
     if (!orgSlug) {
       throw new NoteError('Missing organization slug', 'INVALID_PARAMS');
@@ -178,6 +178,43 @@
     }
   }
 
+  /**
+   * Fetches all notes the current user can access.
+   *
+   * @throws {NoteError} When the request fails or parameters are invalid
+   */
+  static async getAccessibleNotes(params?: GetNotesParams): Promise<NoteListResponse> {
+    try {
+      const queryParams = new URLSearchParams();
+      if (params?.status) queryParams.append('status', params.status);
+      if (params?.documentType) queryParams.append('type', params.documentType);
+      const qs = queryParams.toString();
+
+      const response = await ApiClient.get<any>(
+        `${this.BASE_PATH}/note/accessible/${qs ? `?${qs}` : ''}`
+      );
+
+      if (!response || !Array.isArray(response.results)) {
+        throw new NoteError('Invalid response format', 'INVALID_RESPONSE');
+      }
+
+      return {
+        count: response.count || 0,
+        next: response.next || null,
+        previous: response.previous || null,
+        results: response.results.map(transformNote),
+      };
+    } catch (error) {
+      if (error instanceof NoteError) {
+        throw error;
+      }
+      throw new NoteError(
+        'Failed to fetch accessible notes',
+        error instanceof Error ? error.message : 'UNKNOWN_ERROR'
+      );
+    }
+  }
+
   /**
    * Creates a new note
    * @param params - The note creation parameters