From a4699d1735ec3072863dc863b52f1f24f2038283 Mon Sep 17 00:00:00 2001 From: rahulramesha Date: Tue, 20 Aug 2024 19:23:19 +0530 Subject: [PATCH 1/2] remove inbox delete option for members --- web/core/components/inbox/content/inbox-issue-header.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/core/components/inbox/content/inbox-issue-header.tsx b/web/core/components/inbox/content/inbox-issue-header.tsx index 8d4561fc12d..5d1c2a07f0a 100644 --- a/web/core/components/inbox/content/inbox-issue-header.tsx +++ b/web/core/components/inbox/content/inbox-issue-header.tsx @@ -83,7 +83,10 @@ export const InboxIssueActionsHeader: FC = observer((p const canMarkAsDuplicate = isAllowed && (inboxIssue?.status === 0 || inboxIssue?.status === -2); const canMarkAsAccepted = isAllowed && (inboxIssue?.status === 0 || inboxIssue?.status === -2); const canMarkAsDeclined = isAllowed && (inboxIssue?.status === 0 || inboxIssue?.status === -2); - const canDelete = isAllowed || inboxIssue?.created_by === currentUser?.id; + // can delete only if admin or is creator of the issue + const canDelete = + (!!currentProjectRole && currentProjectRole > EUserProjectRoles.MEMBER) || + inboxIssue?.created_by === currentUser?.id; const isAcceptedOrDeclined = inboxIssue?.status ? [-1, 1, 2].includes(inboxIssue.status) : undefined; // days left for snooze const numberOfDaysLeft = findHowManyDaysLeft(inboxIssue?.snoozed_till); From db28e4e66a12cf519abb9f47f8dd720f7a699862 Mon Sep 17 00:00:00 2001 From: rahulramesha Date: Wed, 21 Aug 2024 16:45:23 +0530 Subject: [PATCH 2/2] change inbox issue delete condition slightly --- web/core/components/inbox/content/inbox-issue-header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/core/components/inbox/content/inbox-issue-header.tsx b/web/core/components/inbox/content/inbox-issue-header.tsx index 5d1c2a07f0a..f62de095c4d 100644 --- a/web/core/components/inbox/content/inbox-issue-header.tsx +++ b/web/core/components/inbox/content/inbox-issue-header.tsx @@ -85,7 +85,7 @@ export const InboxIssueActionsHeader: FC = observer((p const canMarkAsDeclined = isAllowed && (inboxIssue?.status === 0 || inboxIssue?.status === -2); // can delete only if admin or is creator of the issue const canDelete = - (!!currentProjectRole && currentProjectRole > EUserProjectRoles.MEMBER) || + (!!currentProjectRole && currentProjectRole >= EUserProjectRoles.ADMIN) || inboxIssue?.created_by === currentUser?.id; const isAcceptedOrDeclined = inboxIssue?.status ? [-1, 1, 2].includes(inboxIssue.status) : undefined; // days left for snooze