@centreon/js-config 24.4.20 → 24.4.21

package/cypress/component/commands.tsx

@@ -18,15 +18,6 @@ interface MountProps {
   Component: React.ReactNode;
   options?: object;
 }
-interface Resolution {
-  height: number;
-  width: number;
-}
-
-interface MakeSnapshotWithCustomResolution {
-  resolution: Resolution;
-  title: string;
-}
 
 export enum Method {
   DELETE = 'DELETE',
@@ -106,32 +97,20 @@ Cypress.Commands.add(
   }
 );
 
-interface MoveSortableElementProps {
-  direction: 'up' | 'down' | 'left' | 'right';
-  element: Cypress.Chainable<JQuery<HTMLElement>>;
-  times?: number;
-}
-
-Cypress.Commands.add(
-  'moveSortableElement',
-  ({ element, direction, times = 1 }: MoveSortableElementProps): void => {
-    const key = `{${direction}arrow}`;
-
-    element.type(' ', {
-      force: true,
-      scrollBehavior: false
-    });
+Cypress.Commands.add('moveSortableElement', ({ element, direction }): void => {
+  const key = `{${direction}arrow}`;
 
-    Array.from({ length: times }).forEach(() => {
-      element.eq(-1).type(key, {
-        scrollBehavior: false
-      });
-    });
-    element.eq(-1).type(' ', {
-      scrollBehavior: false
-    });
-  }
-);
+  element.type(' ', {
+    force: true,
+    scrollBehavior: false
+  });
+  element.eq(-1).type(key, {
+    scrollBehavior: false
+  });
+  element.eq(-1).type(' ', {
+    scrollBehavior: false
+  });
+});
 
 Cypress.Commands.add(
   'moveSortableElementUsingAriaLabel',
@@ -158,15 +137,6 @@ Cypress.Commands.add('makeSnapshot', (title?: string) => {
   cy.matchImageSnapshot(title);
 });
 
-Cypress.Commands.add(
-  'makeSnapshotWithCustomResolution',
-  ({ title, resolution }: MakeSnapshotWithCustomResolution) => {
-    const { width, height } = resolution;
-    cy.viewport(width, height);
-    cy.matchImageSnapshot(title);
-  }
-);
-
 Cypress.Commands.add('cssDisableMotion', (): void => {
   Cypress.on('window:before:load', (cyWindow) => {
     disableMotion(cyWindow);
@@ -178,22 +148,13 @@ declare global {
     interface Chainable {
       adjustViewport: () => Cypress.Chainable;
       cssDisableMotion: () => Cypress.Chainable;
-      getRequestCalls: (alias) => Cypress.Chainable;
       interceptAPIRequest: <T extends object>(
         props: InterceptAPIRequestProps<T>
       ) => Cypress.Chainable;
       interceptRequest: (method, path, mock, alias) => Cypress.Chainable;
       makeSnapshot: (title?: string) => void;
-      makeSnapshotWithCustomResolution: ({
-        title,
-        resolution
-      }: MakeSnapshotWithCustomResolution) => Cypress.Chainable;
       mount: ({ Component, options }: MountProps) => Cypress.Chainable;
-      moveSortableElement: ({
-        element,
-        direction,
-        times
-      }: MoveSortableElementProps) => void;
+      moveSortableElement: ({ element, direction }) => void;
       moveSortableElementUsingAriaLabel: ({ ariaLabel, direction }) => void;
       waitForRequest: (alias) => Cypress.Chainable;
     }

package/cypress/component/configuration.js

@@ -3,7 +3,6 @@ const { defineConfig } = require('cypress');
 const {
   addMatchImageSnapshotPlugin
 } = require('@simonsmith/cypress-image-snapshot/plugin');
-const cypressCodeCoverageTask = require('@cypress/code-coverage/task');
 
 module.exports = ({
   webpackConfig,
@@ -26,12 +25,9 @@ module.exports = ({
       setupNodeEvents: (on, config) => {
         addMatchImageSnapshotPlugin(on, config);
 
-        cypressCodeCoverageTask(on, config);
-
         on('before:browser:launch', (browser, launchOptions) => {
           if (browser.name === 'chrome' && browser.isHeadless) {
             launchOptions.args.push('--headless=new');
-            launchOptions.args.push('--force-color-profile=srgb');
           }
 
           return launchOptions;
@@ -41,17 +37,8 @@ module.exports = ({
       supportFile: `${mainCypressFolder}/support/component.tsx`
     },
     env: {
-      baseUrl: 'http://localhost:9092',
-      codeCoverage: {
-        exclude: [
-          'cypress/**/*.*',
-          'packages/**',
-          'node_modules',
-          '**/*.js',
-          '**/*.spec.tsx'
-        ]
-      },
-      ...env
+      ...env,
+      baseUrl: 'http://localhost:9092'
     },
     reporter: 'mochawesome',
     reporterOptions: {

package/cypress/e2e/commands.ts

@@ -178,11 +178,13 @@ Cypress.Commands.add(
       .getByLabel({ label: 'Connect', tag: 'button' })
       .click();
 
-    return cy.get('.MuiAlert-message').then(($snackbar) => {
-      if ($snackbar.text().includes('Login succeeded')) {
-        cy.wait('@getNavigationList');
-      }
-    });
+    return cy
+      .get('.SnackbarContent-root > .MuiPaper-root')
+      .then(($snackbar) => {
+        if ($snackbar.text().includes('Login succeeded')) {
+          cy.wait('@getNavigationList');
+        }
+      });
   }
 );
 
@@ -332,11 +334,6 @@ Cypress.Commands.add(
         name,
         source: '/var/log/centreon'
       })
-      .copyFromContainer({
-        destination: `${logDirectory}/centreon-gorgone`,
-        name,
-        source: '/var/log/centreon-gorgone'
-      })
       .then(() => {
         if (Cypress.env('WEB_IMAGE_OS').includes('alma')) {
           return cy.copyFromContainer({
@@ -355,24 +352,6 @@ Cypress.Commands.add(
           { failOnNonZeroExit: false }
         );
       })
-      .then(() => {
-        if (Cypress.env('WEB_IMAGE_OS').includes('alma')) {
-          return cy.copyFromContainer({
-            destination: `${logDirectory}/httpd`,
-            name,
-            source: '/var/log/httpd'
-          });
-        }
-
-        return cy.copyFromContainer(
-          {
-            destination: `${logDirectory}/apache2`,
-            name,
-            source: '/var/log/apache2'
-          },
-          { failOnNonZeroExit: false }
-        );
-      })
       .exec(`chmod -R 755 "${logDirectory}"`)
       .stopContainer({ name });
   }
@@ -389,7 +368,7 @@ Cypress.Commands.add(
 
     cy.exec(`docker logs ${name}`).then(({ stdout }) => {
       cy.writeFile(
-        `results/logs/${Cypress.spec.name.replace(
+        `cypress/results/logs/${Cypress.spec.name.replace(
           artifactIllegalCharactersMatcher,
           '_'
         )}/${Cypress.currentTest.title.replace(
@@ -437,41 +416,6 @@ Cypress.Commands.add(
   }
 );
 
-Cypress.Commands.add(
-  'insertDashboardWithWidget',
-  (dashboardBody, patchBody) => {
-    cy.request({
-      body: {
-        ...dashboardBody
-      },
-      method: 'POST',
-      url: '/centreon/api/latest/configuration/dashboards'
-    }).then((response) => {
-      const dashboardId = response.body.id;
-      cy.waitUntil(
-        () => {
-          return cy
-            .request({
-              method: 'GET',
-              url: `/centreon/api/latest/configuration/dashboards/${dashboardId}`
-            })
-            .then((getResponse) => {
-              return getResponse.body && getResponse.body.id === dashboardId;
-            });
-        },
-        {
-          timeout: 10000
-        }
-      );
-      cy.request({
-        body: patchBody,
-        method: 'PATCH',
-        url: `/centreon/api/latest/configuration/dashboards/${dashboardId}`
-      });
-    });
-  }
-);
-
 interface ShareDashboardToUserProps {
   dashboardName: string;
   role: string;
@@ -486,30 +430,6 @@ interface ListingRequestResult {
   };
 }
 
-interface PatchDashboardBody {
-  panels: Array<{
-    layout: {
-      height: number;
-      min_height: number;
-      min_width: number;
-      width: number;
-      x: number;
-      y: number;
-    };
-    name: string;
-    widget_settings: {
-      options: {
-        description: {
-          content: string;
-          enabled: boolean;
-        };
-        name: string;
-      };
-    };
-    widget_type: string;
-  }>;
-}
-
 Cypress.Commands.add(
   'shareDashboardToUser',
   ({ dashboardName, userName, role }: ShareDashboardToUserProps): void => {
@@ -582,11 +502,6 @@ declare global {
       hoverRootMenuItem: (rootItemNumber: number) => Cypress.Chainable;
       insertDashboard: (dashboard: Dashboard) => Cypress.Chainable;
       insertDashboardList: (fixtureFile: string) => Cypress.Chainable;
-      insertDashboardWithWidget: (
-        dashboard: Dashboard,
-        patch: PatchDashboardBody
-      ) => Cypress.Chainable;
-
       loginByTypeOfUser: ({
         jsonName,
         loginViaApi

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';
@@ -15,7 +14,6 @@ interface ConfigurationOptions {
   cypressFolder?: string;
   dockerName?: string;
   env?: Record<string, unknown>;
-  envFile?: string;
   isDevelopment?: boolean;
   specPattern: string;
 }
@@ -25,13 +23,8 @@ export default ({
   cypressFolder,
   isDevelopment,
   dockerName,
-  env,
-  envFile
+  env
 }: ConfigurationOptions): Cypress.ConfigOptions => {
-  if (envFile) {
-    configDotenv({ path: envFile });
-  }
-
   const resultsFolder = `${cypressFolder || '.'}/results`;
 
   const webImageVersion = execSync('git rev-parse --abbrev-ref HEAD')
@@ -60,7 +53,7 @@ export default ({
     },
     env: {
       ...env,
-      OPENID_IMAGE_VERSION: process.env.MAJOR || '24.04',
+      OPENID_IMAGE_VERSION: '23.04',
       WEB_IMAGE_OS: 'alma9',
       WEB_IMAGE_VERSION: webImageVersion,
       dockerName: dockerName || 'centreon-dev'

package/cypress/e2e/plugins.ts

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

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,63 +1,59 @@
 {
-    "name": "@centreon/js-config",
-    "description": "Centreon Frontend shared build configuration",
-    "version": "24.4.20",
-    "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": {
-        "prettier": "^3.0.0",
-        "eslint": "^8.53.0"
-    },
-    "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",
-        "@tsconfig/node16": "^16.1.1",
-        "@tsconfig/node20": "^20.1.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",
-        "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"
-    }
+  "name": "@centreon/js-config",
+  "description": "Centreon Frontend shared build configuration",
+  "version": "24.4.21",
+  "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"]
-    }
-}