From 5fc6370231dababd25dc3825fc2caf8323d06881 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Date: Tue, 5 Dec 2023 13:41:31 +0530
Subject: [PATCH] chore: draft issue layout and permission validation (#2982)

* chore: create draft issue option added in draft issue layout and permission validation added

* chore: create draft issue option added in draft issue list layout and permission validation added
---
 .../issue-layouts/kanban/base-kanban-root.tsx |  2 +-
 .../kanban/headers/group-by-card.tsx          | 24 ++++++++++++++-----
 .../issue-layouts/list/base-list-root.tsx     |  2 +-
 .../list/headers/group-by-card.tsx            | 24 ++++++++++++++-----
 .../project-issues/draft/issue.store.ts       |  2 +-
 5 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/web/components/issues/issue-layouts/kanban/base-kanban-root.tsx b/web/components/issues/issue-layouts/kanban/base-kanban-root.tsx
index 66d33ad16..e5d279809 100644
--- a/web/components/issues/issue-layouts/kanban/base-kanban-root.tsx
+++ b/web/components/issues/issue-layouts/kanban/base-kanban-root.tsx
@@ -224,7 +224,7 @@ export const BaseKanBanRoot: React.FC<IBaseKanBanLayout> = observer((props: IBas
               isDragStarted={isDragStarted}
               quickAddCallback={issueStore?.quickAddIssue}
               viewId={viewId}
-              disableIssueCreation={!enableIssueCreation}
+              disableIssueCreation={!enableIssueCreation || !isEditingAllowed}
               isReadOnly={!enableInlineEditing || !isEditingAllowed}
               currentStore={currentStore}
               addIssuesToView={addIssuesToView}
diff --git a/web/components/issues/issue-layouts/kanban/headers/group-by-card.tsx b/web/components/issues/issue-layouts/kanban/headers/group-by-card.tsx
index f58001402..8fc2c6e17 100644
--- a/web/components/issues/issue-layouts/kanban/headers/group-by-card.tsx
+++ b/web/components/issues/issue-layouts/kanban/headers/group-by-card.tsx
@@ -3,6 +3,7 @@ import { useRouter } from "next/router";
 // components
 import { CustomMenu } from "@plane/ui";
 import { CreateUpdateIssueModal } from "components/issues/modal";
+import { CreateUpdateDraftIssueModal } from "components/issues/draft-issue-modal";
 import { ExistingIssuesListModal } from "components/core";
 // lucide icons
 import { Minimize2, Maximize2, Circle, Plus } from "lucide-react";
@@ -51,6 +52,8 @@ export const HeaderGroupByCard: FC<IHeaderGroupByCard> = observer((props) => {
   const router = useRouter();
   const { workspaceSlug, projectId, moduleId, cycleId } = router.query;
 
+  const isDraftIssue = router.pathname.includes("draft-issue");
+
   const { setToastAlert } = useToast();
 
   const renderExistingIssueModal = moduleId || cycleId;
@@ -73,12 +76,21 @@ export const HeaderGroupByCard: FC<IHeaderGroupByCard> = observer((props) => {
 
   return (
     <>
-      <CreateUpdateIssueModal
-        isOpen={isOpen}
-        handleClose={() => setIsOpen(false)}
-        prePopulateData={issuePayload}
-        currentStore={currentStore}
-      />
+      {isDraftIssue ? (
+        <CreateUpdateDraftIssueModal
+          isOpen={isOpen}
+          handleClose={() => setIsOpen(false)}
+          prePopulateData={issuePayload}
+          fieldsToShow={["all"]}
+        />
+      ) : (
+        <CreateUpdateIssueModal
+          isOpen={isOpen}
+          handleClose={() => setIsOpen(false)}
+          prePopulateData={issuePayload}
+          currentStore={currentStore}
+        />
+      )}
       {renderExistingIssueModal && (
         <ExistingIssuesListModal
           isOpen={openExistingIssueListModal}
diff --git a/web/components/issues/issue-layouts/list/base-list-root.tsx b/web/components/issues/issue-layouts/list/base-list-root.tsx
index 6789ea63c..4a0ff32c7 100644
--- a/web/components/issues/issue-layouts/list/base-list-root.tsx
+++ b/web/components/issues/issue-layouts/list/base-list-root.tsx
@@ -148,7 +148,7 @@ export const BaseListRoot = observer((props: IBaseListRoot) => {
             quickAddCallback={issueStore?.quickAddIssue}
             enableIssueQuickAdd={!!enableQuickAdd}
             isReadonly={!enableInlineEditing || !isEditingAllowed}
-            disableIssueCreation={!enableIssueCreation}
+            disableIssueCreation={!enableIssueCreation || !isEditingAllowed}
             currentStore={currentStore}
             addIssuesToView={addIssuesToView}
           />
diff --git a/web/components/issues/issue-layouts/list/headers/group-by-card.tsx b/web/components/issues/issue-layouts/list/headers/group-by-card.tsx
index c49d33d1e..24dbf435d 100644
--- a/web/components/issues/issue-layouts/list/headers/group-by-card.tsx
+++ b/web/components/issues/issue-layouts/list/headers/group-by-card.tsx
@@ -3,6 +3,7 @@ import { useRouter } from "next/router";
 // lucide icons
 import { CircleDashed, Plus } from "lucide-react";
 // components
+import { CreateUpdateDraftIssueModal } from "components/issues/draft-issue-modal";
 import { CreateUpdateIssueModal } from "components/issues/modal";
 import { ExistingIssuesListModal } from "components/core";
 import { CustomMenu } from "@plane/ui";
@@ -32,6 +33,8 @@ export const HeaderGroupByCard = observer(
 
     const [openExistingIssueListModal, setOpenExistingIssueListModal] = React.useState(false);
 
+    const isDraftIssue = router.pathname.includes("draft-issue");
+
     const { setToastAlert } = useToast();
 
     const renderExistingIssueModal = moduleId || cycleId;
@@ -90,12 +93,21 @@ export const HeaderGroupByCard = observer(
               </div>
             ))}
 
-          <CreateUpdateIssueModal
-            isOpen={isOpen}
-            handleClose={() => setIsOpen(false)}
-            currentStore={currentStore}
-            prePopulateData={issuePayload}
-          />
+          {isDraftIssue ? (
+            <CreateUpdateDraftIssueModal
+              isOpen={isOpen}
+              handleClose={() => setIsOpen(false)}
+              prePopulateData={issuePayload}
+              fieldsToShow={["all"]}
+            />
+          ) : (
+            <CreateUpdateIssueModal
+              isOpen={isOpen}
+              handleClose={() => setIsOpen(false)}
+              currentStore={currentStore}
+              prePopulateData={issuePayload}
+            />
+          )}
 
           {renderExistingIssueModal && (
             <ExistingIssuesListModal
diff --git a/web/store/issues/project-issues/draft/issue.store.ts b/web/store/issues/project-issues/draft/issue.store.ts
index 0333c066c..ddcebc3f0 100644
--- a/web/store/issues/project-issues/draft/issue.store.ts
+++ b/web/store/issues/project-issues/draft/issue.store.ts
@@ -36,7 +36,7 @@ export class ProjectDraftIssuesStore extends IssueBaseStore implements IProjectD
   //viewData
   viewFlags = {
     enableQuickAdd: false,
-    enableIssueCreation: false,
+    enableIssueCreation: true,
     enableInlineEditing: false,
   };