Fixed doSend arguments

front/src/hooks/api/useAddAnnouncement.ts

@@ -2,8 +2,8 @@ import { useSendWithButton } from '..'
 import { composePutAnnouncementURL, processPutAnnouncement } from '../../api/putAnnouncement'
 import { isPutAnnouncementResponse } from '../../api/putAnnouncement/types'
 
-const useAddAnnouncement = () => (
+function useAddAnnouncement() {
-    useSendWithButton(
+    const { doSend, button } = useSendWithButton(
         'Опубликовать',
         'Опубликовано',
         true,
@@ -13,6 +13,14 @@ const useAddAnnouncement = () => (
         isPutAnnouncementResponse,
         processPutAnnouncement
     )
-)
+
+    function handleAdd(formData: FormData) {
+        void doSend({}, {
+            body: formData
+        })
+    }
+
+    return { handleAdd, addButton: button }
+}
 
 export default useAddAnnouncement

front/src/hooks/api/useBook.ts

@@ -25,7 +25,7 @@ function useBook() {
     )
 
     const handleBook = useCallback((id: number) => {
-        void doSend({
+        void doSend({}, {
             body: JSON.stringify({
                 id
             }),

front/src/hooks/api/useRemoveAnnouncement.ts

@@ -16,7 +16,7 @@ const useRemoveAnnouncement = (close: () => void) => {
     )
 
     const doSendWithClose = useCallback(async (id: number) => {
-        await doSend({
+        await doSend({}, {
             body: JSON.stringify({
                 id
             })

front/src/hooks/useSendWithButton.ts

@@ -12,11 +12,10 @@ function useSendWithButton<R, T extends NonNullable<unknown>>(
 
     const { update, ...button } = useSendButtonCaption(initial, loading, error, result, singular)
 
-    const doSendWithButton = useCallback(async (params: Parameters<typeof doSend>[1]) => {
+    const doSendWithButton = useCallback(async (...args: Parameters<typeof doSend>) => {
-        const data = await doSend({}, params)
+        const data = await doSend(...args)
 
         update(data)
-
     }, [doSend, update])
 
     return { doSend: doSendWithButton, button }

front/src/pages/AddPage.tsx

@@ -31,7 +31,7 @@ function AddPage() {
 
     const address = useOsmAddresses(addressPosition)
 
-    const { doSend, button } = useAddAnnouncement()
+    const { handleAdd, addButton } = useAddAnnouncement()
 
     const handleSubmit: FormEventHandler<HTMLFormElement> = (event) => {
         event.preventDefault()
@@ -44,7 +44,7 @@ function AddPage() {
         formData.append('address', address.data || '') // if address.error
         formData.set('bestBy', new Date((formData.get('bestBy') as number | null) || 0).getTime().toString())
 
-        void doSend(formData)
+        handleAdd(formData)
     }
 
     return (
@@ -176,7 +176,7 @@ function AddPage() {
                         )}
                     </Form.Group>
 
-                    <Button variant='success' type='submit' {...button} />
+                    <Button variant='success' type='submit' {...addButton} />
                 </Form>
             </Card.Body>
         </Card>