@centreon/js-config 24.10.2 → 24.10.4

package/biome/base.json

@@ -21,12 +21,10 @@
       "correctness": {
         "noUnusedImports": "error",
         "noUnusedVariables": "error",
-        "useExhaustiveDependencies": "off",
-        "noUnknownUnit": "error",
-        "noUnknownProperty": "error",
-        "noUnknownFunction": "error"
+        "useExhaustiveDependencies": "off"
       },
       "nursery": {
+        "noConsole": "error",
         "noRestrictedImports": {
           "level": "error",
           "options": {
@@ -35,10 +33,12 @@
               "moment": "Using moment is not encouraged."
             }
           }
-        }
+        },
+        "noUnknownFunction": "error",
+        "noUnknownProperty": "error",
+        "noUnknownUnit": "error"
       },
       "suspicious": {
-        "noConsole": "error",
         "useAwait": "error"
       },
       "performance": {

package/cypress/e2e/commands.ts

@@ -166,6 +166,12 @@ Cypress.Commands.add('getContainersLogs', () => {
   return cy.task('getContainersLogs');
 });
 
+Cypress.Commands.add('getContainerMappedPort', (containerName: string, containerPort: number) => {
+  cy.log(`Getting mapped port ${containerPort} of container ${containerName}`);
+
+  return cy.task('getContainerMappedPort', { containerName, containerPort });
+});
+
 interface CopyFromContainerProps {
   destination: string;
   name?: string;
@@ -290,7 +296,15 @@ Cypress.Commands.add('logoutViaAPI', (): Cypress.Chainable => {
   return cy
     .request({
       method: 'GET',
-      url: '/centreon/authentication/logout'
+      url: '/centreon/authentication/logout',
+      failOnStatusCode: false,
+    })
+    .then((response) => {
+      if (response.status !== 200 && response.status !== 302) {
+        cy.log(`Logout failed with status: ${response.status}`);
+        throw new Error(`Logout API returned unexpected status: ${response.status}`);
+      }
+      cy.log(`Logout successful with status: ${response.status}`);
     })
     .visit('/')
     .getByLabel({ label: 'Alias', tag: 'input' });
@@ -511,103 +525,111 @@ Cypress.Commands.add(
   }
 );
 
-Cypress.Commands.add('stopContainers', (): Cypress.Chainable => {
-  cy.log('Stopping containers ...');
-
-  const logDirectory = `results/logs/${Cypress.spec.name.replace(
-    artifactIllegalCharactersMatcher,
-    '_'
-  )}/${Cypress.currentTest.title.replace(
-    artifactIllegalCharactersMatcher,
-    '_'
-  )}`;
+Cypress.Commands.add(
+  'getLogDirectory',
+  (): Cypress.Chainable => {
+    const logDirectory = `results/logs/${Cypress.spec.name.replace(
+        artifactIllegalCharactersMatcher,
+        '_'
+      )}/${Cypress.currentTest.title.replace(
+        artifactIllegalCharactersMatcher,
+        '_'
+      )}`;
 
-  const name = 'web';
+    return cy
+      .createDirectory(logDirectory)
+      .exec(`chmod -R 755 "${logDirectory}"`)
+      .wrap(logDirectory);
+  }
+);
 
-  return cy
-    .visitEmptyPage()
-    .createDirectory(logDirectory)
-    .getContainersLogs()
-    .then((containersLogs: Array<Array<string>>) => {
-      if (!containersLogs) {
-        return;
-      }
+interface CopyWebContainerLogsProps {
+  name: string;
+}
 
-      Object.entries(containersLogs).forEach(([containerName, logs]) => {
-        cy.writeFile(
-          `results/logs/${Cypress.spec.name.replace(
-            artifactIllegalCharactersMatcher,
-            '_'
-          )}/${Cypress.currentTest.title.replace(
-            artifactIllegalCharactersMatcher,
-            '_'
-          )}/container-${containerName}.log`,
-          logs
-        );
-      });
-    })
-    .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'
-    })
-    .copyFromContainer({
-      destination: `${logDirectory}/centreon-gorgone`,
-      name,
-      source: '/var/log/centreon-gorgone'
-    })
-    .then(() => {
+Cypress.Commands.add(
+  'copyWebContainerLogs',
+  ({ name }: CopyWebContainerLogsProps): Cypress.Chainable => {
+    cy.log(`Getting logs from container ${name} ...`);
+
+    return cy.getLogDirectory().then((logDirectory) => {
+      let sourcePhpLogs = '/var/log/php8.2-fpm-centreon-error.log';
+      let targetPhpLogs = `${logDirectory}/php8.2-fpm-centreon-error.log`;
+      let sourceApacheLogs = '/var/log/apache2';
+      let targetApacheLogs = `${logDirectory}/apache2`;
       if (Cypress.env('WEB_IMAGE_OS').includes('alma')) {
-        return cy.copyFromContainer({
-          destination: `${logDirectory}/php`,
-          name,
-          source: '/var/log/php-fpm'
-        });
+        sourcePhpLogs = '/var/log/php-fpm';
+        targetPhpLogs = `${logDirectory}/php`;
+        sourceApacheLogs = '/var/log/httpd';
+        targetApacheLogs = `${logDirectory}/httpd`;
       }
 
-      return cy.copyFromContainer(
-        {
-          destination: `${logDirectory}/php8.1-fpm-centreon-error.log`,
+      return cy
+        .copyFromContainer({
+          destination: `${logDirectory}/broker`,
           name,
-          source: '/var/log/php8.1-fpm-centreon-error.log'
-        },
-        { failOnNonZeroExit: false }
-      );
-    })
-    .then(() => {
-      if (Cypress.env('WEB_IMAGE_OS').includes('alma')) {
-        return cy.copyFromContainer({
-          destination: `${logDirectory}/httpd`,
+          source: '/var/log/centreon-broker'
+        })
+        .copyFromContainer({
+          destination: `${logDirectory}/engine`,
           name,
-          source: '/var/log/httpd'
-        });
-      }
-
-      return cy.copyFromContainer(
-        {
-          destination: `${logDirectory}/apache2`,
+          source: '/var/log/centreon-engine'
+        })
+        .copyFromContainer({
+          destination: `${logDirectory}/centreon`,
           name,
-          source: '/var/log/apache2'
-        },
-        { failOnNonZeroExit: false }
-      );
-    })
-    .exec(`chmod -R 755 "${logDirectory}"`)
-    .task(
-      'stopContainers',
-      {},
-      { timeout: 600000 } // 10 minutes because docker pull can be very slow
-    );
+          source: '/var/log/centreon'
+        })
+        .copyFromContainer({
+          destination: `${logDirectory}/centreon-gorgone`,
+          name,
+          source: '/var/log/centreon-gorgone'
+        })
+        .copyFromContainer({
+          destination: targetPhpLogs,
+          name,
+          source: sourcePhpLogs,
+        })
+        .copyFromContainer({
+          destination: targetApacheLogs,
+          name,
+          source: sourceApacheLogs,
+        })
+        .exec(`chmod -R 755 "${logDirectory}"`);
+      });
+});
+
+Cypress.Commands.add('stopContainers', (): Cypress.Chainable => {
+  cy.log('Stopping containers ...');
+
+  const name = 'web';
+
+  return cy
+    .visitEmptyPage()
+    .getLogDirectory()
+    .then((logDirectory) => {
+      return cy
+        .getContainersLogs()
+        .then((containersLogs: Array<Array<string>>) => {
+          if (!containersLogs) {
+            return;
+          }
+
+          Object.entries(containersLogs).forEach(([containerName, logs]) => {
+            cy.writeFile(
+              `${logDirectory}/container-${containerName}.log`,
+              logs
+            );
+          });
+        })
+        .copyWebContainerLogs({ name })
+        .exec(`chmod -R 755 "${logDirectory}"`)
+        .task(
+          'stopContainers',
+          {},
+          { timeout: 600000 } // 10 minutes because docker pull can be very slow
+        );
+    });
 });
 
 Cypress.Commands.add(
@@ -650,40 +672,52 @@ Cypress.Commands.add(
   }
 );
 
-Cypress.Commands.add(
-  'insertDashboardWithWidget',
-  (dashboardBody, patchBody) => {
-    cy.request({
-      body: {
-        ...dashboardBody
+Cypress.Commands.add('insertDashboardWithWidget', (dashboardBody, patchBody, widgetName, widgetType) => {
+  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 }
+    );
+
+    const formData = new FormData();
+
+    formData.append('panels[0][name]', widgetName);
+    formData.append('panels[0][widget_type]', widgetType);
+
+    formData.append('panels[0][layout][x]', '0');
+    formData.append('panels[0][layout][y]', '0');
+    formData.append('panels[0][layout][width]', '12');
+    formData.append('panels[0][layout][height]', '3');
+    formData.append('panels[0][layout][min_width]', '2');
+    formData.append('panels[0][layout][min_height]', '2');
+
+    formData.append('panels[0][widget_settings]', JSON.stringify(patchBody));
+
+    cy.request({
       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}`
-      });
+      url: `/centreon/api/latest/configuration/dashboards/${dashboardId}`,
+      body: formData,
+      headers: {
+        'Content-Type': 'multipart/form-data',
+      },
+    }).then((patchResponse) => {
+      console.log('Widget added successfully:', patchResponse);
     });
-  }
-);
+  });
+});
 
 interface ShareDashboardToUserProps {
   dashboardName: string;
@@ -699,29 +733,48 @@ 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: {
+type PatchDashboardBody = {
+  widget_settings: {
+      data: {
+          resources: Array<{
+              resourceType: string;
+              resources: Array<{
+                  id: number;
+                  name: string;
+              }>;
+          }>;
+          metrics: Array<{
+              criticalHighThreshold: number;
+              criticalLowThreshold: number;
+              id: number;
+              name: string;
+              unit: string;
+              warningHighThreshold: number;
+              warningLowThreshold: number;
+          }>;
+      };
       options: {
-        description: {
-          content: string;
-          enabled: boolean;
-        };
-        name: string;
+          timeperiod: {
+              start: any;
+              end: any;
+              timePeriodType: number;
+          };
+          threshold: {
+              enabled: boolean;
+              customCritical: any;
+              criticalType: string;
+              customWarning: any;
+              warningType: string;
+          };
+          refreshInterval: string;
+          curveType: string;
+          description: {
+              content: string;
+              enabled: boolean;
+          };
       };
-    };
-    widget_type: string;
-  }>;
-}
+  };
+};
 
 Cypress.Commands.add(
   'shareDashboardToUser',
@@ -772,6 +825,71 @@ Cypress.Commands.add('getTimeFromHeader', (): Cypress.Chainable => {
     });
 });
 
+Cypress.Commands.add('insertDashboardWithDoubleWidget', (dashboardBody, patchBody1, patchBody2, widgetName, widgetType) => {
+  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 }
+    );
+
+    const formData = new FormData();
+
+    // Panel 1
+    formData.append('panels[0][name]', widgetName);
+    formData.append('panels[0][widget_type]', widgetType);
+    formData.append('panels[0][layout][x]', '0');
+    formData.append('panels[0][layout][y]', '0');
+    formData.append('panels[0][layout][width]', '12');
+    formData.append('panels[0][layout][height]', '3');
+    formData.append('panels[0][layout][min_width]', '2');
+    formData.append('panels[0][layout][min_height]', '2');
+    formData.append('panels[0][widget_settings]', JSON.stringify(patchBody1));
+
+    // Panel 2
+    formData.append('panels[1][name]', widgetName);
+    formData.append('panels[1][widget_type]', widgetType);
+    formData.append('panels[1][layout][x]', '0');
+    formData.append('panels[1][layout][y]', '3');
+    formData.append('panels[1][layout][width]', '12');
+    formData.append('panels[1][layout][height]', '3');
+    formData.append('panels[1][layout][min_width]', '2');
+    formData.append('panels[1][layout][min_height]', '2');
+    formData.append('panels[1][widget_settings]', JSON.stringify(patchBody2));
+
+    // Log form data
+    const dataToLog = {};
+    formData.forEach((value, key) => {
+      dataToLog[key] = value;
+    });
+
+    console.log('FormData before POST:', JSON.stringify(dataToLog, null, 2));
+
+    cy.request({
+      method: 'POST',
+      url: `/centreon/api/latest/configuration/dashboards/${dashboardId}`,
+      body: formData,
+      headers: {
+        'Content-Type': 'multipart/form-data',
+      },
+    }).then((patchResponse) => {
+      console.log('Widget added successfully:', patchResponse);
+    });
+  });
+});
+
 declare global {
   namespace Cypress {
     interface Chainable {
@@ -784,6 +902,7 @@ declare global {
         props: CopyToContainerProps,
         options?: Partial<Cypress.ExecOptions>
       ) => Cypress.Chainable;
+      copyWebContainerLogs: (props: CopyWebContainerLogsProps) => Cypress.Chainable;
       createDirectory: (directoryPath: string) => Cypress.Chainable;
       execInContainer: (
         props: ExecInContainerProps,
@@ -802,7 +921,9 @@ declare global {
       getContainerId: (containerName: string) => Cypress.Chainable;
       getContainerIpAddress: (containerName: string) => Cypress.Chainable;
       getContainersLogs: () => Cypress.Chainable;
+      getContainerMappedPort: (containerName: string, containerPort: number) => Cypress.Chainable;
       getIframeBody: () => Cypress.Chainable;
+      getLogDirectory: () => Cypress.Chainable;
       getTimeFromHeader: () => Cypress.Chainable;
       getWebVersion: () => Cypress.Chainable;
       hoverRootMenuItem: (rootItemNumber: number) => Cypress.Chainable;
@@ -810,7 +931,16 @@ declare global {
       insertDashboardList: (fixtureFile: string) => Cypress.Chainable;
       insertDashboardWithWidget: (
         dashboard: Dashboard,
-        patch: PatchDashboardBody
+        patchBody:  Record<string, any>,
+        widgetName:string,
+        widgetType:string
+      ) => Cypress.Chainable;
+      insertDashboardWithDoubleWidget: (
+        dashboard: Dashboard,
+        patchBody1: Record<string, any>,
+        patchBody2: Record<string, any>,
+        widgetName: string,
+        widgetType: string
       ) => Cypress.Chainable;
       loginAsAdminViaApiV2: () => Cypress.Chainable;
       loginByTypeOfUser: ({

package/cypress/e2e/configuration.ts

@@ -50,14 +50,24 @@ export default ({
       },
       setupNodeEvents: async (cypressOn, config) => {
         const on = require('cypress-on-fix')(cypressOn)
-        installLogsPrinter(on);
+        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,
@@ -65,6 +75,7 @@ export default ({
       OPENID_IMAGE_VERSION: process.env.MAJOR || '24.04',
       SAML_IMAGE_VERSION: process.env.MAJOR || '24.04',
       STABILITY: 'unstable',
+      TARGET_STABILITY: 'unstable',
       WEB_IMAGE_OS: 'alma9',
       WEB_IMAGE_VERSION: webImageVersion
     },

package/cypress/e2e/plugins.ts

@@ -36,36 +36,27 @@ export default (
   });
 
   on('after:run', (results) => {
-    const testRetries: { [key: string]: boolean } = {};
+    const testRetries: { [key: string]: Number } = {};
     if ('runs' in results) {
       results.runs.forEach((run) => {
         run.tests.forEach((test) => {
-          if (test.attempts && test.attempts.length > 1) {
+          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] = true;
+            testRetries[testTitle] = test.attempts.length - 1;
           }
         });
       });
     }
 
-    console.log('After run results:', results);
-    console.log('Test retries:', testRetries);
-
     // Save the testRetries object to a file in the e2e/results directory
     const resultFilePath = path.join(
       __dirname,
       '../../../../tests/e2e/results',
-      'hasRetries.json'
+      'retries.json'
     );
-    if (results.totalFailed > 0) {
-      fs.writeFileSync(resultFilePath, '{}');
-    } else if (Object.keys(testRetries).length > 0) {
-      // If tests succeeded but there were retries, write the retries to the file
-      fs.writeFileSync(resultFilePath, JSON.stringify(testRetries, null, 2));
-    } else {
-      // If no retries, empty the file
-      fs.writeFileSync(resultFilePath, '{}');
-    }
+
+    fs.writeFileSync(resultFilePath, JSON.stringify(testRetries, null, 2));
   });
 
   return config;

package/cypress/e2e/tasks.ts

@@ -18,6 +18,13 @@ interface Containers {
   [key: string]: StartedTestContainer;
 }
 
+class NotFoundContainerError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'NotFoundContainerError';
+  }
+}
+
 export default (on: Cypress.PluginEvents): void => {
   let dockerEnvironment: StartedDockerComposeEnvironment | null = null;
   const containers: Containers = {};
@@ -30,7 +37,7 @@ export default (on: Cypress.PluginEvents): void => {
     } else if (containers[containerName]) {
       container = containers[containerName];
     } else {
-      throw new Error(`Cannot get container ${containerName}`);
+      throw new NotFoundContainerError(`Cannot get container ${containerName}`);
     }
 
     return container;
@@ -55,21 +62,23 @@ 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);
-              });
+        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);
+        if (error instanceof NotFoundContainerError) {
+          console.log(`Cannot get ${source} from container ${serviceName} because it doesn't exist.`);
+        } else {
+          console.error(error);
+        }
       }
 
       return null;
@@ -140,6 +149,11 @@ export default (on: Cypress.PluginEvents): void => {
         return null;
       }
     },
+    getContainerMappedPort: async ({ containerName, containerPort }) => {
+      const container = getContainer(containerName);
+
+      return container.getMappedPort(containerPort);
+    },
     requestOnDatabase: async ({ database, query }) => {
       let container: StartedTestContainer | null = null;
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@centreon/js-config",
     "description": "Centreon Frontend shared build configuration",
-    "version": "24.10.2",
+    "version": "24.10.4",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/centreon/centreon-frontend.git"

package/rspack/base/globalConfig.js

@@ -63,8 +63,12 @@ module.exports = {
     }
   },
   output: {
-    chunkFilename: '[name].[chunkhash:8].chunk.js',
-    filename: '[name].[chunkhash:8].js',
+    chunkFilename: isDev
+      ? '[name].[chunkhash:8].chunk.js'
+      : '[name].[contenthash].[chunkhash].[hash].js',
+    filename: isDev
+      ? '[name].[chunkhash:8].js'
+      : '[name].[contenthash].[hash].js',
     libraryTarget: 'umd',
     umdNamedDefine: true
   }

package/rspack/patch/devServer.js

@@ -13,7 +13,9 @@ const externalInterface = Object.keys(interfaces).find(
     !process.env.IS_STATIC_PORT_FORWARDED
 );
 
-const devServerAddress = 'localhost';
+const devServerAddress = externalInterface
+  ? interfaces[externalInterface][0].address
+  : 'localhost';
 
 const publicPath = `http://${devServerAddress}:${devServerPort}/static/`;