R: Rework all mutations to mutateAsync

rsconcept/frontend/src/app/Navigation/UserDropdown.tsx

@@ -45,12 +45,12 @@ function UserDropdown({ isOpen, hideDropdown }: UserDropdownProps) {
 
   function logoutAndRedirect() {
     hideDropdown();
-    logout(() => router.push(urls.login));
+    void logout().then(() => router.push(urls.login));
   }
 
   function gotoAdmin() {
     hideDropdown();
-    logout(() => router.push(urls.admin, true));
+    void logout().then(() => router.push(urls.admin, true));
   }
 
   function gotoIcons(event: CProps.EventMouse) {

rsconcept/frontend/src/features/auth/backend/useChangePassword.tsx

@@ -10,10 +10,7 @@ export const useChangePassword = () => {
     onSettled: () => client.invalidateQueries({ queryKey: [authApi.baseKey] })
   });
   return {
-    changePassword: (
+    changePassword: (data: IChangePasswordDTO) => mutation.mutateAsync(data),
-      data: IChangePasswordDTO, //
-      onSuccess?: () => void
-    ) => mutation.mutate(data, { onSuccess }),
     isPending: mutation.isPending,
     error: mutation.error,
     reset: mutation.reset

rsconcept/frontend/src/features/auth/backend/useLogin.tsx

@@ -11,7 +11,7 @@ export const useLogin = () => {
     onSuccess: () => client.resetQueries()
   });
   return {
-    login: (data: IUserLoginDTO, onSuccess?: () => void) => mutation.mutate(data, { onSuccess }),
+    login: (data: IUserLoginDTO) => mutation.mutateAsync(data),
     isPending: mutation.isPending,
     error: mutation.error,
     reset: mutation.reset

rsconcept/frontend/src/features/auth/backend/useLogout.tsx

@@ -9,5 +9,5 @@ export const useLogout = () => {
     mutationFn: authApi.logout,
     onSuccess: () => client.resetQueries()
   });
-  return { logout: (onSuccess?: () => void) => mutation.mutate(undefined, { onSuccess }) };
+  return { logout: () => mutation.mutateAsync() };
 };

rsconcept/frontend/src/features/auth/backend/useRequestPasswordReset.tsx

