From 908e7dee6cbdf36de7d50f7cc2c4b09338c3ec5d Mon Sep 17 00:00:00 2001
From: arpitnath <arpitnath42@gmail.com>
Date: Mon, 23 Oct 2023 20:25:26 +0530
Subject: [PATCH] fixes: page switch via validateRoutes

---
 frontend/src/Editor/EditorFunc.jsx | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/frontend/src/Editor/EditorFunc.jsx b/frontend/src/Editor/EditorFunc.jsx
index d803960f1b..8e7fcae85e 100644
--- a/frontend/src/Editor/EditorFunc.jsx
+++ b/frontend/src/Editor/EditorFunc.jsx
@@ -717,7 +717,11 @@ const EditorComponent = (props) => {
     });
 
     if (versionSwitched) {
-      props?.navigate(`/${getWorkspaceId()}/apps/${appId}/${appJson.pages[homePageId]?.handle}`);
+      props?.navigate(`/${getWorkspaceId()}/apps/${appId}/${appJson.pages[homePageId]?.handle}`, {
+        state: {
+          isSwitchingPage: true,
+        },
+      });
     }
 
     await useDataSourcesStore.getState().actions.fetchGlobalDataSources(data?.organization_id);
@@ -1295,7 +1299,11 @@ const EditorComponent = (props) => {
       switchPage: true,
       pageId: newPageId,
     });
-    props?.navigate(`/${getWorkspaceId()}/apps/${appId}/${newHandle}`);
+    props?.navigate(`/${getWorkspaceId()}/apps/${appId}/${newHandle}`, {
+      state: {
+        isSwitchingPage: true,
+      },
+    });
   };
 
   const switchPage = (pageId, queryParams = []) => {
@@ -1314,7 +1322,11 @@ const EditorComponent = (props) => {
     const copyOfAppDefinition = JSON.parse(JSON.stringify(appDefinition));
     const queryParamsString = queryParams.map(([key, value]) => `${key}=${value}`).join('&');
 
-    props?.navigate(`/${getWorkspaceId()}/apps/${appId}/${handle}?${queryParamsString}`);
+    props?.navigate(`/${getWorkspaceId()}/apps/${appId}/${handle}?${queryParamsString}`, {
+      state: {
+        isSwitchingPage: true,
+      },
+    });
 
     const { globals: existingGlobals } = currentState;