@camunda/e2e-test-suite 0.0.1287 → 0.0.1288

package/dist/pages/8.9/AppsPage.d.ts

@@ -19,9 +19,13 @@ declare class AppsPage {
     readonly camundaComponentsButton: Locator;
     readonly camundaAppsButton: Locator;
     readonly hubSidebar: Locator;
+    private hubReturnUrl?;
     constructor(page: Page);
     clickCluster(component: Locator, name: string): Promise<void>;
+    private expandHubClusterGroup;
+    private showAllWorkspaces;
     private clickHubClusterApp;
+    goBackToHub(): Promise<void>;
     clickModeler(): Promise<void>;
     clickTasklist(clusterName: string): Promise<void>;
     clickAdmin(clusterName: string): Promise<void>;
@@ -35,8 +39,10 @@ declare class AppsPage {
     clickCamundaApps(maxRetries?: number): Promise<void>;
     private dismissBlockingOverlays;
     clickConsoleLink(): Promise<void>;
-    assertOperatePresent(shouldBeVisible?: boolean): Promise<void>;
-    assertTasklistPresent(shouldBeVisible?: boolean): Promise<void>;
-    assertOptimizePresent(shouldBeVisible?: boolean): Promise<void>;
+    private hubClusterAppLink;
+    private assertHubClusterAppPresent;
+    assertOperatePresent(clusterName: string, shouldBeVisible?: boolean): Promise<void>;
+    assertTasklistPresent(clusterName: string, shouldBeVisible?: boolean): Promise<void>;
+    assertOptimizePresent(clusterName: string, shouldBeVisible?: boolean): Promise<void>;
 }
 export { AppsPage };

package/dist/pages/8.9/AppsPage.js

@@ -4,6 +4,9 @@ exports.AppsPage = void 0;
 const test_1 = require("@playwright/test");
 const sleep_1 = require("../../utils/sleep");
 const UtilitiesPage_1 = require("../8.9/UtilitiesPage");
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
 class AppsPage {
     page;
     modelerLink;
@@ -24,9 +27,18 @@ class AppsPage {
     camundaComponentsButton;
     camundaAppsButton;
     hubSidebar;
+    hubReturnUrl;
     constructor(page) {
         this.page = page;
-        this.modelerLink = page.getByRole('link', { name: 'Modeler', exact: true });
+        // Hub has no "Modeler" switcher entry; Modeler is Hub's home, reached
+        // through the header logo link clickModeler() uses
+        // (NavShellDs.common.tsx).
+        this.modelerLink = page
+            .getByRole('link', { name: 'Modeler', exact: true })
+            .or(page
+            .locator('header[data-slot="app-header"]')
+            .getByRole('link', { name: /^Camunda (Modeler|Hub) home$/ }))
+            .first();
         // Camunda Hub's persistent "Main navigation" sidebar lists each cluster
         // with its own apps (Operate/Tasklist/Optimize/Identity) as child links
         // -- there is no per-app switcher panel to open on Hub (see
@@ -83,15 +95,186 @@ class AppsPage {
     }
     // Camunda Hub's sidebar groups by cluster, not by app: each cluster row
     // expands to reveal its own per-app child links (Operate/Tasklist/...).
-    // camunda-hub's own nav-shell-ds.spec.saas.tsx documents the shape: "the
+    // camunda-hub's own nav-shell-ds.spec.saas.tsx documents the shape: the
     // design system splits the group row into a label control and a chevron
-    // control, both labelled by the cluster name; either one opens it" -- and
+    // control, both labelled by the cluster name; either one opens it -- and
     // the child links do not exist in the DOM at all until expanded (not just
     // hidden), and are not nested under any container matchable by cluster
     // name once expanded. So: find the toggle by the cluster's own name
-    // (`.first()` because both controls share that name), click it, then
-    // look up the app link sidebar-wide rather than scoped to a "group"
-    // container that doesn't reliably exist.
+    // (`.first()` because both controls share that name), click it, then look
+    // up the app link sidebar-wide rather than scoped to a "group" container
+    // that doesn't reliably exist. Ported back from pages/8.8/AppsPage.ts.
+    async expandHubClusterGroup(clusterName) {
+        // Anchored at the start: the expanded row's accessible name is its text
+        // ("Test Cluster dev" -- name plus environment badge), so a plain
+        // substring match would also hit "UI Test Cluster", which this suite
+        // creates too and which can precede it in the sidebar.
+        const toggle = this.hubSidebar
+            .getByRole('button', { name: new RegExp(`^${escapeRegExp(clusterName)}`) })
+            .first();
+        // The diagram editor (and other full-screen views reached from it, e.g.
+        // right after runProcessInstance/deployDiagram) has no "Main navigation"
+        // sidebar at all -- confirmed from a nightly trace's DOM snapshot: the
+        // page's only <nav> is aria-label="Context navigation" (the breadcrumb),
+        // and neither "Operate"/"Tasklist"/"Optimize" nor any app-switcher text
+        // appears anywhere on it. clickCamundaApps() is a no-op on Hub (there is
+        // no switcher panel to open), so a caller reaching clickOperate/
+        // clickTasklist/clickOptimize straight from a diagram was left on a page
+        // this sidebar could never resolve on, no matter how the toggle itself
+        // is matched. Navigate home first, the same way clickModeler() does,
+        // whenever the sidebar isn't already there.
+        //
+        // A freshly re-authenticated page can also land on a workspace-agnostic
+        // route (e.g. bare /workspaces right after loginWithTestUser(), which
+        // clickCamundaApps() does nothing to fix -- it is a no-op on Hub) whose
+        // sidebar renders but has not resolved this cluster's own group yet.
+        // Confirmed from a nightly trace: both the getAttribute and click below
+        // timed out (10s each) against this exact toggle while the URL sat on
+        // /workspaces, right after a mid-test re-login. Route through the same
+        // clickModeler() recovery whenever the toggle itself hasn't shown up
+        // either, not only when the whole sidebar is missing.
+        // Leave the rail as Hub renders it: collapsed, every group is a visible
+        // flyout trigger. Opening the rail here made the group click that follows
+        // miss, likely because each label is re-wrapped in a truncation tooltip
+        // while the rail widens (8.8 reverted the same step in 3ae39d3).
+        const sidebarReady = (await this.hubSidebar.isVisible({ timeout: 5000 }).catch(() => false)) &&
+            (await toggle
+                .waitFor({ state: 'visible', timeout: 10000 })
+                .then(() => true)
+                .catch(() => false));
+        if (!sidebarReady) {
+            await this.clickModeler();
+            await (0, test_1.expect)(this.hubSidebar).toBeVisible({ timeout: 30000 });
+            // Since camunda-hub #28956 the Workspaces overview defaults to "My
+            // workspaces" -- only the ones the current user is an EXPLICIT member
+            // of -- and resets to it on every load. The shared workspace is created
+            // by whichever setup user won the race, so a role-flow user lands on
+            // "No workspaces match this filter / You don't have explicit membership
+            // in any workspace in this organization" (confirmed live) and the
+            // sidebar never renders this cluster's group. Widening the scope is
+            // what makes it appear; without it the wait below can only time out.
+            // ModelerHomePage.showAllWorkspaces() covers the project-folder paths,
+            // but nothing covered the app-switcher path until here.
+            await this.showAllWorkspaces(5000);
+            await (0, test_1.expect)(toggle).toBeVisible({ timeout: 30000 });
+        }
+        // camunda-hub's own nav-shell-ds.spec.saas.tsx documents the actual
+        // shape: "the design system splits the group row into a label control
+        // and a chevron control, both labelled by the cluster name; either one
+        // opens it" -- there is no separate "Toggle <name>" control, and the
+        // child links do not exist in the DOM at all until expanded (not merely
+        // hidden), nor are they nested under any container matchable by cluster
+        // name once expanded. So: find the toggle by the cluster's own name
+        // (`.first()` because both controls share that name), click it, then
+        // look up the app link sidebar-wide rather than scoped to a "group"
+        // container that doesn't reliably exist.
+        // Check THIS cluster's own toggle state, not "is any app link with this
+        // name visible anywhere in the sidebar" -- with more than one cluster in
+        // the org, a DIFFERENT cluster's group can already be expanded (left over
+        // from an earlier action on the same page), and that cluster's own
+        // Operate/Tasklist/Optimize link would satisfy an unscoped visibility
+        // check, skipping expansion of the requested cluster entirely and then
+        // clicking the wrong cluster's link. The child links are not nested under
+        // any container matchable by cluster name once expanded (confirmed
+        // against camunda-hub's own nav-shell-ds.spec.saas.tsx), so the toggle's
+        // own aria-expanded is the only reliable per-cluster signal available.
+        // Not exact: the same suite asserts this row with a substring/regex
+        // match (`{name: /Production/}`), not an exact string -- and nightly
+        // traces confirm why: the rendered toggle's accessible name is not
+        // byte-for-byte the bare cluster name (it carries additional content,
+        // e.g. a trailing tag summary), so an exact-match lookup here finds
+        // nothing and the click below times out waiting on a locator that can
+        // never resolve.
+        const alreadyExpanded = (await toggle.getAttribute('aria-expanded').catch(() => null)) === 'true';
+        if (!alreadyExpanded) {
+            // This is the only expansion action in the Hub path -- swallowing its
+            // failure made a broken expansion look successful and left the caller
+            // to burn the full 30s below waiting on an app link that could never
+            // appear, hiding the actionable error (e.g. a toggle that doesn't
+            // exist or isn't clickable) behind an unrelated timeout.
+            await toggle.click({ timeout: 10000 });
+        }
+        // An app link resolved after this is sidebar-wide (see callers below), so
+        // if an EARLIER call in the same test left a different cluster's group
+        // expanded too, two "Operate" (say) links now exist and that becomes a
+        // strict-mode violation. Collapse every other expanded group before
+        // resolving it -- there is no container to scope the link to instead,
+        // since the child links aren't nested under anything matchable by
+        // cluster name once expanded.
+        // hasNotText filters DOM text content, not the accessible name -- the
+        // expanded chevron can be labelled via aria-label with no text content
+        // of its own, in which case hasNotText would fail to exclude the toggle
+        // we just expanded and this loop would immediately collapse it again.
+        // Match by accessible name (same algorithm getByRole's own name option
+        // uses) instead, excluding any name CONTAINING clusterName -- not just
+        // one exactly equal to it, since (per the toggle locator above) the
+        // current cluster's own toggle name is not exactly clusterName either,
+        // and an exact-equality exclusion would wrongly treat it as "other" and
+        // immediately re-collapse the group this method just expanded.
+        // The sidebar's own rail toggle is also a button inside "Main navigation"
+        // with aria-expanded="true" once the rail is open ("Collapse sidebar").
+        // Without excluding it this loop clicked it right after the group was
+        // expanded, collapsing the rail and taking the app links with it -- the
+        // 8.8 nightly trace after #3746 shows exactly that sequence (expand
+        // "Test Cluster", count 1, click, app link never appears).
+        const otherExpandedToggles = this.hubSidebar
+            .getByRole('button', {
+            expanded: true,
+            name: new RegExp(`^(?!.*${escapeRegExp(clusterName)}).+$`),
+        })
+            .and(this.page.locator(':not([data-slot="app-sidebar-collapse-toggle"])'));
+        for (let i = 0; i < 5 && (await otherExpandedToggles.count()) > 0; i++) {
+            // Let a failed collapse throw rather than swallowing it: the app link
+            // is intentionally sidebar-wide, so a group left expanded here produces
+            // a strict-mode violation (or the wrong cluster's link) below anyway --
+            // failing at the actual cause is more useful than at that symptom.
+            await otherExpandedToggles.first().click({ timeout: 10000 });
+        }
+    }
+    // Widens Hub's Workspaces scope filter to "All workspaces". Duplicated from
+    // ModelerHomePage.showAllWorkspaces() rather than imported: ModelerHomePage
+    // constructs page objects of its own, and pulling it in here would make the
+    // Apps -> Modeler navigation path circular. The control is absent outside
+    // Hub and for non-elevated users, where a membership-scoped list is already
+    // correct, so a missing control is a no-op.
+    async showAllWorkspaces(probeTimeout) {
+        // The empty state offers an explicit "Switch to All workspaces" button
+        // next to "You don't have explicit membership in any workspace in this
+        // organization" -- prefer it. Driving the combobox alone was not enough:
+        // when its accessible name does not match, the probe below simply
+        // returns and the caller waits out its whole timeout on a page that is
+        // still scoped to "My workspaces" (observed live, twice).
+        const switchButton = this.page.getByRole('button', {
+            name: 'Switch to All workspaces',
+        });
+        const scopeFilter = this.page.getByRole('combobox', {
+            name: 'Filter workspaces',
+        });
+        const appeared = await switchButton
+            .or(scopeFilter)
+            .first()
+            .waitFor({ state: 'visible', timeout: probeTimeout })
+            .then(() => true)
+            .catch(() => false);
+        if (!appeared) {
+            return;
+        }
+        if (await switchButton.isVisible().catch(() => false)) {
+            await switchButton.click({ timeout: 10000 });
+            await (0, test_1.expect)(switchButton).toBeHidden({ timeout: 10000 });
+            return;
+        }
+        if ((await scopeFilter.innerText()).includes('All workspaces')) {
+            return;
+        }
+        await scopeFilter.click({ timeout: 10000 });
+        await this.page
+            .getByRole('option', { name: 'All workspaces' })
+            .click({ timeout: 10000 });
+        await (0, test_1.expect)(scopeFilter).toContainText('All workspaces', {
+            timeout: 10000,
+        });
+    }
     async clickHubClusterApp(clusterName, appName) {
         // When the sidebar is collapsed (the default on a fresh session), the
         // group toggle opens a Radix popover -- a role="dialog" labelled with the
@@ -101,39 +284,14 @@ class AppsPage {
         // Cluster (opens in a new tab)" et al., yet the nav-scoped link never
         // resolves). Look in that popover first; keep the sidebar-scoped lookup
         // for the expanded-sidebar layout, where the links render inline.
-        // Not exact: the rendered accessible name carries more than the bare app
-        // name (e.g. "Operate in <cluster> (opens in a new tab)").
-        //
-        // The sidebar-scoped fallback must also carry clusterName in its name: the
-        // sidebar lists every Environment as a link named after its cluster, so a
-        // bare /Admin|Identity/ match resolved to the "Admin Role Cluster"
-        // environment link -- which precedes the portalled popover in DOM order --
-        // and navigated to that environment's page instead of Admin (nightly
-        // trace, UTR Candidate Group).
-        const appLink = this.page
-            .getByRole('dialog', { name: clusterName, exact: true })
-            .getByRole('link', { name: appName })
-            .or(this.hubSidebar
-            .getByRole('link', { name: appName })
-            .and(this.hubSidebar.getByRole('link', { name: ` in ${clusterName}` })))
-            .first();
-        // Decide whether to expand from clusterName's OWN toggle state, not from
-        // whether "some" appLink is already visible sidebar-wide: in a
-        // multi-cluster org another cluster's group can already be expanded with
-        // the same app name, which made this check pass while clusterName's own
-        // group stayed collapsed -- appLink.click() below then fired on the
-        // wrong cluster's link (see PR #3627 review).
-        const collapsedToggle = this.hubSidebar
-            .getByRole('button', { name: clusterName, expanded: false })
-            .first();
-        if (await collapsedToggle.isVisible({ timeout: 5000 }).catch(() => false)) {
-            // This is the only expansion action in the Hub path -- swallowing its
-            // failure made a broken expansion look successful and left the caller
-            // to burn the full 30s below waiting on an app link that could never
-            // appear, hiding the actionable error (e.g. a toggle that doesn't
-            // exist or isn't clickable) behind an unrelated timeout.
-            await collapsedToggle.click({ timeout: 10000 });
-        }
+        const appLink = this.hubClusterAppLink(clusterName, appName);
+        // Expansion, sidebar recovery and collapsing every OTHER expanded group
+        // all live in the ported helper. Every caller in this suite reaches here
+        // straight from the diagram editor after "Deploy & run", a view with no
+        // "Main navigation" sidebar at all -- so the toggle lookup the old inline
+        // check did could never resolve there (nightly trace: the page's only
+        // chrome is the breadcrumb and the "Instance started!" toast).
+        await this.expandHubClusterGroup(clusterName);
         await (0, test_1.expect)(appLink).toBeVisible({ timeout: 30000 });
         // Hub's cluster-app links carry target="_blank", so clicking them opens
         // the app in a new tab while every caller keeps asserting on this.page.
@@ -141,11 +299,22 @@ class AppsPage {
         // navigation the Console app switcher gave these callers.
         const href = await appLink.getAttribute('href');
         if (href) {
+            this.hubReturnUrl = this.page.url();
             await this.page.goto(new URL(href, this.page.url()).toString());
             return;
         }
         await appLink.click({ timeout: 10000 });
     }
+    // Returns from an app that clickHubClusterApp opened. page.goBack() alone
+    // can stop on one of the app's own login-redirect entries, and the next
+    // Hub sidebar lookup then runs against the app instead of Hub.
+    async goBackToHub() {
+        await this.page.goBack();
+        if (this.hubReturnUrl &&
+            !new URL(this.page.url()).hostname.startsWith('hub.')) {
+            await this.page.goto(this.hubReturnUrl);
+        }
+    }
     async clickModeler() {
         // Camunda Hub (hub.*) replaced Console + Web Modeler on SaaS and has no
         // app switcher. Its home is the Modeler/Workspaces home, but a hostname
@@ -247,10 +416,6 @@ class AppsPage {
     }
     async clickAdmin(clusterName) {
         if (new URL(this.page.url()).hostname.startsWith('hub.')) {
-            // Non-anchored, matching the substring lookup clickHubClusterApp uses
-            // for Operate/Tasklist/Optimize -- an anchored pattern fails the same
-            // way an exact-string match did for those apps if the rendered link's
-            // accessible name carries any extra content (icon/badge).
             await this.clickHubClusterApp(clusterName, /Admin|Identity/);
             return;
         }
@@ -488,8 +653,14 @@ class AppsPage {
         // separate app to switch into. Its header banner (homePage.consoleBanner,
         // via hubHeader) is already visible from any Hub page, so there is no
         // navigation action needed here -- mirrors the same hostname guard in
-        // clickModeler().
+        // clickModeler(). The diagram editor is the exception: it has no "Main
+        // navigation" sidebar, so a caller arriving from Deploy & run would find
+        // no Clusters/Environments link. Go home first there.
         if (new URL(this.page.url()).hostname.startsWith('hub.')) {
+            if (!(await this.hubSidebar.isVisible().catch(() => false))) {
+                await this.clickModeler();
+                await (0, test_1.expect)(this.hubSidebar).toBeVisible({ timeout: 30000 });
+            }
             return;
         }
         const maxRetries = 3;
@@ -527,7 +698,41 @@ class AppsPage {
         }
         throw new Error(`Failed to click the console link after ${maxRetries} attempts.`);
     }
-    async assertOperatePresent(shouldBeVisible = true) {
+    // Hub's replacement for the app switcher: a cluster's apps are the child
+    // links of its sidebar group. Hub names every app link "<app> in
+    // <environment>", plus " (opens in a new tab)" when it leads to the live app
+    // (camunda-hub environment-sidebar-rows.ts). Anchor both halves: the
+    // flyout's first link is "Details of <environment>", so for "Admin Role
+    // Cluster" a bare /Admin|Identity/ picked that link, and inline it picked
+    // "Operate in Admin Role Cluster (opens in a new tab)".
+    hubClusterAppLink(clusterName, appName) {
+        const appPattern = typeof appName === 'string' ? escapeRegExp(appName) : appName.source;
+        const cluster = escapeRegExp(clusterName);
+        const appLinkName = new RegExp(`^(?:${appPattern}) in ${cluster}(?: \\(opens in a new tab\\))?$`);
+        return this.page
+            .getByRole('dialog', { name: clusterName, exact: true })
+            .getByRole('link', { name: appLinkName })
+            .or(this.hubSidebar.getByRole('link', { name: appLinkName }))
+            .first();
+    }
+    async assertHubClusterAppPresent(clusterName, appName, shouldBeVisible) {
+        const appLink = this.hubClusterAppLink(clusterName, appName);
+        // Not expanded for an absence check: expandHubClusterGroup throws when
+        // the user cannot see the environment at all, which is a pass here.
+        if (!shouldBeVisible) {
+            await (0, test_1.expect)(appLink).toBeHidden({ timeout: 30000 });
+            return;
+        }
+        await this.expandHubClusterGroup(clusterName);
+        await (0, test_1.expect)(appLink).toBeVisible({ timeout: 30000 });
+    }
+    // On Hub the cluster name is what scopes the lookup: there is no app
+    // switcher, only each cluster's own sidebar group.
+    async assertOperatePresent(clusterName, shouldBeVisible = true) {
+        if (new URL(this.page.url()).hostname.startsWith('hub.')) {
+            await this.assertHubClusterAppPresent(clusterName, 'Operate', shouldBeVisible);
+            return;
+        }
         const maxRetries = 3;
         for (let retries = 0; retries < maxRetries; retries++) {
             try {
@@ -556,7 +761,12 @@ class AppsPage {
         }
         throw new Error(`Failed to assert the operate link visibility after ${maxRetries} attempts.`);
     }
-    async assertTasklistPresent(shouldBeVisible = true) {
+    // See assertOperatePresent for the clusterName/Hub note.
+    async assertTasklistPresent(clusterName, shouldBeVisible = true) {
+        if (new URL(this.page.url()).hostname.startsWith('hub.')) {
+            await this.assertHubClusterAppPresent(clusterName, 'Tasklist', shouldBeVisible);
+            return;
+        }
         const maxRetries = 3;
         for (let retries = 0; retries < maxRetries; retries++) {
             try {
@@ -585,7 +795,12 @@ class AppsPage {
         }
         throw new Error(`Failed to assert the tasklist link visibility after ${maxRetries} attempts.`);
     }
-    async assertOptimizePresent(shouldBeVisible = true) {
+    // See assertOperatePresent for the clusterName/Hub note.
+    async assertOptimizePresent(clusterName, shouldBeVisible = true) {
+        if (new URL(this.page.url()).hostname.startsWith('hub.')) {
+            await this.assertHubClusterAppPresent(clusterName, 'Optimize', shouldBeVisible);
+            return;
+        }
         const maxRetries = 3;
         for (let retries = 0; retries < maxRetries; retries++) {
             try {

package/dist/pages/8.9/ClusterDetailsPage.d.ts

@@ -4,6 +4,7 @@ import { McpCredentials } from '../../utils/mcpSecrets';
 declare class ClusterDetailsPage {
     private page;
     private pendingClientScopeCheck;
+    private clusterDetailsUrl;
     readonly apiTab: Locator;
     readonly createFirstClientButton: Locator;
     readonly clientNameTextbox: Locator;
@@ -24,6 +25,7 @@ declare class ClusterDetailsPage {
     readonly clientCredentialsDialog: Locator;
     readonly clustersLink: Locator;
     readonly alertsTab: Locator;
+    readonly alertsTabPanel: Locator;
     readonly alertsList: Locator;
     readonly alertExpandRowButtons: Locator;
     readonly alertRowActionsButtons: Locator;
@@ -43,6 +45,7 @@ declare class ClusterDetailsPage {
     readonly expandButton: Locator;
     readonly rbaEnabledMessage: Locator;
     readonly authorizationsHeading: Locator;
+    readonly authorizationsSwitch: Locator;
     readonly orchestrationClusterCheckbox: Locator;
     readonly clientCredentialsLink: (clientCredentials: string) => Locator;
     readonly clientRow: (name: string) => Locator;
@@ -74,11 +77,13 @@ declare class ClusterDetailsPage {
     clickCloseModalButton(): Promise<void>;
     clickSettingsTab(): Promise<void>;
     private waitForAuthorizationsSection;
+    private setAuthorizationsViaSwitch;
     enableAuthorizations(): Promise<void>;
     disableAuthorizations(): Promise<void>;
     searchAndClickClientCredentialsLink(name: string): Promise<ClientCredentialsDetailsPage>;
     deleteAPIClientsIfExist(name?: string): Promise<void>;
     clickAlertsTab(): Promise<void>;
+    reopenAlertsTab(): Promise<void>;
     clickExpandButton(): Promise<void>;
     clickCreateFirstAlertButton(): Promise<void>;
     clickCreateNewAlertButton(): Promise<void>;

package/dist/pages/8.9/ClusterDetailsPage.js

@@ -6,11 +6,17 @@ const sleep_1 = require("../../utils/sleep");
 const clickLocatorWithRetry_1 = require("../../utils/assertionHelpers/clickLocatorWithRetry");
 const expectLocatorWithRetry_1 = require("../../utils/assertionHelpers/expectLocatorWithRetry");
 const ClientCredentialsDetailsPage_1 = require("./ClientCredentialsDetailsPage");
+const sessionRecovery_1 = require("../../utils/sessionRecovery");
+// Hub's own /login and /login-callback routes, which render only a spinner
+// while the Auth0 hand-off of a full page load is in flight.
+const HUB_LOGIN_ROUTE = /^\/login(-callback)?\/?$/;
 class ClusterDetailsPage {
     page;
     // Name of a client whose scopes still have to be checked against the
     // clients list — see createAPIClient() / clickCloseModalButton().
     pendingClientScopeCheck = null;
+    // The cluster page reopenAlertsTab() goes back to -- see there.
+    clusterDetailsUrl;
     apiTab;
     createFirstClientButton;
     clientNameTextbox;
@@ -31,6 +37,7 @@ class ClusterDetailsPage {
     clientCredentialsDialog;
     clustersLink;
     alertsTab;
+    alertsTabPanel;
     alertsList;
     alertExpandRowButtons;
     alertRowActionsButtons;
@@ -50,6 +57,7 @@ class ClusterDetailsPage {
     expandButton;
     rbaEnabledMessage;
     authorizationsHeading;
+    authorizationsSwitch;
     orchestrationClusterCheckbox;
     clientCredentialsLink;
     clientRow;
@@ -134,7 +142,13 @@ class ClusterDetailsPage {
             .getByRole('banner')
             .getByRole('link', { name: 'Clusters' });
         this.alertsTab = page.getByRole('tab', { name: 'Alerts' });
-        this.alertsList = page
+        // Only the selected tab's panel is exposed (the design-system tabs unmount
+        // the others, Carbon marks them hidden), and it is named after its tab.
+        // Page-wide, getByRole('row') read the Overview "Cluster Details" rows
+        // whenever Overview was showing -- the nightly's `Received string:
+        // "NameAlert Flow Cluster"` where the Email alert row was expected.
+        this.alertsTabPanel = page.getByRole('tabpanel', { name: 'Alerts' });
+        this.alertsList = this.alertsTabPanel
             .getByRole('row')
             .filter({ hasNotText: 'Delivery method' }); //Filter out header row
         // Hub's Alerts tab is a design-system data table: one summary row per
@@ -191,6 +205,12 @@ class ClusterDetailsPage {
         });
         this.expandButton = page.locator('button[class="cds--table-expand__button"]');
         this.rbaEnabledMessage = page.getByText('Authorizations enabled');
+        // Hub's design-system Settings tab: <button role="switch"
+        // aria-label="Switch Enable authorizations" aria-checked="true|false">
+        // (c4 C4Toggle). It has no Carbon `.cds--toggle__*` nodes. Same as 8.8.
+        this.authorizationsSwitch = this.page.getByRole('switch', {
+            name: /Enable authorizations/i,
+        });
         this.authorizationsHeading = this.page.getByRole('heading', {
             name: 'Authorizations',
         });
@@ -381,9 +401,40 @@ class ClusterDetailsPage {
             },
         });
     }
+    // Drives the design-system Authorizations switch. Returns false when this
+    // shell does not render one, so the caller falls through to the legacy
+    // Carbon toggle.
+    async setAuthorizationsViaSwitch(enabled) {
+        const hasSwitch = await this.authorizationsSwitch
+            .waitFor({ state: 'visible', timeout: 10000 })
+            .then(() => true)
+            .catch(() => false);
+        if (!hasSwitch) {
+            return false;
+        }
+        const isOn = (await this.authorizationsSwitch.getAttribute('aria-checked')) === 'true';
+        if (isOn === enabled) {
+            return true;
+        }
+        await this.authorizationsSwitch.click({ timeout: 30000 });
+        const confirmOpened = await this.dialog
+            .waitFor({ state: 'visible', timeout: 15000 })
+            .then(() => true)
+            .catch(() => false);
+        if (confirmOpened) {
+            const confirm = enabled ? this.rbaEnableButton : this.rbaDisableButton;
+            await confirm.click({ timeout: 30000 });
+            await (0, test_1.expect)(this.page.getByText(enabled ? 'Enabling...' : 'Disabling...')).not.toBeVisible({ timeout: 60000 });
+        }
+        await (0, test_1.expect)(this.authorizationsSwitch).toHaveAttribute('aria-checked', String(enabled), { timeout: 120000 });
+        return true;
+    }
     async enableAuthorizations() {
         await (0, sleep_1.sleep)(5000);
         await this.waitForAuthorizationsSection();
+        if (await this.setAuthorizationsViaSwitch(true)) {
+            return;
+        }
         // Locate all elements with class .cds--toggle__text
         const toggleTextElements = await this.page.$$('.cds--toggle__text');
         // Check if toggleTextElements has at least 2 elements
@@ -417,11 +468,18 @@ class ClusterDetailsPage {
             }
         }
         else {
-            console.log('Toggle text elements not found or less than 2.');
+            // Was a console.log that returned as though authorizations had been
+            // enabled; under Hub this branch ran every time (8.8 fix 7d771aa).
+            throw new Error('Could not enable authorizations: the Settings tab rendered neither ' +
+                'the design-system "Enable authorizations" switch nor a Carbon ' +
+                'toggle pair.');
         }
     }
     async disableAuthorizations() {
         await this.waitForAuthorizationsSection();
+        if (await this.setAuthorizationsViaSwitch(false)) {
+            return;
+        }
         // Locate all elements with class .cds--toggle__text
         const toggleTextElements = await this.page.$$('.cds--toggle__text');
         // Check if toggleTextElements has at least 2 elements
@@ -456,7 +514,9 @@ class ClusterDetailsPage {
             }
         }
         else {
-            console.log('Toggle text elements not found or less than 2.');
+            throw new Error('Could not disable authorizations: the Settings tab rendered neither ' +
+                'the design-system "Enable authorizations" switch nor a Carbon ' +
+                'toggle pair.');
         }
     }
     async searchAndClickClientCredentialsLink(name) {
@@ -494,10 +554,9 @@ class ClusterDetailsPage {
         await this.alertsTab.click();
         // The tab bar remounts while the cluster payload is still arriving, which
         // discards the click and leaves Overview selected -- and the tab is a
-        // button, not a route, so nothing later re-selects it. Callers then read
-        // the Overview "Cluster Details" rows through the page-wide alertsList
-        // locator and see a row count that never changes. Confirm the panel
-        // mounted, re-selecting the tab after a reload between attempts.
+        // button, not a route, so nothing later re-selects it. Callers would then
+        // find no Alerts panel for alertsList to read. Confirm the panel mounted,
+        // re-selecting the tab after a reload between attempts.
         await (0, expectLocatorWithRetry_1.expectLocatorWithRetry)(this.page, this.alertsPanel, {
             visibilityTimeout: 60000,
             totalTimeout: 240000,
@@ -509,6 +568,31 @@ class ClusterDetailsPage {
             },
         });
     }
+    // Re-enters the cluster page and re-opens the Alerts tab, for callers that
+    // poll the alerts table for a server-side change. Hub keeps the selected
+    // tab out of the URL (ClusterDetails.saas.tsx drops c4's tabChange), so any
+    // full load comes back on Overview and the tab has to be clicked again.
+    // A goto to the remembered cluster page rather than a reload: a full load
+    // re-runs Hub's Auth0 hand-off, and a reload issued while the page is still
+    // parked on /login-callback?code=... replays that single-use code.
+    async reopenAlertsTab() {
+        if ((0, sessionRecovery_1.isAtIdentityProvider)(this.page)) {
+            await (0, sessionRecovery_1.restoreSessionIfLoggedOut)(this.page);
+        }
+        const current = new URL(this.page.url());
+        if (!(0, sessionRecovery_1.isAtIdentityProvider)(this.page) &&
+            !HUB_LOGIN_ROUTE.test(current.pathname)) {
+            this.clusterDetailsUrl = current.href;
+        }
+        const target = this.clusterDetailsUrl ?? current.href;
+        const host = new URL(target).host;
+        await this.page.goto(target, { waitUntil: 'domcontentloaded' });
+        // goto() resolves on the first document; the hand-off then bounces
+        // through /login and /login-callback (~45s on CI) before it lands back.
+        await this.page.waitForURL((url) => url.host === host && !HUB_LOGIN_ROUTE.test(url.pathname), { timeout: 120000 });
+        await this.alertsTab.click({ timeout: 60000 });
+        await (0, test_1.expect)(this.alertsPanel.first()).toBeVisible({ timeout: 60000 });
+    }
     async clickExpandButton() {
         await this.expandButton.click({ timeout: 60000 });
     }
@@ -829,8 +913,7 @@ class ClusterDetailsPage {
             catch (error) {
                 if (attempt < maxRetries - 1) {
                     console.warn(`Attempt ${attempt + 1} failed for asserting ${text}. Retrying...`);
-                    await this.page.reload();
-                    await (0, sleep_1.sleep)(20000);
+                    await this.reopenAlertsTab();
                 }
                 else {
                     throw new Error(`Assertion failed after ${maxRetries} attempts`);