fix: fix issue with forking

app/client/src/ce/sagas/ApplicationSagas.tsx

@@ -234,11 +234,7 @@ export function* fetchAppAndPagesSaga(
 ) {
   try {
     const { pages, ...payload } = action.payload;
-    const request = {
-      applicationId: payload.applicationId,
-      pageId: payload.pageId,
-      mode: payload.mode,
-    };
+    const request = { ...payload };
     if (request.pageId && request.applicationId) {
       delete request.applicationId;
     }

app/client/src/pages/Editor/index.tsx

@@ -77,6 +77,8 @@ interface EditorProps {
 type Props = EditorProps & RouteComponentProps<BuilderRouteParams>;
 
 class Editor extends Component<Props> {
+  prevPageId: string | null = null;
+
   componentDidMount() {
     const { basePageId } = this.props.match.params || {};
     urlBuilder.setCurrentBasePageId(basePageId);
@@ -110,7 +112,24 @@ class Editor extends Component<Props> {
 
   componentDidUpdate(prevProps: Props) {
     const { baseApplicationId, basePageId } = this.props.match.params || {};
-    const { basePageId: prevPageBaseId } = prevProps.match.params || {};
+    const { basePageId: prevBasePageId } = prevProps.match.params || {};
+
+    const pageId = this.props.pages.find(
+      (page) => page.basePageId === basePageId,
+    )?.pageId;
+
+    const prevPageId = prevProps.pages.find(
+      (page) => page.basePageId === prevBasePageId,
+    )?.pageId;
+    // caching value for prevPageId as it is required in future lifecycles
+    if (prevPageId) {
+      this.prevPageId = prevPageId;
+    }
+
+    const isPageIdUpdated = pageId !== this.prevPageId;
+    const isBasePageIdUpdated = basePageId !== prevBasePageId;
+    const isPageUpdated = isPageIdUpdated || isBasePageIdUpdated;
+
     const isBranchUpdated = getIsBranchUpdated(
       this.props.location,
       prevProps.location,
@@ -125,8 +144,6 @@ class Editor extends Component<Props> {
       GIT_BRANCH_QUERY_KEY,
     );
 
-    const isPageIdUpdated = basePageId !== prevPageBaseId;
-
     // to prevent re-init during connect
     if (prevBranch && isBranchUpdated && basePageId) {
       this.props.initEditor({
@@ -141,20 +158,10 @@ class Editor extends Component<Props> {
        * If we don't check for `prevPageId`: fetch page is re triggered
        * when redirected to the default page
        */
-      if (
-        prevPageBaseId &&
-        basePageId &&
-        isPageIdUpdated &&
-        this.props.pages.length
-      ) {
-        const pageId = this.props.pages.find(
-          (page) => page.basePageId === basePageId,
-        )?.pageId;
-        if (pageId) {
-          this.props.updateCurrentPage(pageId);
-          this.props.setupPage(pageId);
-          urlBuilder.setCurrentBasePageId(basePageId);
-        }
+      if (pageId && this.prevPageId && isPageUpdated) {
+        this.props.updateCurrentPage(pageId);
+        this.props.setupPage(pageId);
+        urlBuilder.setCurrentBasePageId(basePageId);
       }
     }
   }