@centreon/js-config 23.10.14 → 23.10.16

package/cypress/component/configuration.js

@@ -4,24 +4,16 @@ const {
   addMatchImageSnapshotPlugin
 } = require('@simonsmith/cypress-image-snapshot/plugin');
 
-module.exports = ({
-  webpackConfig,
-  cypressFolder,
-  specPattern,
-  env,
-  useVite = false,
-  excludeSpecPattern
-}) => {
+module.exports = ({ webpackConfig, cypressFolder, specPattern, env }) => {
   const mainCypressFolder = cypressFolder || 'cypress';
 
   return defineConfig({
     component: {
       devServer: {
-        bundler: useVite ? 'vite' : 'webpack',
+        bundler: 'webpack',
         framework: 'react',
         webpackConfig
       },
-      excludeSpecPattern,
       setupNodeEvents: (on, config) => {
         addMatchImageSnapshotPlugin(on, config);
       },

package/cypress/e2e/commands.ts

@@ -4,8 +4,6 @@ import './commands/configuration';
 
 const apiLoginV2 = '/centreon/authentication/providers/configurations/local';
 
-const artifactIllegalCharactersMatcher = /[,\s/|<>*?:"]/g;
-
 Cypress.Commands.add('getWebVersion', (): Cypress.Chainable => {
   return cy
     .exec(
@@ -23,7 +21,7 @@ Cypress.Commands.add('getWebVersion', (): Cypress.Chainable => {
 
 Cypress.Commands.add('getIframeBody', (): Cypress.Chainable => {
   return cy
-    .get('iframe#main-content', { timeout: 10000 })
+    .get('iframe#main-content')
     .its('0.contentDocument.body')
     .should('not.be.empty')
     .then(cy.wrap);
@@ -39,13 +37,6 @@ Cypress.Commands.add(
   }
 );
 
-Cypress.Commands.add(
-  'clickSubRootMenuItem',
-  (page: string): Cypress.Chainable => {
-    return cy.get('div[data-cy="collapse"]').eq(1).contains(page).click();
-  }
-);
-
 interface NavigateToProps {
   page: string;
   rootItemNumber: number;
@@ -58,8 +49,8 @@ Cypress.Commands.add(
     if (subMenu) {
       cy.hoverRootMenuItem(rootItemNumber)
         .contains(subMenu)
-        .trigger('mouseover');
-      cy.clickSubRootMenuItem(page);
+        .trigger('mouseover', { force: true });
+      cy.contains(page).click({ force: true });
 
       return;
     }
@@ -92,35 +83,29 @@ Cypress.Commands.add(
 
 interface CopyFromContainerProps {
   destination: string;
-  name?: string;
   source: string;
 }
 
 Cypress.Commands.add(
   'copyFromContainer',
-  ({
-    name = Cypress.env('dockerName'),
-    source,
-    destination
-  }: CopyFromContainerProps) => {
-    return cy.exec(`docker cp ${name}:${source} "${destination}"`);
+  ({ source, destination }: CopyFromContainerProps) => {
+    return cy.exec(
+      `docker cp ${Cypress.env('dockerName')}:${source} "${destination}"`
+    );
   }
 );
 
 interface CopyToContainerProps {
   destination: string;
-  name?: string;
   source: string;
 }
 
 Cypress.Commands.add(
   'copyToContainer',
-  ({
-    name = Cypress.env('dockerName'),
-    source,
-    destination
-  }: CopyToContainerProps) => {
-    return cy.exec(`docker cp ${source} ${name}:${destination}`);
+  ({ source, destination }: CopyToContainerProps) => {
+    return cy.exec(
+      `docker cp ${source} ${Cypress.env('dockerName')}:${destination}`
+    );
   }
 );
 
@@ -211,9 +196,7 @@ Cypress.Commands.add(
   'startContainer',
   ({ name, image, portBindings }: StartContainerProps): Cypress.Chainable => {
     return cy
-      .exec(`docker image inspect ${image} || docker pull ${image}`, {
-        timeout: 120000
-      })
+      .exec(`docker image inspect ${image} || docker pull ${image}`)
       .task('startContainer', { image, name, portBindings });
   }
 );
@@ -229,7 +212,7 @@ Cypress.Commands.add(
   'startWebContainer',
   ({
     name = Cypress.env('dockerName'),
-    os = Cypress.env('WEB_IMAGE_OS'),
+    os = 'alma9',
     useSlim = true,
     version = Cypress.env('WEB_IMAGE_VERSION')
   }: StartWebContainerProps = {}): Cypress.Chainable => {
@@ -266,47 +249,25 @@ Cypress.Commands.add(
   ({
     name = Cypress.env('dockerName')
   }: StopWebContainerProps = {}): Cypress.Chainable => {
-    const logDirectory = `cypress/results/logs/${Cypress.spec.name.replace(
-      artifactIllegalCharactersMatcher,
-      '_'
-    )}/${Cypress.currentTest.title.replace(
-      artifactIllegalCharactersMatcher,
-      '_'
-    )}`;
+    const logDirectory = `cypress/results/logs/${
+      Cypress.spec.name
+    }/${Cypress.currentTest.title.replace(/,|\s|\//g, '_')}`;
 
     return cy
       .visitEmptyPage()
       .exec(`mkdir -p "${logDirectory}"`)
       .copyFromContainer({
         destination: `${logDirectory}/broker`,
-        name,
         source: '/var/log/centreon-broker'
       })
       .copyFromContainer({
         destination: `${logDirectory}/engine`,
-        name,
         source: '/var/log/centreon-engine'
       })
       .copyFromContainer({
         destination: `${logDirectory}/centreon`,
-        name,
         source: '/var/log/centreon'
       })
-      .then(() => {
-        if (Cypress.env('WEB_IMAGE_OS').includes('alma')) {
-          return cy.copyFromContainer({
-            destination: `${logDirectory}/php`,
-            name,
-            source: '/var/log/php-fpm'
-          });
-        }
-
-        return cy.copyFromContainer({
-          destination: `${logDirectory}/php8.1-fpm-centreon-error.log`,
-          name,
-          source: '/var/log/php8.1-fpm-centreon-error.log'
-        });
-      })
       .stopContainer({ name });
   }
 );
@@ -320,11 +281,10 @@ Cypress.Commands.add(
   ({ name }: StopContainerProps): Cypress.Chainable => {
     cy.exec(`docker logs ${name}`).then(({ stdout }) => {
       cy.writeFile(
-        `cypress/results/logs/${Cypress.spec.name.replace(
-          artifactIllegalCharactersMatcher,
-          '_'
-        )}/${Cypress.currentTest.title.replace(
-          artifactIllegalCharactersMatcher,
+        `cypress/results/logs/${
+          Cypress.spec.name
+        }/${Cypress.currentTest.title.replace(
+          /,|\s|\//g,
           '_'
         )}/container-${name}.log`,
         stdout
@@ -335,56 +295,9 @@ Cypress.Commands.add(
   }
 );
 
-interface Dashboard {
-  description?: string;
-  name: string;
-}
-
-Cypress.Commands.add(
-  'insertDashboardList',
-  (fixtureFile: string): Cypress.Chainable => {
-    return cy.fixture(fixtureFile).then((dashboardList) => {
-      cy.wrap(
-        Promise.all(
-          dashboardList.map((dashboardBody: Dashboard) =>
-            cy.insertDashboard({ ...dashboardBody })
-          )
-        )
-      );
-    });
-  }
-);
-
-Cypress.Commands.add(
-  'insertDashboard',
-  (dashboardBody: Dashboard): Cypress.Chainable => {
-    return cy.request({
-      body: {
-        ...dashboardBody
-      },
-      method: 'POST',
-      url: '/centreon/api/latest/configuration/dashboards'
-    });
-  }
-);
-
-Cypress.Commands.add('getTimeFromHeader', (): Cypress.Chainable => {
-  return cy.waitUntil(() => {
-    return cy.get('header div[data-cy="clock"]').then(($time) => {
-      const headerTime = $time.children()[1].textContent;
-      if (headerTime?.match(/\d+:\d+/)) {
-        return headerTime;
-      }
-
-      return false;
-    });
-  });
-});
-
 declare global {
   namespace Cypress {
     interface Chainable {
-      clickSubRootMenuItem: (page: string) => Cypress.Chainable;
       copyFromContainer: (props: CopyFromContainerProps) => Cypress.Chainable;
       copyToContainer: (props: CopyToContainerProps) => Cypress.Chainable;
       execInContainer: ({
@@ -392,11 +305,8 @@ declare global {
         name
       }: ExecInContainerProps) => Cypress.Chainable;
       getIframeBody: () => Cypress.Chainable;
-      getTimeFromHeader: () => Cypress.Chainable;
       getWebVersion: () => Cypress.Chainable;
       hoverRootMenuItem: (rootItemNumber: number) => Cypress.Chainable;
-      insertDashboard: (dashboard: Dashboard) => Cypress.Chainable;
-      insertDashboardList: (fixtureFile: string) => Cypress.Chainable;
       loginByTypeOfUser: ({
         jsonName = 'admin',
         loginViaApi = false

package/cypress/e2e/configuration.ts

@@ -45,7 +45,7 @@ export default ({
       WEB_IMAGE_VERSION: webImageVersion,
       dockerName: dockerName || 'centreon-dev'
     },
-    execTimeout: 60000,
+    execTimeout: 120000,
     reporter: 'mochawesome',
     reporterOptions: {
       html: false,

package/eslint/base.typescript.eslintrc.js

@@ -21,15 +21,11 @@ module.exports = {
           }
         ],
         '@typescript-eslint/camelcase': 'off',
-        '@typescript-eslint/consistent-type-definitions': ['off', 'interface'],
-        '@typescript-eslint/explicit-function-return-type': [
+        '@typescript-eslint/consistent-type-definitions': [
           'error',
-          {
-            allowExpressions: true,
-            allowHigherOrderFunctions: true,
-            allowTypedFunctionExpressions: true
-          }
+          'interface'
         ],
+        '@typescript-eslint/explicit-function-return-type': ['error'],
         '@typescript-eslint/explicit-member-accessibility': [
           'error',
           {
@@ -80,21 +76,13 @@ module.exports = {
           }
         ],
         camelcase: 'off',
-        'import/no-cycle': 'off',
-        'import/no-named-as-default': 'warn',
         'no-shadow': 'off',
         'no-unused-expressions': 'off'
       },
       settings: {
-        'import/parsers': {
-          '@typescript-eslint/parser': ['.ts', '.tsx']
-        },
         'import/resolver': {
           alias: {
             extensions: ['.ts', '.tsx', '.js', '.jsx']
-          },
-          typescript: {
-            alwaysTryTypes: true
           }
         }
       }

package/jest/index.js

@@ -1,16 +1,12 @@
 module.exports = {
   moduleNameMapper: {
     '\\.(s?css|png|svg|jpg)$': 'identity-obj-proxy',
-    '^.+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$':
-      'jest-transform-stub',
     '^react($|/.+)': '<rootDir>/node_modules/react$1'
   },
   setupFilesAfterEnv: ['@testing-library/jest-dom/extend-expect'],
   testEnvironment: 'jsdom',
-  testPathIgnorePatterns: ['/node_modules/', '!*.cypress.spec.tsx'],
+  testPathIgnorePatterns: ['/node_modules/'],
   transform: {
-    '.+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$':
-      'jest-transform-stub',
     '^.+\\.[jt]sx?$': [
       '@swc/jest',
       {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@centreon/js-config",
   "description": "Centreon Frontend shared build configuration",
-  "version": "23.10.14",
+  "version": "23.10.16",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/centreon/centreon-frontend.git"
@@ -17,14 +17,12 @@
   },
   "devDependencies": {
     "@badeball/cypress-cucumber-preprocessor": "^14.0.0",
-    "@tsconfig/node16": "^1.0.4",
     "@types/dockerode": "^3.3.16",
     "dockerode": "^3.3.5",
     "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",

package/tsconfig/index.json

@@ -1,14 +1,13 @@
 {
   "compilerOptions": {
-    "moduleResolution": "nodenext",
+    "moduleResolution": "node",
     "downlevelIteration": true,
-    "module": "esnext",
-    "target": "es2018",
+    "module": "es6",
+    "target": "es6",
     "jsx": "react-jsx",
     "strict": true,
     "noImplicitAny": false,
     "skipLibCheck": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true
+    "esModuleInterop": true
   }
 }

package/webpack/base/index.js

@@ -3,22 +3,68 @@ const path = require('path');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const { ModuleFederationPlugin } = require('webpack').container;
 
-const {
-  getModuleConfiguration,
-  optimization,
-  output,
-  cache
-} = require('./globalConfig');
+const excludeNodeModulesExceptCentreonUi =
+  /node_modules(\\|\/)\.pnpm(\\|\/)(?!(@centreon))/;
 
 const getBaseConfiguration = ({
   moduleName,
   moduleFederationConfig,
   jscTransformConfiguration
 }) => ({
-  cache,
-  module: getModuleConfiguration(jscTransformConfiguration),
-  optimization,
-  output,
+  cache: false,
+  module: {
+    rules: [
+      {
+        parser: { system: false },
+        test: /\.[cm]?(j|t)sx?$/
+      },
+      {
+        exclude: excludeNodeModulesExceptCentreonUi,
+        test: /\.[jt]sx?$/,
+        use: {
+          loader: 'swc-loader',
+          options: {
+            jsc: {
+              parser: {
+                syntax: 'typescript',
+                tsx: true
+              },
+              transform: jscTransformConfiguration
+            }
+          }
+        }
+      },
+      {
+        test: /\.icon.svg$/,
+        use: ['@svgr/webpack']
+      },
+      {
+        exclude: excludeNodeModulesExceptCentreonUi,
+        test: /\.(bmp|png|jpg|jpeg|gif|svg)$/,
+        use: [
+          {
+            loader: 'url-loader',
+            options: {
+              limit: 10000,
+              name: '[name].[hash:8].[ext]'
+            }
+          }
+        ]
+      }
+    ]
+  },
+  optimization: {
+    splitChunks: {
+      chunks: 'all',
+      maxSize: 400 * 1024
+    }
+  },
+  output: {
+    chunkFilename: '[name].[chunkhash:8].chunk.js',
+    filename: '[name].[chunkhash:8].js',
+    libraryTarget: 'umd',
+    umdNamedDefine: true
+  },
   plugins: [
     new CleanWebpackPlugin(),
     moduleName &&
@@ -75,10 +121,7 @@ const getBaseConfiguration = ({
   ].filter(Boolean),
   resolve: {
     alias: {
-      react: path.resolve('./node_modules/react'),
-      '@centreon/ui/fonts': path.resolve(
-        './node_modules/@centreon/ui/public/fonts'
-      )
+      react: path.resolve('./node_modules/react')
     },
     extensions: ['.js', '.jsx', '.ts', '.tsx']
   }

package/eslint/lambda/typescript.eslintrc.js

@@ -1,48 +0,0 @@
-module.exports = {
-    extends: [ '../node/typescript.eslintrc.js'],
-    overrides: [
-      {
-        files: ["*.spec.js", "*.test.ts", "*.tests.ts"],
-        rules: {
-          "import/first": 0,
-          "import/order": 0,
-          "@typescript-eslint/ban-ts-comment": 0,
-          "@typescript-eslint/no-explicit-any": 0
-        }
-      }
-    ],
-    rules: {
-      "import/extensions": ["off"],
-      "no-console": "off",
-      "no-underscore-dangle": "off",
-      "class-methods-use-this": "off",
-      "@typescript-eslint/naming-convention": [
-        "error",
-        {
-          format: ["camelCase", "PascalCase", "UPPER_CASE"],
-          selector: "variable"
-        },
-        {
-          filter: {
-            match: false,
-            regex: "(__esModule|.+-.+)"
-          },
-          format: ["snake_case", "camelCase", "PascalCase", "UPPER_CASE"],
-          selector: "property",
-          leadingUnderscore: "allow"
-        },
-        {
-          filter: {
-            match: false,
-            regex: "^_$"
-          },
-          format: ["snake_case", "camelCase", "PascalCase"],
-          selector: "parameter"
-        }
-      ],
-      "@typescript-eslint/require-array-sort-compare": "error"
-    },
-    parserOptions: {
-      project: ["./tsconfig.json"]
-    }
-  }

package/jest/lambda/typescript.js

@@ -1,49 +0,0 @@
-/*
- * Copyright 2023 Centreon Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// For a detailed explanation regarding each configuration property, visit:
-// https://jestjs.io/docs/en/configuration.html
-const path = require('path');
-
-const rootPath = path.join(__dirname);
-
-
-
-module.exports = {
-    rootDir: rootPath,
-    // Automatically clear mock calls and instances between every test
-    clearMocks: true,
-    // The directory where Jest should output its coverage files
-    coverageDirectory: '<rootDir>/coverage',
-    // An array of regexp pattern strings used to skip coverage collection
-    coveragePathIgnorePatterns: ['\\\\node_modules\\\\', 'tests'],
-
-    // An array of file extensions your modules use
-    moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
-
-    // Automatically reset mock state between every test
-    // resetMocks: true,
-
-    testMatch: ['**/*.(test|tests|spec|specs).+(ts|tsx|js)'],
-
-    // This option allows the use of a custom results processor
-    // testResultsProcessor: 'jest-sonar-reporter',
-
-    // A map from regular expressions to paths to transformers
-    transform: {
-        '^.+\\.(ts|tsx)$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.json' }],
-    },
-};

package/tsconfig/lambda/tsconfig.json

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

package/webpack/base/globalConfig.js

@@ -1,71 +0,0 @@
-const excludeNodeModulesExceptCentreonUi =
-  /node_modules(\\|\/)\.pnpm(\\|\/)(?!(@centreon))/;
-
-module.exports = {
-  cache: false,
-  excludeNodeModulesExceptCentreonUi,
-  getModuleConfiguration: (jscTransformConfiguration) => ({
-    rules: [
-      {
-        parser: { system: false },
-        test: /\.[cm]?(j|t)sx?$/
-      },
-      {
-        exclude: [excludeNodeModulesExceptCentreonUi],
-        test: /\.[jt]sx?$/,
-        use: {
-          loader: 'swc-loader',
-          options: {
-            jsc: {
-              parser: {
-                syntax: 'typescript',
-                tsx: true
-              },
-              transform: jscTransformConfiguration
-            }
-          }
-        }
-      },
-      {
-        test: /\.icon.svg$/,
-        use: ['@svgr/webpack']
-      },
-      {
-        exclude: excludeNodeModulesExceptCentreonUi,
-        test: /\.(bmp|png|jpg|jpeg|gif|svg)$/,
-        use: [
-          {
-            loader: 'url-loader',
-            options: {
-              limit: 10000,
-              name: '[name].[hash:8].[ext]'
-            }
-          }
-        ]
-      },
-      {
-        generator: {
-          filename: '[name][ext]'
-        },
-        test: /\.(woff|woff2|eot|ttf|otf)$/i,
-        type: 'asset/resource'
-      },
-      {
-        test: /\.css$/i,
-        use: ['style-loader', 'css-loader']
-      }
-    ]
-  }),
-  optimization: {
-    splitChunks: {
-      chunks: 'all',
-      maxSize: 400 * 1024
-    }
-  },
-  output: {
-    chunkFilename: '[name].[chunkhash:8].chunk.js',
-    filename: '[name].[chunkhash:8].js',
-    libraryTarget: 'umd',
-    umdNamedDefine: true
-  }
-};