Merge branch 'main' into dependabot/npm_and_yarn/main/mantine/core-7.…

…15.2
greenbone · Jan 7, 2025 · fcc352a · fcc352a
2 parents ca0fcd7 + 2493586
commit fcc352a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 2 deletions.
diff --git a/.docker/prod.Dockerfile b/.docker/prod.Dockerfile
@@ -1,7 +1,7 @@
 ARG VERSION=stable
 ARG DEBIAN_FRONTEND=noninteractive
 
-FROM debian:stable-slim as builder
+FROM debian:stable-slim AS builder
 
 ENV NODE_VERSION=node_18.x
 ENV NODE_KEYRING=/usr/share/keyrings/nodesource.gpg

diff --git a/eslint.config.js b/eslint.config.js
@@ -84,6 +84,12 @@ export default [
       'no-prototype-builtins': 'off',
       'no-case-declarations': 'off',
       'react-hooks/exhaustive-deps': 'warn',
+      'no-console': [
+        'warn',
+        {
+          allow: ['warn', 'error', 'info'],
+        },
+      ],
       'header/header': [
         2,
         'block',

diff --git a/src/gmp/log.js b/src/gmp/log.js
@@ -43,6 +43,7 @@ class Logger {
         logValue < newLogValue
           ? noop
           : (...args) => {
+              // eslint-disable-next-line no-console
               return console[logName](
                 '%c' + this.name,
                 'color: ' + GREENBONE_GREEN,

diff --git a/src/gmp/models/__tests__/schedule.js b/src/gmp/models/__tests__/schedule.js
@@ -48,6 +48,7 @@ describe('Schedule model tests', () => {
   });
 
   test('should handle invalid ical data safely', () => {
+    // eslint-disable-next-line no-console
     const consoleError = console.log;
     const errorLog = testing.fn();
 

diff --git a/src/web/components/dialog/content.jsx b/src/web/components/dialog/content.jsx
@@ -11,6 +11,7 @@ const DialogContent = styled.div`
   height: inherit;
   padding: 0;
   gap: 20px;
+  white-space: pre-line;
 `;
 
 export default DialogContent;
diff --git a/src/web/entities/footer.jsx b/src/web/entities/footer.jsx
@@ -55,7 +55,7 @@ export const EntitiesFooter = ({
     const configMap = {
       [DIALOG_TYPES.DELETE]: {
         dialogText: _(
-          'Are you sure you want to delete all rows in the page of the table? This action cannot be undone.',
+          'Are you sure you want to delete all rows in the page of the table?\n This action cannot be undone.',
         ),
         dialogTitle: _('Confirm Deletion'),
         dialogButtonTitle: _('Delete'),