wip await useNavigate and useRevalidator

huridocs · Jan 21, 2025 · 3291d32 · 3291d32
1 parent 11576d3
commit 3291d32
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 24 deletions.
diff --git a/app/react/I18N/components/I18NLink.tsx b/app/react/I18N/components/I18NLink.tsx
@@ -48,20 +48,20 @@ const I18NLink = (props: I18NLinkProps) => {
     }, delay);
   };
 
-  const _navigate = () => {
-    navigate(to, { replace });
+  const _navigate = async () => {
+    await navigate(to, { replace });
     scrollToHashWithRetry(location.hash);
   };
 
-  const onClickHandler = (e: { preventDefault: () => void }) => {
+  const onClickHandler = async (e: { preventDefault: () => void }) => {
     e.preventDefault();
     if (disabled) return;
 
     if (onClick && confirmTitle) {
       props.mainContext.confirm({
-        accept: () => {
+        accept: async () => {
           onClick(e);
-          _navigate();
+          await _navigate();
         },
         title: confirmTitle,
         message: confirmMessage,
@@ -71,10 +71,10 @@ const I18NLink = (props: I18NLinkProps) => {
 
     if (onClick) {
       onClick(e);
-      _navigate();
+      await _navigate();
       return;
     }
-    _navigate();
+    await _navigate();
   };
 
   useEffect(() => {

diff --git a/app/react/Library/actions/libraryActions.js b/app/react/Library/actions/libraryActions.js
@@ -231,7 +231,7 @@ function encodeSearch(_search, appendQ = true) {
   return appendQ ? `?q=${encodedSearch}` : encodedSearch;
 }
 
-function setSearchInUrl(searchParams, location, navigate) {
+async function setSearchInUrl(searchParams, location, navigate) {
   const { pathname } = location;
   const path = `${pathname}/`.replace(/\/\//g, '/');
   const query = new URLSearchParams(location.search);
@@ -246,7 +246,7 @@ function searchDocuments(
   limit = 30,
   from = 0
 ) {
-  return (dispatch, getState) => {
+  return async (dispatch, getState) => {
     const state = getState().library;
     const currentSearch = search || state.search;
     const currentFilters = filters || state.filters;

diff --git a/app/react/Markdown/components/SearchBox.js b/app/react/Markdown/components/SearchBox.js
@@ -11,8 +11,8 @@ import { SearchTipsContent } from 'app/App/SearchTipsContent';
 const SearchBox = ({ placeholder, classname }) => {
   const navigate = useNavigate();
 
-  const search = ({ searchTerm }) => {
-    navigate(`/library/?q=${rison.encode({ searchTerm })}`);
+  const search = async ({ searchTerm }) => {
+    await navigate(`/library/?q=${rison.encode({ searchTerm })}`);
   };
 
   return (

diff --git a/app/react/V2/Routes/Settings/Pages/PageEditor.tsx b/app/react/V2/Routes/Settings/Pages/PageEditor.tsx
@@ -83,13 +83,13 @@ const PageEditor = () => {
     });
   };
 
-  const handleRevalidate = (response: Page) => {
+  const handleRevalidate = async (response: Page) => {
     if (!page.sharedId) {
-      navigate(`/${response.language}/settings/pages/page/${response.sharedId}`, {
+      await navigate(`/${response.language}/settings/pages/page/${response.sharedId}`, {
         replace: true,
       });
     } else {
-      revalidator.revalidate();
+      await revalidator.revalidate();
     }
   };
 
@@ -106,7 +106,7 @@ const PageEditor = () => {
     notify(response);
 
     if (!hasErrors) {
-      handleRevalidate(response);
+      await handleRevalidate(response);
     }
   };
 
@@ -119,7 +119,7 @@ const PageEditor = () => {
     if (!hasErrors) {
       const pageUrl = getPageUrl(response.sharedId!, response.title);
       window.open(`${window.location.origin}/${pageUrl}`);
-      handleRevalidate(response);
+      await handleRevalidate(response);
     }
   };
 

diff --git a/app/react/V2/Routes/Settings/Thesauri/EditThesaurus.tsx b/app/react/V2/Routes/Settings/Thesauri/EditThesaurus.tsx
@@ -168,13 +168,13 @@ const EditThesaurus = () => {
                   }}
                   disabled={isEmpty(getValues().name)}
                   getThesaurus={getCurrentStatus}
-                  onSuccess={(savedThesaurus: ThesaurusSchema) => {
+                  onSuccess={async (savedThesaurus: ThesaurusSchema) => {
                     setValue('_id', savedThesaurus._id);
                     setNotifications({
                       type: 'success',
                       text: <Translate>Thesauri updated.</Translate>,
                     });
-                    navigate(`../edit/${savedThesaurus._id}`);
+                    await navigate(`../edit/${savedThesaurus._id}`);
                     setIsImporting(false);
                   }}
                   onFailure={() => {

diff --git a/app/react/V2/Routes/Settings/Thesauri/ThesaurusForm.tsx b/app/react/V2/Routes/Settings/Thesauri/ThesaurusForm.tsx
@@ -43,11 +43,11 @@ const ThesaurusForm = ({
   const [thesauri, setThesauri] = useAtom(thesauriAtom);
   const setNotifications = useSetAtom(notificationAtom);
 
-  const handleRevalidate = (savedThesaurus: ClientThesaurus) => {
+  const handleRevalidate = async (savedThesaurus: ClientThesaurus) => {
     if (!thesaurus?._id) {
-      navigate(`../edit/${savedThesaurus._id}`);
+      await navigate(`../edit/${savedThesaurus._id}`);
     } else {
-      revalidator.revalidate();
+      await revalidator.revalidate();
     }
   };
 
@@ -68,7 +68,7 @@ const ThesaurusForm = ({
         <Translate>Thesauri added.</Translate>
       ),
     });
-    handleRevalidate(savedThesaurus);
+    await handleRevalidate(savedThesaurus);
   };
 
   const formSubmit: SubmitHandler<ClientThesaurus> = async data => {

diff --git a/app/react/V2/Routes/Settings/Thesauri/components/ThesauriTable.tsx b/app/react/V2/Routes/Settings/Thesauri/components/ThesauriTable.tsx
@@ -21,8 +21,8 @@ interface ThesauriTableProps {
 
 const ThesauriTable = ({ currentThesauri, setSelectedThesauri }: ThesauriTableProps) => {
   const navigate = useNavigate();
-  const navigateToEditThesaurus = (thesaurus: Row<ThesauriRow>) => {
-    navigate(`./edit/${thesaurus.original._id}`);
+  const navigateToEditThesaurus = async (thesaurus: Row<ThesauriRow>) => {
+    await navigate(`./edit/${thesaurus.original._id}`);
   };
 
   return (