From b5cf20b224ebba2951f54415fb45c64ec0a75207 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia Date: Mon, 11 Nov 2024 14:48:54 +0530 Subject: [PATCH 1/2] fix: create issue modal parent select ui --- .../modals/create-modal/issue-properties.tsx | 12 +- .../components/default-properties.tsx | 108 +++++++++--------- 2 files changed, 63 insertions(+), 57 deletions(-) diff --git a/web/core/components/inbox/modals/create-modal/issue-properties.tsx b/web/core/components/inbox/modals/create-modal/issue-properties.tsx index 313adaf3017..104c026810f 100644 --- a/web/core/components/inbox/modals/create-modal/issue-properties.tsx +++ b/web/core/components/inbox/modals/create-modal/issue-properties.tsx @@ -91,7 +91,7 @@ export const InboxIssueProperties: FC = observer((props) {/* labels */}
{ }} + setIsOpen={() => {}} value={data?.label_ids || []} onChange={(labelIds) => handleData("label_ids", labelIds)} projectId={projectId} @@ -171,13 +171,13 @@ export const InboxIssueProperties: FC = observer((props) {/* add parent */} {isVisible && ( - <> +
{selectedParentIssue ? ( @@ -188,6 +188,8 @@ export const InboxIssueProperties: FC = observer((props) } placement="bottom-start" + className="h-full w-full" + customButtonClassName="h-full" tabIndex={getIndex("parent_id")} > <> @@ -208,7 +210,7 @@ export const InboxIssueProperties: FC = observer((props) ) : (
)}
); diff --git a/web/core/components/issues/issue-modal/components/default-properties.tsx b/web/core/components/issues/issue-modal/components/default-properties.tsx index 5177382ce61..c1978260a14 100644 --- a/web/core/components/issues/issue-modal/components/default-properties.tsx +++ b/web/core/components/issues/issue-modal/components/default-properties.tsx @@ -262,58 +262,62 @@ export const IssueDefaultProperties: React.FC = ob )} /> )} - {parentId ? ( - - {selectedParentIssue?.project_id && ( - - )} - - } - placement="bottom-start" - tabIndex={getIndex("parent_id")} - > - <> - setParentIssueListModalOpen(true)}> - Change parent issue - - ( - { - onChange(null); - handleFormChange(); - }} - > - Remove parent issue - - )} - /> - - - ) : ( - - )} +
+ {parentId ? ( + + {selectedParentIssue?.project_id && ( + + )} + + } + placement="bottom-start" + className="h-full w-full" + customButtonClassName="h-full" + tabIndex={getIndex("parent_id")} + > + <> + setParentIssueListModalOpen(true)}> + Change parent issue + + ( + { + onChange(null); + handleFormChange(); + }} + > + Remove parent issue + + )} + /> + + + ) : ( + + )} +
Date: Mon, 11 Nov 2024 15:24:35 +0530 Subject: [PATCH 2/2] chore: code refactor --- .../components/inbox/modals/create-modal/issue-properties.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/core/components/inbox/modals/create-modal/issue-properties.tsx b/web/core/components/inbox/modals/create-modal/issue-properties.tsx index 104c026810f..ce37f07b1f5 100644 --- a/web/core/components/inbox/modals/create-modal/issue-properties.tsx +++ b/web/core/components/inbox/modals/create-modal/issue-properties.tsx @@ -210,7 +210,7 @@ export const InboxIssueProperties: FC = observer((props) ) : (