From bade714fbfd1445358e5cf75c25e8a51fd741576 Mon Sep 17 00:00:00 2001
From: Ivan <8611739+IRBorisov@users.noreply.github.com>
Date: Wed, 26 Feb 2025 16:28:16 +0300
Subject: [PATCH] F: Improve navigation API. Implement async versions

---
 .../src/app/Navigation/Navigation.tsx         | 10 ++--
 .../src/app/Navigation/NavigationContext.tsx  | 60 +++++++++++++------
 .../src/app/Navigation/UserDropdown.tsx       | 12 ++--
 .../frontend/src/app/Navigation/UserMenu.tsx  |  2 +-
 .../auth/components/ExpectedAnonymous.tsx     |  2 +-
 .../src/features/auth/pages/LoginPage.tsx     |  2 +-
 .../auth/pages/PasswordChangePage.tsx         |  4 +-
 .../help/pages/ManualsPage/ManualsPage.tsx    |  7 +--
 .../frontend/src/features/home/HomePage.tsx   |  4 +-
 .../src/features/library/backend/api.ts       |  4 +-
 .../library/backend/useDeleteItem.tsx         | 15 ++---
 .../library/components/EditorLibraryItem.tsx  |  2 +-
 .../features/library/components/MenuRole.tsx  |  2 +-
 .../library/dialogs/DlgCloneLibraryItem.tsx   |  2 +-
 .../pages/CreateItemPage/FormCreateItem.tsx   |  6 +-
 .../pages/LibraryPage/TableLibraryItems.tsx   |  4 +-
 .../EditorOssGraph/NodeContextMenu.tsx        |  2 +-
 .../features/oss/pages/OssPage/MenuMain.tsx   |  4 +-
 .../oss/pages/OssPage/OssEditContext.tsx      | 15 +++--
 .../features/oss/pages/OssPage/OssPage.tsx    |  2 +-
 .../rsform/components/ToolbarRSFormCard.tsx   |  2 +-
 .../ToolbarConstituenta.tsx                   |  6 +-
 .../EditorRSFormCard/FormRSForm.tsx           |  2 +-
 .../pages/RSFormPage/MenuEditSchema.tsx       |  2 +-
 .../rsform/pages/RSFormPage/MenuMain.tsx      |  6 +-
 .../rsform/pages/RSFormPage/RSEditContext.tsx | 29 +++++----
 .../rsform/pages/RSFormPage/RSFormPage.tsx    |  2 +-
 .../users/pages/RegisterPage/FormSignup.tsx   |  6 +-
 .../pages/UserProfilePage/EditorPassword.tsx  |  2 +-
 29 files changed, 125 insertions(+), 93 deletions(-)

