fix broken tests

Author: dididy

zeppelin-web-angular/e2e/models/base-page.ts

@@ -22,7 +22,7 @@ export class BasePage {
   }
 
   async waitForPageLoad(): Promise<void> {
-    await this.page.waitForLoadState('domcontentloaded');
-    await this.loadingScreen.waitFor({ state: 'hidden', timeout: 15000 });
+    await this.page.waitForLoadState('domcontentloaded', { timeout: 15000 });
+    await this.page.waitForLoadState('networkidle', { timeout: 30000 });
   }
 }

zeppelin-web-angular/e2e/utils.ts

@@ -317,9 +317,11 @@ export async function navigateToNotebookWithFallback(page: Page, noteId: string,
         await page.waitForLoadState('networkidle', { timeout: 15000 });
         await page.waitForSelector('zeppelin-node-list', { timeout: 15000 });
 
-        const notebookLink = page.locator(`a[href*="/notebook/"]`).filter({ hasText: notebookName });
-        await notebookLink.waitFor({ state: 'visible', timeout: 10000 });
-        await notebookLink.click();
+        // The link text in the UI is the base name of the note, not the full path.
+        const baseName = notebookName.split('/').pop();
+        const notebookLink = page.locator(`a[href*="/notebook/"]`).filter({ hasText: baseName! });
+        // Use the click action's built-in wait.
+        await notebookLink.click({ timeout: 10000 });
 
         await page.waitForURL(/\/notebook\/[^\/\?]+/, { timeout: 20000 });
         navigationSuccessful = true;
@@ -383,9 +385,10 @@ export async function createTestNotebook(
       await page.waitForLoadState('networkidle', { timeout: 15000 });
       await page.waitForSelector('zeppelin-node-list', { timeout: 15000 });
 
-      const notebookLink = page.locator(`a[href*="/notebook/"]`).filter({ hasText: notebookName });
-      await notebookLink.waitFor({ state: 'visible', timeout: 10000 });
-      await notebookLink.click();
+      // Use baseNotebookName for the filter, as the link text in the UI won't contain the full path.
+      const notebookLink = page.locator(`a[href*="/notebook/"]`).filter({ hasText: baseNotebookName });
+      // Use the click action's built-in wait.
+      await notebookLink.click({ timeout: 10000 });
       await page.waitForURL(/\/notebook\/[^\/\?]+/, { timeout: 20000 });
 
       // Extract noteId after successful navigation through home page