@globisnv/cypress-core 1.1.0 → 1.1.1

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

@@ -713,6 +713,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();
@@ -1141,7 +1147,7 @@ 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')
@@ -1150,7 +1156,7 @@ const dblClickRowInGrid = (type, value, columnId, equals) => {
                 .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();
@@ -2143,6 +2149,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 +2301,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 +2328,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 +2337,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/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": "1.1.1",
     "description": "Core building blocks for Globis Cypress E2E tests",
     "license": "UNLICENSED",
     "type": "module",