Fix : Reject/Close task functionality and Activity Feed Playwright failure (#20471)

* fix activity feed playwright failure

* task close functionality fix

* fix close api call for incident manager's task tab
This commit is contained in:
Shrushti Polekar 2025-03-31 16:29:06 +05:30 committed by GitHub
parent 0aa8bde8af
commit c6dfd61fa6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 9 deletions

View File

@ -727,6 +727,7 @@ base.describe('Activity feed with Data Consumer User', () => {
await resolveTask; await resolveTask;
await toastNotification(page2, /Task resolved successfully/); await toastNotification(page2, /Task resolved successfully/);
await page2.waitForLoadState('networkidle');
checkTaskCountInActivityFeed(page2, 0, 2); checkTaskCountInActivityFeed(page2, 0, 2);
await afterActionUser2(); await afterActionUser2();

View File

@ -737,9 +737,7 @@ export const TaskTab = ({
}} }}
overlayClassName="task-action-dropdown" overlayClassName="task-action-dropdown"
onClick={() => onClick={() =>
taskAction.key === TaskActionMode.EDIT handleMenuItemClick({ key: taskAction.key } as MenuInfo)
? handleMenuItemClick({ key: taskAction.key } as MenuInfo)
: onTaskResolve()
}> }>
{taskAction.label} {taskAction.label}
</Dropdown.Button> </Dropdown.Button>

View File

@ -425,16 +425,18 @@ export const TaskTabNew = ({
(Boolean(isPartOfAssigneeTeam) && !isCreator); (Boolean(isPartOfAssigneeTeam) && !isCreator);
const [hasAddedComment, setHasAddedComment] = useState<boolean>(false); const [hasAddedComment, setHasAddedComment] = useState<boolean>(false);
const [recentComment, setRecentComment] = useState<string>('');
const onSave = () => { const onSave = () => {
postFeed(comment, taskThread?.id ?? '') postFeed(comment, taskThread?.id ?? '')
.catch(() => { .catch(() => {
// ignore since error is displayed in toast in the parent promise. // ignore since error is displayed in toast in the parent promise.
// Added block for sonar code smell
}) })
.finally(() => { .finally(() => {
setHasAddedComment(true); setHasAddedComment(true);
editorRef.current?.clearEditorValue(); editorRef.current?.clearEditorValue();
setShowFeedEditor(false); setShowFeedEditor(false);
setRecentComment(comment);
}); });
}; };
@ -462,7 +464,7 @@ export const TaskTabNew = ({
return; return;
} }
const updatedComment = isTaskGlossaryApproval ? 'Rejected' : comment; const updatedComment = isTaskGlossaryApproval ? 'Rejected' : recentComment;
updateTask(TaskOperation.REJECT, taskDetails?.id + '', { updateTask(TaskOperation.REJECT, taskDetails?.id + '', {
comment: updatedComment, comment: updatedComment,
} as unknown as TaskDetails) } as unknown as TaskDetails)
@ -749,9 +751,7 @@ export const TaskTabNew = ({
}} }}
overlayClassName="task-action-dropdown" overlayClassName="task-action-dropdown"
onClick={() => onClick={() =>
taskAction.key === TaskActionMode.EDIT handleMenuItemClick({ key: taskAction.key } as MenuInfo)
? handleMenuItemClick({ key: taskAction.key } as MenuInfo)
: onTaskResolve()
}> }>
{taskAction.label} {taskAction.label}
</Dropdown.Button> </Dropdown.Button>
@ -998,7 +998,6 @@ export const TaskTabNew = ({
const closeFeedEditor = () => { const closeFeedEditor = () => {
setShowFeedEditor(false); setShowFeedEditor(false);
setComment('');
}; };
useEffect(() => { useEffect(() => {