@centreon/js-config 23.10.66 → 24.4.0

package/cypress/e2e/configuration.ts

@@ -13,7 +13,6 @@ import tasks from './tasks';
 
 interface ConfigurationOptions {
   cypressFolder?: string;
-  dockerName?: string;
   env?: Record<string, unknown>;
   envFile?: string;
   isDevelopment?: boolean;
@@ -24,7 +23,6 @@ export default ({
   specPattern,
   cypressFolder,
   isDevelopment,
-  dockerName,
   env,
   envFile
 }: ConfigurationOptions): Cypress.ConfigOptions => {
@@ -40,7 +38,8 @@ export default ({
 
   return defineConfig({
     chromeWebSecurity: false,
-    defaultCommandTimeout: 6000,
+    defaultCommandTimeout: 20000,
+    downloadsFolder: `${resultsFolder}/downloads`,
     e2e: {
       excludeSpecPattern: ['*.js', '*.ts', '*.md'],
       fixturesFolder: 'fixtures',
@@ -48,29 +47,46 @@ export default ({
       reporterOptions: {
         configFile: `${__dirname}/reporter-config.js`
       },
-      setupNodeEvents: async (on, config) => {
-        installLogsPrinter(on);
+      setupNodeEvents: async (cypressOn, config) => {
+        const on = require('cypress-on-fix')(cypressOn)
+        installLogsPrinter(on, {
+          commandTrimLength: 5000,
+          defaultTrimLength: 5000,
+        });
+        on("task", {
+          logVersion(message) {
+            console.log(`[LOG]: ${message}`);
+            return null;
+          },
+        });
         await esbuildPreprocessor(on, config);
         tasks(on);
 
         return plugins(on, config);
       },
       specPattern,
-      supportFile: 'support/e2e.{js,jsx,ts,tsx}'
+      supportFile: 'support/e2e.{js,jsx,ts,tsx}',
+      testIsolation: true,
     },
     env: {
       ...env,
+      DATABASE_IMAGE: 'bitnami/mariadb:10.11',
       OPENID_IMAGE_VERSION: process.env.MAJOR || '24.04',
+      SAML_IMAGE_VERSION: process.env.MAJOR || '24.04',
       WEB_IMAGE_OS: 'alma9',
-      WEB_IMAGE_VERSION: webImageVersion,
-      dockerName: dockerName || 'centreon-dev'
+      WEB_IMAGE_VERSION: webImageVersion
     },
     execTimeout: 60000,
-    requestTimeout: 10000,
-    retries: 0,
+    requestTimeout: 20000,
+    retries: {
+      openMode: 0,
+      runMode: 2
+    },
     screenshotsFolder: `${resultsFolder}/screenshots`,
-    video: true,
+    video: isDevelopment,
     videoCompression: 0,
-    videosFolder: `${resultsFolder}/videos`
+    videosFolder: `${resultsFolder}/videos`,
+    viewportHeight: 1080,
+    viewportWidth: 1920
   });
 };

package/cypress/e2e/plugins.ts

@@ -3,6 +3,9 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable no-param-reassign */
 
+import fs from 'fs';
+import path from 'path';
+
 export default (
   on: Cypress.PluginEvents,
   config: Cypress.PluginConfigOptions
@@ -11,7 +14,7 @@ export default (
     const width = 1920;
     const height = 1080;
 
-    if (browser.family === 'chromium') {
+    if (browser.family === 'chromium' && browser.name !== 'electron') {
       if (browser.isHeadless) {
         launchOptions.args.push('--headless=new');
       }
@@ -23,14 +26,38 @@ export default (
       launchOptions.args.push('--hide-scrollbars');
       launchOptions.args.push('--mute-audio');
 
-      launchOptions.args.push(`--window-size=${width},${height}`);
-
       // force screen to be non-retina and just use our given resolution
       launchOptions.args.push('--force-device-scale-factor=1');
+
+      launchOptions.args.push(`--window-size=${width},${height}`);
     }
 
     return launchOptions;
   });
 
+  on('after:run', (results) => {
+    const testRetries: { [key: string]: Number } = {};
+    if ('runs' in results) {
+      results.runs.forEach((run) => {
+        run.tests.forEach((test) => {
+          console.log(test)
+          if (test.attempts && test.attempts.length > 1 && test.state === 'passed') {
+            const testTitle = test.title.join(' > '); // Convert the array to a string
+            testRetries[testTitle] = test.attempts.length - 1;
+          }
+        });
+      });
+    }
+
+    // Save the testRetries object to a file in the e2e/results directory
+    const resultFilePath = path.join(
+      __dirname,
+      '../../../../tests/e2e/results',
+      'retries.json'
+    );
+
+    fs.writeFileSync(resultFilePath, JSON.stringify(testRetries, null, 2));
+  });
+
   return config;
-};
+};

package/cypress/e2e/tasks.ts

@@ -1,10 +1,40 @@
+/* eslint-disable no-console */
 import { execSync } from 'child_process';
 import { existsSync, mkdirSync } from 'fs';
+import path from 'path';
 
-import Docker from 'dockerode';
+import tar from 'tar-fs';
+import {
+  DockerComposeEnvironment,
+  GenericContainer,
+  StartedDockerComposeEnvironment,
+  StartedTestContainer,
+  Wait,
+  getContainerRuntimeClient
+} from 'testcontainers';
+import { createConnection } from 'mysql2/promise';
+
+interface Containers {
+  [key: string]: StartedTestContainer;
+}
 
 export default (on: Cypress.PluginEvents): void => {
-  const docker = new Docker();
+  let dockerEnvironment: StartedDockerComposeEnvironment | null = null;
+  const containers: Containers = {};
+
+  const getContainer = (containerName): StartedTestContainer => {
+    let container;
+
+    if (dockerEnvironment !== null) {
+      container = dockerEnvironment.getContainer(`${containerName}-1`);
+    } else if (containers[containerName]) {
+      container = containers[containerName];
+    } else {
+      throw new Error(`Cannot get container ${containerName}`);
+    }
+
+    return container;
+  };
 
   interface PortBinding {
     destination: number;
@@ -12,6 +42,7 @@ export default (on: Cypress.PluginEvents): void => {
   }
 
   interface StartContainerProps {
+    command?: string;
     image: string;
     name: string;
     portBindings: Array<PortBinding>;
@@ -22,6 +53,46 @@ export default (on: Cypress.PluginEvents): void => {
   }
 
   on('task', {
+    copyFromContainer: async ({ destination, serviceName, source }) => {
+      try {
+        const container = getContainer(serviceName);
+
+        await container
+          .copyArchiveFromContainer(source)
+          .then((archiveStream) => {
+            return new Promise<void>((resolve) => {
+              const dest = tar.extract(destination);
+              archiveStream.pipe(dest);
+              dest.on('finish', resolve);
+            });
+          });
+      } catch (error) {
+        console.error(error);
+      }
+
+      return null;
+    },
+    copyToContainer: async ({ destination, serviceName, source, type }) => {
+      const container = getContainer(serviceName);
+
+      if (type === 'directory') {
+        await container.copyDirectoriesToContainer([
+          {
+            source,
+            target: destination
+          }
+        ]);
+      } else if (type === 'file') {
+        await container.copyFilesToContainer([
+          {
+            source,
+            target: destination
+          }
+        ]);
+      }
+
+      return null;
+    },
     createDirectory: async (directoryPath: string) => {
       if (!existsSync(directoryPath)) {
         mkdirSync(directoryPath, { recursive: true });
@@ -29,70 +100,150 @@ export default (on: Cypress.PluginEvents): void => {
 
       return null;
     },
+    execInContainer: async ({ command, name }) => {
+      const { exitCode, output } = await getContainer(name).exec([
+        'bash',
+        '-c',
+        `${command}${command.match(/[\n\r]/) ? '' : ' 2>&1'}`
+      ]);
+
+      return { exitCode, output };
+    },
+    getContainerId: (containerName: string) =>
+      getContainer(containerName).getId(),
+    getContainerIpAddress: (containerName: string) => {
+      const container = getContainer(containerName);
+
+      const networkNames = container.getNetworkNames();
+
+      return container.getIpAddress(networkNames[0]);
+    },
+    getContainersLogs: async () => {
+      try {
+        const { dockerode } = (await getContainerRuntimeClient()).container;
+        const loggedContainers = await dockerode.listContainers();
+
+        return loggedContainers.reduce((acc, container) => {
+          const containerName = container.Names[0].replace('/', '');
+          acc[containerName] = execSync(`docker logs -t ${container.Id}`, {
+            stdio: 'pipe'
+          }).toString('utf8');
+
+          return acc;
+        }, {});
+      } catch (error) {
+        console.warn('Cannot get containers logs');
+        console.warn(error);
+
+        return null;
+      }
+    },
+    requestOnDatabase: async ({ database, query }) => {
+      let container: StartedTestContainer | null = null;
+
+      if (dockerEnvironment !== null) {
+        container = dockerEnvironment.getContainer('db-1');
+      } else {
+        container = getContainer('web');
+      }
+
+      const client = await createConnection({
+        database,
+        host: container.getHost(),
+        password: 'centreon',
+        port: container.getMappedPort(3306),
+        user: 'centreon'
+      });
+
+      const [rows, fields] = await client.execute(query);
+
+      await client.end();
+
+      return [rows, fields];
+    },
     startContainer: async ({
+      command,
       image,
       name,
       portBindings = []
     }: StartContainerProps) => {
-      const imageList = execSync(
-        'docker image list --format "{{.Repository}}:{{.Tag}}"'
-      ).toString('utf8');
-
-      if (
-        !imageList.match(
-          new RegExp(
-            `^${image.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')}`,
-            'm'
-          )
-        )
-      ) {
-        execSync(`docker pull ${image}`);
-      }
+      let container = await new GenericContainer(image).withName(name);
 
-      const webContainers = await docker.listContainers({
-        all: true,
-        filters: { name: [name] }
+      portBindings.forEach(({ source, destination }) => {
+        container = container.withExposedPorts({
+          container: source,
+          host: destination
+        });
       });
-      if (webContainers.length) {
-        return webContainers[0];
-      }
 
-      const container = await docker.createContainer({
-        AttachStderr: true,
-        AttachStdin: false,
-        AttachStdout: true,
-        ExposedPorts: portBindings.reduce((accumulator, currentValue) => {
-          accumulator[`${currentValue.source}/tcp`] = {};
-
-          return accumulator;
-        }, {}),
-        HostConfig: {
-          PortBindings: portBindings.reduce((accumulator, currentValue) => {
-            accumulator[`${currentValue.source}/tcp`] = [
-              {
-                HostIP: '127.0.0.1',
-                HostPort: `${currentValue.destination}`
-              }
-            ];
-
-            return accumulator;
-          }, {})
-        },
-        Image: image,
-        OpenStdin: false,
-        StdinOnce: false,
-        Tty: true,
-        name
-      });
+      if (command) {
+        container
+          .withCommand(['bash', '-c', command])
+          .withWaitStrategy(Wait.forSuccessfulCommand('ls'));
+      }
 
-      await container.start();
+      containers[name] = await container.start();
 
       return container;
     },
+    startContainers: async ({
+      composeFile,
+      databaseImage,
+      openidImage,
+      profiles,
+      samlImage,
+      webImage
+    }) => {
+      try {
+        const composeFileDir = path.dirname(composeFile);
+        const composeFileName = path.basename(composeFile);
+
+        dockerEnvironment = await new DockerComposeEnvironment(
+          composeFileDir,
+          composeFileName
+        )
+          .withEnvironment({
+            MYSQL_IMAGE: databaseImage,
+            OPENID_IMAGE: openidImage,
+            SAML_IMAGE: samlImage,
+            WEB_IMAGE: webImage
+          })
+          .withProfiles(...profiles)
+          .withWaitStrategy(
+            'web-1',
+            Wait.forAll([
+              Wait.forHealthCheck(),
+              Wait.forLogMessage('Centreon is ready')
+            ])
+          )
+          .up();
+
+        return null;
+      } catch (error) {
+        if (error instanceof Error) {
+          console.error(error.message);
+        }
+
+        throw error;
+      }
+    },
     stopContainer: async ({ name }: StopContainerProps) => {
-      const container = await docker.getContainer(name);
-      await container.kill();
-      await container.remove();
+      if (containers[name]) {
+        const container = containers[name];
+
+        await container.stop();
+
+        delete containers[name];
+      }
+
+      return null;
+    },
+    stopContainers: async () => {
+      if (dockerEnvironment !== null) {
+        await dockerEnvironment.down();
+
+        dockerEnvironment = null;
+      }
 
       return null;
     },

package/package.json

@@ -1,60 +1,66 @@
 {
-  "name": "@centreon/js-config",
-  "description": "Centreon Frontend shared build configuration",
-  "version": "23.10.66",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/centreon/centreon-frontend.git"
-  },
-  "keywords": [
-    "centreon",
-    "eslint"
-  ],
-  "author": "centreon@centreon.com",
-  "license": "GPL-2.0",
-  "bugs": {
-    "url": "https://github.com/centreon/centreon-frontend/issues"
-  },
-  "devDependencies": {
-    "@tsconfig/node16": "^16.1.1",
-    "eslint": "^8.17.0",
-    "eslint-config-airbnb": "19.0.4",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-import-resolver-alias": "^1.1.2",
-    "eslint-import-resolver-typescript": "^3.5.5",
-    "eslint-plugin-babel": "^5.3.1",
-    "eslint-plugin-hooks": "^0.4.3",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "^26.1.5",
-    "eslint-plugin-jsx-a11y": "^6.5.1",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prefer-arrow-functions": "^3.1.4",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-react": "^7.29.4",
-    "eslint-plugin-react-hooks": "^4.5.0",
-    "eslint-plugin-sort-keys-fix": "^1.1.2",
-    "eslint-plugin-typescript-sort-keys": "^2.1.0"
-  },
-  "homepage": "https://github.com/centreon/centreon-frontend#readme",
-  "files": [
-    "eslint",
-    "jest",
-    "tsconfig",
-    "webpack",
-    "cypress"
-  ],
-  "dependencies": {
-    "@badeball/cypress-cucumber-preprocessor": "^19.1.0",
-    "@bahmutov/cypress-esbuild-preprocessor": "^2.2.0",
-    "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
-    "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
-    "@types/cypress-cucumber-preprocessor": "^4.0.5",
-    "@types/dockerode": "^3.3.23",
-    "cypress-multi-reporters": "^1.6.4",
-    "cypress-terminal-report": "^5.3.9",
-    "dockerode": "^4.0.0",
-    "dotenv": "^16.3.1",
-    "esbuild": "^0.19.5",
-    "mochawesome": "^7.1.3"
-  }
+    "name": "@centreon/js-config",
+    "description": "Centreon Frontend shared build configuration",
+    "version": "24.4.0",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/centreon/centreon-frontend.git"
+    },
+    "keywords": [
+        "centreon",
+        "eslint"
+    ],
+    "author": "centreon@centreon.com",
+    "license": "GPL-2.0",
+    "bugs": {
+        "url": "https://github.com/centreon/centreon-frontend/issues"
+    },
+    "homepage": "https://github.com/centreon/centreon-frontend#readme",
+    "files": [
+        "eslint",
+        "jest",
+        "tsconfig",
+        "webpack",
+        "cypress"
+    ],
+    "peerDependencies": {
+        "eslint": "^8.53.0",
+        "prettier": "^3.0.0"
+    },
+    "dependencies": {
+        "@badeball/cypress-cucumber-preprocessor": "^20.0.1",
+        "@bahmutov/cypress-esbuild-preprocessor": "^2.2.0",
+        "@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",
+        "@types/cypress-cucumber-preprocessor": "^4.0.5",
+        "cypress": "^13.6.4",
+        "cypress-multi-reporters": "^1.6.4",
+        "cypress-terminal-report": "^6.0.0",
+        "cypress-wait-until": "^3.0.1",
+        "dotenv": "^16.4.1",
+        "esbuild": "^0.20.0",
+        "eslint": "^8.53.0",
+        "eslint-config-airbnb": "19.0.4",
+        "eslint-config-prettier": "^8.5.0",
+        "eslint-import-resolver-alias": "^1.1.2",
+        "eslint-import-resolver-typescript": "^3.5.5",
+        "eslint-plugin-babel": "^5.3.1",
+        "eslint-plugin-hooks": "^0.4.3",
+        "eslint-plugin-import": "^2.26.0",
+        "eslint-plugin-jest": "^26.1.5",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-node": "^11.1.0",
+        "eslint-plugin-prefer-arrow-functions": "^3.1.4",
+        "eslint-plugin-prettier": "^5.0.0",
+        "eslint-plugin-react": "^7.29.4",
+        "eslint-plugin-react-hooks": "^4.5.0",
+        "eslint-plugin-sort-keys-fix": "^1.1.2",
+        "eslint-plugin-typescript-sort-keys": "^2.1.0",
+        "mochawesome": "^7.1.3",
+        "mysql2": "^3.9.1",
+        "tar-fs": "^3.0.4",
+        "testcontainers": "^10.7.1"
+    }
 }

package/tsconfig/lambda/node20.tsconfig.json

@@ -0,0 +1,12 @@
+{
+    "extends": "@tsconfig/node20/tsconfig.json",
+    "compilerOptions": {
+        "sourceMap": true,
+        "allowJs": true,
+        "strictNullChecks": false,
+        "declaration": false,
+        "esModuleInterop": true,
+        "strict": true,
+        "types": ["@types/jest", "node"]
+    }
+}

package/webpack/base/index.js

@@ -34,6 +34,7 @@ const getBaseConfiguration = ({
         shared: [
           {
             '@centreon/ui-context': {
+              requiredVersion: '24.x',
               singleton: true
             }
           },
@@ -62,7 +63,7 @@ const getBaseConfiguration = ({
           },
           {
             'react-i18next': {
-              requiredVersion: '11.x',
+              requiredVersion: '14.x',
               singleton: true
             }
           },