@@ -8,10 +8,7 @@ export const useRequestPasswordReset = () => {
     mutationFn: authApi.requestPasswordReset
   });
   return {
-    requestPasswordReset: (
+    requestPasswordReset: (data: IRequestPasswordDTO) => mutation.mutateAsync(data),
-      data: IRequestPasswordDTO, //
-      onSuccess?: () => void
-    ) => mutation.mutate(data, { onSuccess }),
     isPending: mutation.isPending,
     error: mutation.error,
     reset: mutation.reset

rsconcept/frontend/src/features/auth/backend/useResetPassword.tsx

@@ -12,14 +12,8 @@ export const useResetPassword = () => {
     mutationFn: authApi.resetPassword
   });
   return {
-    validateToken: (
+    validateToken: (data: IPasswordTokenDTO) => validateMutation.mutateAsync(data),
-      data: IPasswordTokenDTO, //
+    resetPassword: (data: IResetPasswordDTO) => resetMutation.mutateAsync(data),
-      onSuccess?: () => void
-    ) => validateMutation.mutate(data, { onSuccess }),
-    resetPassword: (
-      data: IResetPasswordDTO, //
-      onSuccess?: () => void
-    ) => resetMutation.mutate(data, { onSuccess }),
     isPending: resetMutation.isPending || validateMutation.isPending,
     error: resetMutation.error ?? validateMutation.error,
     reset: resetMutation.reset

rsconcept/frontend/src/features/auth/components/ExpectedAnonymous.tsx

@@ -10,7 +10,7 @@ function ExpectedAnonymous() {
   const router = useConceptNavigation();
 
   function logoutAndRedirect() {
-    logout(() => router.push(urls.login));
+    void logout().then(() => router.push(urls.login));
   }
 
   return (

rsconcept/frontend/src/features/auth/pages/LoginPage.tsx

@@ -37,7 +37,7 @@ function LoginPage() {
   const { login, isPending, error: serverError, reset: clearServerError } = useLogin();
 
   function onSubmit(data: IUserLoginDTO) {
-    login(data, () => {
+    return login(data).then(() => {
       resetField('password');
       if (router.canBack()) {
         router.back();

rsconcept/frontend/src/features/auth/pages/PasswordChangePage.tsx

@@ -19,7 +19,7 @@ export function Component() {
 
   const { validateToken, resetPassword, isPending, error: serverError } = useResetPassword();
 
-  const [isTokenValidated, setIsTokenValidated] = useState(false);
+  const [isTokenValidating, setIsTokenValidating] = useState(false);
   const [newPassword, setNewPassword] = useState('');
   const [newPasswordRepeat, setNewPasswordRepeat] = useState('');
 
@@ -31,25 +31,22 @@ export function Component() {
   function handleSubmit(event: React.FormEvent<HTMLFormElement>) {
     event.preventDefault();
     if (!isPending) {
-      resetPassword(
+      void resetPassword({
-        {
         password: newPassword,
         token: token
-        },
+      }).then(() => {
-        () => {
         router.replace(urls.home);
         router.push(urls.login);
-        }
+      });
-      );
     }
   }
 
   useEffect(() => {
-    if (!isTokenValidated && !isPending) {
+    if (!isTokenValidating && !isPending) {
-      validateToken({ token: token });
+      void validateToken({ token: token });
-      setIsTokenValidated(true);
+      setIsTokenValidating(true);
     }
-  }, [token, validateToken, isTokenValidated, isPending]);
+  }, [token, validateToken, isTokenValidating, isPending]);
 
   if (isPending) {
     return <Loader />;

rsconcept/frontend/src/features/auth/pages/RestorePasswordPage.tsx

@@ -19,7 +19,7 @@ export function Component() {
   function handleSubmit(event: React.FormEvent<HTMLFormElement>) {
     event.preventDefault();
     if (!isPending) {
-      requestPasswordReset({ email: email }, () => setIsCompleted(true));
+      void requestPasswordReset({ email: email }).then(() => setIsCompleted(true));
     }
   }
 

rsconcept/frontend/src/features/library/backend/useCloneItem.tsx

@@ -1,8 +1,5 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { DataCallback } from '@/backend/apiTransport';
-import { IRSFormDTO } from '@/features/rsform/backend/api';
-
 import { ICloneLibraryItemDTO, libraryApi } from './api';
 
 export const useCloneItem = () => {
@@ -13,9 +10,6 @@ export const useCloneItem = () => {
     onSuccess: () => client.invalidateQueries({ queryKey: [libraryApi.baseKey] })
   });
   return {
-    cloneItem: (
+    cloneItem: (data: ICloneLibraryItemDTO) => mutation.mutateAsync(data)
-      data: ICloneLibraryItemDTO, //
-      onSuccess?: DataCallback<IRSFormDTO>
-    ) => mutation.mutate(data, { onSuccess })
   };
 };

rsconcept/frontend/src/features/library/backend/useCreateItem.tsx

@@ -1,8 +1,5 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { DataCallback } from '@/backend/apiTransport';
-
-import { ILibraryItem } from '../models/library';
 import { ICreateLibraryItemDTO, libraryApi } from './api';
 
 export const useCreateItem = () => {
@@ -13,10 +10,7 @@ export const useCreateItem = () => {
     onSuccess: () => client.invalidateQueries({ queryKey: [libraryApi.baseKey] })
   });
   return {
-    createItem: (
+    createItem: (data: ICreateLibraryItemDTO) => mutation.mutateAsync(data),
-      data: ICreateLibraryItemDTO, //
-      onSuccess?: DataCallback<ILibraryItem>
-    ) => mutation.mutate(data, { onSuccess }),
     isPending: mutation.isPending,
     error: mutation.error,
     reset: mutation.reset

rsconcept/frontend/src/features/library/backend/useDeleteItem.tsx

@@ -26,10 +26,7 @@ export const useDeleteItem = () => {
     }
   });
   return {
-    deleteItem: (
+    deleteItem: (target: LibraryItemID) => mutation.mutateAsync(target),
-      target: LibraryItemID, //
-      onSuccess?: () => void
-    ) => mutation.mutate(target, { onSuccess }),
     isPending: mutation.isPending
   };
 };

rsconcept/frontend/src/features/library/backend/useRenameLocation.tsx

@@ -18,9 +18,6 @@ export const useRenameLocation = () => {
       ])
   });
   return {
-    renameLocation: (
+    renameLocation: (data: IRenameLocationDTO) => mutation.mutateAsync(data)
-      data: IRenameLocationDTO, //
-      onSuccess?: () => void
-    ) => mutation.mutate(data, { onSuccess })
   };
 };

rsconcept/frontend/src/features/library/backend/useSetAccessPolicy.tsx

@@ -39,6 +39,6 @@ export const useSetAccessPolicy = () => {
   });
 
   return {
-    setAccessPolicy: (data: { itemID: LibraryItemID; policy: AccessPolicy }) => mutation.mutate(data)
+    setAccessPolicy: (data: { itemID: LibraryItemID; policy: AccessPolicy }) => mutation.mutateAsync(data)
   };
 };

rsconcept/frontend/src/features/library/backend/useSetEditors.tsx

@@ -36,6 +36,6 @@ export const useSetEditors = () => {
   });
 
   return {
-    setEditors: (data: { itemID: LibraryItemID; editors: UserID[] }) => mutation.mutate(data)
+    setEditors: (data: { itemID: LibraryItemID; editors: UserID[] }) => mutation.mutateAsync(data)
   };
 };

rsconcept/frontend/src/features/library/backend/useSetLocation.tsx

@@ -39,12 +39,6 @@ export const useSetLocation = () => {
   });
 
   return {
-    setLocation: (
+    setLocation: (data: { itemID: LibraryItemID; location: string }) => mutation.mutateAsync(data)
-      data: {
-        itemID: LibraryItemID; //
-        location: string;
-      },
-      onSuccess?: () => void
-    ) => mutation.mutate(data, { onSuccess })
   };
 };

rsconcept/frontend/src/features/library/backend/useSetOwner.tsx

@@ -40,6 +40,6 @@ export const useSetOwner = () => {
   });
 
   return {
-    setOwner: (data: { itemID: LibraryItemID; owner: UserID }) => mutation.mutate(data)
+    setOwner: (data: { itemID: LibraryItemID; owner: UserID }) => mutation.mutateAsync(data)
   };
 };

rsconcept/frontend/src/features/library/backend/useUpdateItem.tsx

@@ -32,6 +32,6 @@ export const useUpdateItem = () => {
     }
   });
   return {
-    updateItem: (data: IUpdateLibraryItemDTO, onSuccess?: () => void) => mutation.mutate(data, { onSuccess })
+    updateItem: (data: IUpdateLibraryItemDTO) => mutation.mutateAsync(data)
   };
 };

rsconcept/frontend/src/features/library/backend/useVersionCreate.tsx

@@ -1,9 +1,8 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { DataCallback } from '@/backend/apiTransport';
 import { rsformsApi } from '@/features/rsform/backend/api';
 
-import { LibraryItemID, VersionID } from '../models/library';
+import { LibraryItemID } from '../models/library';
 import { IVersionCreateDTO, libraryApi } from './api';
 import { useUpdateTimestamp } from './useUpdateTimestamp';
 
@@ -19,12 +18,7 @@ export const useVersionCreate = () => {
     }
   });
   return {
-    versionCreate: (
+    versionCreate: (data: { itemID: LibraryItemID; data: IVersionCreateDTO }) =>
-      data: {
+      mutation.mutateAsync(data).then(response => response.version)
-        itemID: LibraryItemID; //
-        data: IVersionCreateDTO;
-      },
-      onSuccess?: DataCallback<VersionID>
-    ) => mutation.mutate(data, { onSuccess: response => onSuccess?.(response.version) })
   };
 };

