@camunda/e2e-test-suite 0.0.1273 → 0.0.1275

package/dist/pages/8.8/ClusterPage.js

@@ -124,10 +124,43 @@ class ClusterPage {
         this.clusterVersion = (clusterName, versionText) => this.cluster(clusterName).getByText(versionText);
     }
     async clickClusterBanner() {
-        await this.page
+        // Camunda Hub has no `banner` landmark; "Clusters" instead lives in its
+        // persistent "Main navigation" sidebar, and once the org has environments
+        // enabled that link is further renamed "Environments" (same rollout
+        // HomePage.clusterTab handles).
+        const clusterLink = this.page
             .getByRole('banner')
             .getByRole('link', { name: 'Clusters' })
-            .click({ timeout: 60000 });
+            .or(this.page
+            .getByRole('navigation', { name: 'Main navigation' })
+            .getByRole('link', { name: 'Clusters', exact: true }))
+            .or(this.page
+            .getByRole('navigation', { name: 'Main navigation' })
+            .getByRole('link', { name: 'Environments', exact: true }));
+        await clusterLink.click({ timeout: 60000 });
+        // Landing on Hub's Environments overview (see above) renders clusters as
+        // cards, not the getByRole('row') table this page's own locators expect
+        // -- route through the page's own "Clusters" tab to reach the classic
+        // route. Same fix as HomePage.clickClusters().
+        const clustersPageTab = this.page
+            .getByRole('navigation', { name: 'Environments views' })
+            .getByRole('link', { name: 'Clusters', exact: true });
+        // Required on Hub, not optional: this page's row-based cluster locators
+        // cannot be satisfied by the card-based Environments overview we just
+        // landed on. isVisible() does not wait, so a slow tab render used to be
+        // read as "no tab here" and the flow continued on the wrong route.
+        const onHub = new URL(this.page.url()).hostname.startsWith('hub.');
+        const tabShown = await clustersPageTab
+            .waitFor({ state: 'visible', timeout: onHub ? 30000 : 5000 })
+            .then(() => true)
+            .catch(() => false);
+        if (tabShown) {
+            await clustersPageTab.click({ timeout: 15000 });
+        }
+        else if (onHub) {
+            throw new Error('Hub Environments view did not render its "Clusters" tab; the ' +
+                'row-based cluster list this page needs is unreachable without it');
+        }
     }
     async deleteCluster(name) {
         await this.page.waitForTimeout(1000);

package/dist/pages/8.8/ClusterSecretsPage.d.ts

@@ -36,6 +36,7 @@ declare class ClusterSecretsPage {
         value: string;
     }[]): Promise<void>;
     reopenConnectorSecretsTab(cluster: string): Promise<void>;
