Fix restrore entity inherited fields specs (#27414)

* increase data contracts test timeout

* fix failure in restroreEntityInheritedFields

* fix restrore entity inheritance specs

* remove unnecessary multiple domains check

---------

Co-authored-by: Shrabanti Paul <shrabantipaul@Shrabantis-MacBook-Pro.local>

Author: shrabantipaul-collate

openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/RestoreEntityInheritedFields.spec.ts

@@ -105,9 +105,14 @@ entities.forEach((EntityClass) => {
 
       await entity.visitEntityPage(page);
 
-      await assignDataProduct(page, domain.responseData, [
-        dataProduct.responseData,
-      ]);
+      await assignDataProduct(
+        page,
+        domain.responseData,
+        [dataProduct.responseData],
+        'Add',
+        'KnowledgePanel.DataProducts',
+        true
+      );
 
       // This will delete and restore and ensure both operation are successful
       await softDeleteEntity(

openmetadata-ui/src/main/resources/ui/playwright/utils/common.ts

@@ -430,13 +430,31 @@ export const assignDataProduct = async (
     fullyQualifiedName?: string;
   }[],
   action: 'Add' | 'Edit' = 'Add',
-  parentId = 'KnowledgePanel.DataProducts'
+  parentId = 'KnowledgePanel.DataProducts',
+  // Set true when the domain is inherited from a parent entity. The search
+  // index is updated asynchronously, so a page reload is needed on each poll
+  // to fetch the current state directly from the entity API.
+  pollForInheritance = false
 ) => {
-  const hasMultipleDomains = await page
-    .getByTestId('domain-count-button')
-    .isVisible();
-  if (hasMultipleDomains) {
-    await expect(page.getByTestId('domain-count-button')).toBeVisible();
+  if (pollForInheritance) {
+    await expect
+      .poll(
+        async () => {
+          await page.reload();
+          await waitForAllLoadersToDisappear(page);
+
+          return page
+            .getByTestId('domain-link')
+            .textContent()
+            .catch(() => null);
+        },
+        {
+          message: `Waiting for inherited domain "${domain.displayName}" to appear on the entity page`,
+          timeout: 60_000,
+          intervals: [2_000, 3_000, 5_000],
+        }
+      )
+      .toContain(domain.displayName);
   } else {
     await expect(page.getByTestId('domain-link')).toContainText(
       domain.displayName
@@ -487,13 +505,38 @@ export const assignDataProduct = async (
     .click();
   await patchReq;
 
-  for (const dataProduct of dataProducts) {
-    await expect(
-      page
-        .getByTestId(parentId)
-        .getByTestId('data-products-list')
-        .getByTestId(`data-product-${dataProduct.fullyQualifiedName}`)
-    ).toBeVisible();
+  if (pollForInheritance) {
+    for (const dataProduct of dataProducts) {
+      await expect
+        .poll(
+          async () => {
+            await page.reload();
+            await waitForAllLoadersToDisappear(page);
+
+            return page
+              .getByTestId(parentId)
+              .getByTestId('data-products-list')
+              .getByTestId(`data-product-${dataProduct.fullyQualifiedName}`)
+              .isVisible()
+              .catch(() => false);
+          },
+          {
+            message: `Waiting for data product "${dataProduct.displayName}" to appear after save`,
+            timeout: 60_000,
+            intervals: [2_000, 3_000, 5_000],
+          }
+        )
+        .toBe(true);
+    }
+  } else {
+    for (const dataProduct of dataProducts) {
+      await expect(
+        page
+          .getByTestId(parentId)
+          .getByTestId('data-products-list')
+          .getByTestId(`data-product-${dataProduct.fullyQualifiedName}`)
+      ).toBeVisible();
+    }
   }
 };