From 62913aea25051fc747f8d86b7470fa7dfc383e7c Mon Sep 17 00:00:00 2001
From: Hetu Nandu <hetu@appsmith.com>
Date: Thu, 14 Dec 2023 16:29:36 +0530
Subject: [PATCH] fix: App sidebar context switching with page (#29615)

Fixes a context switching issue where app sidebar navigation does not
retain the current page canvas

fixes #29614

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **Refactor**
- Improved the context switching mechanism to include page-specific
data, enhancing the app's responsiveness and accuracy when users switch
between different contexts.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 app/client/src/sagas/ContextSwitchingSaga.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/client/src/sagas/ContextSwitchingSaga.ts b/app/client/src/sagas/ContextSwitchingSaga.ts
index 884827ecca..a43b913ad5 100644
--- a/app/client/src/sagas/ContextSwitchingSaga.ts
+++ b/app/client/src/sagas/ContextSwitchingSaga.ts
@@ -260,7 +260,7 @@ function* getEntitiesForSet(
     state?.invokedBy === NavigationMethod.AppSidebar
   ) {
     const currentAppId: string = yield select(getCurrentApplicationId);
-    const key = `${currentEntityInfo.appState}.${currentAppId}#${branch}`;
+    const key = `${currentEntityInfo.appState}.${currentAppId}.${currentEntityInfo.pageId}#${branch}`;
     entities.push({
       key,
       entityInfo: {