Fix display order calculation

src/frontend/src/entities/note/lib/useNextDisplayOrder.ts

@@ -1,20 +1,12 @@
-import { type NoteItem, noteApi } from '../api';
+import { useMemo } from 'react';
+import { type NoteItem } from '../api';
 
-const getMaxDisplayOrder = (notes: NoteItem[]): number =>
-  notes.reduce(
-    (maxOrder, note) => (note.displayOrder > maxOrder ? note.displayOrder : maxOrder),
-    -1,
+export const useNextDisplayOrder = (notes: NoteItem[]): number =>
+  useMemo(
+    () =>
+      notes.reduce(
+        (maxOrder, note) => (note.displayOrder > maxOrder ? note.displayOrder : maxOrder),
+        -1,
+      ) + 1,
+    [notes],
   );
-
-export const useNextDisplayOrder = (date: string): number => {
-  const { nextDisplayOrder } = noteApi.useNotesQuery(
-    { date },
-    {
-      selectFromResult: ({ data, isSuccess }) => ({
-        nextDisplayOrder: isSuccess ? getMaxDisplayOrder(data.notes) + 1 : 0,
-      }),
-    },
-  );
-
-  return nextDisplayOrder;
-};

src/frontend/src/features/note/addEdit/ui/AddNote.tsx

@@ -13,16 +13,16 @@ import { NoteInputFlow } from './NoteInputFlow';
 interface Props {
   date: string;
   mealType: noteModel.MealType;
+  displayOrder: number;
 }
 
-export const AddNote: FC<Props> = ({ date, mealType }) => {
+export const AddNote: FC<Props> = ({ date, mealType, displayOrder }) => {
   const [addNote, { reset, ...addNoteResponse }] = noteApi.useCreateNoteMutation();
 
   const addProductIfNotExists = useAddProductIfNotExists();
   const [recognizeNotes, recognizeNotesResult] = useRecognizeNotes();
 
   const notes = noteLib.useNotes(date);
-  const displayOrder = noteLib.useNextDisplayOrder(date);
 
   const { clearValues: clearNoteForm, ...noteForm } = noteLib.useFormValues({
     date,

src/frontend/src/widgets/MealsList/ui/NotesList.tsx

@@ -1,6 +1,6 @@
 import { List, ListItem } from '@mui/material';
 import { type FC } from 'react';
-import { type NoteItem, type noteModel } from '@/entities/note';
+import { noteLib, type NoteItem, type noteModel } from '@/entities/note';
 import { AddNote } from '@/features/note/addEdit';
 import { NotesListItem } from './NotesListItem';
 
@@ -10,13 +10,17 @@ interface Props {
   notes: NoteItem[];
 }
 
-export const NotesList: FC<Props> = ({ date, mealType, notes }) => (
-  <List disablePadding>
-    {notes.map(note => (
-      <NotesListItem key={note.id} note={note} />
-    ))}
-    <ListItem disableGutters>
-      <AddNote date={date} mealType={mealType} />
-    </ListItem>
-  </List>
-);
+export const NotesList: FC<Props> = ({ date, mealType, notes }) => {
+  const displayOrder = noteLib.useNextDisplayOrder(notes);
+
+  return (
+    <List disablePadding>
+      {notes.map(note => (
+        <NotesListItem key={note.id} note={note} />
+      ))}
+      <ListItem disableGutters>
+        <AddNote date={date} mealType={mealType} displayOrder={displayOrder} />
+      </ListItem>
+    </List>
+  );
+};