From c6dfd61fa683aa37c98251e37234e1552fb0f1d5 Mon Sep 17 00:00:00 2001
From: Shrushti Polekar <shrushtipolekar@gmail.com>
Date: Mon, 31 Mar 2025 16:29:06 +0530
Subject: [PATCH] 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
---
 .../ui/playwright/e2e/Features/ActivityFeed.spec.ts   |  1 +
 .../Entity/Task/TaskTab/TaskTab.component.tsx         |  4 +---
 .../Entity/Task/TaskTab/TaskTabNew.component.tsx      | 11 +++++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ActivityFeed.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ActivityFeed.spec.ts
index 605f267c510..6fdfe3525a1 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ActivityFeed.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/ActivityFeed.spec.ts
@@ -727,6 +727,7 @@ base.describe('Activity feed with Data Consumer User', () => {
       await resolveTask;
       await toastNotification(page2, /Task resolved successfully/);
 
+      await page2.waitForLoadState('networkidle');
       checkTaskCountInActivityFeed(page2, 0, 2);
 
       await afterActionUser2();
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTab.component.tsx
index 934efefe4d9..64d6994224a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTab.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTab.component.tsx
@@ -737,9 +737,7 @@ export const TaskTab = ({
                 }}
                 overlayClassName="task-action-dropdown"
                 onClick={() =>
-                  taskAction.key === TaskActionMode.EDIT
-                    ? handleMenuItemClick({ key: taskAction.key } as MenuInfo)
-                    : onTaskResolve()
+                  handleMenuItemClick({ key: taskAction.key } as MenuInfo)
                 }>
                 {taskAction.label}
               </Dropdown.Button>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTabNew.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTabNew.component.tsx
index 148fd6d8f75..e0a2a77a0f8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTabNew.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTabNew.component.tsx
@@ -425,16 +425,18 @@ export const TaskTabNew = ({
     (Boolean(isPartOfAssigneeTeam) && !isCreator);
 
   const [hasAddedComment, setHasAddedComment] = useState<boolean>(false);
+  const [recentComment, setRecentComment] = useState<string>('');
+
   const onSave = () => {
     postFeed(comment, taskThread?.id ?? '')
       .catch(() => {
         // ignore since error is displayed in toast in the parent promise.
-        // Added block for sonar code smell
       })
       .finally(() => {
         setHasAddedComment(true);
         editorRef.current?.clearEditorValue();
         setShowFeedEditor(false);
+        setRecentComment(comment);
       });
   };
 
@@ -462,7 +464,7 @@ export const TaskTabNew = ({
       return;
     }
 
-    const updatedComment = isTaskGlossaryApproval ? 'Rejected' : comment;
+    const updatedComment = isTaskGlossaryApproval ? 'Rejected' : recentComment;
     updateTask(TaskOperation.REJECT, taskDetails?.id + '', {
       comment: updatedComment,
     } as unknown as TaskDetails)
@@ -749,9 +751,7 @@ export const TaskTabNew = ({
                 }}
                 overlayClassName="task-action-dropdown"
                 onClick={() =>
-                  taskAction.key === TaskActionMode.EDIT
-                    ? handleMenuItemClick({ key: taskAction.key } as MenuInfo)
-                    : onTaskResolve()
+                  handleMenuItemClick({ key: taskAction.key } as MenuInfo)
                 }>
                 {taskAction.label}
               </Dropdown.Button>
@@ -998,7 +998,6 @@ export const TaskTabNew = ({
 
   const closeFeedEditor = () => {
     setShowFeedEditor(false);
-    setComment('');
   };
 
   useEffect(() => {