@centreon/js-config 24.4.27 → 24.4.29

package/cypress/e2e/configuration.ts

@@ -5,7 +5,6 @@ import { execSync } from 'child_process';
 
 import { defineConfig } from 'cypress';
 import installLogsPrinter from 'cypress-terminal-report/src/installLogsPrinter';
-import { config as configDotenv } from 'dotenv';
 
 import esbuildPreprocessor from './esbuild-preprocessor';
 import plugins from './plugins';
@@ -13,8 +12,8 @@ import tasks from './tasks';
 
 interface ConfigurationOptions {
   cypressFolder?: string;
+  dockerName?: string;
   env?: Record<string, unknown>;
-  envFile?: string;
   isDevelopment?: boolean;
   specPattern: string;
 }
@@ -23,13 +22,9 @@ export default ({
   specPattern,
   cypressFolder,
   isDevelopment,
-  env,
-  envFile
+  dockerName,
+  env
 }: ConfigurationOptions): Cypress.ConfigOptions => {
-  if (envFile) {
-    configDotenv({ path: envFile });
-  }
-
   const resultsFolder = `${cypressFolder || '.'}/results`;
 
   const webImageVersion = execSync('git rev-parse --abbrev-ref HEAD')
@@ -39,7 +34,6 @@ export default ({
   return defineConfig({
     chromeWebSecurity: false,
     defaultCommandTimeout: 6000,
-    downloadsFolder: `${resultsFolder}/downloads`,
     e2e: {
       excludeSpecPattern: ['*.js', '*.ts', '*.md'],
       fixturesFolder: 'fixtures',
@@ -59,17 +53,16 @@ export default ({
     },
     env: {
       ...env,
-      DATABASE_IMAGE: 'bitnami/mariadb:10.11',
-      OPENID_IMAGE_VERSION: process.env.MAJOR || '24.04',
-      SAML_IMAGE_VERSION: process.env.MAJOR || '24.04',
+      OPENID_IMAGE_VERSION: '23.04',
       WEB_IMAGE_OS: 'alma9',
-      WEB_IMAGE_VERSION: webImageVersion
+      WEB_IMAGE_VERSION: webImageVersion,
+      dockerName: dockerName || 'centreon-dev'
     },
     execTimeout: 60000,
     requestTimeout: 10000,
     retries: 0,
     screenshotsFolder: `${resultsFolder}/screenshots`,
-    video: isDevelopment,
+    video: true,
     videoCompression: 0,
     videosFolder: `${resultsFolder}/videos`
   });

package/cypress/e2e/plugins.ts

@@ -11,7 +11,7 @@ export default (
     const width = 1920;
     const height = 1080;
 
-    if (browser.family === 'chromium' && browser.name !== 'electron') {
+    if (browser.name === 'chrome') {
       if (browser.isHeadless) {
         launchOptions.args.push('--headless=new');
       }

package/cypress/e2e/tasks.ts

@@ -1,40 +1,10 @@
-/* eslint-disable no-console */
 import { execSync } from 'child_process';
 import { existsSync, mkdirSync } from 'fs';
-import path from 'path';
 
-import tar from 'tar-fs';
-import {
-  DockerComposeEnvironment,
-  GenericContainer,
-  StartedDockerComposeEnvironment,
-  StartedTestContainer,
-  Wait,
-  getContainerRuntimeClient
-} from 'testcontainers';
-import { createConnection } from 'mysql2/promise';
-
-interface Containers {
-  [key: string]: StartedTestContainer;
-}
+import Docker from 'dockerode';
 
 export default (on: Cypress.PluginEvents): void => {
-  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;
-  };
+  const docker = new Docker();
 
   interface PortBinding {
     destination: number;
@@ -42,7 +12,6 @@ export default (on: Cypress.PluginEvents): void => {
   }
 
   interface StartContainerProps {
-    command?: string;
     image: string;
     name: string;
     portBindings: Array<PortBinding>;
@@ -53,48 +22,6 @@ export default (on: Cypress.PluginEvents): void => {
   }
 
   on('task', {
-    copyFromContainer: async ({ destination, serviceName, source }) => {
-      try {
-        if (dockerEnvironment !== null) {
-          const container = dockerEnvironment.getContainer(`${serviceName}-1`);
-
-          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 });
@@ -102,150 +29,70 @@ 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) => {
-      let container = await new GenericContainer(image).withName(name);
+      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}`);
+      }
 
-      portBindings.forEach(({ source, destination }) => {
-        container = container.withExposedPorts({
-          container: source,
-          host: destination
-        });
+      const webContainers = await docker.listContainers({
+        all: true,
+        filters: { name: [name] }
       });
-
-      if (command) {
-        container
-          .withCommand(['bash', '-c', command])
-          .withWaitStrategy(Wait.forSuccessfulCommand('ls'));
+      if (webContainers.length) {
+        return webContainers[0];
       }
 
-      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();
+      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
+      });
 
-        return null;
-      } catch (error) {
-        if (error instanceof Error) {
-          console.error(error.message);
-        }
+      await container.start();
 
-        throw error;
-      }
+      return container;
     },
     stopContainer: async ({ name }: StopContainerProps) => {
-      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;
-      }
+      const container = await docker.getContainer(name);
+      await container.kill();
+      await container.remove();
 
       return null;
     },

package/jest/index.js

@@ -5,6 +5,7 @@ module.exports = {
       'jest-transform-stub',
     '^react($|/.+)': '<rootDir>/node_modules/react$1'
   },
+  setupFilesAfterEnv: ['@testing-library/jest-dom/extend-expect'],
   testEnvironment: 'jsdom',
   testPathIgnorePatterns: ['/node_modules/', '!*.cypress.spec.tsx'],
   transform: {

package/package.json

@@ -1,66 +1,59 @@
 {
-    "name": "@centreon/js-config",
-    "description": "Centreon Frontend shared build configuration",
-    "version": "24.4.27",
-    "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"
-    }
+  "name": "@centreon/js-config",
+  "description": "Centreon Frontend shared build configuration",
+  "version": "24.4.29",
+  "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",
+    "esbuild": "^0.19.5",
+    "mochawesome": "^7.1.3"
+  }
 }

package/webpack/base/globalConfig.js

@@ -1,10 +1,10 @@
 const excludeNodeModulesExceptCentreonUi =
-  /node_modules(\\|\/)\.pnpm(\\|\/)(?!(@centreon|file\+packages\+ui-context))/;
+  /node_modules(\\|\/)\.pnpm(\\|\/)(?!(@centreon))/;
 
 module.exports = {
   cache: false,
   excludeNodeModulesExceptCentreonUi,
-  getModuleConfiguration: (jscTransformConfiguration, enableCoverage) => ({
+  getModuleConfiguration: (jscTransformConfiguration) => ({
     rules: [
       {
         parser: { system: false },
@@ -17,11 +17,6 @@ module.exports = {
           loader: 'swc-loader',
           options: {
             jsc: {
-              experimental: {
-                plugins: [
-                  enableCoverage && ['swc-plugin-coverage-instrument', {}]
-                ].filter(Boolean)
-              },
               parser: {
                 syntax: 'typescript',
                 tsx: true

package/webpack/base/index.js

@@ -13,11 +13,10 @@ const {
 const getBaseConfiguration = ({
   moduleName,
   moduleFederationConfig,
-  jscTransformConfiguration,
-  enableCoverage
+  jscTransformConfiguration
 }) => ({
   cache,
-  module: getModuleConfiguration(jscTransformConfiguration, enableCoverage),
+  module: getModuleConfiguration(jscTransformConfiguration),
   optimization,
   output: {
     ...output,
@@ -34,18 +33,19 @@ const getBaseConfiguration = ({
         shared: [
           {
             '@centreon/ui-context': {
-              requiredVersion: '24.x',
+              requiredVersion: '22.10.0',
               singleton: true
             }
           },
           {
             jotai: {
-              requiredVersion: '2.x',
+              requiredVersion: '1.x',
               singleton: true
             }
           },
           {
             'jotai-suspense': {
+              requiredVersion: '0.1.x',
               singleton: true
             }
           },

package/cypress/component/excludeNodeModulesFromCoverage.js

@@ -1,36 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-const filePath = process.argv[2];
-
-const { error: logError } = console;
-
-try {
-  const outFile = fs.readFileSync(path.resolve(filePath)).toString();
-  const outFileJson = JSON.parse(outFile);
-
-  const coveragesWithoutNodeModules = Object.entries(outFileJson)
-    .map(([key, value]) => {
-      if (key.includes('node_modules')) {
-        return undefined;
-      }
-
-      return [key, value];
-    })
-    .filter((v) => v);
-
-  const finalOutJson = coveragesWithoutNodeModules.reduce(
-    (acc, [key, value]) => ({
-      ...acc,
-      [key]: value
-    }),
-    {}
-  );
-
-  fs.writeFileSync(
-    path.resolve(filePath),
-    JSON.stringify(finalOutJson, null, 2)
-  );
-} catch (error) {
-  logError(error.message);
-}

package/tsconfig/lambda/node20.tsconfig.json

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