From f2af5f06531185f0a186f01c1657cbdae6659fce Mon Sep 17 00:00:00 2001
From: rahulramesha <71900764+rahulramesha@users.noreply.github.com>
Date: Tue, 30 Jul 2024 13:53:19 +0530
Subject: [PATCH] fix modules and cycle peek views (#5261)

---
 web/core/components/cycles/board/cycles-board-card.tsx | 2 +-
 web/core/components/cycles/list/cycles-list-item.tsx   | 2 +-
 web/core/components/modules/module-card-item.tsx       | 2 +-
 web/core/components/modules/module-list-item.tsx       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/core/components/cycles/board/cycles-board-card.tsx b/web/core/components/cycles/board/cycles-board-card.tsx
index e14f63a95..5c7730560 100644
--- a/web/core/components/cycles/board/cycles-board-card.tsx
+++ b/web/core/components/cycles/board/cycles-board-card.tsx
@@ -139,7 +139,7 @@ export const CyclesBoardCard: FC<ICyclesBoardCard> = observer((props) => {
     e.stopPropagation();
 
     const query = generateQueryParams(searchParams, ["peekCycle"]);
-    if (searchParams.has("peekCycle")) {
+    if (searchParams.has("peekCycle") && searchParams.get("peekCycle") === cycleId) {
       router.push(`${pathname}?${query}`);
     } else {
       router.push(`${pathname}?${query && `${query}&`}peekCycle=${cycleId}`);
diff --git a/web/core/components/cycles/list/cycles-list-item.tsx b/web/core/components/cycles/list/cycles-list-item.tsx
index 7b93acbca..67983829a 100644
--- a/web/core/components/cycles/list/cycles-list-item.tsx
+++ b/web/core/components/cycles/list/cycles-list-item.tsx
@@ -70,7 +70,7 @@ export const CyclesListItem: FC<TCyclesListItem> = observer((props) => {
     e.stopPropagation();
 
     const query = generateQueryParams(searchParams, ["peekCycle"]);
-    if (searchParams.has("peekCycle")) {
+    if (searchParams.has("peekCycle") && searchParams.get("peekCycle") === cycleId) {
       router.push(`${pathname}?${query}`);
     } else {
       router.push(`${pathname}?${query && `${query}&`}peekCycle=${cycleId}`);
diff --git a/web/core/components/modules/module-card-item.tsx b/web/core/components/modules/module-card-item.tsx
index cda9c7381..d8518f21a 100644
--- a/web/core/components/modules/module-card-item.tsx
+++ b/web/core/components/modules/module-card-item.tsx
@@ -113,7 +113,7 @@ export const ModuleCardItem: React.FC<Props> = observer((props) => {
     e.preventDefault();
 
     const query = generateQueryParams(searchParams, ["peekModule"]);
-    if (searchParams.has("peekModule")) {
+    if (searchParams.has("peekModule") && searchParams.get("peekModule") === moduleId) {
       router.push(`${pathname}?${query}`);
     } else {
       router.push(`${pathname}?${query && `${query}&`}peekModule=${moduleId}`);
diff --git a/web/core/components/modules/module-list-item.tsx b/web/core/components/modules/module-list-item.tsx
index 88d4d0141..8eb1f5b98 100644
--- a/web/core/components/modules/module-list-item.tsx
+++ b/web/core/components/modules/module-list-item.tsx
@@ -67,7 +67,7 @@ export const ModuleListItem: React.FC<Props> = observer((props) => {
     e.preventDefault();
 
     const query = generateQueryParams(searchParams, ["peekModule"]);
-    if (searchParams.has("peekModule")) {
+    if (searchParams.has("peekModule") && searchParams.get("peekModule") === moduleId) {
       router.push(`${pathname}?${query}`);
     } else {
       router.push(`${pathname}?${query && `${query}&`}peekModule=${moduleId}`);