fix failing playwright test and minor css fix

open-metadata · Dec 18, 2024 · 323ccdb · 323ccdb
1 parent 6575f42
commit 323ccdb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/ServiceEntity.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/ServiceEntity.spec.ts
@@ -112,11 +112,13 @@ entities.forEach((EntityClass) => {
     });
 
     test(`Announcement create & delete`, async ({ page }) => {
-      await entity.announcement(page, false);
+      const isService = entity.type.includes('Service') ? false : true;
+      await entity.announcement(page, isService);
     });
 
     test(`Inactive Announcement create & delete`, async ({ page }) => {
-      await entity.inactiveAnnouncement(page, false);
+      const isService = entity.type.includes('Service') ? false : true;
+      await entity.inactiveAnnouncement(page, isService);
     });
 
     // Create custom property only for supported entities

diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/entity.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/entity.ts
@@ -800,7 +800,12 @@ export const createAnnouncement = async (
   isForActivityFeedTab: boolean
 ) => {
   if (isForActivityFeedTab) {
-    await page.getByText('Activity Feeds & Tasks').click(); // For Activity Feed
+    const activityFeedText = (await page
+      .getByText('Activity Feeds & Tasks')
+      .isVisible())
+      ? 'Activity Feeds & Tasks'
+      : 'Activity Feeds';
+    await page.getByText(activityFeedText).click(); // For Activity Feed
     await page.getByTestId('announcement-sub-tab').click();
   } else {
     await page.getByText('Announcements').click(); // For Service page
@@ -893,7 +898,12 @@ export const createInactiveAnnouncement = async (
   isForActivityFeedTab: boolean
 ) => {
   if (isForActivityFeedTab) {
-    await page.getByText('Activity Feeds & Tasks').click(); // For Activity Feed
+    const activityFeedText = (await page
+      .getByText('Activity Feeds & Tasks')
+      .isVisible())
+      ? 'Activity Feeds & Tasks'
+      : 'Activity Feeds';
+    await page.getByText(activityFeedText).click(); // For Activity Feed
     await page.getByTestId('announcement-sub-tab').click();
   } else {
     await page.getByText('Announcements').click(); // For Service page

diff --git a/...in/resources/ui/src/components/ActivityFeed/ActivityFeedCardV2/activity-feed-card-v2.less b/...in/resources/ui/src/components/ActivityFeed/ActivityFeedCardV2/activity-feed-card-v2.less
@@ -35,6 +35,8 @@
     }
     .ant-avatar-group {
       margin-bottom: 8px !important;
+      z-index: 9;
+      margin-right: 5px;
     }
     .assignee-item {
       z-index: 9;

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Announcement/announcement.less b/openmetadata-ui/src/main/resources/ui/src/components/Announcement/announcement.less
@@ -49,6 +49,7 @@
       .ant-avatar-group {
         z-index: 10;
         margin-bottom: 5px;
+        margin-right: 5px;
       }
     }