rsconcept/frontend/src/features/library/backend/useVersionDelete.tsx

@@ -24,12 +24,6 @@ export const useVersionDelete = () => {
     }
   });
   return {
-    versionDelete: (
+    versionDelete: (data: { itemID: LibraryItemID; versionID: VersionID }) => mutation.mutateAsync(data)
-      data: {
-        itemID: LibraryItemID; //
-        versionID: VersionID;
-      },
-      onSuccess?: () => void
-    ) => mutation.mutate(data, { onSuccess })
   };
 };

rsconcept/frontend/src/features/library/backend/useVersionRestore.tsx

@@ -16,6 +16,6 @@ export const useVersionRestore = () => {
     }
   });
   return {
-    versionRestore: (data: { versionID: VersionID }, onSuccess?: () => void) => mutation.mutate(data, { onSuccess })
+    versionRestore: (data: { versionID: VersionID }) => mutation.mutateAsync(data)
   };
 };

rsconcept/frontend/src/features/library/backend/useVersionUpdate.tsx

@@ -27,6 +27,6 @@ export const useVersionUpdate = () => {
     }
   });
   return {
-    versionUpdate: (data: IVersionUpdateDTO, onSuccess?: () => void) => mutation.mutate(data, { onSuccess })
+    versionUpdate: (data: IVersionUpdateDTO) => mutation.mutateAsync(data)
   };
 };

rsconcept/frontend/src/features/library/pages/CreateItemPage/FormCreateItem.tsx

@@ -86,7 +86,7 @@ function FormCreateItem() {
   }
 
   function onSubmit(data: ICreateLibraryItemDTO) {
-    createItem(data, newItem => {
+    return createItem(data).then(newItem => {
       setSearchLocation(data.location);
       if (newItem.item_type == LibraryItemType.RSFORM) {
         router.push(urls.schema(newItem.id));

rsconcept/frontend/src/features/library/pages/LibraryPage/LibraryPage.tsx

@@ -35,13 +35,10 @@ export function LibraryPage() {
   const showChangeLocation = useDialogsStore(state => state.showChangeLocation);
 
   function handleRenameLocation(newLocation: string) {
-    renameLocation(
+    void renameLocation({
-      {
       target: location,
       new_location: newLocation
-      },
+    }).then(() => setLocation(newLocation));
-      () => setLocation(newLocation)
-    );
   }
 
   function handleDownloadCSV() {

rsconcept/frontend/src/features/oss/backend/useFindPredecessor.tsx

@@ -1,7 +1,6 @@
 import { useMutation } from '@tanstack/react-query';
 
-import { DataCallback } from '@/backend/apiTransport';
+import { ITargetCst } from '@/features/rsform/models/rsform';
-import { IConstituentaReference, ITargetCst } from '@/features/rsform/models/rsform';
 
 import { ossApi } from './api';
 
@@ -11,9 +10,6 @@ export const useFindPredecessor = () => {
     mutationFn: ossApi.getPredecessor
   });
   return {
-    findPredecessor: (
+    findPredecessor: (data: ITargetCst) => mutation.mutateAsync(data)
-      data: ITargetCst, //
-      onSuccess?: DataCallback<IConstituentaReference>
-    ) => mutation.mutate(data, { onSuccess })
   };
 };

rsconcept/frontend/src/features/oss/backend/useInputCreate.tsx

@@ -1,8 +1,7 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { DataCallback } from '@/backend/apiTransport';
 import { libraryApi } from '@/features/library/backend/api';
-import { ILibraryItem, LibraryItemID } from '@/features/library/models/library';
+import { LibraryItemID } from '@/features/library/models/library';
 import { rsformsApi } from '@/features/rsform/backend/api';
 
 import { ITargetOperation, ossApi } from './api';
@@ -21,12 +20,7 @@ export const useInputCreate = () => {
     }
   });
   return {
-    inputCreate: (
+    inputCreate: (data: { itemID: LibraryItemID; data: ITargetOperation }) =>
-      data: {
+      mutation.mutateAsync(data).then(response => response.new_schema)
-        itemID: LibraryItemID; //
-        data: ITargetOperation;
-      },
-      onSuccess?: DataCallback<ILibraryItem>
-    ) => mutation.mutate(data, { onSuccess: response => onSuccess?.(response.new_schema) })
   };
 };

rsconcept/frontend/src/features/oss/backend/useInputUpdate.tsx

@@ -20,6 +20,6 @@ export const useInputUpdate = () => {
     }
   });
   return {
-    inputUpdate: (data: { itemID: LibraryItemID; data: IInputUpdateDTO }) => mutation.mutate(data)
+    inputUpdate: (data: { itemID: LibraryItemID; data: IInputUpdateDTO }) => mutation.mutateAsync(data)
   };
 };

rsconcept/frontend/src/features/oss/backend/useOperationDelete.tsx

@@ -20,6 +20,6 @@ export const useOperationDelete = () => {
     }
   });
   return {
-    operationDelete: (data: { itemID: LibraryItemID; data: IOperationDeleteDTO }) => mutation.mutate(data)
+    operationDelete: (data: { itemID: LibraryItemID; data: IOperationDeleteDTO }) => mutation.mutateAsync(data)
   };
 };

rsconcept/frontend/src/features/oss/backend/useOperationExecute.tsx

@@ -20,6 +20,6 @@ export const useOperationExecute = () => {
     }
   });
   return {
-    operationExecute: (data: { itemID: LibraryItemID; data: ITargetOperation }) => mutation.mutate(data)
+    operationExecute: (data: { itemID: LibraryItemID; data: ITargetOperation }) => mutation.mutateAsync(data)
   };
 };

