From c988a29af6a27c3a9e4ae260dc8edddb40adc588 Mon Sep 17 00:00:00 2001
From: gurusainath <gurusainath007@gmail.com>
Date: Tue, 3 Oct 2023 17:14:28 +0530
Subject: [PATCH 1/2] chore: handled route validation and layout access
 validation in plane deploy issues

---
 space/components/issues/navbar/index.tsx | 54 +++++++++++++++++++-----
 1 file changed, 43 insertions(+), 11 deletions(-)

diff --git a/space/components/issues/navbar/index.tsx b/space/components/issues/navbar/index.tsx
index 509d676b7bb..cecc6ba778e 100644
--- a/space/components/issues/navbar/index.tsx
+++ b/space/components/issues/navbar/index.tsx
@@ -44,19 +44,51 @@ const IssueNavbar = observer(() => {
   }, [projectStore, workspace_slug, project_slug]);
 
   useEffect(() => {
-    if (workspace_slug && project_slug) {
-      if (!board) {
-        router.push({
-          pathname: `/${workspace_slug}/${project_slug}`,
-          query: {
-            board: "list",
-          },
-        });
-        return projectStore.setActiveBoard("list");
+    if (workspace_slug && project_slug && projectStore?.deploySettings) {
+      const viewsAcceptable: string[] = [];
+      let currentBoard: string | null = null;
+
+      if (projectStore?.deploySettings?.views?.list) viewsAcceptable.push("list");
+      if (projectStore?.deploySettings?.views?.kanban) viewsAcceptable.push("kanban");
+      if (projectStore?.deploySettings?.views?.calendar) viewsAcceptable.push("calendar");
+      if (projectStore?.deploySettings?.views?.gantt) viewsAcceptable.push("gantt");
+      if (projectStore?.deploySettings?.views?.spreadsheet) viewsAcceptable.push("spreadsheet");
+
+      if (board) {
+        if (viewsAcceptable.includes(board.toString())) {
+          currentBoard = board.toString();
+        } else {
+          if (viewsAcceptable && viewsAcceptable.length > 0) {
+            currentBoard = viewsAcceptable[0];
+          }
+        }
+      } else {
+        if (viewsAcceptable && viewsAcceptable.length > 0) {
+          currentBoard = viewsAcceptable[0];
+        }
+      }
+
+      if (currentBoard) {
+        if (projectStore?.activeBoard === null) {
+          projectStore.setActiveBoard(currentBoard);
+          router.push({
+            pathname: `/${workspace_slug}/${project_slug}`,
+            query: {
+              board: currentBoard,
+            },
+          });
+        } else if (projectStore?.activeBoard !== currentBoard) {
+          projectStore.setActiveBoard(currentBoard);
+          router.push({
+            pathname: `/${workspace_slug}/${project_slug}`,
+            query: {
+              board: currentBoard,
+            },
+          });
+        }
       }
-      projectStore.setActiveBoard(board.toString());
     }
-  }, [board, workspace_slug, project_slug]);
+  }, [board, workspace_slug, project_slug, router, projectStore, projectStore?.deploySettings]);
 
   return (
     <div className="px-5 relative w-full flex items-center gap-4">

From cec50db9e93e7168e30efa6317e1788111f8f80a Mon Sep 17 00:00:00 2001
From: gurusainath <gurusainath007@gmail.com>
Date: Tue, 3 Oct 2023 17:20:50 +0530
Subject: [PATCH 2/2] chore: impoved validation condition

---
 space/components/issues/navbar/index.tsx | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/space/components/issues/navbar/index.tsx b/space/components/issues/navbar/index.tsx
index cecc6ba778e..35ffbe289c2 100644
--- a/space/components/issues/navbar/index.tsx
+++ b/space/components/issues/navbar/index.tsx
@@ -69,15 +69,7 @@ const IssueNavbar = observer(() => {
       }
 
       if (currentBoard) {
-        if (projectStore?.activeBoard === null) {
-          projectStore.setActiveBoard(currentBoard);
-          router.push({
-            pathname: `/${workspace_slug}/${project_slug}`,
-            query: {
-              board: currentBoard,
-            },
-          });
-        } else if (projectStore?.activeBoard !== currentBoard) {
+        if (projectStore?.activeBoard === null || projectStore?.activeBoard !== currentBoard) {
           projectStore.setActiveBoard(currentBoard);
           router.push({
             pathname: `/${workspace_slug}/${project_slug}`,