revamp announcement card

openmetadata-ui/src/main/resources/ui/cypress/common/Entities/EntityClass.ts

@@ -17,7 +17,8 @@ import { EntityType, ENTITY_PATH } from '../../constants/Entity.interface';
 import {
   createAnnouncement as createAnnouncementUtil,
   createInactiveAnnouncement as createInactiveAnnouncementUtil,
-  deleteAnnoucement,
+  deleteAnnouncement,
+  replyAnnouncementUtil,
 } from '../Utils/Annoucement';
 import {
   createCustomPropertyForEntity,
@@ -449,26 +450,30 @@ class EntityClass {
 
   createAnnouncement() {
     createAnnouncementUtil({
-      title: 'Cypress annocement',
-      description: 'Cypress annocement description',
+      title: 'Cypress announcement',
+      description: 'Cypress announcement description',
     });
   }
 
+  replyAnnouncement() {
+    replyAnnouncementUtil();
+  }
+
   removeAnnouncement() {
-    deleteAnnoucement();
+    deleteAnnouncement();
   }
 
   // Inactive Announcement
 
   createInactiveAnnouncement() {
     createInactiveAnnouncementUtil({
-      title: 'Inactive Cypress annocement',
-      description: 'Inactive Cypress annocement description',
+      title: 'Inactive Cypress announcement',
+      description: 'Inactive Cypress announcement description',
     });
   }
 
   removeInactiveAnnouncement() {
-    deleteAnnoucement();
+    deleteAnnouncement();
   }
 
   followUnfollowEntity() {

openmetadata-ui/src/main/resources/ui/cypress/common/Utils/Annoucement.ts

@@ -21,7 +21,7 @@ import {
   verifyResponseStatusCode,
 } from '../common';
 
-const annoucementForm = ({ title, description, startDate, endDate }) => {
+const announcementForm = ({ title, description, startDate, endDate }) => {
   cy.get('#title').type(title);
 
   cy.get('#startTime').click().type(`${startDate}{enter}`);
@@ -60,7 +60,7 @@ export const createAnnouncement = (announcement) => {
   cy.get('[data-testid="add-announcement"]').click();
   cy.get('.ant-modal-header').should('contain', 'Make an announcement');
 
-  annoucementForm({ ...announcement, startDate, endDate });
+  announcementForm({ ...announcement, startDate, endDate });
 
   // wait time for success toast message
   verifyResponseStatusCode('@announcementFeed', 200);
@@ -76,7 +76,7 @@ export const createAnnouncement = (announcement) => {
   );
 };
 
-export const deleteAnnoucement = () => {
+export const deleteAnnouncement = () => {
   interceptURL(
     'GET',
     '/api/v1/feed?entityLink=*type=Announcement',
@@ -103,6 +103,62 @@ export const deleteAnnoucement = () => {
     });
 };
 
+export const replyAnnouncementUtil = () => {
+  interceptURL(
+    'GET',
+    '/api/v1/feed?entityLink=*type=Announcement',
+    'announcementFeed'
+  );
+  interceptURL('GET', '/api/v1/feed/*', 'allAnnouncementFeed');
+  interceptURL('POST', '/api/v1/feed/*/posts', 'addAnnouncementReply');
+
+  cy.get('[data-testid="announcement-card"]').click();
+
+  cy.get(
+    '[data-testid="announcement-card"] [data-testid="main-message"]'
+  ).trigger('mouseover');
+
+  cy.get('[data-testid="add-reply"]').click();
+
+  verifyResponseStatusCode('@allAnnouncementFeed', 200);
+
+  cy.get('[data-testid="send-button"]').should('be.disabled');
+
+  cy.get('[data-testid="editor-wrapper"] .ql-editor').type('Reply message');
+
+  cy.get('[data-testid="send-button"]').should('not.disabled').click();
+
+  verifyResponseStatusCode('@addAnnouncementReply', 201);
+  verifyResponseStatusCode('@announcementFeed', 200);
+  verifyResponseStatusCode('@allAnnouncementFeed', 200);
+
+  cy.get('[data-testid="replies"] [data-testid="viewer-container"]').should(
+    'contain',
+    'Reply message'
+  );
+  cy.get('[data-testid="show-reply-thread"]').should('contain', '1 replies');
+
+  // Edit the reply message
+  cy.get('[data-testid="replies"] > [data-testid="main-message"]').trigger(
+    'mouseover'
+  );
+
+  cy.get('[data-testid="edit-message"]').click();
+
+  cy.get('.feed-message [data-testid="editor-wrapper"] .ql-editor')
+    .clear()
+    .type('Reply message edited');
+
+  cy.get('[data-testid="save-button"]').click();
+
+  cy.get('[data-testid="replies"] [data-testid="viewer-container"]').should(
+    'contain',
+    'Reply message edited'
+  );
+
+  cy.reload();
+};
+
 export const createInactiveAnnouncement = (announcement) => {
   // Create InActive Announcement
   interceptURL(
@@ -126,7 +182,7 @@ export const createInactiveAnnouncement = (announcement) => {
     'yyyy-MM-dd'
   );
 
-  annoucementForm({
+  announcementForm({
     ...announcement,
     startDate: InActiveStartDate,
     endDate: InActiveEndDate,

openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Database.spec.ts

@@ -101,12 +101,13 @@ describe('Database hierarchy details page', { tags: 'DataAssets' }, () => {
         entity.renameEntity();
       });
 
-      it(`Annoucement create & delete`, () => {
+      it(`Announcement create & delete`, () => {
         entity.createAnnouncement();
+        entity.replyAnnouncement();
         entity.removeAnnouncement();
       });
 
-      it(`Inactive annoucement create & delete`, () => {
+      it(`Inactive announcement create & delete`, () => {
         entity.createInactiveAnnouncement();
         entity.removeInactiveAnnouncement();
       });

openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Entity.spec.ts

@@ -105,12 +105,13 @@ describe('Entity detail page', { tags: 'DataAssets' }, () => {
         entity.removeGlossary();
       });
 
-      it(`Annoucement create & delete`, () => {
+      it(`Announcement create & delete`, () => {
         entity.createAnnouncement();
+        entity.replyAnnouncement();
         entity.removeAnnouncement();
       });
 
-      it(`Inactive annoucement create & delete`, () => {
+      it(`Inactive Announcement create & delete`, () => {
         entity.createInactiveAnnouncement();
         entity.removeInactiveAnnouncement();
       });

openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Services.spec.ts

@@ -106,12 +106,13 @@ describe('Services detail page', { tags: 'Integration' }, () => {
         entity.renameEntity();
       });
 
-      it(`Annoucement create & delete`, () => {
+      it(`Announcement create & delete`, () => {
         entity.createAnnouncement();
+        entity.replyAnnouncement();
         entity.removeAnnouncement();
       });
 
-      it(`Inactive annoucement create & delete`, () => {
+      it(`Inactive Announcement create & delete`, () => {
         entity.createInactiveAnnouncement();
         entity.removeInactiveAnnouncement();
       });

openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardFooter/FeedCardFooter.tsx

@@ -43,6 +43,7 @@ const FeedCardFooter: FC<FeedFooterProp> = ({
           onClick={() => onThreadSelect?.(threadId as string)}>
           {repliedUsers?.map((u, i) => (
             <ProfilePicture
+              avatarType="outlined"
               className="m-r-xss"
               data-testid="replied-user"
               key={i}

openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedEditor/SendButton.tsx

@@ -11,10 +11,12 @@
  *  limitations under the License.
  */
 
+import Icon from '@ant-design/icons/lib/components/Icon';
 import { Button } from 'antd';
 import classNames from 'classnames';
 import React, { FC } from 'react';
-import { ReactComponent as IconPaperPlanePrimary } from '../../../assets/svg/paper-plane-primary.svg';
+import { ReactComponent as IconPaperPlanePrimary } from '../../../assets/svg/paper-plane-fill.svg';
+import './send-button.less';
 
 interface SendButtonProp {
   editorValue: string;
@@ -28,12 +30,10 @@ export const SendButton: FC<SendButtonProp> = ({
   onSaveHandler,
 }) => (
   <Button
-    className={classNames('absolute', className)}
+    className={classNames('send-button', className)}
     data-testid="send-button"
     disabled={editorValue.length === 0}
-    icon={<IconPaperPlanePrimary height={18} width={18} />}
-    size="small"
-    style={{ bottom: '2px', right: '5px' }}
+    icon={<Icon component={IconPaperPlanePrimary} />}
     type="text"
     onClick={onSaveHandler}
   />

openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedEditor/send-button.less

@@ -0,0 +1,47 @@
+/*
+ *  Copyright 2024 Collate.
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+@import (reference) url('../../../styles/variables.less');
+
+// Define a mixin for repeated styles
+.buttonStyle() {
+  background: @primary-color;
+  color: @white;
+}
+
+.ant-btn.send-button {
+  position: absolute;
+  bottom: 8px;
+  right: 8px;
+  width: 34px;
+  height: 34px;
+  padding: 0;
+  border-radius: 50%;
+
+  // Apply the mixin to the base and hover, disabled states
+  .buttonStyle();
+
+  &:hover {
+    .buttonStyle();
+    opacity: 0.9;
+  }
+
+  &:disabled {
+    .buttonStyle();
+    opacity: 0.8;
+
+    &:hover {
+      .buttonStyle();
+      opacity: 0.8;
+    }
+  }
+}

openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanel.interface.ts

@@ -44,7 +44,6 @@ export interface ActivityThreadPanelBodyProp
       | 'createThread'
       | 'deletePostHandler'
     > {
-  editAnnouncementPermission?: boolean;
   threadType: ThreadType;
   showHeader?: boolean;
 }

openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanelBody.tsx

@@ -42,11 +42,9 @@ import FeedPanelHeader from '../ActivityFeedPanel/FeedPanelHeader';
 import ActivityThread from './ActivityThread';
 import ActivityThreadList from './ActivityThreadList';
 import { ActivityThreadPanelBodyProp } from './ActivityThreadPanel.interface';
-import AnnouncementThreads from './AnnouncementThreads';
 
 const ActivityThreadPanelBody: FC<ActivityThreadPanelBodyProp> = ({
   threadLink,
-  editAnnouncementPermission,
   onCancel,
   postFeedHandler,
   createThread,
@@ -84,8 +82,6 @@ const ActivityThreadPanelBody: FC<ActivityThreadPanelBodyProp> = ({
 
   const isTaskClosed = isEqual(taskStatus, ThreadTaskStatus.Closed);
 
-  const isAnnouncementType = threadType === ThreadType.Announcement;
-
   const getThreads = (after?: string) => {
     const status = isTaskType ? taskStatus : undefined;
     setIsThreadLoading(true);
@@ -295,49 +291,29 @@ const ActivityThreadPanelBody: FC<ActivityThreadPanelBodyProp> = ({
                     />
                   </Space>
                 )}
-                {(isAnnouncementType || isTaskType) && !isThreadLoading && (
+                {isTaskType && !isThreadLoading && (
                   <ErrorPlaceHolder
                     className="mt-24"
                     type={ERROR_PLACEHOLDER_TYPE.CUSTOM}>
-                    {isTaskType ? (
-                      <Typography.Paragraph>
-                        {isTaskClosed
-                          ? t('message.no-closed-task')
-                          : t('message.no-open-task')}
-                      </Typography.Paragraph>
-                    ) : (
-                      <Typography.Paragraph data-testid="announcement-error">
-                        {t('message.no-announcement-message')}
-                      </Typography.Paragraph>
-                    )}
+                    <Typography.Paragraph>
+                      {isTaskClosed
+                        ? t('message.no-closed-task')
+                        : t('message.no-open-task')}
+                    </Typography.Paragraph>
                   </ErrorPlaceHolder>
                 )}
               </>
             ) : null}
-            {isAnnouncementType ? (
-              <AnnouncementThreads
-                className={classNames(className)}
-                editAnnouncementPermission={editAnnouncementPermission}
-                postFeed={postFeed}
-                selectedThreadId={selectedThreadId}
-                threads={threads}
-                updateThreadHandler={onUpdateThread}
-                onConfirmation={onConfirmation}
-                onThreadIdSelect={onThreadIdSelect}
-                onThreadSelect={onThreadSelect}
-              />
-            ) : (
-              <ActivityThreadList
-                className={classNames(className)}
-                postFeed={postFeed}
-                selectedThreadId={selectedThreadId}
-                threads={threads}
-                updateThreadHandler={onUpdateThread}
-                onConfirmation={onConfirmation}
-                onThreadIdSelect={onThreadIdSelect}
-                onThreadSelect={onThreadSelect}
-              />
-            )}
+            <ActivityThreadList
+              className={classNames(className)}
+              postFeed={postFeed}
+              selectedThreadId={selectedThreadId}
+              threads={threads}
+              updateThreadHandler={onUpdateThread}
+              onConfirmation={onConfirmation}
+              onThreadIdSelect={onThreadIdSelect}
+              onThreadSelect={onThreadSelect}
+            />
             <div
               data-testid="observer-element"
               id="observer-element"