From 4e70e894f62a18248cb47052d4ae5624ad41b906 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Date: Tue, 15 Oct 2024 18:59:22 +0530
Subject: [PATCH] chore: workspace draft issue type (#5836)

---
 .../issue-modal/additional-properties.tsx     |  1 +
 .../components/issues/issue-modal/base.tsx    |  2 ++
 .../issue-modal/context/issue-modal.tsx       |  1 +
 .../issues/issue-modal/draft-issue-layout.tsx |  1 +
 .../components/issues/issue-modal/form.tsx    | 19 ++++++++++---------
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/web/ce/components/issues/issue-modal/additional-properties.tsx b/web/ce/components/issues/issue-modal/additional-properties.tsx
index 228ab51e85..99ddc8830b 100644
--- a/web/ce/components/issues/issue-modal/additional-properties.tsx
+++ b/web/ce/components/issues/issue-modal/additional-properties.tsx
@@ -3,6 +3,7 @@ type TIssueAdditionalPropertiesProps = {
   issueTypeId: string | null;
   projectId: string;
   workspaceSlug: string;
+  isDraft?: boolean;
 };
 
 export const IssueAdditionalProperties: React.FC<TIssueAdditionalPropertiesProps> = () => <></>;
diff --git a/web/core/components/issues/issue-modal/base.tsx b/web/core/components/issues/issue-modal/base.tsx
index b74a235d39..19d54a973f 100644
--- a/web/core/components/issues/issue-modal/base.tsx
+++ b/web/core/components/issues/issue-modal/base.tsx
@@ -204,6 +204,7 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((
           issueTypeId: response.type_id,
           projectId: response.project_id,
           workspaceSlug: workspaceSlug.toString(),
+          isDraft: isDraft,
         });
       }
 
@@ -257,6 +258,7 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((
         issueTypeId: payload.type_id,
         projectId: payload.project_id,
         workspaceSlug: workspaceSlug.toString(),
+        isDraft: isDraft,
       });
 
       setToast({
diff --git a/web/core/components/issues/issue-modal/context/issue-modal.tsx b/web/core/components/issues/issue-modal/context/issue-modal.tsx
index 3b4c650c26..8181445a45 100644
--- a/web/core/components/issues/issue-modal/context/issue-modal.tsx
+++ b/web/core/components/issues/issue-modal/context/issue-modal.tsx
@@ -22,6 +22,7 @@ export type TCreateUpdatePropertyValuesProps = {
   projectId: string;
   workspaceSlug: string;
   issueTypeId: string | null | undefined;
+  isDraft?: boolean;
 };
 
 export type TIssueModalContext = {
diff --git a/web/core/components/issues/issue-modal/draft-issue-layout.tsx b/web/core/components/issues/issue-modal/draft-issue-layout.tsx
index 767e266e5c..8146e6cb40 100644
--- a/web/core/components/issues/issue-modal/draft-issue-layout.tsx
+++ b/web/core/components/issues/issue-modal/draft-issue-layout.tsx
@@ -142,6 +142,7 @@ export const DraftIssueLayout: React.FC<DraftIssueProps> = observer((props) => {
         issueTypeId: response.type_id,
         projectId,
         workspaceSlug: workspaceSlug?.toString(),
+        isDraft: true,
       });
     }
   };
diff --git a/web/core/components/issues/issue-modal/form.tsx b/web/core/components/issues/issue-modal/form.tsx
index c74cc68c49..74808a003a 100644
--- a/web/core/components/issues/issue-modal/form.tsx
+++ b/web/core/components/issues/issue-modal/form.tsx
@@ -195,12 +195,12 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
     const submitData = !data?.id
       ? formData
       : {
-        ...getChangedIssuefields(formData, dirtyFields as { [key: string]: boolean | undefined }),
-        project_id: getValues<"project_id">("project_id"),
-        id: data.id,
-        description_html: formData.description_html ?? "<p></p>",
-        type_id: getValues<"type_id">("type_id"),
-      };
+          ...getChangedIssuefields(formData, dirtyFields as { [key: string]: boolean | undefined }),
+          project_id: getValues<"project_id">("project_id"),
+          id: data.id,
+          description_html: formData.description_html ?? "<p></p>",
+          type_id: getValues<"type_id">("type_id"),
+        };
 
     // this condition helps to move the issues from draft to project issues
     if (formData.hasOwnProperty("is_draft")) submitData.is_draft = formData.is_draft;
@@ -323,7 +323,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
           className={cn(
             "pb-4 space-y-3",
             activeAdditionalPropertiesLength > 4 &&
-            "max-h-[45vh] overflow-hidden overflow-y-auto vertical-scrollbar scrollbar-sm"
+              "max-h-[45vh] overflow-hidden overflow-y-auto vertical-scrollbar scrollbar-sm"
           )}
         >
           <div className="px-5">
@@ -352,7 +352,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
             className={cn(
               "px-5",
               activeAdditionalPropertiesLength <= 4 &&
-              "max-h-[25vh] overflow-hidden overflow-y-auto vertical-scrollbar scrollbar-sm"
+                "max-h-[25vh] overflow-hidden overflow-y-auto vertical-scrollbar scrollbar-sm"
             )}
           >
             {projectId && (
@@ -361,6 +361,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
                 issueTypeId={watch("type_id")}
                 projectId={projectId}
                 workspaceSlug={workspaceSlug?.toString()}
+                isDraft={isDraft}
               />
             )}
           </div>
@@ -393,7 +394,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
                 tabIndex={getIndex("create_more")}
                 role="button"
               >
-                <ToggleSwitch value={isCreateMoreToggleEnabled} onChange={() => { }} size="sm" />
+                <ToggleSwitch value={isCreateMoreToggleEnabled} onChange={() => {}} size="sm" />
                 <span className="text-xs">Create more</span>
               </div>
             )}