Merge pull request #1035 from sennetconsortium/libpitt/1029-redirect

Move page saving logic after deleteCookies - #1029
sennetconsortium · Nov 14, 2023 · 877dc53 · 877dc53
2 parents 634e365 + b0fcc36
commit 877dc53
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/context/AppContext.jsx b/src/context/AppContext.jsx
@@ -38,10 +38,6 @@ export const AppProvider = ({ cache, children }) => {
     useEffect(() => {
         // Should only include: '/', '/search', '/logout', '/login', '/404'
         const noRedirectTo = Object.values(APP_ROUTES)
-        if (noRedirectTo.indexOf(router.pathname) === -1) {
-            // Set expiry for 10 minutes
-            setLocalItemWithExpiry(pageKey, router.asPath, 600000)
-        }
 
         let info = getCookie('info')
         let groups_token = ""
@@ -58,6 +54,11 @@ export const AppProvider = ({ cache, children }) => {
             deleteCookies()
         }
 
+        if (noRedirectTo.indexOf(router.pathname) === -1) {
+            // Set expiry for 10 minutes
+            setLocalItemWithExpiry(pageKey, router.asPath, 600000)
+        }
+
         if(groups_token  != "") {
             check_valid_token().then((response) => {
                 if (typeof response == "boolean") {

diff --git a/src/search-ui b/src/search-ui
+1 −1		VERSION
+1 −1		components/core/CollapsibleLayout.jsx
+1 −1		package.json