From defa0525c193b325377ef0d04847e99e08369cb0 Mon Sep 17 00:00:00 2001
From: Dhruv Parmar <83108871+dhruvjsx@users.noreply.github.com>
Date: Fri, 2 May 2025 10:17:25 +0530
Subject: [PATCH] fixed flaky metrics tests (#21000)

---
 .../main/resources/ui/playwright/e2e/Flow/Metric.spec.ts   | 6 ++++++
 .../src/main/resources/ui/playwright/utils/entity.ts       | 7 ++++---
 .../src/main/resources/ui/playwright/utils/metric.ts       | 1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/Metric.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/Metric.spec.ts
index e7638410261..8555c0cabd4 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/Metric.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/Metric.spec.ts
@@ -136,6 +136,12 @@ test.describe('Listing page and add Metric flow should work', () => {
       'Track the health of your data assets with metrics.'
     );
 
+    const pageSizeDropdown = page.getByTestId('page-size-selection-dropdown');
+    if (await pageSizeDropdown.isVisible()) {
+      await pageSizeDropdown.click();
+      await page.getByText('25 / Page').click();
+    }
+
     await expect(
       page.getByRole('cell', { name: 'Name', exact: true })
     ).toBeVisible();
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/entity.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/entity.ts
index 8e74ec6962d..15f2e90498c 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/utils/entity.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/entity.ts
@@ -1248,10 +1248,11 @@ export const softDeleteEntity = async (
   await page.click('[data-testid="confirm-button"]');
 
   await deleteResponse;
+  await page.waitForLoadState('networkidle');
 
   await toastNotification(
     page,
-    /deleted successfully!/,
+    /(deleted successfully!|Delete operation initiated)/,
     BIG_ENTITY_DELETE_TIMEOUT
   );
 
@@ -1319,10 +1320,10 @@ export const hardDeleteEntity = async (
   );
   await page.click('[data-testid="confirm-button"]');
   await deleteResponse;
-
+  await page.waitForLoadState('networkidle');
   await toastNotification(
     page,
-    /deleted successfully!/,
+    /(deleted successfully!|Delete operation initiated)/,
     BIG_ENTITY_DELETE_TIMEOUT
   );
 };
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/metric.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/metric.ts
index eda2c2af21f..1462738f446 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/utils/metric.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/metric.ts
@@ -175,6 +175,7 @@ export const updateRelatedMetric = async (
       hasText: dataAsset.entity.name,
     })
     .click();
+
   await page.locator('[data-testid="saveRelatedMetrics"]').click();
 
   await patchPromise;