Merge branch 'dev' into improvement/FRM/allow-blob-img-src

Author: graduta

Control/package-lock.json

@@ -46,7 +46,7 @@
     "nock": "^15.0.0",
     "nyc": "^17.1.0",
     "proxyquire": "^2.1.3",
-    "puppeteer": "^24.32.1",
+    "puppeteer": "^24.33.0",
     "sinon": "21.0.0",
     "supertest": "7.1.0"
   },

Control/package.json

@@ -37,11 +37,11 @@
     "@eslint/js": "^9.39.1",
     "@stylistic/eslint-plugin": "^5.6.1",
     "eslint": "^9.39.1",
-    "eslint-plugin-jsdoc": "^61.4.1",
+    "eslint-plugin-jsdoc": "^61.5.0",
     "globals": "^16.5.0",
     "mocha": "^11.7.0",
     "nyc": "^17.1.0",
-    "puppeteer": "^24.31.0",
+    "puppeteer": "^24.33.0",
     "sinon": "^21.0.0"
   },
   "bundleDependencies": [

InfoLogger/package-lock.json

@@ -16,7 +16,7 @@
 import { LogManager } from '@aliceo2/web-ui';
 import { realpath } from 'node:fs/promises';
 import { dirname, join } from 'path';
-import { fileURLToPath } from 'url';
+import { fileURLToPath, pathToFileURL } from 'url';
 
 const logger = LogManager.getLogger(`${process.env.npm_config_log_label ?? 'qcg'}/config`);
 
@@ -27,7 +27,7 @@ let configFilePath = _getConfigurationFilePath();
 
 try {
   configFilePath = await realpath(configFilePath);
-  ({ config } = await import(configFilePath));
+  ({ config } = await import(pathToFileURL(configFilePath).href));
 
   logger.info(`Configuration file successfully read from: "${configFilePath}"`);
 } catch (err) {

InfoLogger/package.json

@@ -54,7 +54,7 @@
     "eslint-plugin-jsdoc": "^61.5.0",
     "globals": "^16.5.0",
     "nock": "^15.0.0",
-    "puppeteer": "^24.31.0",
+    "puppeteer": "^24.33.0",
     "sequelize-cli": "^6.6.2",
     "sinon": "^21.0.0",
     "supertest": "^7.1.0"

QualityControl/lib/config/configProvider.js

@@ -155,3 +155,35 @@
 .cursor-pointer {
   cursor: pointer;
 }
+
+.header-layout {
+  &.edit {
+    display: flex;
+  }
+
+  /*
+   * Hack to center content: `justify-content: center` fails with `overflow-x: auto`
+   *  (see https://stackoverflow.com/questions/62288432/problem-when-using-with-overflow-x-scroll-and-justify-content-center).
+   * Adding flex: 1 auto-margins on ::before/::after centers the content correctly for scrolling.
+   */
+  &::after,
+  &::before {
+    content: '';
+    flex: 1;
+  }
+}
+
+.header-layout-tabs {
+  display: flex;
+  overflow-x: auto;
+  overflow-y: hidden;
+  padding-bottom: 2px;
+}
+
+.flex-fixed {
+  flex: 0 0 auto;
+}
+
+.whitespace-nowrap {
+  white-space: nowrap;
+}

QualityControl/package-lock.json

@@ -32,14 +32,15 @@ import { filtersPanel } from './filters/filterViews.js';
  */
 export default (model) => {
   const specific = headerSpecific(model) || {};
-  const { centerCol, rightCol } = specific;
+  const { centerCol, rightCol, subRow } = specific;
 
   return h('.flex-col', [
     h('.flex-row.p2.items-center', { id: 'qcg-header' }, [
       commonHeader(model),
       centerCol || h('.flex-grow'),
       rightCol || h('.w-25'),
     ]),
+    subRow && h('.p2', [subRow]),
     filterSpecific(model),
   ]);
 };