diff --git a/rsconcept/frontend/src/app/Navigation/Navigation.tsx b/rsconcept/frontend/src/app/Navigation/Navigation.tsx
index 2129d27a..03e99b4a 100644
--- a/rsconcept/frontend/src/app/Navigation/Navigation.tsx
+++ b/rsconcept/frontend/src/app/Navigation/Navigation.tsx
@@ -18,12 +18,14 @@ export function Navigation() {
   const size = useWindowSize();
   const noNavigationAnimation = useAppLayoutStore(state => state.noNavigationAnimation);
 
-  const navigateHome = (event: React.MouseEvent<Element>) => router.push(urls.home, event.ctrlKey || event.metaKey);
+  const navigateHome = (event: React.MouseEvent<Element>) =>
+    router.push({ path: urls.home, newTab: event.ctrlKey || event.metaKey });
   const navigateLibrary = (event: React.MouseEvent<Element>) =>
-    router.push(urls.library, event.ctrlKey || event.metaKey);
-  const navigateHelp = (event: React.MouseEvent<Element>) => router.push(urls.manuals, event.ctrlKey || event.metaKey);
+    router.push({ path: urls.library, newTab: event.ctrlKey || event.metaKey });
+  const navigateHelp = (event: React.MouseEvent<Element>) =>
+    router.push({ path: urls.manuals, newTab: event.ctrlKey || event.metaKey });
   const navigateCreateNew = (event: React.MouseEvent<Element>) =>
-    router.push(urls.create_schema, event.ctrlKey || event.metaKey);
+    router.push({ path: urls.create_schema, newTab: event.ctrlKey || event.metaKey });
 
   return (
     <nav
diff --git a/rsconcept/frontend/src/app/Navigation/NavigationContext.tsx b/rsconcept/frontend/src/app/Navigation/NavigationContext.tsx
index 105c1856..1d622dd6 100644
--- a/rsconcept/frontend/src/app/Navigation/NavigationContext.tsx
+++ b/rsconcept/frontend/src/app/Navigation/NavigationContext.tsx
@@ -3,11 +3,19 @@
 import { createContext, useContext, useEffect, useState } from 'react';
 import { useNavigate } from 'react-router';
 
+export interface NavigationProps {
+  path: string;
+  newTab?: boolean;
+  force?: boolean;
+}
+
 interface INavigationContext {
-  push: (path: string, newTab?: boolean) => void;
-  replace: (path: string) => void;
-  back: () => void;
-  forward: () => void;
+  push: (props: NavigationProps) => void;
+  pushAsync: (props: NavigationProps) => void | Promise<void>;
+  replace: (props: Omit<NavigationProps, 'newTab'>) => void;
+  replaceAsync: (props: Omit<NavigationProps, 'newTab'>) => void | Promise<void>;
+  back: (force?: boolean) => void;
+  forward: (force?: boolean) => void;
 
   canBack: () => boolean;
 
@@ -37,33 +45,47 @@ export const NavigationState = ({ children }: React.PropsWithChildren) => {
     return !!window.history && window.history?.length !== 0;
   }
 
-  function push(path: string, newTab?: boolean) {
-    if (newTab) {
-      window.open(`${path}`, '_blank');
-      return;
-    }
-    if (validate()) {
-      Promise.resolve(router(path, { viewTransition: true })).catch(console.error);
+  function push(props: NavigationProps) {
+    if (props.newTab) {
+      window.open(`${props.path}`, '_blank');
+    } else if (props.force || validate()) {
       setIsBlocked(false);
+      Promise.resolve(router(props.path, { viewTransition: true })).catch(console.error);
     }
   }
 
-  function replace(path: string) {
-    if (validate()) {
-      Promise.resolve(router(path, { replace: true, viewTransition: true })).catch(console.error);
+  function pushAsync(props: NavigationProps): void | Promise<void> {
+    if (props.newTab) {
+      window.open(`${props.path}`, '_blank');
+    } else if (props.force || validate()) {
       setIsBlocked(false);
+      return router(props.path, { viewTransition: true });
     }
   }
 
-  function back() {
-    if (validate()) {
+  function replace(props: Omit<NavigationProps, 'newTab'>) {
+    if (props.force || validate()) {
+      setIsBlocked(false);
+      Promise.resolve(router(props.path, { replace: true, viewTransition: true })).catch(console.error);
+    }
+  }
+
+  function replaceAsync(props: Omit<NavigationProps, 'newTab'>): void | Promise<void> {
+    if (props.force || validate()) {
+      setIsBlocked(false);
+      return router(props.path, { replace: true, viewTransition: true });
+    }
+  }
+
+  function back(force?: boolean) {
+    if (force || validate()) {
       Promise.resolve(router(-1)).catch(console.error);
       setIsBlocked(false);
     }
   }
 
-  function forward() {
-    if (validate()) {
+  function forward(force?: boolean) {
+    if (force || validate()) {
       Promise.resolve(router(1)).catch(console.error);
       setIsBlocked(false);
     }
@@ -73,7 +95,9 @@ export const NavigationState = ({ children }: React.PropsWithChildren) => {
     <NavigationContext
       value={{
         push,
+        pushAsync,
         replace,
+        replaceAsync,
         back,
         forward,
         canBack,
diff --git a/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx b/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx
index 4c369584..6cf0fe9a 100644
--- a/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx
+++ b/rsconcept/frontend/src/app/Navigation/UserDropdown.tsx
@@ -41,32 +41,32 @@ export function UserDropdown({ isOpen, hideDropdown }: UserDropdownProps) {
 
   function navigateProfile(event: React.MouseEvent<Element>) {
     hideDropdown();
-    router.push(urls.profile, event.ctrlKey || event.metaKey);
+    router.push({ path: urls.profile, newTab: event.ctrlKey || event.metaKey });
   }
 
   function logoutAndRedirect() {
     hideDropdown();
-    void logout().then(() => router.push(urls.login));
+    void logout().then(() => router.push({ path: urls.login, force: true }));
   }
 
   function gotoAdmin() {
     hideDropdown();
-    void logout().then(() => router.push(urls.admin, true));
+    void logout().then(() => router.push({ path: urls.admin, force: true, newTab: true }));
   }
 
   function gotoIcons(event: React.MouseEvent<Element>) {
     hideDropdown();
-    router.push(urls.icons, event.ctrlKey || event.metaKey);
+    router.push({ path: urls.icons, newTab: event.ctrlKey || event.metaKey });
   }
 
   function gotoRestApi() {
     hideDropdown();
-    router.push(urls.rest_api, true);
+    router.push({ path: urls.rest_api, newTab: true });
   }
 
   function gotoDatabaseSchema(event: React.MouseEvent<Element>) {
     hideDropdown();
-    router.push(urls.database_schema, event.ctrlKey || event.metaKey);
+    router.push({ path: urls.database_schema, newTab: event.ctrlKey || event.metaKey });
   }
 
   function handleToggleDarkMode() {
diff --git a/rsconcept/frontend/src/app/Navigation/UserMenu.tsx b/rsconcept/frontend/src/app/Navigation/UserMenu.tsx
index 1e48a02f..2a0dc9de 100644
--- a/rsconcept/frontend/src/app/Navigation/UserMenu.tsx
+++ b/rsconcept/frontend/src/app/Navigation/UserMenu.tsx
@@ -15,7 +15,7 @@ export function UserMenu() {
   return (
     <div ref={menu.ref} className='h-full w-[4rem] flex items-center justify-center'>
       <Suspense fallback={<Loader circular scale={1.5} />}>
-        <UserButton onLogin={() => router.push(urls.login)} onClickUser={menu.toggle} />
+        <UserButton onLogin={() => router.push({ path: urls.login, force: true })} onClickUser={menu.toggle} />
       </Suspense>
       <UserDropdown isOpen={menu.isOpen} hideDropdown={() => menu.hide()} />
     </div>
diff --git a/rsconcept/frontend/src/features/auth/components/ExpectedAnonymous.tsx b/rsconcept/frontend/src/features/auth/components/ExpectedAnonymous.tsx
index 1ca71e2b..bd2d2680 100644
--- a/rsconcept/frontend/src/features/auth/components/ExpectedAnonymous.tsx
+++ b/rsconcept/frontend/src/features/auth/components/ExpectedAnonymous.tsx
@@ -11,7 +11,7 @@ export function ExpectedAnonymous() {
   const router = useConceptNavigation();
 
   function logoutAndRedirect() {
-    void logout().then(() => router.push(urls.login));
+    void logout().then(() => router.push({ path: urls.login, force: true }));
   }
 
   return (
diff --git a/rsconcept/frontend/src/features/auth/pages/LoginPage.tsx b/rsconcept/frontend/src/features/auth/pages/LoginPage.tsx
index 3cc6d539..9ed03877 100644
--- a/rsconcept/frontend/src/features/auth/pages/LoginPage.tsx
+++ b/rsconcept/frontend/src/features/auth/pages/LoginPage.tsx
@@ -41,7 +41,7 @@ export function LoginPage() {
       if (router.canBack()) {
         router.back();
       } else {
-        router.push(urls.library);
+        router.push({ path: urls.library, force: true });
       }
     });
   }
diff --git a/rsconcept/frontend/src/features/auth/pages/PasswordChangePage.tsx b/rsconcept/frontend/src/features/auth/pages/PasswordChangePage.tsx
index 9f6a02df..58f9c274 100644
--- a/rsconcept/frontend/src/features/auth/pages/PasswordChangePage.tsx
+++ b/rsconcept/frontend/src/features/auth/pages/PasswordChangePage.tsx
@@ -33,8 +33,8 @@ export function Component() {
         password: newPassword,
         token: token
       }).then(() => {
-        router.replace(urls.home);
-        router.push(urls.login);
+        router.replace({ path: urls.home });
+        router.push({ path: urls.login });
       });
     }
   }
diff --git a/rsconcept/frontend/src/features/help/pages/ManualsPage/ManualsPage.tsx b/rsconcept/frontend/src/features/help/pages/ManualsPage/ManualsPage.tsx
index c024c6d3..7a4583b3 100644
--- a/rsconcept/frontend/src/features/help/pages/ManualsPage/ManualsPage.tsx
+++ b/rsconcept/frontend/src/features/help/pages/ManualsPage/ManualsPage.tsx
@@ -4,7 +4,6 @@ import { urls, useConceptNavigation } from '@/app';
 
 import { useQueryStrings } from '@/hooks/useQueryStrings';
 import { useMainHeight } from '@/stores/appLayout';
-import { PARAMETER } from '@/utils/constants';
 
 import { HelpTopic } from '../../models/helpTopic';
 
@@ -19,13 +18,11 @@ export function ManualsPage() {
   const mainHeight = useMainHeight();
 
   function onSelectTopic(newTopic: HelpTopic) {
-    router.push(urls.help_topic(newTopic));
+    router.push({ path: urls.help_topic(newTopic) });
   }
 
   if (!Object.values(HelpTopic).includes(activeTopic)) {
-    setTimeout(() => {
-      router.push(urls.page404);
-    }, PARAMETER.refreshTimeout);
+    router.push({ path: urls.page404, force: true });
     return null;
   }
 
diff --git a/rsconcept/frontend/src/features/home/HomePage.tsx b/rsconcept/frontend/src/features/home/HomePage.tsx
index 33a3b0e4..1776de2a 100644
--- a/rsconcept/frontend/src/features/home/HomePage.tsx
+++ b/rsconcept/frontend/src/features/home/HomePage.tsx
@@ -6,9 +6,9 @@ export function HomePage() {
   const { isAnonymous } = useAuthSuspense();
 
   if (isAnonymous) {
-    router.replace(urls.manuals);
+    router.replace({ path: urls.manuals });
   } else {
-    router.replace(urls.library);
+    router.replace({ path: urls.library });
   }
 
   return null;
diff --git a/rsconcept/frontend/src/features/library/backend/api.ts b/rsconcept/frontend/src/features/library/backend/api.ts
index f40dd601..8211e7f3 100644
--- a/rsconcept/frontend/src/features/library/backend/api.ts
+++ b/rsconcept/frontend/src/features/library/backend/api.ts
@@ -111,9 +111,9 @@ export const libraryApi = {
       }
     }),
 
-  deleteItem: (target: number) =>
+  deleteItem: (data: { target: number; beforeInvalidate?: () => void | Promise<void> }) =>
     axiosDelete({
-      endpoint: `/api/library/${target}`,
+      endpoint: `/api/library/${data.target}`,
       request: {
         successMessage: infoMsg.itemDestroyed
       }
diff --git a/rsconcept/frontend/src/features/library/backend/useDeleteItem.tsx b/rsconcept/frontend/src/features/library/backend/useDeleteItem.tsx
index c46cc73c..9718f882 100644
--- a/rsconcept/frontend/src/features/library/backend/useDeleteItem.tsx
+++ b/rsconcept/frontend/src/features/library/backend/useDeleteItem.tsx
@@ -10,22 +10,23 @@ export const useDeleteItem = () => {
   const mutation = useMutation({
     mutationKey: [KEYS.global_mutation, libraryApi.baseKey, 'delete-item'],
     mutationFn: libraryApi.deleteItem,
-    onSuccess: (_, variables) => {
-      client.invalidateQueries({ queryKey: libraryApi.libraryListKey }).catch(console.error);
+    onSuccess: async (_, variables) => {
+      await client.invalidateQueries({ queryKey: libraryApi.libraryListKey });
+      await Promise.resolve(variables.beforeInvalidate?.());
       setTimeout(
         () =>
           void Promise.allSettled([
             client.invalidateQueries({ queryKey: [KEYS.oss] }),
-            client.resetQueries({ queryKey: KEYS.composite.rsItem({ itemID: variables }) }),
-            client.resetQueries({ queryKey: KEYS.composite.ossItem({ itemID: variables }) })
-          ]).catch(console.error),
-        PARAMETER.navigationDuration
+            client.resetQueries({ queryKey: KEYS.composite.rsItem({ itemID: variables.target }) }),
+            client.resetQueries({ queryKey: KEYS.composite.ossItem({ itemID: variables.target }) })
+          ]),
+        PARAMETER.refreshTimeout
       );
     },
     onError: () => client.invalidateQueries()
   });
   return {
-    deleteItem: (target: number) => mutation.mutateAsync(target),
+    deleteItem: (data: { target: number; beforeInvalidate?: () => void | Promise<void> }) => mutation.mutateAsync(data),
     isPending: mutation.isPending
   };
 };
diff --git a/rsconcept/frontend/src/features/library/components/EditorLibraryItem.tsx b/rsconcept/frontend/src/features/library/components/EditorLibraryItem.tsx
index a5b1172b..f8dc01eb 100644
--- a/rsconcept/frontend/src/features/library/components/EditorLibraryItem.tsx
+++ b/rsconcept/frontend/src/features/library/components/EditorLibraryItem.tsx
@@ -64,7 +64,7 @@ export function EditorLibraryItem({ schema, isAttachedToOSS }: EditorLibraryItem
 
   function handleOpenLibrary(event: React.MouseEvent<Element>) {
     setGlobalLocation(schema.location);
-    router.push(urls.library, event.ctrlKey || event.metaKey);
+    router.push({ path: urls.library, newTab: event.ctrlKey || event.metaKey });
   }
 
   function handleEditLocation() {
diff --git a/rsconcept/frontend/src/features/library/components/MenuRole.tsx b/rsconcept/frontend/src/features/library/components/MenuRole.tsx
index fd057760..20e71316 100644
--- a/rsconcept/frontend/src/features/library/components/MenuRole.tsx
+++ b/rsconcept/frontend/src/features/library/components/MenuRole.tsx
@@ -38,7 +38,7 @@ export function MenuRole({ isOwned, isEditor }: MenuRoleProps) {
         hideTitle={accessMenu.isOpen}
         className='h-full pr-2'
         icon={<IconAlert size='1.25rem' className='icon-red' />}
-        onClick={() => router.push(urls.login)}
+        onClick={() => router.push({ path: urls.login })}
       />
     );
   }
diff --git a/rsconcept/frontend/src/features/library/dialogs/DlgCloneLibraryItem.tsx b/rsconcept/frontend/src/features/library/dialogs/DlgCloneLibraryItem.tsx
index c9e023f0..fc29ebbe 100644
--- a/rsconcept/frontend/src/features/library/dialogs/DlgCloneLibraryItem.tsx
+++ b/rsconcept/frontend/src/features/library/dialogs/DlgCloneLibraryItem.tsx
@@ -60,7 +60,7 @@ export function DlgCloneLibraryItem() {
   });
 
   function onSubmit(data: ICloneLibraryItemDTO) {
-    return cloneItem(data).then(newSchema => router.push(urls.schema(newSchema.id)));
+    return cloneItem(data).then(newSchema => router.pushAsync({ path: urls.schema(newSchema.id), force: true }));
   }
 
   return (
diff --git a/rsconcept/frontend/src/features/library/pages/CreateItemPage/FormCreateItem.tsx b/rsconcept/frontend/src/features/library/pages/CreateItemPage/FormCreateItem.tsx
index 73906484..a1665cfc 100644
--- a/rsconcept/frontend/src/features/library/pages/CreateItemPage/FormCreateItem.tsx
+++ b/rsconcept/frontend/src/features/library/pages/CreateItemPage/FormCreateItem.tsx
@@ -69,7 +69,7 @@ export function FormCreateItem() {
     if (router.canBack()) {
       router.back();
     } else {
-      router.push(urls.library);
+      router.push({ path: urls.library });
     }
   }
 
@@ -95,9 +95,9 @@ export function FormCreateItem() {
     return createItem(data).then(newItem => {
       setSearchLocation(data.location);
       if (newItem.item_type == LibraryItemType.RSFORM) {
-        router.push(urls.schema(newItem.id));
+        router.push({ path: urls.schema(newItem.id), force: true });
       } else {
-        router.push(urls.oss(newItem.id));
+        router.push({ path: urls.oss(newItem.id), force: true });
       }
     });
   }
diff --git a/rsconcept/frontend/src/features/library/pages/LibraryPage/TableLibraryItems.tsx b/rsconcept/frontend/src/features/library/pages/LibraryPage/TableLibraryItems.tsx
index 2ad97ea4..fde5669b 100644
--- a/rsconcept/frontend/src/features/library/pages/LibraryPage/TableLibraryItems.tsx
+++ b/rsconcept/frontend/src/features/library/pages/LibraryPage/TableLibraryItems.tsx
@@ -44,9 +44,9 @@ export function TableLibraryItems({ items }: TableLibraryItemsProps) {
       return;
     }
     if (item.item_type === LibraryItemType.RSFORM) {
-      router.push(urls.schema(item.id), event.ctrlKey || event.metaKey);
+      router.push({ path: urls.schema(item.id), newTab: event.ctrlKey || event.metaKey });
     } else if (item.item_type === LibraryItemType.OSS) {
-      router.push(urls.oss(item.id), event.ctrlKey || event.metaKey);
+      router.push({ path: urls.oss(item.id), newTab: event.ctrlKey || event.metaKey });
     }
   }
 
diff --git a/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/NodeContextMenu.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/NodeContextMenu.tsx
index e597eb5b..65549054 100644
--- a/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/NodeContextMenu.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/NodeContextMenu.tsx
@@ -151,7 +151,7 @@ export function NodeContextMenu({ isOpen, operation, cursorX, cursorY, onHide }:
     void inputCreate({
       itemID: schema.id,
       data: { target: operation.id, positions: getPositions() }
-    }).then(new_schema => router.push(urls.schema(new_schema.id)));
+    }).then(new_schema => router.push({ path: urls.schema(new_schema.id), force: true }));
   }
 
   function handleRelocateConstituents() {
diff --git a/rsconcept/frontend/src/features/oss/pages/OssPage/MenuMain.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/MenuMain.tsx
index b603eaa4..46c2d103 100644
--- a/rsconcept/frontend/src/features/oss/pages/OssPage/MenuMain.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/MenuMain.tsx
@@ -37,7 +37,7 @@ export function MenuMain() {
   }
 
   function handleCreateNew() {
-    router.push(urls.create_schema);
+    router.push({ path: urls.create_schema });
   }
 
   function handleShowQR() {
@@ -91,7 +91,7 @@ export function MenuMain() {
         <DropdownButton
           text='Библиотека'
           icon={<IconLibrary size='1rem' className='icon-primary' />}
-          onClick={() => router.push(urls.library)}
+          onClick={() => router.push({ path: urls.library })}
         />
       </Dropdown>
     </div>
diff --git a/rsconcept/frontend/src/features/oss/pages/OssPage/OssEditContext.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/OssEditContext.tsx
index b76157d3..1ce36d05 100644
--- a/rsconcept/frontend/src/features/oss/pages/OssPage/OssEditContext.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/OssEditContext.tsx
@@ -92,7 +92,7 @@ export const OssEditState = ({ itemID, children }: React.PropsWithChildren<OssEd
       id: schema.id,
       tab: tab
     });
-    router.push(url);
+    router.push({ path: url });
   }
 
   function navigateOperationSchema(target: number) {
@@ -100,18 +100,21 @@ export const OssEditState = ({ itemID, children }: React.PropsWithChildren<OssEd
     if (!node?.result) {
       return;
     }
-    router.push(urls.schema_props({ id: node.result, tab: RSTabID.CST_LIST }));
+    router.push({ path: urls.schema_props({ id: node.result, tab: RSTabID.CST_LIST }) });
   }
 
   function deleteSchema() {
     if (!window.confirm(promptText.deleteOSS)) {
       return;
     }
-    void deleteItem(schema.id).then(() => {
-      if (searchLocation === schema.location) {
-        setSearchLocation('');
+    void deleteItem({
+      target: schema.id,
+      beforeInvalidate: () => {
+        if (searchLocation === schema.location) {
+          setSearchLocation('');
+        }
+        return router.pushAsync({ path: urls.library, force: true });
       }
-      router.push(urls.library);
     });
   }
 
diff --git a/rsconcept/frontend/src/features/oss/pages/OssPage/OssPage.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/OssPage.tsx
index afa0d046..0ff838a6 100644
--- a/rsconcept/frontend/src/features/oss/pages/OssPage/OssPage.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/OssPage.tsx
@@ -37,7 +37,7 @@ export function OssPage() {
   useEffect(() => setIsModified(false), [setIsModified]);
 
   if (!urlData.id) {
-    router.replace(urls.page404);
+    router.replace({ path: urls.page404, force: true });
     return null;
   }
 
diff --git a/rsconcept/frontend/src/features/rsform/components/ToolbarRSFormCard.tsx b/rsconcept/frontend/src/features/rsform/components/ToolbarRSFormCard.tsx
index 38227942..65d4c195 100644
--- a/rsconcept/frontend/src/features/rsform/components/ToolbarRSFormCard.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/ToolbarRSFormCard.tsx
@@ -43,7 +43,7 @@ export function ToolbarRSFormCard({ schema, onSubmit, isMutable, deleteSchema }:
     return (
       <MiniSelectorOSS
         items={rsSchema.oss}
-        onSelect={(event, value) => router.push(urls.oss(value.id), event.ctrlKey || event.metaKey)}
+        onSelect={(event, value) => router.push({ path: urls.oss(value.id), newTab: event.ctrlKey || event.metaKey })}
       />
     );
   })();
diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx
index 5c2c0de0..7c02e5f6 100644
--- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/ToolbarConstituenta.tsx
@@ -69,13 +69,13 @@ export function ToolbarConstituenta({
 
   function viewPredecessor(target: number) {
     void findPredecessor(target).then(reference =>
-      router.push(
-        urls.schema_props({
+      router.push({
+        path: urls.schema_props({
           id: reference.schema,
           active: reference.id,
           tab: RSTabID.CST_EDIT
         })
-      )
+      })
     );
   }
 
diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx
index ef03b836..787b75a8 100644
--- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx
@@ -61,7 +61,7 @@ export function FormRSForm() {
   }, [isDirty, setIsModified]);
 
   function handleSelectVersion(version: CurrentVersion) {
-    router.push(urls.schema(schema.id, version === 'latest' ? undefined : version));
+    router.push({ path: urls.schema(schema.id, version === 'latest' ? undefined : version) });
   }
 
   function onSubmit(data: IUpdateLibraryItemDTO) {
diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuEditSchema.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuEditSchema.tsx
index bc0bdf47..233d43a0 100644
--- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuEditSchema.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuEditSchema.tsx
@@ -112,7 +112,7 @@ export function MenuEditSchema() {
         hideTitle={editMenu.isOpen}
         className='h-full px-2'
         icon={<IconArchive size='1.25rem' className='icon-primary' />}
-        onClick={event => router.push(urls.schema(schema.id), event.ctrlKey || event.metaKey)}
+        onClick={event => router.push({ path: urls.schema(schema.id), newTab: event.ctrlKey || event.metaKey })}
       />
     );
   }
diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuMain.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuMain.tsx
index 67262a6d..565ddaae 100644
--- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuMain.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/MenuMain.tsx
@@ -175,20 +175,20 @@ export function MenuMain() {
           <DropdownButton
             text='Создать новую схему'
             icon={<IconNewItem size='1rem' className='icon-primary' />}
-            onClick={() => router.push(urls.create_schema)}
+            onClick={() => router.push({ path: urls.create_schema })}
           />
         ) : null}
         {schema.oss.length > 0 ? (
           <DropdownButton
             text='Перейти к ОСС'
             icon={<IconOSS size='1rem' className='icon-primary' />}
-            onClick={() => router.push(urls.oss(schema.oss[0].id))}
+            onClick={() => router.push({ path: urls.oss(schema.oss[0].id) })}
           />
         ) : null}
         <DropdownButton
           text='Библиотека'
           icon={<IconLibrary size='1rem' className='icon-primary' />}
-          onClick={() => router.push(urls.library)}
+          onClick={() => router.push({ path: urls.library })}
         />
       </Dropdown>
     </div>
diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSEditContext.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSEditContext.tsx
index 443caad5..7d29f833 100644
--- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSEditContext.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSEditContext.tsx
@@ -135,11 +135,11 @@ export const RSEditState = ({
   }
 
   function navigateVersion(versionID?: number) {
-    router.push(urls.schema(schema.id, versionID));
+    router.push({ path: urls.schema(schema.id, versionID) });
   }
 
   function navigateOss(ossID: number, newTab?: boolean) {
-    router.push(urls.oss(ossID), newTab);
+    router.push({ path: urls.oss(ossID), newTab: newTab });
   }
 
   function navigateRSForm({ tab, activeID }: { tab: RSTabID; activeID?: number }) {
@@ -152,15 +152,15 @@ export const RSEditState = ({
     const url = urls.schema_props(data);
     if (activeID) {
       if (tab === activeTab && tab !== RSTabID.CST_EDIT) {
-        router.replace(url);
+        router.replace({ path: url });
       } else {
-        router.push(url);
+        router.push({ path: url });
       }
     } else if (tab !== activeTab && tab === RSTabID.CST_EDIT && schema.items.length > 0) {
       data.active = schema.items[0].id;
-      router.replace(urls.schema_props(data));
+      router.replace({ path: urls.schema_props(data) });
     } else {
-      router.push(url);
+      router.push({ path: url });
     }
   }
 
@@ -175,14 +175,17 @@ export const RSEditState = ({
       return;
     }
     const ossID = schema.oss.length > 0 ? schema.oss[0].id : null;
-    void deleteItem(schema.id).then(() => {
-      if (ossID) {
-        router.push(urls.oss(ossID));
-      } else {
-        if (searchLocation === schema.location) {
-          setSearchLocation('');
+    void deleteItem({
+      target: schema.id,
+      beforeInvalidate: () => {
+        if (ossID) {
+          return router.pushAsync({ path: urls.oss(ossID), force: true });
+        } else {
+          if (searchLocation === schema.location) {
+            setSearchLocation('');
+          }
+          return router.pushAsync({ path: urls.library, force: true });
         }
-        router.push(urls.library);
       }
     });
   }
diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSFormPage.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSFormPage.tsx
index 8704ca00..f3a9208e 100644
--- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSFormPage.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/RSFormPage.tsx
@@ -48,7 +48,7 @@ export function RSFormPage() {
   useEffect(() => setIsModified(false), [setIsModified]);
 
   if (!urlData.id) {
-    router.replace(urls.page404);
+    router.replace({ path: urls.page404, force: true });
     return null;
   }
   return (
diff --git a/rsconcept/frontend/src/features/users/pages/RegisterPage/FormSignup.tsx b/rsconcept/frontend/src/features/users/pages/RegisterPage/FormSignup.tsx
index 914820f8..1ba648d1 100644
--- a/rsconcept/frontend/src/features/users/pages/RegisterPage/FormSignup.tsx
+++ b/rsconcept/frontend/src/features/users/pages/RegisterPage/FormSignup.tsx
@@ -44,12 +44,14 @@ export function FormSignup() {
     if (router.canBack()) {
       router.back();
     } else {
-      router.push(urls.library);
+      router.push({ path: urls.library });
     }
   }
 
   function onSubmit(data: IUserSignupDTO) {
-    return signup(data).then(createdUser => router.push(urls.login_hint(createdUser.username)));
+    return signup(data).then(createdUser =>
+      router.pushAsync({ path: urls.login_hint(createdUser.username), force: true })
+    );
   }
 
   return (
diff --git a/rsconcept/frontend/src/features/users/pages/UserProfilePage/EditorPassword.tsx b/rsconcept/frontend/src/features/users/pages/UserProfilePage/EditorPassword.tsx
index 9fddd78e..12c6a589 100644
--- a/rsconcept/frontend/src/features/users/pages/UserProfilePage/EditorPassword.tsx
+++ b/rsconcept/frontend/src/features/users/pages/UserProfilePage/EditorPassword.tsx
@@ -32,7 +32,7 @@ export function EditorPassword() {
   }
 
   function onSubmit(data: IChangePasswordDTO) {
-    return changePassword(data).then(() => router.push(urls.login));
+    return changePassword(data).then(() => router.pushAsync({ path: urls.login, force: true }));
   }
 
   return (