From dc2a12ca8b3b4830b577ef7b132cc370f9e0f1c1 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <anmolsinghbhatia@plane.so>
Date: Mon, 4 Sep 2023 18:22:54 +0530
Subject: [PATCH 1/2] chore: condition for subscribed page add issue option

---
 web/components/issues/my-issues/my-issues-view.tsx | 9 +++++++++
 web/components/profile/profile-issues-view.tsx     | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/web/components/issues/my-issues/my-issues-view.tsx b/web/components/issues/my-issues/my-issues-view.tsx
index e8624e23696..c0c688be0e3 100644
--- a/web/components/issues/my-issues/my-issues-view.tsx
+++ b/web/components/issues/my-issues/my-issues-view.tsx
@@ -209,6 +209,15 @@ export const MyIssuesView: React.FC<Props> = ({
     Object.keys(filtersToDisplay).length > 0 &&
     nullFilters.length !== Object.keys(filtersToDisplay).length;
 
+  const isSubscribedIssuesRoute = router.pathname.includes("subscribed");
+  const isMySubscribedIssues =
+    (filters.subscriber &&
+      filters.subscriber.length > 0 &&
+      router.pathname.includes("my-issues")) ??
+    false;
+
+  const disableAddIssueOption = isSubscribedIssuesRoute || isMySubscribedIssues;
+
   return (
     <>
       <CreateUpdateIssueModal
diff --git a/web/components/profile/profile-issues-view.tsx b/web/components/profile/profile-issues-view.tsx
index fa5df1227f5..352562ac475 100644
--- a/web/components/profile/profile-issues-view.tsx
+++ b/web/components/profile/profile-issues-view.tsx
@@ -223,6 +223,15 @@ export const ProfileIssuesView = () => {
     Object.keys(filtersToDisplay).length > 0 &&
     nullFilters.length !== Object.keys(filtersToDisplay).length;
 
+  const isSubscribedIssuesRoute = router.pathname.includes("subscribed");
+  const isMySubscribedIssues =
+    (filters.subscriber &&
+      filters.subscriber.length > 0 &&
+      router.pathname.includes("my-issues")) ??
+    false;
+
+  const disableAddIssueOption = isSubscribedIssuesRoute || isMySubscribedIssues;
+
   return (
     <>
       <CreateUpdateIssueModal

From 9596df7dd1dade949993b9911a28b4a084d356d8 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <anmolsinghbhatia@plane.so>
Date: Mon, 4 Sep 2023 18:29:21 +0530
Subject: [PATCH 2/2] chore: condition for subscribed page add issue option

---
 web/components/core/views/all-views.tsx               | 4 ++++
 web/components/core/views/board-view/all-boards.tsx   | 3 +++
 web/components/core/views/board-view/single-board.tsx | 8 ++++----
 web/components/core/views/list-view/all-lists.tsx     | 3 +++
 web/components/core/views/list-view/single-list.tsx   | 5 +++--
 web/components/issues/my-issues/my-issues-view.tsx    | 1 +
 web/components/profile/profile-issues-view.tsx        | 1 +
 7 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/web/components/core/views/all-views.tsx b/web/components/core/views/all-views.tsx
index 79d5d6b11f0..eb54ccb2ace 100644
--- a/web/components/core/views/all-views.tsx
+++ b/web/components/core/views/all-views.tsx
@@ -53,6 +53,7 @@ type Props = {
   handleOnDragEnd: (result: DropResult) => Promise<void>;
   openIssuesListModal: (() => void) | null;
   removeIssue: ((bridgeId: string, issueId: string) => void) | null;
+  disableAddIssueOption?: boolean;
   trashBox: boolean;
   setTrashBox: React.Dispatch<React.SetStateAction<boolean>>;
   viewProps: IIssueViewProps;
@@ -68,6 +69,7 @@ export const AllViews: React.FC<Props> = ({
   handleOnDragEnd,
   openIssuesListModal,
   removeIssue,
+  disableAddIssueOption = false,
   trashBox,
   setTrashBox,
   viewProps,
@@ -127,6 +129,7 @@ export const AllViews: React.FC<Props> = ({
                 openIssuesListModal={cycleId || moduleId ? openIssuesListModal : null}
                 removeIssue={removeIssue}
                 disableUserActions={disableUserActions}
+                disableAddIssueOption={disableAddIssueOption}
                 user={user}
                 userAuth={memberRole}
                 viewProps={viewProps}
@@ -135,6 +138,7 @@ export const AllViews: React.FC<Props> = ({
               <AllBoards
                 addIssueToGroup={addIssueToGroup}
                 disableUserActions={disableUserActions}
+                disableAddIssueOption={disableAddIssueOption}
                 dragDisabled={dragDisabled}
                 handleIssueAction={handleIssueAction}
                 handleTrashBox={handleTrashBox}
diff --git a/web/components/core/views/board-view/all-boards.tsx b/web/components/core/views/board-view/all-boards.tsx
index ee0fc668bd6..2637e7c334d 100644
--- a/web/components/core/views/board-view/all-boards.tsx
+++ b/web/components/core/views/board-view/all-boards.tsx
@@ -10,6 +10,7 @@ import { ICurrentUserResponse, IIssue, IIssueViewProps, IState, UserAuth } from
 type Props = {
   addIssueToGroup: (groupTitle: string) => void;
   disableUserActions: boolean;
+  disableAddIssueOption?: boolean;
   dragDisabled: boolean;
   handleIssueAction: (issue: IIssue, action: "copy" | "delete" | "edit") => void;
   handleTrashBox: (isDragging: boolean) => void;
@@ -24,6 +25,7 @@ type Props = {
 export const AllBoards: React.FC<Props> = ({
   addIssueToGroup,
   disableUserActions,
+  disableAddIssueOption = false,
   dragDisabled,
   handleIssueAction,
   handleTrashBox,
@@ -52,6 +54,7 @@ export const AllBoards: React.FC<Props> = ({
                 addIssueToGroup={() => addIssueToGroup(singleGroup)}
                 currentState={currentState}
                 disableUserActions={disableUserActions}
+                disableAddIssueOption={disableAddIssueOption}
                 dragDisabled={dragDisabled}
                 groupTitle={singleGroup}
                 handleIssueAction={handleIssueAction}
diff --git a/web/components/core/views/board-view/single-board.tsx b/web/components/core/views/board-view/single-board.tsx
index 52e8c27c7a2..7ba70c97b46 100644
--- a/web/components/core/views/board-view/single-board.tsx
+++ b/web/components/core/views/board-view/single-board.tsx
@@ -20,6 +20,7 @@ type Props = {
   addIssueToGroup: () => void;
   currentState?: IState | null;
   disableUserActions: boolean;
+  disableAddIssueOption?: boolean;
   dragDisabled: boolean;
   groupTitle: string;
   handleIssueAction: (issue: IIssue, action: "copy" | "delete" | "edit") => void;
@@ -36,6 +37,7 @@ export const SingleBoard: React.FC<Props> = ({
   currentState,
   groupTitle,
   disableUserActions,
+  disableAddIssueOption = false,
   dragDisabled,
   handleIssueAction,
   handleTrashBox,
@@ -53,8 +55,6 @@ export const SingleBoard: React.FC<Props> = ({
   const router = useRouter();
   const { cycleId, moduleId } = router.query;
 
-  const isSubscribedIssues = router.pathname.includes("subscribed");
-
   const type = cycleId ? "cycle" : moduleId ? "module" : "issue";
 
   // Check if it has at least 4 tickets since it is enough to accommodate the Calendar height
@@ -72,7 +72,7 @@ export const SingleBoard: React.FC<Props> = ({
         isCollapsed={isCollapsed}
         setIsCollapsed={setIsCollapsed}
         disableUserActions={disableUserActions}
-        disableAddIssue={isSubscribedIssues}
+        disableAddIssue={disableAddIssueOption}
         viewProps={viewProps}
       />
       {isCollapsed && (
@@ -154,7 +154,7 @@ export const SingleBoard: React.FC<Props> = ({
               {selectedGroup !== "created_by" && (
                 <div>
                   {type === "issue"
-                    ? !isSubscribedIssues && (
+                    ? !disableAddIssueOption && (
                         <button
                           type="button"
                           className="flex items-center gap-2 font-medium text-custom-primary outline-none p-1"
diff --git a/web/components/core/views/list-view/all-lists.tsx b/web/components/core/views/list-view/all-lists.tsx
index 64cbebdcd14..84ef029620e 100644
--- a/web/components/core/views/list-view/all-lists.tsx
+++ b/web/components/core/views/list-view/all-lists.tsx
@@ -11,6 +11,7 @@ type Props = {
   openIssuesListModal?: (() => void) | null;
   removeIssue: ((bridgeId: string, issueId: string) => void) | null;
   disableUserActions: boolean;
+  disableAddIssueOption?: boolean;
   user: ICurrentUserResponse | undefined;
   userAuth: UserAuth;
   viewProps: IIssueViewProps;
@@ -20,6 +21,7 @@ export const AllLists: React.FC<Props> = ({
   addIssueToGroup,
   handleIssueAction,
   disableUserActions,
+  disableAddIssueOption = false,
   openIssuesListModal,
   removeIssue,
   states,
@@ -49,6 +51,7 @@ export const AllLists: React.FC<Props> = ({
                 openIssuesListModal={openIssuesListModal}
                 removeIssue={removeIssue}
                 disableUserActions={disableUserActions}
+                disableAddIssueOption={disableAddIssueOption}
                 user={user}
                 userAuth={userAuth}
                 viewProps={viewProps}
diff --git a/web/components/core/views/list-view/single-list.tsx b/web/components/core/views/list-view/single-list.tsx
index a1b80c067a3..bd1c3c6ab30 100644
--- a/web/components/core/views/list-view/single-list.tsx
+++ b/web/components/core/views/list-view/single-list.tsx
@@ -39,6 +39,7 @@ type Props = {
   openIssuesListModal?: (() => void) | null;
   removeIssue: ((bridgeId: string, issueId: string) => void) | null;
   disableUserActions: boolean;
+  disableAddIssueOption?: boolean;
   user: ICurrentUserResponse | undefined;
   userAuth: UserAuth;
   viewProps: IIssueViewProps;
@@ -52,6 +53,7 @@ export const SingleList: React.FC<Props> = ({
   openIssuesListModal,
   removeIssue,
   disableUserActions,
+  disableAddIssueOption = false,
   user,
   userAuth,
   viewProps,
@@ -60,7 +62,6 @@ export const SingleList: React.FC<Props> = ({
   const { workspaceSlug, projectId, cycleId, moduleId } = router.query;
 
   const isArchivedIssues = router.pathname.includes("archived-issues");
-  const isSubscribedIssues = router.pathname.includes("subscribed");
 
   const type = cycleId ? "cycle" : moduleId ? "module" : "issue";
 
@@ -181,7 +182,7 @@ export const SingleList: React.FC<Props> = ({
             {isArchivedIssues ? (
               ""
             ) : type === "issue" ? (
-              !isSubscribedIssues && (
+              !disableAddIssueOption && (
                 <button
                   type="button"
                   className="p-1  text-custom-text-200 hover:bg-custom-background-80"
diff --git a/web/components/issues/my-issues/my-issues-view.tsx b/web/components/issues/my-issues/my-issues-view.tsx
index c0c688be0e3..3500e69e76f 100644
--- a/web/components/issues/my-issues/my-issues-view.tsx
+++ b/web/components/issues/my-issues/my-issues-view.tsx
@@ -300,6 +300,7 @@ export const MyIssuesView: React.FC<Props> = ({
         handleIssueAction={handleIssueAction}
         openIssuesListModal={openIssuesListModal ? openIssuesListModal : null}
         removeIssue={null}
+        disableAddIssueOption={disableAddIssueOption}
         trashBox={trashBox}
         setTrashBox={setTrashBox}
         viewProps={{
diff --git a/web/components/profile/profile-issues-view.tsx b/web/components/profile/profile-issues-view.tsx
index 352562ac475..353b55ae241 100644
--- a/web/components/profile/profile-issues-view.tsx
+++ b/web/components/profile/profile-issues-view.tsx
@@ -301,6 +301,7 @@ export const ProfileIssuesView = () => {
         handleIssueAction={handleIssueAction}
         openIssuesListModal={null}
         removeIssue={null}
+        disableAddIssueOption={disableAddIssueOption}
         trashBox={trashBox}
         setTrashBox={setTrashBox}
         viewProps={{