+    private reselectConnectorSecretsTabIfPresent;
     assertSecretsToolbarVisible(cluster: string): Promise<void>;
     assertSecretsOrCreate(cluster: string, secrets: {
         name: string;

package/dist/pages/8.8/ClusterSecretsPage.js

@@ -50,10 +50,27 @@ class ClusterSecretsPage {
         this.dialogImportButton = this.page
             .getByRole('dialog')
             .getByRole('button', { name: 'Import', exact: true });
-        this.secretsSearchBox = page.getByRole('searchbox', { name: 'Filter table' });
+        // "Filter table" was Carbon's default TableToolbarSearch label. Camunda
+        // Hub's rebranded panel renders a plain "Search" input instead, so the
+        // old exact-name match never resolves and every lookup falls through to
+        // creating a secret that may already exist. Match either.
+        this.secretsSearchBox = page
+            .getByRole('searchbox', { name: 'Filter table' })
+            .or(page.getByRole('searchbox', { name: 'Search' }))
+            .or(page.getByPlaceholder('Search'));
+        // Camunda Hub has no `banner` landmark; "Clusters" instead lives in its
+        // persistent "Main navigation" sidebar, and once the org has environments
+        // enabled that link is further renamed "Environments" (same rollout
+        // HomePage.clusterTab handles).
         this.clusterBanner = this.page
             .getByRole('banner')
-            .getByRole('link', { name: 'Clusters' });
+            .getByRole('link', { name: 'Clusters' })
+            .or(this.page
+            .getByRole('navigation', { name: 'Main navigation' })
+            .getByRole('link', { name: 'Clusters', exact: true }))
+            .or(this.page
+            .getByRole('navigation', { name: 'Main navigation' })
+            .getByRole('link', { name: 'Environments', exact: true }));
         this.clusterLink = (name) => page.getByRole('link', { name: name });
         this.clusterSecretTab = this.page.getByRole('tab', {
             name: 'Connector Secrets',
@@ -144,6 +161,30 @@ class ClusterSecretsPage {
         await this.dismissOpenDialogIfPresent();
         await (0, test_1.expect)(this.clusterBanner).toBeVisible({ timeout: 30000 });
         await this.clusterBanner.click({ timeout: 60000 });
+        // Landing on Hub's Environments overview (see clusterBanner above) renders
+        // clusters as cards, not the getByRole('link') the clusterLink() locator
+        // below expects to find directly -- route through the page's own
+        // "Clusters" tab to reach the classic route. Same fix as
+        // HomePage.clickClusters().
+        const clustersPageTab = this.page
+            .getByRole('navigation', { name: 'Environments views' })
+            .getByRole('link', { name: 'Clusters', exact: true });
+        // Required on Hub, not optional: this page's row-based cluster locators
+        // cannot be satisfied by the card-based Environments overview we just
+        // landed on. isVisible() does not wait, so a slow tab render used to be
+        // read as "no tab here" and the flow continued on the wrong route.
+        const onHub = new URL(this.page.url()).hostname.startsWith('hub.');
+        const tabShown = await clustersPageTab
+            .waitFor({ state: 'visible', timeout: onHub ? 30000 : 5000 })
+            .then(() => true)
+            .catch(() => false);
+        if (tabShown) {
+            await clustersPageTab.click({ timeout: 15000 });
+        }
+        else if (onHub) {
+            throw new Error('Hub Environments view did not render its "Clusters" tab; the ' +
+                'row-based cluster list this page needs is unreachable without it');
+        }
     }
     async clickCluster(name) {
         await (0, test_1.expect)(this.clusterLink(name)).toBeVisible({ timeout: 30000 });
@@ -241,7 +282,25 @@ class ClusterSecretsPage {
         await (0, test_1.expect)(this.clusterSecretTab).toBeVisible({ timeout: 30000 });
         await this.clusterSecretTab.click({ timeout: 30000 });
     }
+    // Camunda Hub keeps the selected cluster tab in client-side state rather
+    // than in the URL (/org/<id>/cluster/<id> carries no tab segment), so every
+    // page.reload() in this file lands back on the cluster Overview tab, where
+    // the secrets toolbar does not exist at all. Re-selecting the tab is a
+    // client-side click that costs nothing, whereas re-entering from the
+    // Clusters list navigates to `/` and pays a full Hub OAuth hand-off -- so
+    // try the cheap route before the toolbar assertions fall through to their
+    // broken-panel recovery.
+    async reselectConnectorSecretsTabIfPresent() {
+        const onTab = await this.clusterSecretTab
+            .waitFor({ state: 'visible', timeout: 30000 })
+            .then(() => true)
+            .catch(() => false);
+        if (onTab) {
+            await this.clusterSecretTab.click({ timeout: 15000 }).catch(() => { });
+        }
+    }
     async assertSecretsToolbarVisible(cluster) {
+        await this.reselectConnectorSecretsTabIfPresent();
         await (0, expectLocatorWithRetry_1.expectLocatorWithRetry)(this.page, this.createNewSecretButton, {
             visibilityTimeout: 60000,
             totalTimeout: 300000,
@@ -272,6 +331,7 @@ class ClusterSecretsPage {
         // Same broken-panel state as assertSecretsToolbarVisible guards against:
         // when the secrets panel failed to load, Import is simply absent, and only
         // re-entering the tab brings it back.
+        await this.reselectConnectorSecretsTabIfPresent();
         await (0, expectLocatorWithRetry_1.expectLocatorWithRetry)(this.page, this.importButton, {
             visibilityTimeout: 30000,
             totalTimeout: 300000,

package/dist/pages/8.8/FormJsPage.js

@@ -5,6 +5,8 @@ const test_1 = require("@playwright/test");
 const sleep_1 = require("../../utils/sleep");
 const ProcessApplicationPage_1 = require("./ProcessApplicationPage");
 const sessionRecovery_1 = require("../../utils/sessionRecovery");
+const consoleApiHelpers_1 = require("../../utils/consoleApiHelpers");
+const hubDeployDialog_1 = require("../../utils/hubDeployDialog");
 class FormJsPage {
     page;
     processApplicationPage;
@@ -54,16 +56,36 @@ class FormJsPage {
         // Inside a process application hub titles this modal for the application
         // rather than for the form, so 'Deploy form' never matches and the dialog
         // reads as absent. pages/SM-8.10 filters on 'Deploy' for the same reason.
+        // Camunda Hub's design-system shell renders no Carbon markup at all: a DOM
+        // audit of a live run found zero `cds--*` classes on these pages, so the
+        // Carbon container selector matched nothing and the dialog read as absent
+        // even once it had opened. Match the dialog by role and keep the Carbon
+        // container for shells where the Ds migration has not shipped.
         this.dialog = page
+            .getByRole('dialog')
+            .filter({ hasText: 'Deploy' })
+            .or(page
             .locator('.cds--modal-container[role="dialog"]')
-            .filter({ hasText: 'Deploy' });
+            .filter({ hasText: 'Deploy' }))
+            .first();
         this.deploySubButton = this.dialog.getByRole('button', {
             name: 'Deploy',
             exact: true,
         });
+        // Same Carbon-to-design-system move as the dialog above: the success toast
+        // is a role=status/alert region on Hub rather than a `cds--toast-*` node.
+        // Hub's dialog deploys the whole PROJECT ("Deploy project"), so its
+        // confirmation is no longer the form-specific "Form deployed!" string.
+        // Match the deployment confirmation however it is worded, while still
+        // requiring a success (not an error) wording so a failed deploy cannot
+        // satisfy it.
         this.deploySuccessNotification = page
+            .getByText(/(form|project|resources?)\s+(was\s+)?deployed/i)
+            .or(page.getByText('Form deployed!'))
+            .or(page
             .locator('.cds--toast-notification--success')
-            .filter({ hasText: 'Form deployed!' });
+            .filter({ hasText: 'Form deployed!' }))
+            .first();
         this.deployErrorMessage = this.dialog.getByText('The form failed to deploy');
     }
     async generateAIForm(request = 'Create a form with the following fields: 1. A text field with the label "Full Name" 2. A number with the label "Count" 3. A date input with the label "Date of birth"4. A Checkbox with the label "Agree"') {
@@ -159,14 +181,30 @@ class FormJsPage {
             }
             return;
         }
-        const healthyRegex = new RegExp(`${clusterName}[\\s\\S]*?HealthydevManage`);
-        const cluster = this.dialog.locator(`[title="${clusterName}"]`);
+        // "HealthydevManage" was the Carbon row's chrome concatenated together.
+        // The design-system dialog renders the cluster row as
+        // "<name> ... <generation> dev <checkmark> Healthy" with no Manage link,
+        // so the old pattern could never match. Keep what the assertion is for --
+        // the chosen cluster reports Healthy -- without the stale chrome.
+        const healthyRegex = new RegExp(`${clusterName}[\\s\\S]*?Healthy`);
+        // `[title="<cluster>"]` was the Carbon toggle's own tooltip attribute; the
+        // design-system dialog renders no `title` here, so the click target is the
+        // labelled toggle itself (the same node `legacyClusterToggle` already
+        // matched to decide this branch).
+        const cluster = this.dialog
+            .locator(`[title="${clusterName}"]`)
+            .or(legacyClusterToggle.first())
+            .first();
         await (0, test_1.expect)(cluster).toBeVisible({ timeout: 30000 });
         await cluster.click();
-        await (0, test_1.expect)(this.dialog
-            .locator('label')
-            .filter({ hasText: new RegExp(`^${clusterName}`) })
-            .getByRole('switch')).toBeChecked({ timeout: 30000 });
+        // Carbon rendered the cluster choice as a toggle `switch`; the
+        // design-system dialog uses a different control (and auto-selects the
+        // single offered cluster), so a switch-only assertion timed out on a
+        // dialog that had in fact selected the cluster. Assert whichever control
+        // shape is present, and skip the check when none is -- the deploy itself,
+        // and the success notification the caller waits on, are what actually
+        // prove the right cluster was used.
+        await (0, hubDeployDialog_1.assertClusterSelectedInDialog)(this.dialog, clusterName);
         await (0, test_1.expect)(this.dialog).toHaveText(healthyRegex, {
             timeout: healthCheckTimeout,
         });
@@ -189,22 +227,7 @@ class FormJsPage {
     // silently turning it into a process-application deploy. The combobox only
     // exists inside a container, hence the boolean probe.
     async selectOnlyThisResource() {
-        const scopeSelect = this.dialog.getByRole('combobox', {
-            name: 'Resources to deploy',
-        });
-        const hasScopeSelect = await scopeSelect
-            .waitFor({ state: 'visible', timeout: 10000 })
-            .then(() => true)
-            .catch(() => false);
-        if (!hasScopeSelect) {
-            return;
-        }
-        await scopeSelect.click();
-        await this.dialog
-            .getByRole('option', { name: 'Only this resource' })
-            .or(this.dialog.getByText('Only this resource', { exact: true }))
-            .first()
-            .click({ timeout: 30000 });
+        await (0, hubDeployDialog_1.selectOnlyThisResourceInDialog)(this.page, this.dialog);
     }
     async deployForm(clusterName) {
         await this.processApplicationPage.ensureStageCluster(clusterName);
@@ -214,6 +237,14 @@ class FormJsPage {
         // retry through that propagation window instead of failing on the transient
         // rejection. Non-migration runs keep the original single-attempt behavior.
         const maxAttempts = process.env.IS_MIGRATION === 'true' ? 15 : 1;
+        // Camunda Hub's deploy modal lists the ENVIRONMENTS assigned to this
+        // workspace, not the org's clusters, so a cluster created after the
+        // workspace existed never appears and the picker comes up empty. The
+        // wizard's "Assign environments" step only covers a workspace created
+        // after its cluster, which test-setup cannot guarantee -- it creates
+        // clusters and workspaces in parallel. Ensure the link here, at the point
+        // of use, so the ordering does not matter.
+        await (0, consoleApiHelpers_1.ensureClusterLinkedToSharedWorkspace)(this.page, clusterName);
         for (let attempt = 1; attempt <= maxAttempts; attempt++) {
             await this.clickDeployButton();
             await (0, test_1.expect)(this.dialog).toBeVisible({

package/dist/pages/8.8/HomePage.d.ts

@@ -12,11 +12,14 @@ declare class HomePage {
     readonly appSwitcher: Locator;
     readonly openOrganizationButton: Locator;
     readonly consoleBanner: Locator;
+    readonly hubHeader: Locator;
+    readonly hubSidebar: Locator;
     readonly modelerBanner: Locator;
     readonly gettingStartedHeading: Locator;
     readonly buttonSkipCustomization: Locator;
     constructor(page: Page);
     clickClusters(): Promise<void>;
+    private clickClustersPageTabIfPresent;
     clickDashboard(): Promise<void>;
     clickOrganization(): Promise<void>;
     closeInformationDialog(): Promise<void>;

package/dist/pages/8.8/HomePage.js

@@ -15,16 +15,35 @@ class HomePage {
     appSwitcher;
     openOrganizationButton;
     consoleBanner;
+    hubHeader;
+    hubSidebar;
     modelerBanner;
     gettingStartedHeading;
     buttonSkipCustomization;
     constructor(page) {
         this.page = page;
+        // Camunda Hub replaces Console on SaaS: an app header (only carrying the
+        // user menu once authenticated) plus a sidebar whose Console section
+        // links to /org/<id>/clusters and /org/<id>/management.
+        this.hubHeader = page
+            .locator('header[data-slot="app-header"]')
+            .filter({ has: page.locator('[data-slot="user-menu-trigger"]') });
+        this.hubSidebar = page.locator('nav[data-slot="app-sidebar"]');
         this.dashboardTab = page.getByRole('link', { name: 'Dashboard' });
+        // Once an org has environmentsEnabled, camunda-hub's
+        // use-ds-sidebar-items.tsx replaces the sidebar's Clusters link with one
+        // labelled "Environments" whose href is '/environments', not
+        // '/clusters' -- accept both hrefs so this resolves either way.
         this.clusterTab = page
             .getByRole('banner')
-            .getByRole('link', { name: 'Clusters' });
-        this.organizationTab = page.getByRole('link', { name: 'Organization' });
+            .getByRole('link', { name: 'Clusters' })
+            .or(this.hubSidebar.locator('a[href$="/clusters"]'))
+            .or(this.hubSidebar.locator('a[href$="/environments"]'))
+            .first();
+        this.organizationTab = page
+            .getByRole('link', { name: 'Organization' })
+            .or(this.hubSidebar.locator('a[href$="/management"]'))
+            .first();
         this.organizationViewTitle = page.getByText('Organization Management');
         this.welcomeMessage = page.getByText('Welcome to Camunda!').first();
         this.informationDialog = page.getByRole('button', {
@@ -32,14 +51,23 @@ class HomePage {
         });
         this.camundaAppsButton = page.getByLabel('Camunda apps');
         this.appSwitcher = page.getByLabel('App Switcher');
+        // Specs assert this as "the authenticated app shell has rendered" before
+        // navigating. Camunda Hub has no app-switcher button at all (apps are
+        // reached from the sidebar), so on Hub its authenticated header is the
+        // equivalent readiness signal.
         this.camundaComponentsButton = page
             .getByLabel('Camunda components')
             .or(this.camundaAppsButton)
-            .or(this.appSwitcher);
+            .or(this.appSwitcher)
+            .or(this.hubHeader);
         this.openOrganizationButton = page.getByLabel('Open Organizations');
-        this.consoleBanner = page.getByRole('link', {
-            name: 'Camunda logo Console',
-        });
+        // "Camunda logo Console" was the old Carbon header's logo link. Camunda
+        // Hub has no equivalent link -- its post-login landing is `hubHeader`
+        // (see above) -- so callers that assert this banner as a login/Console
+        // arrival signal need the Hub fallback too.
+        this.consoleBanner = page
+            .getByRole('link', { name: 'Camunda logo Console' })
+            .or(this.hubHeader);
         this.gettingStartedHeading = page.getByText('start by creating a project');
         this.buttonSkipCustomization = page.getByRole('button', {
             name: 'Skip customization',
@@ -49,8 +77,35 @@ class HomePage {
         });
     }
     async clickClusters() {
-        await (0, test_1.expect)(this.clusterTab).toBeVisible({ timeout: 15000 });
+        await (0, test_1.expect)(this.clusterTab).toBeVisible({ timeout: 30000 });
         await this.clusterTab.click({ timeout: 15000 });
+        await this.clickClustersPageTabIfPresent();
+    }
+    // Landing on Hub's Environments overview (see clusterTab above) doesn't put
+    // us on the classic row-based cluster list ClusterPage.ts expects -- that
+    // page renders clusters as cards. Its own header renders a separate
+    // "Clusters" tab (camunda-hub EnvironmentsPageHeader.tsx, href /clusters)
+    // that does.
+    async clickClustersPageTabIfPresent() {
+        const clustersPageTab = this.page
+            .getByRole('navigation', { name: 'Environments views' })
+            .getByRole('link', { name: 'Clusters', exact: true });
+        // Required on Hub, not optional: this page's row-based cluster locators
+        // cannot be satisfied by the card-based Environments overview we just
+        // landed on. isVisible() does not wait, so a slow tab render used to be
+        // read as "no tab here" and the flow continued on the wrong route.
+        const onHub = new URL(this.page.url()).hostname.startsWith('hub.');
+        const tabShown = await clustersPageTab
+            .waitFor({ state: 'visible', timeout: onHub ? 30000 : 5000 })
+            .then(() => true)
+            .catch(() => false);
+        if (tabShown) {
+            await clustersPageTab.click({ timeout: 15000 });
+        }
+        else if (onHub) {
+            throw new Error('Hub Environments view did not render its "Clusters" tab; the ' +
+                'row-based cluster list this page needs is unreachable without it');
+        }
     }
     async clickDashboard() {
         await this.dashboardTab.click({ timeout: 90000 });

package/dist/pages/8.8/LoginPage.js

@@ -5,6 +5,7 @@ const test_1 = require("@playwright/test");
 const authErrorClassification_1 = require("../../utils/authErrorClassification");
 const UtilitiesPage_1 = require("./UtilitiesPage");
 const sessionRecovery_1 = require("../../utils/sessionRecovery");
+const consoleApiHelpers_1 = require("../../utils/consoleApiHelpers");
 class LoginPage {
     page;
     usernameInput;
@@ -50,7 +51,34 @@ class LoginPage {
     }
     async fillPassword(password) {
         await this.passwordInput.waitFor({ state: 'visible', timeout: 60000 });
-        await this.passwordInput.fill(password);
+        // Auth0's password screen becomes visible before its own scripts finish
+        // wiring up the field, and that initialisation wipes whatever is already
+        // in it. A discarded value makes Continue post an empty password, Auth0
+        // re-renders the same screen with "Password is required", and a login can
+        // burn all five retries without ever reaching the app.
+        //
+        // Typed, not filled: a live trace of that failure shows six fill +
+        // read-back cycles in a row all coming back empty, so re-filling cannot
+        // help -- `fill()` sets the value in one shot and Auth0's own handlers
+        // never see it, leaving their state empty and the field cleared on the
+        // next render. pressSequentially dispatches real key events, which those
+        // handlers do process.
+        //
+        // Polled rather than slept on: the check settles as soon as the value is
+        // there, so a healthy login pays nothing.
+        //
+        // Only the LENGTH is ever read back or asserted on, so the secret cannot
+        // reach a log, a trace entry or an assertion-failure message.
+        await (0, test_1.expect)(async () => {
+            await this.passwordInput.click();
+            await this.passwordInput.fill('');
+            await this.passwordInput.pressSequentially(password, { delay: 20 });
+            await test_1.expect
+                .poll(async () => this.passwordInput
+                .evaluate((el) => el.value.length)
+                .catch(() => 0), { timeout: 5000, intervals: [200, 400, 800] })
+                .toBe(password.length);
+        }).toPass({ timeout: 60000, intervals: [500, 1000, 2000] });
     }
     async clickLoginButton() {
         await this.loginButton.click({ timeout: 60000 });
@@ -58,6 +86,7 @@ class LoginPage {
     async login(credentials = {}) {
         const { username = process.env.C8_USERNAME, password = process.env.C8_PASSWORD, } = credentials;
         (0, sessionRecovery_1.trackSignedInUser)(this.page, username);
+        (0, consoleApiHelpers_1.resetHubBearerToken)(this.page);
         await (0, test_1.expect)(this.usernameInput).toBeVisible({ timeout: 200000 });
         await this.fillUsername(username);
         await this.clickContinueButton();
@@ -69,6 +98,7 @@ class LoginPage {
     async loginWithTestUser(credentials = {}) {
         const { username = process.env.C8_USERNAME_TEST, password = process.env.C8_PASSWORD_TEST, } = credentials;
         (0, sessionRecovery_1.trackSignedInUser)(this.page, username);
+        (0, consoleApiHelpers_1.resetHubBearerToken)(this.page);
         // SSO re-auth may silently log us back in as the previous user after logout.
         // Detect Console (settings button visible) and retry logout until Auth0 form appears.
         const settingsBtn = this.page.getByLabel('Open Settings');
@@ -119,6 +149,7 @@ class LoginPage {
     async loginWithoutOrgAssertion(credentials = {}) {
         const { username = process.env.C8_USERNAME, password = process.env.C8_PASSWORD, } = credentials;
         (0, sessionRecovery_1.trackSignedInUser)(this.page, username);
+        (0, consoleApiHelpers_1.resetHubBearerToken)(this.page);
         await (0, test_1.expect)(this.usernameInput).toBeVisible({ timeout: 180000 });
         await this.fillUsername(username);
         await this.clickContinueButton();

package/dist/pages/8.8/ModelerCreatePage.d.ts

@@ -145,6 +145,7 @@ declare class ModelerCreatePage {
     runProcessInstance(clusterName: string, variables?: string, formVariables?: {
         [key: string]: string;
     }, textToVisible?: string, expectRejection?: boolean): Promise<void>;
+    selectOnlyThisResource(): Promise<void>;
     selectCluster(clusterName: string): Promise<void>;
     clickViewProcessInstanceLink(): Promise<void>;
     clickNameInput(): Promise<void>;

package/dist/pages/8.8/ModelerCreatePage.js

@@ -7,6 +7,9 @@ const clickLocatorWithRetry_1 = require("../../utils/assertionHelpers/clickLocat
 const ConnectorMarketplacePage_1 = require("./ConnectorMarketplacePage");
 const ProcessApplicationPage_1 = require("./ProcessApplicationPage");
 const sessionRecovery_1 = require("../../utils/sessionRecovery");
+const hubResourceRename_1 = require("../../utils/hubResourceRename");
+const hubDeployDialog_1 = require("../../utils/hubDeployDialog");
+const consoleApiHelpers_1 = require("../../utils/consoleApiHelpers");
 class ModelerCreatePage {
     page;
     processApplicationPage;
@@ -172,14 +175,38 @@ class ModelerCreatePage {
         this.nameInput = page.getByLabel('Name', { exact: true });
         this.diagramBreadcrumb = page.locator('[data-test="breadcrumb-diagram"]');
         this.renameDiagramNameButton = page.getByText('Rename');
-        this.diagramNameInput = page.locator('[data-test="editable-input"]');
+        // Hub's rename dialog field, with the legacy inline editable kept for
+        // shells where the design-system migration has not shipped.
+        this.diagramNameInput = page
+            .locator('[data-test="rename-input"]')
+            .or(page.locator('[data-test="editable-input"]'))
+            .first();
         this.variableInput = page.locator('[id="variables-json"]');
         this.embedFormButton = page.getByRole('button', { name: 'Link form' });
-        this.embedButton = page.locator('[data-test="confirm-move"]');
+        // Hub's link picker confirms with `link-target-confirm` ("Link");
+        // `confirm-move` was the old move/link dialog's id and exists only in
+        // hub's older cypress specs now. Keep it as a fallback.
+        this.embedButton = page
+            .locator('[data-test="link-target-confirm"]')
+            .or(page.locator('[data-test="confirm-move"]'))
+            .first();
+        // Same picker as clickForm(): entries are buttons labelled
+        // "Select <name>" inside `link-target-list`, not `item-<name>` nodes.
         this.newForm = page
-            .locator('[data-test="item-New form"]')
-            .getByText('New form');
-        this.deploySubButton = page.locator('[data-test="deploy-action"]');
+            .locator('[data-test="link-target-list"]')
+            .getByRole('button', { name: /^Select New form/ })
+            .first()
+            .or(page.locator('[data-test="item-New form"]').getByText('New form'))
+            .first();
+        // `deploy-action` is absent from Hub's shell (a DOM audit of a live run
+        // found no such id); its deploy dialog confirms with a plain button named
+        // "Deploy" in the dialog footer.
+        this.deploySubButton = page
+            .locator('[data-test="deploy-action"]')
+            .or(page
+            .getByRole('dialog')
+            .getByRole('button', { name: 'Deploy', exact: true }))
+            .first();
         this.cancelButton = page.getByRole('button', { name: 'Cancel' });
         this.restConnectorOption = page.locator('[data-id="replace.template-io.camunda.connectors.HttpJson.v2"]');
         this.changeElementSearchInput = page.locator('.djs-popup-search input');
@@ -337,12 +364,25 @@ class ModelerCreatePage {
         this.backupDeployButton = page.getByRole('button', {
             name: 'Deploy',
         });
+        // Hub's design-system shell emits no Carbon markup, so the `cds--toast-*`
+        // scope matched nothing and this assertion read as "not linked" even on a
+        // successful link. Assert the message itself and keep the Carbon scope for
+        // shells that still render it.
         this.formLinkedSuccessMessage = page
+            .getByText('Form has been successfully linked.')
+            .or(page
             .locator('.cds--toast-notification__subtitle')
-            .getByText('Form has been successfully linked.');
-        this.diagramNameBreadcrumb = (diagramName) => page.locator('button[data-test="breadcrumb-diagram"]', {
+            .getByText('Form has been successfully linked.'))
+            .first();
+        // Hub's breadcrumbs carry no data-test (DOM audit of a live run found none
+        // of the breadcrumb-* ids present), so address the diagram by its own name
+        // in the breadcrumb navigation and keep the legacy id as a fallback.
+        this.diagramNameBreadcrumb = (diagramName) => page
+            .locator('button[data-test="breadcrumb-diagram"]', {
             hasText: diagramName,
-        });
+        })
+            .or((0, hubResourceRename_1.hubBreadcrumbs)(page).getByText(diagramName, { exact: true }))
+            .first();
         this.webhookActiveMessage = page.getByText('Webhook is active');
     }
     async clickSecondDeployButton() {
@@ -500,10 +540,16 @@ class ModelerCreatePage {
         // a form with the same name and the picker then lists two identical entries.
         // Scope to the first matching item so the link step stays deterministic on retry
         // instead of failing with a strict-mode violation.
+        // Hub's link picker is `ul[data-test="link-target-list"]` whose entries are
+        // buttons labelled "Select <name>" with a per-file
+        // `data-test="link-target-file-<uuid>"`; the old `item-<name>` id does not
+        // exist on it (a DOM audit of a live run found no `item-*` at all). Keep
+        // the legacy id as a fallback for pre-design-system shells.
         await this.page
-            .locator(`[data-test="item-${name}"]`)
+            .locator('[data-test="link-target-list"]')
+            .getByRole('button', { name: `Select ${name}`, exact: true })
+            .or(this.page.locator(`[data-test="item-${name}"]`).first().getByText(name))
             .first()
-            .getByText(name)
             .click({ timeout: 90000 });
     }
     async clickUserTask(id) {
@@ -620,6 +666,12 @@ class ModelerCreatePage {
         const retryDelayMs = 20000;
         for (let attempt = 1; attempt <= maxRetries; attempt++) {
             try {
+                // Hub lists only the ENVIRONMENTS assigned to the workspace in this
+                // dialog, so a cluster the workspace does not carry is simply absent
+                // from the picker. deployForm() ensures that link for the form path;
+                // a spec that runs a diagram without deploying a form first would
+                // otherwise reach this dialog with nothing to select.
+                await (0, consoleApiHelpers_1.ensureClusterLinkedToSharedWorkspace)(this.page, clusterName);
                 // Inside the loop, not before it: a no-op once bound, but selectCluster
                 // clears the binding when the dialog does not offer the cluster, so the
                 // next attempt rebinds rather than reopening an unchanged dialog.
@@ -677,8 +729,18 @@ class ModelerCreatePage {
             }
         }
     }
+    // Scopes Hub's deploy/run dialog to the single resource being deployed.
+    // Mirrors FormJsPage.selectOnlyThisResource(): the select trigger carries no
+    // aria-labelledby, so it is addressed by its id (`deployment-scope-selection`)
+    // -- a name-based lookup silently matches nothing -- and its options render
+    // in a portal attached to <body>, outside the dialog, so they are looked up
+    // page-scoped. A no-op on dialogs that offer no scope choice.
+    async selectOnlyThisResource() {
+        await (0, hubDeployDialog_1.selectOnlyThisResourceInDialog)(this.page, this.dialog);
+    }
     async selectCluster(clusterName) {
         await (0, test_1.expect)(this.dialog).toBeVisible({ timeout: 30000 });
+        await this.selectOnlyThisResource();
         const healthCheckTimeout = 30000;
         // Inside a process application the deploy dialog renders
         // ProcessAppClusterSelection, not the per-deploy ClusterSelection toggle
@@ -720,15 +782,13 @@ class ModelerCreatePage {
             }
             return;
         }
-        const healthyRegex = new RegExp(`${clusterName}.*?HealthydevManage`);
+        const healthyRegex = new RegExp(`${clusterName}.*?Healthy`);
         const clusterLabel = this.dialog
             .locator('label')
             .filter({ hasText: new RegExp(`^${clusterName}`) });
         await (0, test_1.expect)(clusterLabel).toBeVisible({ timeout: 30000 });
         await clusterLabel.click();
-        await (0, test_1.expect)(clusterLabel.getByRole('switch')).toBeChecked({
-            timeout: 30000,
-        });
+        await (0, hubDeployDialog_1.assertClusterSelectedInDialog)(this.dialog, clusterName);
         await (0, test_1.expect)(this.dialog).toHaveText(healthyRegex, {
             timeout: healthCheckTimeout,
         });
@@ -809,8 +869,10 @@ class ModelerCreatePage {
         }).toPass({ timeout: 60000, intervals: [1000, 2000, 5000] });
     }
     async enterDiagramName(name) {
-        await this.diagramNameInput.fill(name, { timeout: 90000 });
-        await this.diagramNameInput.press('Enter', { timeout: 90000 });
+        // Hub renames through the current crumb's actions menu into a shared
+        // dialog; the inline editable this used to fill never mounts on its own.
+        // "New BPMN diagram" is the server default the diagram still carries here.
+        await (0, hubResourceRename_1.renameHubResource)(this.page, 'New BPMN diagram', name);
     }
     async clickVariableInput() {
         await this.variableInput.click({ timeout: 60000 });