@centreon/js-config 24.8.1 → 24.9.0

package/cypress/e2e/commands/monitoring.ts

@@ -21,6 +21,112 @@ const getStatusNumberFromString = (status: string): number => {
   throw new Error(`Status ${status} does not exist`);
 };
 
+interface HostCheck {
+  host: string;
+  isForced?: boolean;
+}
+
+Cypress.Commands.add(
+  'scheduleHostCheck',
+  ({
+    host,
+    isForced = true
+  }: ServiceCheck): Cypress.Chainable => {
+    let query = `SELECT id FROM resources WHERE name = '${host}' AND type = 1`;
+
+    return cy
+      .requestOnDatabase({
+        database: 'centreon_storage',
+        query
+      })
+      .then(([rows]) => {
+        if (rows.length === 0) {
+          throw new Error(`Cannot find host ${host}`);
+        }
+
+        const hostId = rows[0].id;
+
+        return cy.request({
+          body: {
+            check: {
+              is_forced: isForced
+            },
+            resources: [
+              {
+                id: hostId,
+                parent: null,
+                type: 'host'
+              }
+            ]
+          },
+          method: 'POST',
+          timeout: 30000,
+          url: '/centreon/api/latest/monitoring/resources/check'
+        }).then((response) => {
+          expect(response.status).to.eq(204);
+
+          return cy.wrap(null);
+        });
+      });
+  }
+);
+
+interface ServiceCheck {
+  host: string;
+  isForced?: boolean;
+  service: string;
+}
+
+Cypress.Commands.add(
+  'scheduleServiceCheck',
+  ({
+    host,
+    isForced = true,
+    service
+  }: ServiceCheck): Cypress.Chainable => {
+    let query = `SELECT parent_id, id FROM resources WHERE parent_name = '${host}' AND name = '${service}'`;
+
+    return cy
+      .requestOnDatabase({
+        database: 'centreon_storage',
+        query
+      })
+      .then(([rows]) => {
+        if (rows.length === 0) {
+          throw new Error(`Cannot find service ${host} / ${service}`);
+        }
+
+        const hostId = rows[0].parent_id;
+        const serviceId = rows[0].id;
+
+        return cy.request({
+          body: {
+            check: {
+              is_forced: isForced
+            },
+            resources: [
+              {
+                id: serviceId,
+                parent: {
+                  id: hostId
+                },
+                type: 'service'
+              }
+            ]
+          },
+          method: 'POST',
+          timeout: 30000,
+          url: '/centreon/api/latest/monitoring/resources/check'
+        }).then((response) => {
+          expect(response.status).to.eq(204);
+
+          return cy.wrap(null);
+        });
+      });
+  }
+);
+
+
 interface SubmitResult {
   host: string;
   output: string;
@@ -108,6 +214,8 @@ Cypress.Commands.add(
 declare global {
   namespace Cypress {
     interface Chainable {
+      scheduleHostCheck: (hostCheck) => Cypress.Chainable;
+      scheduleServiceCheck: (serviceCheck) => Cypress.Chainable;
       submitResults: (props: Array<SubmitResult>) => Cypress.Chainable;
       waitForDowntime: (downtime: Downtime) => Cypress.Chainable;
     }

package/cypress/e2e/commands.ts

@@ -312,6 +312,10 @@ interface ExecInContainerProps {
   name: string;
 }
 
+interface ExecInContainerOptions {
+  log: boolean;
+}
+
 interface ExecInContainerResult {
   exitCode: number;
   output: string;
@@ -319,7 +323,7 @@ interface ExecInContainerResult {
 
 Cypress.Commands.add(
   'execInContainer',
-  ({ command, name }: ExecInContainerProps): Cypress.Chainable => {
+  ({ command, name }, { log = true } = { log: true }): Cypress.Chainable => {
     const commands =
       typeof command === 'string' || command instanceof String
         ? [command]
@@ -330,19 +334,22 @@ Cypress.Commands.add(
         cy.task<ExecInContainerResult>(
           'execInContainer',
           { command: runCommand, name },
-          { timeout: 600000 }
+          { log, timeout: 600000 }
         ).then((result) => {
+          const displayedOutput = log ? result.output : 'hidden command output';
+          const displayedRunCommand = log ? runCommand : 'hidden run command';
+
           if (result.exitCode) {
-            cy.log(result.output);
+            cy.log(displayedOutput);
 
             // output will not be truncated
             throw new Error(`
-Execution of "${runCommand}" failed
+Execution of "${displayedRunCommand}" failed
 Exit code: ${result.exitCode}
-Output:\n${result.output}`);
+Output:\n${displayedOutput}`);
           }
 
-          acc.output = `${acc.output}${result.output}`;
+          acc.output = `${acc.output}${displayedOutput}`;
         });
 
         return acc;
@@ -778,10 +785,10 @@ declare global {
         options?: Partial<Cypress.ExecOptions>
       ) => Cypress.Chainable;
       createDirectory: (directoryPath: string) => Cypress.Chainable;
-      execInContainer: ({
-        command,
-        name
-      }: ExecInContainerProps) => Cypress.Chainable;
+      execInContainer: (
+        props: ExecInContainerProps,
+        options?: ExecInContainerOptions
+      ) => Cypress.Chainable;
       getByLabel: ({
         patternType,
         tag,

package/cypress/e2e/configuration.ts

@@ -64,6 +64,7 @@ export default ({
       DATABASE_IMAGE: 'bitnami/mariadb:10.11',
       OPENID_IMAGE_VERSION: process.env.MAJOR || '24.04',
       SAML_IMAGE_VERSION: process.env.MAJOR || '24.04',
+      STABILITY: 'unstable',
       WEB_IMAGE_OS: 'alma9',
       WEB_IMAGE_VERSION: webImageVersion
     },

package/cypress/e2e/plugins.ts

@@ -31,7 +31,6 @@ export default (
 
       launchOptions.args.push(`--window-size=${width},${height}`);
     }
-    launchOptions.args.push(`--window-size=${width},${height}`);
 
     return launchOptions;
   });

package/package.json

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