Add e2e test for adding computed columns

Signed-off-by: Gavin Reynolds <[email protected]>

cypress/e2e/Settings/settings.spec.js

@@ -12,7 +12,7 @@ import {
   updateDarkMode,
   updateRelativeDates,
   manageIncidentTableColumns,
-  manageCustomAlertColumnDefinitions,
+  manageCustomColumnDefinitions,
   checkIncidentCellContentAllRows,
   checkActionAlertsModalContent,
 } from '../../support/util/common';
@@ -142,7 +142,7 @@ describe('Manage Settings', { failFast: { enabled: true } }, () => {
 
   it('Add valid custom alert column to incident table', () => {
     const customAlertColumnDefinitions = ['Quote:details.quote'];
-    manageCustomAlertColumnDefinitions(customAlertColumnDefinitions);
+    manageCustomColumnDefinitions(customAlertColumnDefinitions);
     customAlertColumnDefinitions.forEach((columnName) => {
       const header = columnName.split(':')[0];
       cy.get(`[data-column-name="${header}"]`).scrollIntoView().should('be.visible');
@@ -154,9 +154,22 @@ describe('Manage Settings', { failFast: { enabled: true } }, () => {
   });
 
   it('Add valid custom alert column with JSON path containing spaces to incident table', () => {
-    const customAlertColumnDefinitions = ["Fav Flavour:details.['favorite ice cream flavor']"];
-    manageCustomAlertColumnDefinitions(customAlertColumnDefinitions);
-    customAlertColumnDefinitions.forEach((columnName) => {
+    const customColumnDefinitions = ["Fav Flavour:details.['favorite ice cream flavor']"];
+    manageCustomColumnDefinitions(customColumnDefinitions);
+    customColumnDefinitions.forEach((columnName) => {
+      const header = columnName.split(':')[0];
+      cy.get(`[data-column-name="${header}"]`).scrollIntoView().should('be.visible');
+      cy.get(`[data-incident-header="${header}"][data-incident-row-cell-idx="0"]`).then(($el) => {
+        // eslint-disable-next-line no-unused-expressions
+        expect($el.text()).to.exist;
+      });
+    });
+  });
+
+  it('Add valid custom computed column to incident table', () => {
+    const customColumnDefinitions = ['CI:first_trigger_log_entry.channel.details:(.*.example.com)'];
+    manageCustomColumnDefinitions(customColumnDefinitions, 'computed');
+    customColumnDefinitions.forEach((columnName) => {
       const header = columnName.split(':')[0];
       cy.get(`[data-column-name="${header}"]`).scrollIntoView().should('be.visible');
       cy.get(`[data-incident-header="${header}"][data-incident-row-cell-idx="0"]`).then(($el) => {

cypress/support/util/common.js

@@ -255,18 +255,22 @@ export const manageIncidentTableColumns = (desiredState = 'add', columns = []) =
   checkActionAlertsModalContent('Incident table columns saved');
 };
 
-export const manageCustomAlertColumnDefinitions = (customAlertColumnDefinitions) => {
+export const manageCustomColumnDefinitions = (customColumnDefinitions, type = 'alert') => {
   cy.get('.settings-panel-dropdown').click();
   cy.get('.dropdown-item').contains('Columns').click();
 
   cy.get('#custom-columns-card-body .chakra-icon').each(($el) => {
     cy.wrap($el).click();
   });
 
-  customAlertColumnDefinitions.forEach((customAlertColumnDefinition) => {
-    const [header, accessorPath] = customAlertColumnDefinition.split(':');
+  customColumnDefinitions.forEach((customAlertColumnDefinition) => {
+    const [header, accessorPath, expression] = customAlertColumnDefinition.split(':');
+    cy.get('#column-type-select').select(type);
     cy.get('input[placeholder="Header"]').type(header);
     cy.get('input[placeholder="JSON Path"]').type(accessorPath);
+    if (type === 'computed') {
+      cy.get('input[placeholder="Regex"]').type(expression);
+    }
     cy.get('button[aria-label="Add custom column"]').click();
     // Need to escape special characters in accessorPath
     // https://docs.cypress.io/faq/questions/using-cypress-faq#How-do-I-use-special-characters-with-cyget