@globisnv/cypress-core 1.1.1 → 2.1.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

@@ -150,6 +150,20 @@ declare global {
              * @example - cy.GLO_clickDatacontrolViewerButton('salesorder', 'btnAdd');
              */
             GLO_clickDatacontrolViewerButton(pageName: string, buttonName: baseDatacontrolViewerButtonType, skipCheck?: skipCheckFlag): void;
+            /**
+             * Command to check the counter badges of a button within the main program datacontrol bar.
+             *
+             * The grey badge counts the attachments with a physical file or the closed notifications, the red badge the
+             * attachments without a physical file or the open notifications. A badge is hidden at 0, so passing 0 checks that it does not exist.
+             *
+             * @param {datacontrolCounterButtonType} buttonName - The datacontrol button with the counters.
+             * @param {number} greyCount - The expected grey count, 0 when there should be no grey badge.
+             * @param {number} redCount - The expected red count, 0 when there should be no red badge.
+             * @param {number} [timeOut = defaultTimeout] - The time to wait for the counters to update.
+             *
+             * @example - cy.GLO_checkDatacontrolCounter('btnAttachment', 3, 1);
+             */
+            GLO_checkDatacontrolCounter(buttonName: datacontrolCounterButtonType, greyCount: number, redCount: number, timeOut?: number): void;
             /**
              * Command to click a button based on its displayed text.
              *

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) });
@@ -469,6 +472,21 @@ Cypress.Commands.add('GLO_clickDatacontrolViewerButton', (pageName, buttonName,
             cy.GLO_getElement([`ng$${pageName}_tab`, 'datacontrol_viewer']).find('[title="Save record"][disabled="true"]', { timeout: 60000 });
     });
 });
+Cypress.Commands.add('GLO_checkDatacontrolCounter', (buttonName, greyCount, redCount, timeOut = defaultTimeout) => {
+    const button = `globiscomponents-data-control[name="datacontrol"]:visible #${buttonName}`;
+    // Without the button in view a 'not.exist' check below would pass for the wrong reason.
+    cy.get(button, { timeout: timeOut }).should('exist');
+    const checkBadge = (selector, count) => {
+        if (count > 0) {
+            cy.get(selector, { timeout: timeOut }).should('have.text', count.toString());
+        }
+        else {
+            cy.get(selector, { timeout: timeOut }).should('not.exist');
+        }
+    };
+    checkBadge(`${button} [counter-muted]`, greyCount);
+    checkBadge(`${button} [counter]:not([counter-muted])`, redCount);
+});
 Cypress.Commands.add('GLO_selectCompany', (companyName) => {
     cy.GLO_addInput(['ng2$svy_nav_login', 'company'], companyName);
     cy.get('[data-cy="ng2$svy_nav_login.btnLogin"]').click();
@@ -756,7 +774,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
@@ -1072,13 +1090,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
@@ -1092,15 +1110,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
         }
     })
@@ -1150,7 +1161,7 @@ const dblClickRowInGrid = (type, value, columnId, equals) => {
             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);
@@ -1173,7 +1184,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);
@@ -1198,13 +1209,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.
@@ -1217,7 +1228,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');
@@ -1481,13 +1494,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.
@@ -1509,12 +1524,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
@@ -1558,7 +1573,7 @@ Cypress.Commands.add('GLO_checkNumberOfRowsInGrid', (selector, numberToValidate,
                 runChainAssertion(tabCount);
             }
             else {
-                runChainAssertion($grid.find('.ag-center-cols-container [row-index]'));
+                runChainAssertion($grid.find(gridDataRows));
             }
         });
     }
@@ -1569,7 +1584,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 {
@@ -1768,7 +1783,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) {
@@ -1783,7 +1798,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();
     });
@@ -1966,14 +1981,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) => {

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/types.d.ts

@@ -11,6 +11,7 @@ type customValueTypeUndefined = customValueType | undefined;
 type deleteRecordsType = 'DELETE_CYPRESS_RECORDS' | 'DELETE_LEAPWORK_RECORDS';
 type viewModeButtonType = 'btnList' | 'btnDetail';
 type datacontrolbuttonType = baseDatacontrolViewerButtonType | viewModeButtonType | 'btnPrev' | 'btnNext' | 'btnAll' | 'btnPivot' | 'btnAttachment' | 'btnAddMode' | 'btnEditMode' | 'btnDeleteMode' | 'btnDeeplink' | 'btnExtendedSearch' | 'btnCustomViews' | 'btnFilter' | 'btnClearAllFilters';
+type datacontrolCounterButtonType = 'btnAttachment' | 'btnNotification';
 type checkValueInGridType = string | string[] | number;
 type selectMenuButtonLeftType = 'home' | 'settings' | 'help' | 'support' | 'excel' | 'info' | 'refresh' | 'query' | 'clients' | 'users' | 'theme';
 type urlTypeType = 'online' | 'pos' | 'globgate' | 'globjob' | 'globscan' | 'portal' | 'carrier' | 'globtrace' | 'external_portal' | 'globtake' | 'globis_external_portal';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@globisnv/cypress-core",
-    "version": "1.1.1",
+    "version": "2.1.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",