@globisnv/cypress-core 1.1.0 → 2.0.0

package/README.md

@@ -34,6 +34,7 @@ See [Cutting a release](#cutting-a-release) for how a bump actually gets publish
 
 | Core version | Minimum globis-online version |
 | --- | --- |
+| `2.0.0` | `11.0.3` |
 | `0.0.1` | `11.0.2` |
 
 The floor is recorded in `package.json` under `globisOnline.minVersion` (machine-readable, in case tooling wants to check it later) and here in this table (human-readable, updated on every release alongside `CHANGELOG.md`). `globis-cypress` stays pinned to the latest core version — since it's Globis's own suite, it's the first thing to catch a globis-online release breaking something, before any customer repo would.

package/dist/commands/GLO_commands.d.ts

@@ -183,6 +183,8 @@ declare global {
             /**
              * Command to select a tab using its data-cy attribute, which is composed of formName.elementName
              *
+             * Fails if the tab has to be opened or closed but is disabled.
+             *
              * @param {string[]} selector - One element: `[name=]` lookup. Two elements: `[data-cy$="form.element"]` lookup.
              * @param {string} tabName - The name of the tab to be selected.
              * @param {OpenClose} openOrClose - Indicates whether to open (true) or close (false) the tab.
@@ -647,6 +649,14 @@ declare global {
              * @param {disabledFlag} [shouldBeEnabled=true] - Whether the field should be enabled (true) or disabled (false).
              */
             GLO_checkFieldEnabled(selector: string[], shouldBeEnabled?: disabledFlag): void;
+            /**
+             * Checks if a tab is enabled or disabled, without clicking it.
+             *
+             * @param {string[]} selector - One element: `[name=]` lookup. Two elements: `[data-cy$="form.element"]` lookup.
+             * @param {string} tabName - The name of the tab to check.
+             * @param {disabledFlag} [shouldBeEnabled=true] - Whether the tab should be enabled (true) or disabled (false).
+             */
+            GLO_checkTabEnabled(selector: string[], tabName: string, shouldBeEnabled?: disabledFlag): void;
             /**
              * Checks if a field has the given background color class applied to its input element.
              *

package/dist/commands/GLO_commands.js

@@ -33,6 +33,9 @@ const isGridRowSelector = (baseSelector, index) => {
 // rendered-but-scrolled-past rows as hidden (measured: 14 of 21 rendered rows drop out of `:visible`
 // after scrolling a grid to the bottom). Filter on the container, which is what both were after.
 const isInOpenContainer = (_, el) => !el.closest('[hidden]');
+// Data rows of an AG Grid 36 body. Group rows (full-width) share the scrolling container with the data rows,
+// so they are excluded to keep row indexes and counts about data rows only.
+const gridDataRows = '.ag-grid-scrolling-container [row-index]:not(.ag-full-width-row)';
 const pickByRowIndex = (chain, index, log = false, timeout = defaultTimeout) => {
     if (log)
         Cypress.log({ name: 'idx', message: String(index) });
@@ -713,6 +716,12 @@ Cypress.Commands.add('GLO_selectTab', (selector, tabName, openOrClose) => {
         const isOpenAttr = $tab[0].getAttribute('open'); // Attribute is a string 'true' or missing -> null
         const isOpen = isOpenAttr === 'true'; // Convert to boolean
         if (openOrClose !== isOpen) {
+            // The tab header is a div, so Cypress's `:disabled` actionability check doesn't apply: the click goes through
+            // and the server silently ignores it. Closing a disabled tab that is open fails too, because the close request
+            // goes through the same click on the same disabled tab, which the server ignores the same way.
+            if ($tab[0].hasAttribute('disabled')) {
+                throw new Error(`Tab "${tabName}" in ${selector.join('.')} is disabled and cannot be ${openOrClose ? 'opened' : 'closed'}`);
+            }
             const action = openOrClose ? 'Opening' : 'Closing';
             cy.log(`${action} tab ${tabName}`);
             cy.wrap($tab).click();
@@ -750,7 +759,7 @@ const navItem = (topBottom, programName, tabNumber, mode) => {
         throw new Error(`Incorrect type for GLO_${mode}Program. Available types: top, bottom`);
     const location = topBottom === top ? 0 : 1;
     const regex = new RegExp(`^${Cypress._.escapeRegExp(programName)}$`);
-    cy.get('drag-scroll')
+    cy.get('[navigation] > [nodelist]')
         .eq(location)
         .within(() => {
         const items = cy
@@ -1066,13 +1075,13 @@ Cypress.Commands.add('GLO_selectProgram', (topBottom, programName, tabnumber) =>
     navItem(topBottom, programName, tabnumber, 'select');
 });
 Cypress.Commands.add('GLO_getRowInGrid', (rowFilter) => {
-    const rows = cy.get('.ag-center-cols-container [row-index]').filter(isInOpenContainer);
+    const rows = cy.get(gridDataRows).filter(isInOpenContainer);
     return typeof rowFilter === 'number' ? rows.eq(rowFilter) : rows.filter(`:contains("${rowFilter}")`).first();
 });
 Cypress.Commands.add('GLO_selectRowInGrid', (rowFilter) => {
     let found = false;
     if (typeof rowFilter === 'number') {
-        cy.get(`[row-id="root_${rowFilter}"]`).filter(isInOpenContainer).find('[data-ref="eInput"]').click();
+        cy.get(`[row-id="root_${rowFilter}"]`).filter(isInOpenContainer).find('.ag-grid-pinned-left-cells [data-ref="eInput"]').click();
         return;
     }
     // Convert to array if it's a string
@@ -1086,15 +1095,8 @@ Cypress.Commands.add('GLO_selectRowInGrid', (rowFilter) => {
         const matches = filters.every((filterValue) => cellTexts.some((val) => val.includes(filterValue)));
         if (matches) {
             found = true;
-            const rowId = $row.attr('row-id');
-            // No isInOpenContainer here: `.ag-root` is the grid of $row, which already passed that
-            // filter above, so everything inside shares its ancestors. The re-query is only needed
-            // because the checkbox lives in the pinned-left twin carrying the same row-id.
-            cy.wrap($row)
-                .closest('.ag-root')
-                .within(() => {
-                cy.get(`[row-id="${rowId}"]`).find('[data-ref="eInput"]').click();
-            });
+            // AG Grid 36 renders the pinned-left selection checkbox inside the row itself.
+            cy.wrap($row).find('.ag-grid-pinned-left-cells [data-ref="eInput"]').click();
             return false; // Stop after the first match
         }
     })
@@ -1141,16 +1143,16 @@ const dblClickRowInGrid = (type, value, columnId, equals) => {
     };
     const helper = (filterSelector) => {
         if (columnId) {
-            cy.get('[row-index]')
+            cy.get('[row-index]:visible')
                 .find(`[col-id="${columnId}"]`)
                 .filter(filterSelector, { timeout: 10000 })
-                .parentsUntil('.ag-center-cols-container')
+                .parentsUntil('.ag-grid-scrolling-container')
                 .filter('[row-index]')
                 .first()
                 .then(saveValues);
         }
         else {
-            cy.get('[row-index]').filter(filterSelector, { timeout: 10000 }).first().then(saveValues);
+            cy.get('[row-index]:visible').filter(filterSelector, { timeout: 10000 }).first().then(saveValues);
         }
     };
     cy.GLO_checkAGLoader();
@@ -1167,7 +1169,7 @@ const dblClickRowInGrid = (type, value, columnId, equals) => {
                 cy.get('[row-index]:visible')
                     .find(columnId ? `[col-id="${columnId}"] ${span}` : span)
                     .contains(regex, { timeout: 10000 })
-                    .parentsUntil('.ag-center-cols-container')
+                    .parentsUntil('.ag-grid-scrolling-container')
                     .filter('[row-index]')
                     .first()
                     .then(saveValues);
@@ -1192,13 +1194,13 @@ const dblClickRowInGrid = (type, value, columnId, equals) => {
     }
     // The actual dblClick on the row
     cy.get('@COM_selectedRowSelector').then((selector) => {
-        columnId ? cy.get(selector).find(`[col-id="${columnId}"]`).dblclick() : cy.get(selector).find('[aria-colindex]').eq(1).dblclick();
+        columnId ? cy.get(selector).find(`[col-id="${columnId}"]`).dblclick() : cy.get(selector).find('.ag-grid-scrolling-cells [aria-colindex]').eq(1).dblclick();
     });
 };
 Cypress.Commands.add('GLO_clickRowInGrid', (value, columnId) => {
     if (value === undefined)
         throw new Error('Value missing for GLO_clickRowInGrid');
-    columnId ? cy.GLO_getRowInGrid(value).find(`[col-id="${columnId}"]`).click() : cy.GLO_getRowInGrid(value).children().first().click();
+    columnId ? cy.GLO_getRowInGrid(value).find(`[col-id="${columnId}"]`).click() : cy.GLO_getRowInGrid(value).find('.ag-grid-scrolling-cells').children().first().click();
     cy.GLO_checkLoadingIndicator();
 });
 // Shared popup-window search + grid selection logic used by GLO_popupWindow.
@@ -1211,7 +1213,9 @@ const selectFromPopupWindow = (value, columnId, equals = noEqualBool) => {
     const loadingColumnId = () => columnId
         ? cy.wrap(columnId)
         : cy
-            .get('.svy-dialog.active .window-body .ag-center-cols-container [row-index="0"] [role="gridcell"]', { timeout: 30000 })
+            .get('.svy-dialog.active .window-body .ag-grid-scrolling-container [row-index="0"]:not(.ag-full-width-row) .ag-grid-scrolling-cells [role="gridcell"]', {
+            timeout: 30000
+        })
             .filter((_, el) => Cypress.$(el).text().trim().length > 0)
             .first()
             .invoke('attr', 'col-id');
@@ -1475,13 +1479,15 @@ Cypress.Commands.add('GLO_checkNumberOfRowsInGrid', (selector, numberToValidate,
     const pollInterval = 5000;
     const HEADER_ROWS = 2;
     const getAriaRowcount = ($grid) => parseInt($grid.find('[role="grid"]').attr('aria-rowcount') || '0', 10);
-    // Column header row + filter row, counted in the center viewport only (the pinned-left and
-    // pinned-right containers repeat those same header rows).
-    const headerRowCount = ($grid) => $grid.find('.ag-header-viewport .ag-header-row').length || HEADER_ROWS;
+    // Column header row + filter row (AG Grid 36 renders each header row once, pinned cells included).
+    const headerRowCount = ($grid) => $grid.find('.ag-header .ag-header-row').length || HEADER_ROWS;
+    // Rows aria-rowcount counts that are not data rows: header rows plus pinned top/bottom rows (e.g. a totals
+    // row), which AG Grid 36 includes in aria-rowcount. Pinned rows are never virtualised, so the DOM count is exact.
+    const nonDataRowCount = ($grid) => headerRowCount($grid) + $grid.find('.ag-row-pinned').length;
     const isLazyLoaded = ($grid) => {
         const ariaRowcount = getAriaRowcount($grid);
-        const renderedRows = $grid.find('.ag-center-cols-container [row-index]').length;
-        return renderedRows > 0 && (ariaRowcount === -1 || ariaRowcount > renderedRows + headerRowCount($grid));
+        const renderedRows = $grid.find(gridDataRows).length;
+        return renderedRows > 0 && (ariaRowcount === -1 || ariaRowcount > renderedRows + nonDataRowCount($grid));
     };
     // When a client-side column filter is active, the tab-/datacontrol-counter still shows the
     // unfiltered foundset total, so we must count the rendered (filtered) rows instead.
@@ -1503,12 +1509,12 @@ Cypress.Commands.add('GLO_checkNumberOfRowsInGrid', (selector, numberToValidate,
         const total = parseInt(parts[1].trim(), 10);
         return Number.isNaN(total) ? null : total;
     };
-    // AG Grid publishes the displayed row total (header rows included, pinned "sum" rows
-    // excluded) in aria-rowcount, so a virtualised grid still reports rows the viewport never
-    // rendered. Verified on ng$consignment_dtl_general.grid: 25 goods -> aria-rowcount 27 with
-    // 2 header rows, while only 12 rows exist in the DOM.
+    // AG Grid publishes the displayed row total (header and pinned rows included) in aria-rowcount,
+    // so a virtualised grid still reports rows the viewport never rendered. Verified on
+    // ng$consignment_dtl_general.grid: 25 goods -> aria-rowcount 27 with 2 header rows, while only
+    // 12 rows exist in the DOM.
     const getCountFromAriaRowcount = ($grid) => {
-        const total = getAriaRowcount($grid) - headerRowCount($grid);
+        const total = getAriaRowcount($grid) - nonDataRowCount($grid);
         return total >= 0 ? total : null; // An aria-rowcount of -1 means the total is unknown (infinite row model)
     };
     // Form-level counters (#txtCount navigator, tab "(n)" label) only match a grid on list
@@ -1552,7 +1558,7 @@ Cypress.Commands.add('GLO_checkNumberOfRowsInGrid', (selector, numberToValidate,
                 runChainAssertion(tabCount);
             }
             else {
-                runChainAssertion($grid.find('.ag-center-cols-container [row-index]'));
+                runChainAssertion($grid.find(gridDataRows));
             }
         });
     }
@@ -1563,7 +1569,7 @@ Cypress.Commands.add('GLO_checkNumberOfRowsInGrid', (selector, numberToValidate,
         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, log: false }).then(($grid) => {
-                const $rows = $grid.find('.ag-center-cols-container [row-index]');
+                const $rows = $grid.find(gridDataRows);
                 let actual = $rows.length;
                 let passed = false;
                 try {
@@ -1762,7 +1768,7 @@ Cypress.Commands.add('GLO_selectRows', (selector, rowNumber) => {
         }
     };
     cy.GLO_getElement(selector)
-        .find('.ag-body-viewport')
+        .find('.ag-grid-scrolling-rows')
         .within(() => {
         cy.GLO_clickRowInGrid(0); // Always click the first row
         if (rowNumber !== undefined) {
@@ -1777,7 +1783,7 @@ Cypress.Commands.add('GLO_selectRows', (selector, rowNumber) => {
 });
 Cypress.Commands.add('GLO_sortGrid', (selector, headerText) => {
     cy.GLO_getElement(selector)
-        .find('.ag-header-viewport .ag-header-row.ag-header-row-column')
+        .find('.ag-header .ag-header-row.ag-header-row-column')
         .within(() => {
         cy.get('.ag-header-cell').contains(headerText).click();
     });
@@ -1960,14 +1966,15 @@ Cypress.Commands.add('GLO_getAllRowsInGrid', (selector, timeOut = defaultTimeout
         const deadline = Date.now() + timeOut;
         return cy
             .GLO_getElement(selector, { timeout: timeOut })
-            .find('.ag-center-cols-container [row-index]', { timeout: timeOut + 500 })
+            .find(gridDataRows, { timeout: timeOut + 500 })
             .should(($rows) => {
             if ($rows.length === 0 && Date.now() < deadline)
                 throw new Error('GLO_getAllRowsInGrid: waiting for rows');
         });
     }
     else {
-        return cy.get('.ag-center-cols-container [row-index] [role="gridcell"]', { timeout: timeOut }).parent().filter(isInOpenContainer);
+        // AG Grid 36 nests cells in pinned/scrolling wrappers, so a cell's parent is no longer the row.
+        return cy.get(`${gridDataRows}:has([role="gridcell"])`, { timeout: timeOut }).filter(isInOpenContainer);
     }
 });
 Cypress.Commands.add('GLO_validateGridOrFail', (waitValue, failValue, rowNumber, columnId, timeOut = 600000, interval = 15000) => {
@@ -2143,6 +2150,11 @@ Cypress.Commands.add('GLO_checkFieldEnabled', (selector, shouldBeEnabled = enabl
         }
     });
 });
+Cypress.Commands.add('GLO_checkTabEnabled', (selector, tabName, shouldBeEnabled = enabled) => {
+    cy.GLO_getElement(selector)
+        .contains('[tabcontainer] .tab', tabName)
+        .should(shouldBeEnabled ? 'not.have.attr' : 'have.attr', 'disabled');
+});
 Cypress.Commands.add('GLO_checkFieldBgColor', (selector, color = 'red') => {
     const [formName, fieldOrFields] = selector;
     const fields = Array.isArray(fieldOrFields) ? fieldOrFields : [fieldOrFields];
@@ -2290,7 +2302,12 @@ Cypress.Commands.add('GLO_extendedFilter', (filter, clearExistingFilters) => {
                             cy.wrap($field).find('button.fa-search').click();
                             cy.GLO_getElement(['svy_nav_selection', 'search_criteria']).type(String(v));
                             cy.GLO_clickButton(['svy_nav_selection', 'btn_search']);
-                            dblClickRowInGrid(span, String(v));
+                            // dblClickRowInGrid is document-scoped unless wrapped in .within() - without this,
+                            // its unscoped [row-index] lookup can match a row in whatever grid sits behind this
+                            // dialog instead of the dialog's own grid. Same scoping GLO_popupWindow uses.
+                            cy.GLO_getVisible('.svy-dialog.active .window-body').within(() => {
+                                dblClickRowInGrid(span, String(v));
+                            });
                             cy.GLO_checkLoadingIndicator();
                         }
                         else {
@@ -2312,8 +2329,6 @@ Cypress.Commands.add('GLO_extendedFilter', (filter, clearExistingFilters) => {
                 // Fall through
                 case 'before':
                 case 'after':
-                case '<= today +/- days':
-                case '>= today +/- days':
                 case 'contains':
                 case 'starts with':
                 case 'ends with':
@@ -2323,6 +2338,32 @@ Cypress.Commands.add('GLO_extendedFilter', (filter, clearExistingFilters) => {
                 case '<=':
                     filterComponent().find(getFilterFieldSelector(path, 'value')).type(`{selectall}{del}${v}{enter}`);
                     return;
+                case '<= today +/- days':
+                case '>= today +/- days': {
+                    // This operator renders two separate controls (a sign select + a days number box),
+                    // not the single 'value' input the other operators share - getFilterFieldSelector's
+                    // generic 'value' selector doesn't match either one.
+                    const num = Number(v);
+                    const signInput = () => filterComponent().find(`[data-cy="filter-builder-xdays-sign-${path}"] .dx-texteditor-input`);
+                    signInput().then(($el) => {
+                        const id = $el[0].getAttribute('aria-controls');
+                        if (!id)
+                            cy.wrap($el).click();
+                    });
+                    signInput().then(($el) => {
+                        const id = $el[0].getAttribute('aria-controls');
+                        if (!id)
+                            throw new Error('Missing aria-controls');
+                        cy.get(`[id="${id}"] .dx-scrollview-content`)
+                            .children()
+                            .contains(num < 0 ? '-' : '+')
+                            .click();
+                    });
+                    filterComponent()
+                        .find(`[data-cy="filter-builder-xdays-value-${path}"] .dx-texteditor-input`)
+                        .type(`{selectall}{del}${Math.abs(num)}{enter}`);
+                    return;
+                }
                 default: {
                     const _exhaustive = operator;
                     throw new Error(`Unhandled operator: ${String(_exhaustive)}`);

package/dist/commands/GLS_commands.js

@@ -19,15 +19,15 @@ Cypress.Commands.add('GLS_mainNavigation', (value) => {
             throw new Error(`Could not find menu item: ${value}`);
         }
         return cy
-            .get('.ag-body-viewport')
+            .get('.ag-grid-scrolling-rows')
             .first()
             .then(($viewport) => {
             const $label = $viewport.find('label').filter((_i, el) => el.innerText.trim() === value);
             if ($label.length > 0 && $label.is(':visible')) {
-                return cy.contains('.ag-body-viewport label', value).click();
+                return cy.contains('.ag-grid-scrolling-rows label', value).click();
             }
             return cy
-                .get('.ag-center-cols-container [role="row"][tabindex="0"]')
+                .get('.ag-grid-scrolling-container [role="row"][tabindex="0"]')
                 .first()
                 .focus()
                 .realPress('ArrowDown')

package/dist/commands/POR_commands.js

@@ -65,7 +65,7 @@ Cypress.Commands.add('POR_clickTopDropdownMenu', (linkText) => {
 });
 Cypress.Commands.add('POR_checkTableHasData', () => {
     cy.GLO_getElement(['ep$consignment_lst', 'shipments_grid']).within(() => {
-        cy.get('.ag-center-cols-container').POR_isNotEmpty();
+        cy.get('.ag-grid-scrolling-container').POR_isNotEmpty();
     });
 });
 Cypress.Commands.add('POR_isNotEmpty', { prevSubject: true }, (subject, className) => {

package/dist/websocketDetector.js

@@ -35,6 +35,10 @@ let lastCypressLocator = '';
 let lastGLOCommand = '';
 let lastActionStartTime = null;
 let wsInteractionCounter = 0;
+// Module-scoped (not per-WS_loadingCheck-invocation): a componentApi call's reply can arrive after
+// the invocation that recorded its smsgid has already resolved, so tracking has to survive across
+// invocations within a test — cleared per-test in beforeEach below, same as the other cross-invocation state.
+const componentApiSmsgids = new Set();
 Cypress.on('command:start', (cmd) => {
     const rawName = cmd.get('name');
     const name = typeof rawName === 'string' ? rawName : '';
@@ -57,6 +61,7 @@ beforeEach(() => {
     lastGLOCommand = '';
     lastActionStartTime = null;
     wsInteractionCounter = 0;
+    componentApiSmsgids.clear();
 });
 after(() => {
     cy.task('flushWsMetrics', null, { log: false }).then((result) => {
@@ -828,17 +833,31 @@ Cypress.Commands.add('WS_loadingCheck', (options) => {
             debugLog('🔁 Ignored columnState-only dataPush');
             return;
         }
+        // Server-initiated componentApi calls (e.g. internalGetColumnState) carry their own smsgid the
+        // client will echo back in its reply - record it so checkForDialogInteraction can recognize that
+        // reply as unrelated to a dialog, rather than mistaking it for one (both share the {smsgid, ret}
+        // wire shape).
+        const componentApisField = data.componentApis;
+        if (Array.isArray(componentApisField) && 'smsgid' in data && typeof data.smsgid === 'number') {
+            componentApiSmsgids.add(data.smsgid);
+        }
         const hasDialog = 'serviceApis' in data && Array.isArray(data.serviceApis) && checkForDialogInResponse(data.serviceApis);
+        // Response triggers a dialog — hold the triggering request until the dialog is dismissed.
+        // The held id is threaded through to updateDialogState so the dialog record is attributed to
+        // the exact request that was held, instead of updateDialogState independently re-deriving it
+        // from state.lastOutgoingRequestId (which can point at a different, possibly already-resolved
+        // request when several requests are in flight - leaking the hold forever, since dismissal only
+        // releases a held request whose id matches the dialog's recorded triggeringRequestId exactly).
+        let heldRequestId = null;
         if (hasDialog) {
-            // Response triggers a dialog — hold the triggering request until the dialog is dismissed
-            handleDialogResponse(data);
+            heldRequestId = handleDialogResponse(data);
         }
         else {
             handleNormalResponse(data);
         }
         if ('serviceApis' in data && Array.isArray(data.serviceApis)) {
             updateLoadingState(data.serviceApis);
-            updateDialogState(data.serviceApis);
+            updateDialogState(data.serviceApis, heldRequestId);
             updateExpectFormShowState(data.serviceApis);
         }
         // Check if this response echoes back a pending svyPush data change
@@ -889,6 +908,10 @@ Cypress.Commands.add('WS_loadingCheck', (options) => {
     function checkForDialogInteraction(data) {
         if (!('smsgid' in data && 'ret' in data && typeof data.ret === 'string'))
             return;
+        // This reply answers a componentApi call (e.g. internalGetColumnState), not a dialog button -
+        // it just happens to share the same {smsgid, ret} wire shape. Ignore it here.
+        if (typeof data.smsgid === 'number' && componentApiSmsgids.delete(data.smsgid))
+            return;
         state.extendedQuietPeriod = true;
         // Release the oldest held non-Window pending dialog (FIFO order)
         for (const [key, dialogData] of pendingDialogs) {
@@ -955,6 +978,8 @@ Cypress.Commands.add('WS_loadingCheck', (options) => {
     /**
      * When a response arrives that also opens a dialog, the triggering request is held
      * rather than resolved. The actual result will arrive after the dialog is dismissed.
+     * Returns the held request id so the caller can attribute the dialog record to this exact
+     * request (see the comment in handleIncomingMessage for why that matters).
      */
     function handleDialogResponse(data) {
         let targetId = null;
@@ -971,6 +996,7 @@ Cypress.Commands.add('WS_loadingCheck', (options) => {
             state.heldRequests.add(targetId);
             debugLog(`🔲 Dialog detected - holding request: ${targetId}`);
         }
+        return targetId;
     }
     function wsRequestPhase(sendTs) {
         // No loading detected yet at response time → pre_loading
@@ -1180,10 +1206,10 @@ Cypress.Commands.add('WS_loadingCheck', (options) => {
         });
     }
     /** Dispatches serviceApi calls to the appropriate dialog/window handler. */
-    function updateDialogState(apis) {
+    function updateDialogState(apis, heldRequestId = null) {
         apis.forEach((api) => {
             if (api.name === 'dialogs')
-                handleMessageDialog(api);
+                handleMessageDialog(api, heldRequestId);
             if (api.name === '$windowService')
                 handleWindowDialog(api);
             if (api.name === 'window' && api.call === 'cancelFormPopupInternal')
@@ -1212,8 +1238,14 @@ Cypress.Commands.add('WS_loadingCheck', (options) => {
      * Only Info dialogs with the literal title "Info" are auto-handled and block the loader.
      * All others (Warning, Error, Input, Select, Info with a different title) use a "Question:"
      * key which unblocks the loader so the test can interact with the dialog.
+     *
+     * triggeringRequestId must be the exact request id handleDialogResponse held for this same
+     * incoming message (passed in as heldRequestId), not independently re-derived from
+     * state.lastOutgoingRequestId - that can point at a different (or already-resolved) request
+     * when several requests are in flight, which would leave the actually-held request unreleasable
+     * once the dialog is dismissed and permanently hang the loader.
      */
-    function handleMessageDialog(api) {
+    function handleMessageDialog(api, heldRequestId = null) {
         if (!api.call || !DIALOG_METHODS.includes(api.call))
             return;
         const dialogType = api.call.replace('show', '').replace('Dialog', '');
@@ -1221,7 +1253,7 @@ Cypress.Commands.add('WS_loadingCheck', (options) => {
         // 'Info' key → loader blocks until auto-handled; 'Question' key → loader unblocks immediately
         const keyType = dialogType === 'Info' && wsTitle === 'Info' ? 'Info' : 'Question';
         const dialogKey = `${keyType}:${++dialogIdCounter}`;
-        pendingDialogs.set(dialogKey, { dialogType, triggeringRequestId: state.lastOutgoingRequestId, timestamp: Date.now() });
+        pendingDialogs.set(dialogKey, { dialogType, triggeringRequestId: heldRequestId, timestamp: Date.now() });
         debugLog(`🔲 ${dialogType} dialog opened: ${api.call}`, { ...createDialogDebugInfo(api), dialogKey, wsTitle });
     }
     /** Routes $windowService API calls to create/show/destroy handlers. */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@globisnv/cypress-core",
-    "version": "1.1.0",
+    "version": "2.0.0",
     "description": "Core building blocks for Globis Cypress E2E tests",
     "license": "UNLICENSED",
     "type": "module",
@@ -15,7 +15,7 @@
         "access": "public"
     },
     "globisOnline": {
-        "minVersion": "11.0.2"
+        "minVersion": "11.0.3"
     },
     "exports": {
         ".": "./dist/index.js",