rsconcept/frontend/src/features/oss/backend/useOperationUpdate.tsx

@@ -30,6 +30,6 @@ export const useOperationUpdate = () => {
     }
   });
   return {
-    operationUpdate: (data: { itemID: LibraryItemID; data: IOperationUpdateDTO }) => mutation.mutate(data)
+    operationUpdate: (data: { itemID: LibraryItemID; data: IOperationUpdateDTO }) => mutation.mutateAsync(data)
   };
 };

rsconcept/frontend/src/features/oss/backend/useRelocateConstituents.tsx

@@ -19,6 +19,6 @@ export const useRelocateConstituents = () => {
     }
   });
   return {
-    relocateConstituents: (data: ICstRelocateDTO) => mutation.mutate(data)
+    relocateConstituents: (data: ICstRelocateDTO) => mutation.mutateAsync(data)
   };
 };

rsconcept/frontend/src/features/oss/backend/useUpdatePositions.tsx

@@ -13,13 +13,10 @@ export const useUpdatePositions = () => {
     onSuccess: (_, variables) => updateTimestamp(variables.itemID)
   });
   return {
-    updatePositions: (
+    updatePositions: (data: {
-      data: {
       itemID: LibraryItemID; //
       positions: IOperationPosition[];
       isSilent?: boolean;
-      },
+    }) => mutation.mutateAsync(data)
-      onSuccess?: () => void
-    ) => mutation.mutate(data, { onSuccess })
   };
 };

rsconcept/frontend/src/features/oss/dialogs/DlgChangeInputSchema.tsx

@@ -45,7 +45,7 @@ function DlgChangeInputSchema() {
   }
 
   function onSubmit(data: IInputUpdateDTO) {
-    inputUpdate({ itemID: oss.id, data: data });
+    return inputUpdate({ itemID: oss.id, data: data });
   }
 
   return (

rsconcept/frontend/src/features/oss/dialogs/DlgCreateOperation/DlgCreateOperation.tsx

@@ -68,9 +68,7 @@ function DlgCreateOperation() {
     });
     data.item_data.position_x = target.x;
     data.item_data.position_y = target.y;
-    operationCreate({ itemID: oss.id, data: data })
+    void operationCreate({ itemID: oss.id, data: data }).then(response => onCreate?.(response.new_operation.id));
-      .then(response => onCreate?.(response.new_operation.id))
-      .catch(console.error);
   }
 
   function handleSelectTab(newTab: TabID, last: TabID) {

rsconcept/frontend/src/features/oss/dialogs/DlgDeleteOperation.tsx

@@ -34,7 +34,7 @@ function DlgDeleteOperation() {
   });
 
   function onSubmit(data: IOperationDeleteDTO) {
-    operationDelete({ itemID: oss.id, data: data });
+    return operationDelete({ itemID: oss.id, data: data });
   }
 
   return (

rsconcept/frontend/src/features/oss/dialogs/DlgRelocateConstituents.tsx

@@ -104,16 +104,13 @@ function DlgRelocateConstituents() {
       return operation.position_x === item.position_x && operation.position_y === item.position_y;
     });
     if (positionsUnchanged) {
-      relocateConstituents(data);
+      return relocateConstituents(data);
     } else {
-      updatePositions(
+      return updatePositions({
-        {
         isSilent: true,
         itemID: oss.id,
         positions: positions
-        },
+      }).then(() => relocateConstituents(data));
-        () => relocateConstituents(data)
-      );
     }
   }
 

rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssCard/FormOSS.tsx

