From 6c2b28df913d54cb8646ce441a213ca6b6c1c010 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Date: Mon, 8 Jul 2024 20:53:35 +0530 Subject: [PATCH] fix: attachment delete modal (#5080) --- .../issues/attachment/attachment-list-item.tsx | 6 +++--- web/core/store/issue/issue-details/root.store.ts | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/web/core/components/issues/attachment/attachment-list-item.tsx b/web/core/components/issues/attachment/attachment-list-item.tsx index 6bdf4490dc..dadea0d060 100644 --- a/web/core/components/issues/attachment/attachment-list-item.tsx +++ b/web/core/components/issues/attachment/attachment-list-item.tsx @@ -48,8 +48,8 @@ export const IssueAttachmentsListItem: FC = observer( <> {isDeleteAttachmentModalOpen && ( toggleDeleteAttachmentModal(null)} + isOpen={isDeleteAttachmentModalOpen} + onClose={() => toggleDeleteAttachmentModal(false)} handleAttachmentOperations={handleAttachmentOperations} data={attachment} /> @@ -95,7 +95,7 @@ export const IssueAttachmentsListItem: FC = observer( onClick={(e) => { e.preventDefault(); e.stopPropagation(); - toggleDeleteAttachmentModal(attachmentId); + toggleDeleteAttachmentModal(true); }} >
diff --git a/web/core/store/issue/issue-details/root.store.ts b/web/core/store/issue/issue-details/root.store.ts index 835c5ef5e3..86d530dcdb 100644 --- a/web/core/store/issue/issue-details/root.store.ts +++ b/web/core/store/issue/issue-details/root.store.ts @@ -57,7 +57,7 @@ export interface IIssueDetail isArchiveIssueModalOpen: string | null; isRelationModalOpen: TIssueRelationModal | null; isSubIssuesModalOpen: string | null; - isDeleteAttachmentModalOpen: string | null; + isDeleteAttachmentModalOpen: boolean; // computed isAnyModalOpen: boolean; // helper actions @@ -71,7 +71,7 @@ export interface IIssueDetail toggleArchiveIssueModal: (value: string | null) => void; toggleRelationModal: (issueId: string | null, relationType: TIssueRelationTypes | null) => void; toggleSubIssuesModal: (value: string | null) => void; - toggleDeleteAttachmentModal: (attachmentId: string | null) => void; + toggleDeleteAttachmentModal: (value:boolean) => void; // store rootIssueStore: IIssueRootStore; issue: IIssueStore; @@ -96,7 +96,7 @@ export class IssueDetail implements IIssueDetail { isArchiveIssueModalOpen: string | null = null; isRelationModalOpen: TIssueRelationModal | null = null; isSubIssuesModalOpen: string | null = null; - isDeleteAttachmentModalOpen: string | null = null; + isDeleteAttachmentModalOpen: boolean = false; // store rootIssueStore: IIssueRootStore; issue: IIssueStore; @@ -121,7 +121,7 @@ export class IssueDetail implements IIssueDetail { isArchiveIssueModalOpen: observable.ref, isRelationModalOpen: observable.ref, isSubIssuesModalOpen: observable.ref, - isDeleteAttachmentModalOpen: observable.ref, + isDeleteAttachmentModalOpen: observable, // computed isAnyModalOpen: computed, // action @@ -160,7 +160,7 @@ export class IssueDetail implements IIssueDetail { !!this.isArchiveIssueModalOpen || !!this.isRelationModalOpen?.issueId || !!this.isSubIssuesModalOpen || - !!this.isDeleteAttachmentModalOpen + this.isDeleteAttachmentModalOpen ); } @@ -177,7 +177,7 @@ export class IssueDetail implements IIssueDetail { toggleRelationModal = (issueId: string | null, relationType: TIssueRelationTypes | null) => (this.isRelationModalOpen = { issueId, relationType }); toggleSubIssuesModal = (issueId: string | null) => (this.isSubIssuesModalOpen = issueId); - toggleDeleteAttachmentModal = (attachmentId: string | null) => (this.isDeleteAttachmentModalOpen = attachmentId); + toggleDeleteAttachmentModal = (value: boolean) => (this.isDeleteAttachmentModalOpen = value); // issue fetchIssue = async (