fix(playwright): wait for add/edit-domain button to be visible before clicking (#31719)

* fix(playwright): wait for add/edit-domain button before checking which to click

isVisible() is a snapshot call with no retry — it can return false for
add-domain while edit-domain has not yet rendered, leaving both absent
during a UI re-render after a domain PATCH.  The subsequent .click() then
waits the full 60 s timeout before failing.

Add an explicit waitFor({ state: 'visible' }) on the or()-combined locator
so either button is stable before the snapshot check.  Fixes the flaky
"should change domain on glossary" test.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix overall add and edit test

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 7859d17)

Author: 2 people

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

@@ -799,7 +799,7 @@ test.describe(
         await assignDomainWidget(page, testDomain1.responseData, true);
 
         // Assign second domain (should ADD to first, not replace)
-        await assignDomainWidget(page, testDomain2.responseData, true);
+        await assignDomainWidget(page, testDomain2.responseData, true, true);
 
         // Verify both domains are visible (multi-select mode allows multiple)
         // Use filter to find specific domain links

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

@@ -284,7 +284,7 @@ test.describe(
         );
 
         // Assign second domain (should REPLACE first, not add to it)
-        await assignDomainWidget(page, testDomain2.responseData);
+        await assignDomainWidget(page, testDomain2.responseData, false, true);
 
         // Verify second domain is visible
         await expect(page.getByTestId('domain-link')).toContainText(

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

@@ -56,7 +56,7 @@ test.describe('Domain & DataProduct - Tier, Certification, and Voting', () => {
     test('Domain - Tier assign, update, and remove', async ({ page }) => {
       await domain.visitEntityPage(page);
       await addTierWidget(page, 'Tier1', domain.endpoint);
-      await addTierWidget(page, 'Tier3', domain.endpoint);
+      await addTierWidget(page, 'Tier3', domain.endpoint, true);
       await removeTierFromWidget(page, domain.endpoint);
     });
 
@@ -65,7 +65,7 @@ test.describe('Domain & DataProduct - Tier, Certification, and Voting', () => {
     }) => {
       await domain.visitEntityPage(page);
       await addCertificationWidget(page, certTag1, domain.endpoint);
-      await addCertificationWidget(page, certTag2, domain.endpoint);
+      await addCertificationWidget(page, certTag2, domain.endpoint, true);
       await removeCertificationFromWidget(page, domain.endpoint);
     });
 
@@ -78,7 +78,7 @@ test.describe('Domain & DataProduct - Tier, Certification, and Voting', () => {
     test('DataProduct - Tier assign, update, and remove', async ({ page }) => {
       await dataProduct.visitEntityPage(page);
       await addTierWidget(page, 'Tier1', dataProduct.endpoint);
-      await addTierWidget(page, 'Tier3', dataProduct.endpoint);
+      await addTierWidget(page, 'Tier3', dataProduct.endpoint, true);
       await removeTierFromWidget(page, dataProduct.endpoint);
     });
 
@@ -87,7 +87,7 @@ test.describe('Domain & DataProduct - Tier, Certification, and Voting', () => {
     }) => {
       await dataProduct.visitEntityPage(page);
       await addCertificationWidget(page, certTag1, dataProduct.endpoint);
-      await addCertificationWidget(page, certTag2, dataProduct.endpoint);
+      await addCertificationWidget(page, certTag2, dataProduct.endpoint, true);
       await removeCertificationFromWidget(page, dataProduct.endpoint);
     });
 

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

@@ -362,7 +362,7 @@ test.describe('Glossary Advanced Operations', () => {
       await selectActiveGlossary(page, glossary.data.displayName);
 
       await assignDomainWidget(page, domain1.responseData);
-      await assignDomainWidget(page, domain2.responseData);
+      await assignDomainWidget(page, domain2.responseData, false, true);
     } finally {
       await glossary.delete(apiContext);
       await domain1.delete(apiContext);

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

@@ -63,29 +63,24 @@ const waitForSearchDebounce = async (page: Page) => {
   }
 };
 
-const clickAvailableWidgetAction = async (
-  addBtn: Locator,
-  editBtn: Locator
-) => {
-  await addBtn.or(editBtn).first().waitFor({ state: 'visible' });
-
-  if (await addBtn.isVisible()) {
-    await addBtn.click();
-
-    return;
-  }
-
-  await editBtn.click();
-};
+// A widget shows the add button when the value is unset and the edit button
+// once it is assigned. The caller knows which state the entity is in, so it
+// passes `isUpdate` and we open the exact button — click() auto-waits for it,
+// so there is no need to probe which of the two is currently rendered.
+const openWidgetEditor = (
+  page: Page,
+  addTestId: string,
+  editTestId: string,
+  isUpdate: boolean
+) => page.getByTestId(isUpdate ? editTestId : addTestId).click();
 
 export const addTierWidget = async (
   page: Page,
   tier: string,
-  endpoint: string
+  endpoint: string,
+  isUpdate = false
 ) => {
-  const addBtn = page.getByTestId('add-tier');
-  const editBtn = page.getByTestId('edit-tier');
-  await clickAvailableWidgetAction(addBtn, editBtn);
+  await openWidgetEditor(page, 'add-tier', 'edit-tier', isUpdate);
 
   await waitForAllLoadersToDisappear(page);
 
@@ -116,11 +111,15 @@ export const addTierWidget = async (
 export const addCertificationWidget = async (
   page: Page,
   certification: TagClass,
-  endpoint: string
+  endpoint: string,
+  isUpdate = false
 ) => {
-  const addBtn = page.getByTestId('add-certification');
-  const editBtn = page.getByTestId('edit-certification');
-  await clickAvailableWidgetAction(addBtn, editBtn);
+  await openWidgetEditor(
+    page,
+    'add-certification',
+    'edit-certification',
+    isUpdate
+  );
 
   await page.locator('.certification-card-popover').waitFor({
     state: 'visible',
@@ -248,12 +247,10 @@ export const removeCertificationFromWidget = async (
 export const assignDomainWidget = async (
   page: Page,
   domain: { name: string; displayName: string; fullyQualifiedName?: string },
-  multiSelect = false
+  multiSelect = false,
+  isUpdate = false
 ) => {
-  const addBtn = page.getByTestId('add-domain');
-  const editBtn = page.getByTestId('edit-domain');
-  const isAdd = await addBtn.isVisible();
-  await (isAdd ? addBtn : editBtn).click();
+  await openWidgetEditor(page, 'add-domain', 'edit-domain', isUpdate);
   await waitForAllLoadersToDisappear(page);
 
   const searchDomain = page.waitForResponse(
@@ -296,10 +293,8 @@ export const removeDomainWidget = async (
   page: Page,
   domain: { name: string; displayName: string; fullyQualifiedName?: string }
 ) => {
-  const addBtn = page.getByTestId('add-domain');
-  const editBtn = page.getByTestId('edit-domain');
-  const isAdd = await addBtn.isVisible();
-  await (isAdd ? addBtn : editBtn).click();
+  // Removing implies a domain is already assigned, so the widget shows edit.
+  await openWidgetEditor(page, 'add-domain', 'edit-domain', true);
   await waitForAllLoadersToDisappear(page);
 
   await page