@@ -52,7 +52,7 @@ function FormOSS() {
   }, [isDirty, setIsModified]);
 
   function onSubmit(data: IUpdateLibraryItemDTO) {
-    updateOss(data, () => reset({ ...data }));
+    return updateOss(data).then(() => reset({ ...data }));
   }
 
   return (

rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/OssFlow.tsx

@@ -123,7 +123,7 @@ function OssFlow() {
 
   function handleSavePositions() {
     const positions = getPositions();
-    updatePositions({ itemID: controller.schema.id, positions: positions }, () => {
+    void updatePositions({ itemID: controller.schema.id, positions: positions }).then(() => {
       positions.forEach(item => {
         const operation = controller.schema.operationByID.get(item.id);
         if (operation) {
@@ -170,9 +170,10 @@ function OssFlow() {
       toast.error(errors.inputAlreadyExists);
       return;
     }
-    inputCreate({ itemID: controller.schema.id, data: { target: target, positions: getPositions() } }, new_schema =>
+    void inputCreate({
-      router.push(urls.schema(new_schema.id))
+      itemID: controller.schema.id,
-    );
+      data: { target: target, positions: getPositions() }
+    }).then(new_schema => router.push(urls.schema(new_schema.id)));
   }
 
   function handleEditSchema(target: OperationID) {
@@ -184,7 +185,7 @@ function OssFlow() {
   }
 
   function handleOperationExecute(target: OperationID) {
-    operationExecute({
+    void operationExecute({
       itemID: controller.schema.id, //
       data: { target: target, positions: getPositions() }
     });

rsconcept/frontend/src/features/oss/pages/OssPage/OssEditContext.tsx

@@ -128,7 +128,7 @@ export const OssEditState = ({ itemID, children }: React.PropsWithChildren<OssEd
     if (!window.confirm(prompts.deleteOSS)) {
       return;
     }
-    deleteItem(schema.id, () => {
+    void deleteItem(schema.id).then(() => {
       if (searchLocation === schema.location) {
         setSearchLocation('');
       }

rsconcept/frontend/src/features/rsform/backend/cctext/useGenerateLexeme.tsx

@@ -1,8 +1,6 @@
 import { useMutation } from '@tanstack/react-query';
 
-import { DataCallback } from '@/backend/apiTransport';
+import { cctextApi } from './api';
-
-import { cctextApi, ILexemeResponse } from './api';
 
 export const useGenerateLexeme = () => {
   const mutation = useMutation({
@@ -10,9 +8,6 @@ export const useGenerateLexeme = () => {
     mutationFn: cctextApi.generateLexeme
   });
   return {
-    generateLexeme: (
+    generateLexeme: (data: { text: string }) => mutation.mutateAsync(data)
-      data: { text: string }, //
-      onSuccess?: DataCallback<ILexemeResponse>
-    ) => mutation.mutate(data, { onSuccess })
   };
 };

rsconcept/frontend/src/features/rsform/backend/cctext/useInflectText.tsx

@@ -1,8 +1,6 @@
 import { useMutation } from '@tanstack/react-query';
 
-import { DataCallback } from '@/backend/apiTransport';
+import { cctextApi, IWordFormDTO } from './api';
-
-import { cctextApi, ITextResult, IWordFormDTO } from './api';
 
 export const useInflectText = () => {
   const mutation = useMutation({
@@ -10,9 +8,6 @@ export const useInflectText = () => {
     mutationFn: cctextApi.inflectText
   });
   return {
-    inflectText: (
+    inflectText: (data: IWordFormDTO) => mutation.mutateAsync(data)
-      data: IWordFormDTO, //
-      onSuccess?: DataCallback<ITextResult>
-    ) => mutation.mutate(data, { onSuccess })
   };
 };

rsconcept/frontend/src/features/rsform/backend/cctext/useParseText.tsx

@@ -1,8 +1,6 @@
 import { useMutation } from '@tanstack/react-query';
 
-import { DataCallback } from '@/backend/apiTransport';
+import { cctextApi } from './api';
-
-import { cctextApi, ITextResult } from './api';
 
 export const useParseText = () => {
   const mutation = useMutation({
@@ -10,9 +8,6 @@ export const useParseText = () => {
     mutationFn: cctextApi.parseText
   });
   return {
-    parseText: (
+    parseText: (data: { text: string }) => mutation.mutateAsync(data)
-      data: { text: string }, //
-      onSuccess?: DataCallback<ITextResult>
-    ) => mutation.mutate(data, { onSuccess })
   };
 };

rsconcept/frontend/src/features/rsform/backend/useCheckConstituenta.tsx

@@ -1,9 +1,7 @@
 import { useMutation } from '@tanstack/react-query';
 
-import { DataCallback } from '@/backend/apiTransport';
 import { LibraryItemID } from '@/features/library/models/library';
 
-import { IExpressionParse } from '../models/rslang';
 import { ICheckConstituentaDTO, rsformsApi } from './api';
 
 export const useCheckConstituenta = () => {
@@ -12,13 +10,7 @@ export const useCheckConstituenta = () => {
     mutationFn: rsformsApi.checkConstituenta
   });
   return {
-    checkConstituenta: (
+    checkConstituenta: (data: { itemID: LibraryItemID; data: ICheckConstituentaDTO }) => mutation.mutateAsync(data),
-      data: {
-        itemID: LibraryItemID; //
-        data: ICheckConstituentaDTO;
-      },
-      onSuccess?: DataCallback<IExpressionParse>
-    ) => mutation.mutate(data, { onSuccess }),
     isPending: mutation.isPending,
     error: mutation.error
   };

rsconcept/frontend/src/features/rsform/backend/useCstCreate.tsx

@@ -1,11 +1,9 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { DataCallback } from '@/backend/apiTransport';
 import { useUpdateTimestamp } from '@/features/library/backend/useUpdateTimestamp';
 import { LibraryItemID } from '@/features/library/models/library';
 import { ossApi } from '@/features/oss/backend/api';
 
-import { IConstituentaMeta } from '../models/rsform';
 import { ICstCreateDTO, rsformsApi } from './api';
 
 export const useCstCreate = () => {
@@ -28,12 +26,7 @@ export const useCstCreate = () => {
     }
   });
   return {
-    cstCreate: (
+    cstCreate: (data: { itemID: LibraryItemID; data: ICstCreateDTO }) =>
-      data: {
+      mutation.mutateAsync(data).then(response => response.new_cst)
-        itemID: LibraryItemID; //
-        data: ICstCreateDTO;
-      },
-      onSuccess?: DataCallback<IConstituentaMeta>
-    ) => mutation.mutate(data, { onSuccess: response => onSuccess?.(response.new_cst) })
   };
 };

rsconcept/frontend/src/features/rsform/backend/useCstDelete.tsx

@@ -27,12 +27,6 @@ export const useCstDelete = () => {
     }
   });
   return {
-    cstDelete: (
+    cstDelete: (data: { itemID: LibraryItemID; data: IConstituentaList }) => mutation.mutateAsync(data)
-      data: {
-        itemID: LibraryItemID; //
-        data: IConstituentaList;
-      },
-      onSuccess?: () => void
-    ) => mutation.mutate(data, { onSuccess })
   };
 };

rsconcept/frontend/src/features/rsform/backend/useCstMove.tsx

@@ -17,12 +17,6 @@ export const useCstMove = () => {
     }
   });
   return {
-    cstMove: (
+    cstMove: (data: { itemID: LibraryItemID; data: ICstMoveDTO }) => mutation.mutateAsync(data)
-      data: {
-        itemID: LibraryItemID; //
-        data: ICstMoveDTO;
-      },
-      onSuccess?: () => void
-    ) => mutation.mutate(data, { onSuccess })
   };
 };

rsconcept/frontend/src/features/rsform/backend/useCstRename.tsx

@@ -26,6 +26,6 @@ export const useCstRename = () => {
     }
   });
   return {
-    cstRename: (data: { itemID: LibraryItemID; data: ICstRenameDTO }) => mutation.mutate(data)
+    cstRename: (data: { itemID: LibraryItemID; data: ICstRenameDTO }) => mutation.mutateAsync(data)
   };
 };

rsconcept/frontend/src/features/rsform/backend/useCstSubstitute.tsx

@@ -27,12 +27,6 @@ export const useCstSubstitute = () => {
     }
   });
   return {
-    cstSubstitute: (
+    cstSubstitute: (data: { itemID: LibraryItemID; data: ICstSubstitutions }) => mutation.mutateAsync(data)
-      data: {
-        itemID: LibraryItemID; //
-        data: ICstSubstitutions;
-      },
-      onSuccess?: () => void
-    ) => mutation.mutate(data, { onSuccess })
   };
 };

rsconcept/frontend/src/features/rsform/backend/useCstUpdate.tsx

@@ -22,7 +22,6 @@ export const useCstUpdate = () => {
     }
   });
   return {
-    cstUpdate: (data: { itemID: LibraryItemID; data: ICstUpdateDTO }, onSuccess?: () => void) =>
+    cstUpdate: (data: { itemID: LibraryItemID; data: ICstUpdateDTO }) => mutation.mutateAsync(data)
-      mutation.mutate(data, { onSuccess })
   };
 };

rsconcept/frontend/src/features/rsform/backend/useDownloadRSForm.tsx

@@ -10,12 +10,6 @@ export const useDownloadRSForm = () => {
     mutationFn: rsformsApi.download
   });
   return {
-    download: (
+    download: (data: { itemID: LibraryItemID; version?: VersionID }) => mutation.mutateAsync(data)
-      data: {
-        itemID: LibraryItemID; //
-        version?: VersionID;
-      },
-      onSuccess?: (data: Blob) => void
-    ) => mutation.mutate(data, { onSuccess })
   };
 };

rsconcept/frontend/src/features/rsform/backend/useInlineSynthesis.tsx

@@ -1,11 +1,10 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { DataCallback } from '@/backend/apiTransport';
 import { useUpdateTimestamp } from '@/features/library/backend/useUpdateTimestamp';
 import { LibraryItemID } from '@/features/library/models/library';
 import { ossApi } from '@/features/oss/backend/api';
 
-import { IInlineSynthesisDTO, IRSFormDTO, rsformsApi } from './api';
+import { IInlineSynthesisDTO, rsformsApi } from './api';
 
 export const useInlineSynthesis = () => {
   const client = useQueryClient();
@@ -27,12 +26,6 @@ export const useInlineSynthesis = () => {
     }
   });
   return {
-    inlineSynthesis: (
+    inlineSynthesis: (data: { itemID: LibraryItemID; data: IInlineSynthesisDTO }) => mutation.mutateAsync(data)
-      data: {
-        itemID: LibraryItemID; //
-        data: IInlineSynthesisDTO;
-      },
-      onSuccess?: DataCallback<IRSFormDTO>
-    ) => mutation.mutate(data, { onSuccess })
   };
 };

