@globisnv/cypress-core 0.0.4 → 0.0.6

package/dist/commands/GLO_commands.js

@@ -181,14 +181,10 @@ Cypress.Commands.add('GLO_oktaLogin', (company, urlType, skipvNavCheck) => {
         const target = globisUrlTypes.includes(urlType) ? 'globis_online' : 'online';
         url = url.replace(target, urlType);
     }
-    if (cypressWebsocketLoader) {
-        // Stateless Okta login redirects server side before any Servoy client boots, so there is
-        // no websocket to wait for on the first visit. Attach the spy to every document load and
-        // only assert the connection after the Okta round trip (see waitForWebSocketAfterOkta).
-        cy.on('window:before:load', (win) => {
-            attachWebSocketSpy(win);
-        });
-    }
+    // Stateless Okta login redirects server side before any Servoy client boots, so there is no
+    // websocket to wait for on the first visit — the connection is only asserted after the Okta
+    // round trip (see waitForWebSocketAfterOkta). The spy itself is attached globally on every
+    // AUT page load (see websocketDetector.ts), which covers this server-side redirect too.
     cy.visit(url);
     cy.task('log', 'Redirect to okta url');
     cy.origin(Cypress.expose('oktaUrl'), () => {
@@ -354,6 +350,52 @@ Cypress.Commands.add('GLO_searchDataControl', (elementName) => {
         cy.GLO_checkLoadingIndicator();
     });
 });
+const loadingCheckTimeout = 1200000;
+const progressBarSelector = '[data-cy="ng$main_form2.progress"] dx-progress-bar';
+/** Modal overlays that park the Servoy server thread until the user answers. */
+const blockingDialogSelector = '.svy-message-dialog, .servoycore-dialog-body, .svy-dialog';
+/**
+ * Polls the full screen progress bar away. A process that asks the user something halfway - a formula
+ * showing a select dialog, for instance - keeps the bar in the DOM while its thread is parked on that
+ * dialog, so a visible dialog resolves the poll and lets the test answer it. The dialog handler calls
+ * the loading check again afterwards, which re-enters this same poll.
+ */
+const waitForProgressBar = () => {
+    const pollInterval = 1000;
+    const maxAttempts = Math.ceil(loadingCheckTimeout / pollInterval);
+    let attempts = 0;
+    const log = Cypress.log({ name: 'checkLoadingIndicator', message: 'Waiting for the progress bar…', autoEnd: false, timeout: 0 });
+    const checkStatus = (resolve, reject) => {
+        cy.get('body', { log: false }).then(($body) => {
+            if (!$body.find(progressBarSelector).length) {
+                log.end();
+                resolve();
+                return;
+            }
+            if ($body.find(blockingDialogSelector).filter(':visible').length) {
+                log.set({ message: 'Progress bar still shown, but a dialog is waiting for input: continuing' });
+                log.end();
+                resolve();
+                return;
+            }
+            attempts += 1;
+            if (attempts > maxAttempts) {
+                log.end();
+                reject(new Error(`Timed out after ${Math.round((maxAttempts * pollInterval) / 1000)}s waiting for the progress bar to disappear`));
+                return;
+            }
+            // biome-ignore plugin: wait for next poll interval before checking again
+            cy.wait(pollInterval, { log: false }).then(() => {
+                log.set({ message: `Still waiting for the progress bar ${attempts}/${maxAttempts}` });
+                checkStatus(resolve, reject);
+            });
+        });
+    };
+    const promise = new Cypress.Promise((resolve, reject) => {
+        checkStatus(resolve, reject);
+    });
+    cy.then(() => promise);
+};
 Cypress.Commands.add('GLO_checkLoadingIndicator', () => {
     if (cypressWebsocketLoader) {
         cy.WS_loadingCheck();
@@ -361,8 +403,8 @@ Cypress.Commands.add('GLO_checkLoadingIndicator', () => {
     else {
         // biome-ignore plugin: wait before checking loading indicator
         cy.wait(1000);
-        cy.get('loading-indicator', { timeout: 1200000 }).should('not.exist');
-        cy.get('[data-cy="ng$main_form2.progress"] dx-progress-bar', { timeout: 1200000, log: false }).should('not.exist');
+        cy.get('loading-indicator', { timeout: loadingCheckTimeout }).should('not.exist');
+        waitForProgressBar();
     }
 });
 Cypress.Commands.add('GLO_clickDatacontrolBrowserButton', (buttonName, skipCheck = noSkipCheck) => {
@@ -1502,7 +1544,7 @@ Cypress.Commands.add('GLO_checkNumberOfRowsInGrid', (selector, numberToValidate,
         let lastError;
         const log = Cypress.log({ name: 'checkNumberOfRowsInGrid', message: `Polling rows (${lengthCondition} ${numberToValidate})…`, autoEnd: false, timeout: 0 });
         const checkStatus = (resolve, reject) => {
-            cy.GLO_getElement(selector, { timeout: timeOut }).then(($grid) => {
+            cy.GLO_getElement(selector, { timeout: timeOut, log: false }).then(($grid) => {
                 const $rows = $grid.find('.ag-center-cols-container [row-index]');
                 let actual = $rows.length;
                 let passed = false;
@@ -2313,7 +2355,7 @@ Cypress.Commands.add('GLO_extendedFilter', (filter, clearExistingFilters) => {
     cy.GLO_checkLoadingIndicator();
 });
 Cypress.Commands.add('GLO_selectNamedSearch', (searchName) => {
-    cy.GLO_clickDatacontrolBrowserButton('btnExtendedSearch');
+    cy.GLO_getVisible('#txtSearch .dx-icon-search').click();
     cy.GLO_getVisible('.dx-submenu', 10000).contains(searchName).click();
     cy.GLO_checkLoadingIndicator();
 });

package/dist/plugins/prometheusWriter.js

@@ -3,8 +3,8 @@ import * as http from 'node:http';
 import * as https from 'node:https';
 import { URL } from 'node:url';
 import { Sha256 } from '@aws-crypto/sha256-js';
-import { fromContainerMetadata } from '@aws-sdk/credential-provider-imds';
-import { SignatureV4 } from '@aws-sdk/signature-v4';
+import { fromContainerMetadata } from '@smithy/credential-provider-imds';
+import { SignatureV4 } from '@smithy/signature-v4';
 import { compress } from 'snappyjs';
 // ─── Minimal Prometheus remote-write protobuf encoder ─────────────────────────
 // WriteRequest { repeated TimeSeries timeseries = 1 }

package/dist/tsHelper.d.ts

@@ -143,7 +143,7 @@ export declare function parseLocalizedNumber(value: string | number | undefined)
  * will fall back to a random generated 4-character UUID if not found.
  * @returns {string} CYP + build number or random 4-character UUID
  */
-export declare const getOrCreateUuid: (index?: number) => string;
+export declare const getOrCreateUuid: (createNew?: 'createNew') => string;
 /**
  * Returns the ISO 8601 week number for the given date.
  *

package/dist/tsHelper.js

@@ -153,12 +153,13 @@ export function parseLocalizedNumber(value) {
  * will fall back to a random generated 4-character UUID if not found.
  * @returns {string} CYP + build number or random 4-character UUID
  */
-export const getOrCreateUuid = (index) => {
-    const envKey = index !== undefined ? `BUILD_UUID_${index}` : 'BUILD_UUID';
+export const getOrCreateUuid = (createNew) => {
+    const id = createNew === 'createNew' ? getUUID(3) : undefined;
+    const envKey = id !== undefined ? `BUILD_UUID_${id}` : 'BUILD_UUID';
     let uuid = Cypress.expose(envKey);
     if (!uuid) {
         const buildNumber = Cypress.expose('BUILD_NUMBER');
-        const suffix = index !== undefined ? `-${index}` : '';
+        const suffix = id !== undefined ? `-${id}` : '';
         uuid = buildNumber ? `CYP${buildNumber}${suffix}` : `CYP${getUUID(4)}${suffix}`;
         Cypress.expose({ [envKey]: uuid });
     }

package/dist/websocketDetector.js

@@ -1,4 +1,4 @@
-import { cypressWebsocketDebug, extraParams } from './tsHelper.js';
+import { cypressWebsocketDebug, cypressWebsocketLoader, extraParams } from './tsHelper.js';
 /** Module-level flag controlling auto-dismissal of Info dialogs. Disabled by default; set via WS_toggleDialogHandler or env wsEnableDialogHandler=true. */
 let wsDialogHandlerEnabled = extraParams.wsEnableDialogHandler === 'true';
 // ─── Cypress action tracking for metric labels ────────────────────────────────
@@ -71,13 +71,16 @@ after(() => {
         Cypress.log({ name: 'WSMetrics', displayName: '📊 WSMetrics', message: msg });
     });
 });
-Cypress.Commands.add('WS_visitWithSpy', (url) => {
-    const enableSpy = () => ({
-        onBeforeLoad(win) {
-            attachWebSocketSpy(win);
-        }
+// Attaches to every AUT page load, not just the one triggered by the WS_visitWithSpy call below —
+// GLO_logout redirects to the login page itself (app-triggered, not via cy.visit), and that load
+// needs the spy too or its websocket connects unpatched (same problem GLO_oktaLogin's redirect has).
+if (cypressWebsocketLoader) {
+    Cypress.on('window:before:load', (win) => {
+        attachWebSocketSpy(win);
     });
-    cy.visit(url, enableSpy());
+}
+Cypress.Commands.add('WS_visitWithSpy', (url) => {
+    cy.visit(url);
     cy.window().then((win) => {
         cy.wrap(win.wsMessages).as('wsMessages');
     });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@globisnv/cypress-core",
-    "version": "0.0.4",
+    "version": "0.0.6",
     "description": "Core building blocks for Globis Cypress E2E tests",
     "license": "UNLICENSED",
     "type": "module",
@@ -48,8 +48,8 @@
     },
     "dependencies": {
         "@aws-crypto/sha256-js": "^5.2.0",
-        "@aws-sdk/credential-provider-imds": "^3.374.0",
-        "@aws-sdk/signature-v4": "^3.374.0",
+        "@smithy/credential-provider-imds": "^4.5.2",
+        "@smithy/signature-v4": "^5.7.3",
         "snappyjs": "^0.7.0",
         "uuid": "^14.0.1"
     },