From b3b8d916b6b94b70cd1316686d5392bfdbc875b6 Mon Sep 17 00:00:00 2001
From: vamsi krishna <matalav55@gmail.com>
Date: Mon, 25 Nov 2024 18:10:32 +0530
Subject: [PATCH 1/2] fixed custom properties adding issue

---
 .../components/issues/issue-modal/form.tsx    | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/web/core/components/issues/issue-modal/form.tsx b/web/core/components/issues/issue-modal/form.tsx
index 221f6627a67..6f1cee6b6fd 100644
--- a/web/core/components/issues/issue-modal/form.tsx
+++ b/web/core/components/issues/issue-modal/form.tsx
@@ -113,7 +113,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
 
   // store hooks
   const { getProjectById } = useProject();
-  const { getIssueTypeIdOnProjectChange, getActiveAdditionalPropertiesLength, handlePropertyValuesValidation } =
+  const { getIssueTypeIdOnProjectChange, getActiveAdditionalPropertiesLength, handlePropertyValuesValidation, handleCreateUpdatePropertyValues } =
     useIssueModal();
   const { isMobile } = usePlatformOS();
   const { moveIssue } = useWorkspaceDraftIssues();
@@ -236,6 +236,23 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
       });
   };
 
+  const handleMoveToProjects = async () => {
+    if( !data?.id ||!data?.project_id || !data) return
+    await handleCreateUpdatePropertyValues({
+      issueId: data.id,
+      issueTypeId: data.type_id,
+      projectId: data.project_id,
+      workspaceSlug: workspaceSlug.toString(),
+      isDraft: true
+    })
+
+    moveIssue(workspaceSlug.toString(), data.id, {
+      ...data,
+      ...getValues(),
+    } as TWorkspaceDraftIssue);
+
+  }
+
   const condition =
     (watch("name") && watch("name") !== "") || (watch("description_html") && watch("description_html") !== "<p></p>");
 
@@ -493,14 +510,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
                       type="button"
                       size="sm"
                       loading={isSubmitting}
-                      onClick={() => {
-                        if (data?.id && data) {
-                          moveIssue(workspaceSlug.toString(), data?.id, {
-                            ...data,
-                            ...getValues(),
-                          } as TWorkspaceDraftIssue);
-                        }
-                      }}
+                      onClick={handleMoveToProjects}
                     >
                       Add to project
                     </Button>

From 64c41947ad62c6be2d7192ca80624cda06bc013e Mon Sep 17 00:00:00 2001
From: vamsi krishna <matalav55@gmail.com>
Date: Mon, 25 Nov 2024 18:55:52 +0530
Subject: [PATCH 2/2] added error handling to function

---
 .../components/issues/issue-modal/form.tsx    | 52 ++++++++++++-------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/web/core/components/issues/issue-modal/form.tsx b/web/core/components/issues/issue-modal/form.tsx
index 6f1cee6b6fd..5f182d24ee5 100644
--- a/web/core/components/issues/issue-modal/form.tsx
+++ b/web/core/components/issues/issue-modal/form.tsx
@@ -101,6 +101,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
   const [labelModal, setLabelModal] = useState(false);
   const [selectedParentIssue, setSelectedParentIssue] = useState<ISearchIssueResponse | null>(null);
   const [gptAssistantModal, setGptAssistantModal] = useState(false);
+  const [isMoving, setIsMoving] = useState<boolean>(false);
 
   // refs
   const editorRef = useRef<EditorRefApi>(null);
@@ -113,8 +114,12 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
 
   // store hooks
   const { getProjectById } = useProject();
-  const { getIssueTypeIdOnProjectChange, getActiveAdditionalPropertiesLength, handlePropertyValuesValidation, handleCreateUpdatePropertyValues } =
-    useIssueModal();
+  const {
+    getIssueTypeIdOnProjectChange,
+    getActiveAdditionalPropertiesLength,
+    handlePropertyValuesValidation,
+    handleCreateUpdatePropertyValues,
+  } = useIssueModal();
   const { isMobile } = usePlatformOS();
   const { moveIssue } = useWorkspaceDraftIssues();
 
@@ -237,21 +242,31 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
   };
 
   const handleMoveToProjects = async () => {
-    if( !data?.id ||!data?.project_id || !data) return
-    await handleCreateUpdatePropertyValues({
-      issueId: data.id,
-      issueTypeId: data.type_id,
-      projectId: data.project_id,
-      workspaceSlug: workspaceSlug.toString(),
-      isDraft: true
-    })
-
-    moveIssue(workspaceSlug.toString(), data.id, {
-      ...data,
-      ...getValues(),
-    } as TWorkspaceDraftIssue);
-
-  }
+    if (!data?.id || !data?.project_id || !data) return;
+    setIsMoving(true);
+    try {
+      await handleCreateUpdatePropertyValues({
+        issueId: data.id,
+        issueTypeId: data.type_id,
+        projectId: data.project_id,
+        workspaceSlug: workspaceSlug.toString(),
+        isDraft: true,
+      });
+
+      await moveIssue(workspaceSlug.toString(), data.id, {
+        ...data,
+        ...getValues(),
+      } as TWorkspaceDraftIssue);
+    } catch (error) {
+      setToast({
+        type: TOAST_TYPE.ERROR,
+        title: "Error!",
+        message: "Failed to move issue to project. Please try again.",
+      });
+    } finally {
+      setIsMoving(false);
+    }
+  };
 
   const condition =
     (watch("name") && watch("name") !== "") || (watch("description_html") && watch("description_html") !== "<p></p>");
@@ -509,8 +524,9 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
                       variant="primary"
                       type="button"
                       size="sm"
-                      loading={isSubmitting}
+                      loading={isMoving}
                       onClick={handleMoveToProjects}
+                      disabled={isMoving}
                     >
                       Add to project
                     </Button>