rsconcept/frontend/src/features/rsform/backend/useProduceStructure.tsx

@@ -1,11 +1,10 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { DataCallback } from '@/backend/apiTransport';
 import { useUpdateTimestamp } from '@/features/library/backend/useUpdateTimestamp';
 import { LibraryItemID } from '@/features/library/models/library';
 import { ossApi } from '@/features/oss/backend/api';
 
-import { ConstituentaID, ITargetCst } from '../models/rsform';
+import { ITargetCst } from '../models/rsform';
 import { rsformsApi } from './api';
 
 export const useProduceStructure = () => {
@@ -28,12 +27,7 @@ export const useProduceStructure = () => {
     }
   });
   return {
-    produceStructure: (
+    produceStructure: (data: { itemID: LibraryItemID; data: ITargetCst }) =>
-      data: {
+      mutation.mutateAsync(data).then(response => response.cst_list)
-        itemID: LibraryItemID; //
-        data: ITargetCst;
-      },
-      onSuccess?: DataCallback<ConstituentaID[]>
-    ) => mutation.mutate(data, { onSuccess: response => onSuccess?.(response.cst_list) })
   };
 };

rsconcept/frontend/src/features/rsform/backend/useResetAliases.tsx

@@ -26,6 +26,6 @@ export const useResetAliases = () => {
     }
   });
   return {
-    resetAliases: (data: { itemID: LibraryItemID }) => mutation.mutate(data)
+    resetAliases: (data: { itemID: LibraryItemID }) => mutation.mutateAsync(data)
   };
 };

rsconcept/frontend/src/features/rsform/backend/useRestoreOrder.tsx

@@ -17,6 +17,6 @@ export const useRestoreOrder = () => {
     }
   });
   return {
-    restoreOrder: (data: { itemID: LibraryItemID }) => mutation.mutate(data)
+    restoreOrder: (data: { itemID: LibraryItemID }) => mutation.mutateAsync(data)
   };
 };

rsconcept/frontend/src/features/rsform/backend/useUploadTRS.tsx

@@ -27,6 +27,6 @@ export const useUploadTRS = () => {
     }
   });
   return {
-    upload: (data: IRSFormUploadDTO) => mutation.mutate(data)
+    upload: (data: IRSFormUploadDTO) => mutation.mutateAsync(data)
   };
 };

rsconcept/frontend/src/features/rsform/dialogs/DlgCloneLibraryItem.tsx

