From 941c4946a45f0bf4b1309949002ed2c48c69b86e Mon Sep 17 00:00:00 2001
From: Dhruvik Neharia <dhruvik@appsmith.com>
Date: Fri, 9 Jun 2023 22:01:06 +0530
Subject: [PATCH] fix: Add check to disable nav logo link click if current page
 is the same as homepage (#24241)

## Description
This PR adds a check to disable the link on the logo in navigation, to
avoid creating useless back button history, when the user is on the
homepage of their app.

## This change was required both in CE and EE
EE PR - https://github.com/appsmithorg/appsmith-ee/pull/1596

#### PR fixes following issue(s)
Fixes #23397

#### Type of change
- Bug fix (non-breaking change which fixes an issue)

## Testing
#### How Has This Been Tested?
- [x] Manual
- [ ] Jest
- [ ] Cypress
>
>
#### Test Plan
> Add Testsmith test cases links that relate to this PR
>
>
#### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
>
>
>
## Checklist:
#### Dev activity
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag


#### QA activity:
- [ ] [Speedbreak
features](https://github.com/appsmithorg/TestSmith/wiki/Test-plan-implementation#speedbreaker-features-to-consider-for-every-change)
have been covered
- [ ] Test plan covers all impacted features and [areas of
interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans/_edit#areas-of-interest)
- [ ] Test plan has been peer reviewed by project stakeholders and other
QA members
- [ ] Manually tested functionality on DP
- [ ] We had an implementation alignment call with stakeholders post QA
Round 2
- [ ] Cypress test cases have been added and approved by SDET/manual QA
- [ ] Added `Test Plan Approved` label after Cypress tests were reviewed
- [ ] Added `Test Plan Approved` label after JUnit tests were reviewed
---
 app/client/src/ce/pages/AppViewer/NavigationLogo.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/client/src/ce/pages/AppViewer/NavigationLogo.tsx b/app/client/src/ce/pages/AppViewer/NavigationLogo.tsx
index 228ed8b506..9c5c549c2c 100644
--- a/app/client/src/ce/pages/AppViewer/NavigationLogo.tsx
+++ b/app/client/src/ce/pages/AppViewer/NavigationLogo.tsx
@@ -10,7 +10,10 @@ import {
   getCurrentApplication,
 } from "@appsmith/selectors/applicationSelectors";
 import type { ApplicationPayload } from "@appsmith/constants/ReduxActionConstants";
-import { getViewModePageList } from "selectors/editorSelectors";
+import {
+  getCurrentPageId,
+  getViewModePageList,
+} from "selectors/editorSelectors";
 import { useHref } from "pages/Editor/utils";
 import { APP_MODE } from "entities/App";
 import { builderURL, viewerURL } from "RouteBuilder";
@@ -45,6 +48,7 @@ function NavigationLogo(props: NavigationLogoProps) {
     "applicationDetail.navigationSetting.logoAssetId",
     "",
   );
+  const currentPageId = useSelector(getCurrentPageId);
 
   if (
     !logoAssetId?.length ||
@@ -60,7 +64,8 @@ function NavigationLogo(props: NavigationLogoProps) {
     <Link
       className={classNames({
         "mr-4": true,
-        "pointer-events-none select-none": pages.length <= 1,
+        "pointer-events-none select-none":
+          pages.length <= 1 || defaultPage.pageId === currentPageId,
       })}
       to={pageUrl}
     >