From 2b28d310726f81ef7d0dc51ddbde52bb07971af2 Mon Sep 17 00:00:00 2001
From: Sachin Chaurasiya <sachinchaurasiyachotey87@gmail.com>
Date: Tue, 16 Aug 2022 18:24:39 +0530
Subject: [PATCH] Fix #6689 Announcement bug (#6742)

---
 .../ActivityFeedCard/ActivityFeedCard.test.tsx           | 4 ----
 .../ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx   | 6 +-----
 .../ActivityFeedCard/FeedCardBody/FeedCardBody.tsx       | 6 +++++-
 .../ActivityFeed/ActivityFeedCard/PopoverContent.tsx     | 9 ++-------
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.test.tsx
index b9535479c6c..67940bd765b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.test.tsx
@@ -26,10 +26,6 @@ jest.mock('../../../AppState', () => ({
   isProfilePicLoading: jest.fn(),
 }));
 
-jest.mock('../../../hooks/authHooks', () => ({
-  useAuth: jest.fn().mockReturnValue({ isAdminUser: false }),
-}));
-
 jest.mock('../../../utils/FeedUtils', () => ({
   getEntityField: jest.fn(),
   getEntityFQN: jest.fn(),
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx
index bf1b479cbed..cdfe2635937 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx
@@ -22,7 +22,6 @@ import { ReactionOperation } from '../../../enums/reactions.enum';
 import { AnnouncementDetails } from '../../../generated/api/feed/createThread';
 import { Post } from '../../../generated/entity/feed/thread';
 import { Reaction, ReactionType } from '../../../generated/type/reaction';
-import { useAuth } from '../../../hooks/authHooks';
 import {
   getEntityField,
   getEntityFQN,
@@ -60,7 +59,6 @@ const ActivityFeedCard: FC<ActivityFeedCardProp> = ({
   const entityFQN = getEntityFQN(entityLink as string);
   const entityField = getEntityField(entityLink as string);
 
-  const { isAdminUser } = useAuth();
   const currentUser = AppState.getCurrentUserDetails();
 
   const [feedDetail, setFeedDetail] = useState<Post>(feed);
@@ -69,9 +67,7 @@ const ActivityFeedCard: FC<ActivityFeedCardProp> = ({
   const [isEditAnnouncement, setEditAnnouncement] = useState<boolean>(false);
   const [isEditPost, setEditPost] = useState<boolean>(false);
 
-  const isAuthor = Boolean(
-    feedDetail.from === currentUser?.name || isAdminUser
-  );
+  const isAuthor = feedDetail.from === currentUser?.name;
 
   const onFeedUpdate = (data: Operation[]) => {
     updateThreadHandler(
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.tsx
index 6070e7de636..f889c178fe8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.tsx
@@ -14,7 +14,7 @@
 import { Button, Space, Typography } from 'antd';
 import classNames from 'classnames';
 import { isUndefined } from 'lodash';
-import React, { FC, useState } from 'react';
+import React, { FC, useEffect, useState } from 'react';
 import {
   getFrontEndFormat,
   MarkdownToHTMLConverter,
@@ -92,6 +92,10 @@ const FeedCardBody: FC<FeedBodyProp> = ({
     />
   );
 
+  useEffect(() => {
+    setPostMessage(message);
+  }, [message]);
+
   return (
     <div className={classNames('tw-group', isEditPost ? '' : className)}>
       <div className="feed-meesage">
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.tsx
index 43c0a68e1db..eb8d6d8fbc6 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.tsx
@@ -70,11 +70,7 @@ const PopoverContent: FC<Props> = ({
   };
 
   const deleteButtonCheck =
-    threadId &&
-    postId &&
-    onConfirmation &&
-    (isAuthor || currentUser?.isAdmin) &&
-    !isThread;
+    threadId && postId && onConfirmation && isAuthor && !isThread;
 
   const handleDelete = (e: React.MouseEvent<HTMLButtonElement>) => {
     e.stopPropagation();
@@ -145,8 +141,7 @@ const PopoverContent: FC<Props> = ({
     onEdit && onEdit();
   };
 
-  const editCheck =
-    (isAnnouncement || !isThread) && (isAuthor || currentUser?.isAdmin);
+  const editCheck = (isAnnouncement || !isThread) && isAuthor;
 
   return (
     <Space>