@centreon/js-config 24.6.1 → 24.6.2

package/cypress/e2e/commands/configuration.ts

@@ -141,12 +141,12 @@ Cypress.Commands.add(
 );
 
 interface Contact {
+  GUIAccess?: boolean;
   admin?: boolean;
   alias?: string | null;
   authenticationType?: 'local' | 'ldap';
   email: string;
   enableNotifications?: boolean;
-  GUIAccess?: boolean;
   language?: string;
   name: string;
   password: string;
@@ -203,7 +203,7 @@ Cypress.Commands.add(
 
 interface ContactGroup {
   alias?: string | null;
-  contacts: string[];
+  contacts: Array<string>;
   name: string;
 }
 
@@ -449,7 +449,7 @@ Cypress.Commands.add(
 
 interface ServiceGroup {
   alias?: string | null;
-  hostsAndServices: string[][];
+  hostsAndServices: Array<Array<string>>;
   name: string;
 }
 
@@ -500,8 +500,8 @@ Cypress.Commands.add(
 
 interface ACLGroup {
   alias?: string | null;
-  contacts?: string[];
-  contactGroups?: string[];
+  contactGroups?: Array<string>;
+  contacts?: Array<string>;
   name: string;
 }
 
@@ -525,7 +525,7 @@ Cypress.Commands.add(
       })
       .then(() => {
         if (contacts) {
-          contacts.map((contact) => {
+          contacts.forEach((contact) => {
             cy.executeActionViaClapi({
               bodyContent: {
                 action: 'ADDCONTACT',
@@ -536,7 +536,7 @@ Cypress.Commands.add(
           });
         }
         if (contactGroups) {
-          contactGroups.map((contactGroup) => {
+          contactGroups.forEach((contactGroup) => {
             cy.executeActionViaClapi({
               bodyContent: {
                 action: 'ADDCONTACTGROUP',
@@ -551,11 +551,11 @@ Cypress.Commands.add(
 );
 
 interface ACLMenu {
-  name: string;
-  rule?: string[];
   alias?: string | null;
   includeChildren?: boolean;
+  name: string;
   readOnly?: boolean;
+  rule?: Array<string>;
 }
 
 Cypress.Commands.add(
@@ -580,30 +580,31 @@ Cypress.Commands.add(
         }
       })
       .then(() => {
-        if (rule.length == 0) {
+        if (rule.length === 0) {
           return cy.wrap(null);
         }
 
         let ruleCommand = '';
-        rule.map((rulePage, index) => {
+        rule.forEach((rulePage, index) => {
           ruleCommand += rulePage + (index == rule.length - 1 ? '' : ';');
         });
         cy.executeActionViaClapi({
           bodyContent: {
-            action: action,
+            action,
             object: 'ACLMENU',
             values: `${name};${children};${ruleCommand}`
           }
         });
+
         return cy.wrap(null);
       });
   }
 );
 
 interface ACLAction {
-  name: string;
+  actions?: Array<Action>;
   description: string;
-  actions?: Action[];
+  name: string;
 }
 
 Cypress.Commands.add(
@@ -618,12 +619,12 @@ Cypress.Commands.add(
         }
       })
       .then(() => {
-        if (actions.length == 0) {
+        if (actions.length === 0) {
           return cy.wrap(null);
         }
 
         let actionCommand = '';
-        actions.map((action, index) => {
+        actions.forEach((action, index) => {
           actionCommand += action + (index == actions.length - 1 ? '' : '|');
         });
         cy.executeActionViaClapi({
@@ -633,20 +634,22 @@ Cypress.Commands.add(
             values: `${name};${actionCommand}`
           }
         });
+
         return cy.wrap(null);
       });
   }
 );
 
 interface ACLResource {
-  name: string;
   alias?: string | null;
+  name: string;
 }
 
 Cypress.Commands.add(
   'addACLResource',
   ({ name, alias = null }: ACLResource): Cypress.Chainable => {
     const ACLResourcesAlias = alias === null ? name : alias;
+
     return cy.executeActionViaClapi({
       bodyContent: {
         action: 'ADD',

package/cypress/e2e/commands/monitoring.ts

@@ -64,10 +64,52 @@ Cypress.Commands.add(
   }
 );
 
+interface Downtime {
+  host: string;
+  service?: string | null;
+}
+
+Cypress.Commands.add(
+  'waitForDowntime',
+  (downtime: Downtime): Cypress.Chainable => {
+    cy.log('Checking hosts in database');
+
+    let query = `SELECT COUNT(d.downtime_id) AS count_downtimes FROM downtimes as d
+      INNER JOIN hosts as h ON h.host_id = d.host_id AND h.name = '${downtime.host}'`;
+    if (downtime.service) {
+      query += ` INNER JOIN services as s ON s.service_id = d.service_id AND s.description = '${downtime.service}'`;
+    }
+    query += ` WHERE d.started=1`;
+    if (!downtime.service) {
+      query += ` AND d.service_id = 0`;
+    }
+
+    cy.log(query);
+
+    cy.waitUntil(() => {
+      return cy
+        .requestOnDatabase({
+          database: 'centreon_storage',
+          query
+        })
+        .then(([rows]) => {
+          const foundDowntimesCount = rows.length ? rows[0].count_downtimes : 0;
+
+          cy.log('Downtime count in database', foundDowntimesCount);
+
+          return cy.wrap(foundDowntimesCount > 0);
+        });
+    });
+
+    return cy.wrap(null);
+  }
+);
+
 declare global {
   namespace Cypress {
     interface Chainable {
       submitResults: (props: Array<SubmitResult>) => Cypress.Chainable;
+      waitForDowntime: (downtime: Downtime) => Cypress.Chainable;
     }
   }
 }

package/cypress/e2e/configuration.ts

@@ -67,6 +67,7 @@ export default ({
       WEB_IMAGE_VERSION: webImageVersion
     },
     execTimeout: 60000,
+    experimentalMemoryManagement: true,
     requestTimeout: 20000,
     retries: 0,
     screenshotsFolder: `${resultsFolder}/screenshots`,

package/cypress/e2e/tasks.ts

@@ -157,7 +157,7 @@ export default (on: Cypress.PluginEvents): void => {
         user: 'centreon'
       });
 
-      const [rows, fields] = await client.execute(query);
+      const [rows, fields] = await client.query(query);
 
       await client.end();
 
@@ -211,6 +211,7 @@ export default (on: Cypress.PluginEvents): void => {
             WEB_IMAGE: webImage
           })
           .withProfiles(...profiles)
+          .withStartupTimeout(120000)
           .withWaitStrategy(
             'web-1',
             Wait.forAll([

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@centreon/js-config",
     "description": "Centreon Frontend shared build configuration",
-    "version": "24.6.1",
+    "version": "24.6.2",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/centreon/centreon-frontend.git"
@@ -21,19 +21,19 @@
         "prettier": "^3.0.0"
     },
     "dependencies": {
-        "@badeball/cypress-cucumber-preprocessor": "^20.0.5",
-        "@bahmutov/cypress-esbuild-preprocessor": "^2.2.0",
+        "@badeball/cypress-cucumber-preprocessor": "^20.0.7",
+        "@bahmutov/cypress-esbuild-preprocessor": "^2.2.1",
         "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
         "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
-        "@tsconfig/node16": "^16.1.1",
-        "@tsconfig/node20": "^20.1.2",
+        "@tsconfig/node16": "^16.1.3",
+        "@tsconfig/node20": "^20.1.4",
         "@types/cypress-cucumber-preprocessor": "^4.0.5",
         "cypress": "^13.6.4",
         "cypress-multi-reporters": "^1.6.4",
-        "cypress-terminal-report": "^6.0.2",
+        "cypress-terminal-report": "^6.1.0",
         "cypress-wait-until": "^3.0.1",
         "dotenv": "^16.4.5",
-        "esbuild": "^0.20.0",
+        "esbuild": "^0.21.5",
         "eslint": "^8.53.0",
         "eslint-config-airbnb": "19.0.4",
         "eslint-config-prettier": "^8.5.0",
@@ -52,7 +52,7 @@
         "eslint-plugin-sort-keys-fix": "^1.1.2",
         "eslint-plugin-typescript-sort-keys": "^2.1.0",
         "mochawesome": "^7.1.3",
-        "mysql2": "^3.9.7",
+        "mysql2": "^3.10.1",
         "tar-fs": "^3.0.6",
         "testcontainers": "^10.9.0"
     }