@@ -60,7 +60,7 @@ function DlgCloneLibraryItem() {
   });
 
   function onSubmit(data: ICloneLibraryItemDTO) {
-    cloneItem(data, newSchema => router.push(urls.schema(newSchema.id)));
+    return cloneItem(data).then(newSchema => router.push(urls.schema(newSchema.id)));
   }
 
   return (

rsconcept/frontend/src/features/rsform/dialogs/DlgCreateVersion.tsx

@@ -45,7 +45,7 @@ function DlgCreateVersion() {
   const canSubmit = !versions.find(ver => ver.version === version);
 
   function onSubmit(data: IVersionCreateDTO) {
-    versionCreate({ itemID, data }, onCreate);
+    return versionCreate({ itemID, data }).then(onCreate);
   }
 
   return (

rsconcept/frontend/src/features/rsform/dialogs/DlgEditVersions/DlgEditVersions.tsx

@@ -66,7 +66,7 @@ function DlgEditVersions() {
 
   function handleDeleteVersion(targetVersion: VersionID) {
     const nextVer = schema.versions.find(ver => ver.id !== targetVersion);
-    versionDelete({ itemID: itemID, versionID: targetVersion }, () => {
+    void versionDelete({ itemID: itemID, versionID: targetVersion }).then(() => {
       if (!nextVer) {
         hideDialog();
       } else if (targetVersion === versionID) {
@@ -80,7 +80,7 @@ function DlgEditVersions() {
     if (!isDirty || isProcessing || !isValid) {
       return;
     }
-    versionUpdate(data, () => reset({ ...data }));
+    void versionUpdate(data).then(() => reset({ ...data }));
   }
 
   return (

rsconcept/frontend/src/features/rsform/dialogs/DlgEditWordForms/DlgEditWordForms.tsx

@@ -78,17 +78,14 @@ function DlgEditWordForms() {
   }
 
   function handleInflect() {
-    inflectText(
+    void inflectText({
-      {
       text: term,
       grams: inputGrams.map(gram => gram.value).join(',')
-      },
+    }).then(response => setInputText(response.result));
-      response => setInputText(response.result)
-    );
   }
 
   function handleParse() {
-    parseText({ text: inputText }, response => {
+    void parseText({ text: inputText }).then(response => {
       const grams = parseGrammemes(response.result);
       setInputGrams(supportedGrammeOptions.filter(gram => grams.find(test => test === gram.value)));
     });
@@ -100,14 +97,17 @@ function DlgEditWordForms() {
         return;
       }
     }
-    generateLexeme({ text: inputText }, response => {
+    void generateLexeme({ text: inputText }).then(response => {
       const lexeme: IWordForm[] = [];
       response.items.forEach(form => {
+        const grams = parseGrammemes(form.grams).filter(gram =>
+          supportedGrammemes.find(item => item === (gram as Grammeme))
+        );
         const newForm: IWordForm = {
           text: form.text,
-          grams: parseGrammemes(form.grams).filter(gram => supportedGrammemes.find(item => item === (gram as Grammeme)))
+          grams: grams
         };
-        if (newForm.grams.length === 2 && !lexeme.some(test => wordFormEquals(test, newForm))) {
+        if (grams.length === 2 && !lexeme.some(test => wordFormEquals(test, newForm))) {
           lexeme.push(newForm);
         }
       });

rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx

@@ -97,7 +97,7 @@ function FormConstituenta({ disabled, id, toggleReset, schema, activeCst, onOpen
   }, [isDirty, activeCst, setIsModified]);
 
   function onSubmit(data: ICstUpdateDTO) {
-    cstUpdate({ itemID: schema.id, data }, () => reset({ ...data }));
+    return cstUpdate({ itemID: schema.id, data }).then(() => reset({ ...data }));
   }
 
   function handleTypeGraph(event: CProps.EventMouse) {

rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx

@@ -55,7 +55,7 @@ function ToolbarConstituenta({
   const isProcessing = useMutatingRSForm();
 
   function viewPredecessor(target: ConstituentaID) {
-    findPredecessor({ target: target }, reference =>
+    void findPredecessor({ target: target }).then(reference =>
       router.push(
         urls.schema_props({
           id: reference.schema,

rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx

@@ -75,7 +75,7 @@ function EditorRSExpression({
       alias: activeCst.alias,
       cst_type: activeCst.cst_type
     };
-    checkInternal({ itemID: controller.schema.id, data }, parse => {
+    void checkInternal({ itemID: controller.schema.id, data }).then(parse => {
       setParseData(parse);
       onSuccess?.(parse);
     });

rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx

@@ -60,7 +60,7 @@ function FormRSForm() {
   }
 
   function onSubmit(data: IUpdateLibraryItemDTO) {
-    updateSchema(data, () => reset({ ...data }));
+    return updateSchema(data).then(() => reset({ ...data }));
   }
 
   return (

rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/ToolbarVersioning.tsx

@@ -30,7 +30,7 @@ function ToolbarVersioning({ blockReload }: ToolbarVersioningProps) {
     if (!controller.schema.version || !window.confirm(prompts.restoreArchive)) {
       return;
     }
-    versionRestore({ versionID: controller.schema.version }, () => controller.navigateVersion(undefined));
+    void versionRestore({ versionID: controller.schema.version }).then(() => controller.navigateVersion(undefined));
   }
 
   function handleCreateVersion() {

rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuRSTabs.tsx

@@ -109,19 +109,16 @@ function MenuRSTabs() {
       return;
     }
     const fileName = (controller.schema.alias ?? 'Schema') + EXTEOR_TRS_FILE;
-    download(
+    void download({
-      {
+      itemID: controller.schema.id,
-        itemID: controller.schema.id, //
       version: controller.schema.version
-      },
+    }).then((data: Blob) => {
-      (data: Blob) => {
       try {
         fileDownload(data, fileName);
       } catch (error) {
         console.error(error);
       }
-      }
+    });
-    );
   }
 
   function handleUpload() {
@@ -154,12 +151,12 @@ function MenuRSTabs() {
 
   function handleReindex() {
     editMenu.hide();
-    resetAliases({ itemID: controller.schema.id });
+    void resetAliases({ itemID: controller.schema.id });
   }
 
   function handleRestoreOrder() {
     editMenu.hide();
-    restoreOrder({ itemID: controller.schema.id });
+    void restoreOrder({ itemID: controller.schema.id });
   }
 
   function handleSubstituteCst() {
@@ -170,14 +167,8 @@ function MenuRSTabs() {
     showSubstituteCst({
       schema: controller.schema,
       onSubstitute: data =>
-        cstSubstitute(
+        void cstSubstitute({ itemID: controller.schema.id, data }).then(() =>
-          {
+          controller.setSelected(prev => prev.filter(id => !data.substitutions.find(sub => sub.original === id)))
-            itemID: controller.schema.id,
-            data
-          },
-          () => {
-            controller.setSelected(prev => prev.filter(id => !data.substitutions.find(sub => sub.original === id)));
-          }
         )
     });
   }
@@ -195,17 +186,14 @@ function MenuRSTabs() {
     if (isModified && !promptUnsaved()) {
       return;
     }
-    produceStructure(
+    void produceStructure({
-      {
+      itemID: controller.schema.id,
-        itemID: controller.schema.id, //
       data: { target: controller.activeCst.id }
-      },
+    }).then(cstList => {
-      cstList => {
       if (cstList.length !== 0) {
         controller.setSelected(cstList);
       }
-      }
+    });
-    );
   }
 
   function handleInlineSynthesis() {
@@ -216,7 +204,7 @@ function MenuRSTabs() {
     showInlineSynthesis({
       receiver: controller.schema,
       onInlineSynthesis: data => {
-        inlineSynthesis({ itemID: controller.schema.id, data }, () => controller.deselectAll());
+        void inlineSynthesis({ itemID: controller.schema.id, data }).then(() => controller.deselectAll());
       }
     });
   }

rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSEditContext.tsx

@@ -170,7 +170,7 @@ export const RSEditState = ({
       return;
     }
     const ossID = schema.oss.length > 0 ? schema.oss[0].id : undefined;
-    deleteItem(schema.id, () => {
+    void deleteItem(schema.id).then(() => {
       if (ossID) {
         router.push(urls.oss(ossID, OssTabID.GRAPH));
       } else {
@@ -184,7 +184,7 @@ export const RSEditState = ({
 
   function handleCreateCst(data: ICstCreateDTO) {
     data.alias = data.alias || generateAlias(data.cst_type, schema);
-    cstCreate({ itemID: itemID, data }, newCst => {
+    void cstCreate({ itemID: itemID, data }).then(newCst => {
       setSelected([newCst.id]);
       navigateRSForm({ tab: activeTab, activeID: newCst.id });
       if (activeTab === RSTabID.CST_LIST) {
@@ -210,7 +210,7 @@ export const RSEditState = ({
     const isEmpty = deleted.length === schema.items.length;
     const nextActive = isEmpty ? undefined : getNextActiveOnDelete(activeCst?.id, schema.items, deleted);
 
-    cstDelete({ itemID: itemID, data }, () => {
+    void cstDelete({ itemID: itemID, data }).then(() => {
       setSelected(nextActive ? [nextActive] : []);
       if (!nextActive) {
         navigateRSForm({ tab: RSTabID.CST_LIST });
@@ -235,7 +235,7 @@ export const RSEditState = ({
       return Math.min(prev, index);
     }, -1);
     const target = Math.max(0, currentIndex - 1);
-    cstMove({
+    void cstMove({
       itemID: itemID,
       data: {
         items: selected,
@@ -261,7 +261,7 @@ export const RSEditState = ({
       }
     }, -1);
     const target = Math.min(schema.items.length - 1, currentIndex - count + 2);
-    cstMove({
+    void cstMove({
       itemID: itemID,
       data: {
         items: selected,

rsconcept/frontend/src/features/users/backend/useSignup.tsx

@@ -1,8 +1,5 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { DataCallback } from '@/backend/apiTransport';
-
-import { IUserProfile } from '../models/user';
 import { IUserSignupDTO, usersApi } from './api';
 
 export const useSignup = () => {
@@ -13,10 +10,7 @@ export const useSignup = () => {
     onSuccess: () => client.invalidateQueries({ queryKey: usersApi.getUsersQueryOptions().queryKey })
   });
   return {
-    signup: (
+    signup: (data: IUserSignupDTO) => mutation.mutateAsync(data),
-      data: IUserSignupDTO, //
-      onSuccess?: DataCallback<IUserProfile>
-    ) => mutation.mutate(data, { onSuccess }),
     isPending: mutation.isPending,
     error: mutation.error,
     reset: mutation.reset

rsconcept/frontend/src/features/users/backend/useUpdateProfile.tsx

@@ -1,8 +1,5 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
-import { DataCallback } from '@/backend/apiTransport';
-
-import { IUserProfile } from '../models/user';
 import { IUpdateProfileDTO, usersApi } from './api';
 
 export const useUpdateProfile = () => {
@@ -16,8 +13,7 @@ export const useUpdateProfile = () => {
     }
   });
   return {
-    updateProfile: (data: IUpdateProfileDTO, onSuccess?: DataCallback<IUserProfile>) =>
+    updateProfile: (data: IUpdateProfileDTO) => mutation.mutateAsync(data),
-      mutation.mutate(data, { onSuccess }),
     isPending: mutation.isPending,
     error: mutation.error,
     reset: mutation.reset

rsconcept/frontend/src/features/users/pages/RegisterPage/FormSignup.tsx

@@ -50,7 +50,7 @@ function FormSignup() {
   }
 
   function onSubmit(data: IUserSignupDTO) {
-    signup(data, createdUser => router.push(urls.login_hint(createdUser.username)));
+    return signup(data).then(createdUser => router.push(urls.login_hint(createdUser.username)));
   }
 
   return (

rsconcept/frontend/src/features/users/pages/UserProfilePage/EditorPassword.tsx

@@ -31,7 +31,7 @@ function EditorPassword() {
   }
 
   function onSubmit(data: IChangePasswordDTO) {
-    changePassword(data, () => router.push(urls.login));
+    return changePassword(data).then(() => router.push(urls.login));
   }
 
   return (

rsconcept/frontend/src/features/users/pages/UserProfilePage/EditorProfile.tsx

@@ -40,7 +40,7 @@ function EditorProfile() {
   }
 
   function onSubmit(data: IUpdateProfileDTO) {
-    updateProfile(data, () => resetForm({ ...data }));
+    return updateProfile(data).then(() => resetForm({ ...data }));
   }
 
   return (