Merge branch 'main' into mboulais/O2B-1393/use-certificate-when-handling-lost-runs-and-envs

Author: martinboulais

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.5.0](https://github.com/AliceO2Group/Bookkeeping/releases/tag/%40aliceo2%2Fbookkeeping%401.5.0)
+* Notable changes for users:
+  * Added nTF orbits to runs updated runs API endpoints accordingly
+  * Added a global error page, displaying amongst other 404 error
+* Notable changes for developers:
+  * Fixed randomly failing runs test based on timerange selection (start/stop)
+  * Fixed randomly failing QC tests
+  * Updated docker ca-certificate dependency
+  * Allow to prefill of on-call template through URL parameters:
+    * In log creation page, query parameters `templateKey`, `issueDescription`, `detectorOrSubsystem` allow
+      respectively to pre-chose a log template and define the issue description and detector or subsystem in the
+      case of on-call template
+
 ## [1.4.1](https://github.com/AliceO2Group/Bookkeeping/releases/tag/%40aliceo2%2Fbookkeeping%401.4.1)
 * Notable changes for developers:
   * Fixed the runs start/stop extraction from AliECS kafka messages

Dockerfile

@@ -22,7 +22,7 @@ RUN apk add --no-cache \
     freetype=2.13.0-r5 \
     freetype-dev=2.13.0-r5 \
     harfbuzz=7.3.0-r0 \
-    ca-certificates=20241121-r0
+    ca-certificates=20241121-r1
 
 # Tell Puppeteer to skip installing Chrome. We'll be using the installed package.
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true

lib/public/Model.js

@@ -38,6 +38,7 @@ import { ObservableData } from './utilities/ObservableData.js';
 import { BkpRoles } from './domain/enums/BkpRoles.js';
 import { getRoleForDetector } from './utilities/getRoleForDetector.js';
 import { detectorsProvider } from './services/detectors/detectorsProvider.js';
+import { ErrorModel } from './views/Error/ErrorModel.js';
 
 /**
  * Root of model tree
@@ -168,6 +169,12 @@ export default class Model extends Observable {
         this.aboutModel = new AboutModel();
         this.aboutModel.bubbleTo(this);
 
+        /**
+         * @type {ErrorModel}
+         */
+        this.errorModel = new ErrorModel();
+        this.errorModel.bubbleTo(this);
+
         // Setup router
         this.router = new QueryRouter();
         this.router.observe(this.handleLocationChange.bind(this));
@@ -309,9 +316,22 @@ export default class Model extends Observable {
             case 'eos-report-create':
                 this.eosReportModel.loadCreation(this.router.params.shiftType);
                 break;
-            default:
-                this.router.go('?page=home');
+            case 'error':
                 break;
+            default:
+                if (this.router.params.page) {
+                    this.errorModel.setError({
+                        code: '404',
+                        codeDescription: 'Page not found',
+                        message: 'The page you are looking for might have been removed, had its name changed or is temorarily unavailable.',
+                    });
+                    this.router.params.page = 'error';
+                    this.router.notify();
+                    break;
+                } else {
+                    this.router.go('?page=home');
+                    break;
+                }
         }
     }
 

lib/public/components/qcFlags/qcFlagsBreadcrumbs.js

@@ -22,29 +22,33 @@ export const qcFlagsBreadcrumbs = ({ remoteDataPass, remoteSimulationPass, remot
     }
 
     return breadcrumbs([
-        h('h2', header),
-        remoteDataPass && remoteDataPass.match({
-            Success: ({ id, name }) => h('h2', frontLink(name, 'runs-per-data-pass', { dataPassId: id })),
+        h('h2#breadcrumb-header', header),
+        remoteDataPass?.match({
+            Success: ({ id, name }) => h('h2#breadcrumb-data-pass-name', frontLink(name, 'runs-per-data-pass', { dataPassId: id })),
             Failure: () => tooltip(h('.f3', iconWarning()), 'Not able to load data pass info'),
             Loading: () => h('', spinner({ size: 2, absolute: false })),
             NotAsked: () => tooltip(h('.f3', iconWarning()), 'No data pass data was asked for'),
         }),
-        remoteSimulationPass && remoteSimulationPass.match({
-            Success: ({ id, name }) => h('h2', frontLink(name, 'runs-per-simulation-pass', { simulationPassId: id })),
+        remoteSimulationPass?.match({
+            Success: ({ id, name }) => h(
+                'h2#breadcrumb-simulation-pass-name',
+                frontLink(name, 'runs-per-simulation-pass', { simulationPassId: id }),
+            ),
             Failure: () => tooltip(h('.f3', iconWarning()), 'Not able to load simulation pass info'),
             Loading: () => h('', spinner({ size: 2, absolute: false })),
             NotAsked: () => tooltip(h('.f3', iconWarning()), 'No simulation pass data was asked for'),
         }),
         remoteRun.match({
-            Success: ({ runNumber, runQuality }) => runQuality === RunQualities.BAD
-                ? h('h2.danger', frontLink(runNumber, 'run-detail', { runNumber }))
-                : h('h2', frontLink(runNumber, 'run-detail', { runNumber })),
+            Success: ({ runNumber, runQuality }) => h(
+                `h2#breadcrumb-run-number${runQuality === RunQualities.BAD ? '.danger' : ''}`,
+                frontLink(runNumber, 'run-detail', { runNumber }),
+            ),
             Failure: () => tooltip(h('.f3', iconWarning()), 'Not able to load run info'),
             Loading: () => h('', spinner({ size: 2, absolute: false })),
             NotAsked: () => tooltip(h('.f3', iconWarning()), 'No run data was asked for'),
         }),
-        remoteDplDetector && remoteDplDetector.match({
-            Success: (dplDetector) => h('h2', dplDetector.name),
+        remoteDplDetector?.match({
+            Success: (dplDetector) => h('h2#breadcrumb-detector-name', dplDetector.name),
             Failure: () => tooltip(h('.f3', iconWarning()), 'Not able to load detector info'),
             Loading: () => h('', spinner({ size: 2, absolute: false })),
             NotAsked: () => tooltip(h('.f3', iconWarning()), 'No detector data was asked for'),

lib/public/view.js

@@ -53,6 +53,7 @@ import { QcFlagDetailsForDataPassPage } from './views/QcFlags/details/forDataPas
 import { QcFlagDetailsForSimulationPassPage } from './views/QcFlags/details/forSimulationPass/QcFlagDetailsForSimulationPassPage.js';
 import { GaqFlagsOverviewPage } from './views/QcFlags/GaqFlags/GaqFlagsOverviewPage.js';
 import { SynchronousQcFlagsOverviewPage } from './views/QcFlags/Synchronous/SynchronousQcFlagsOverviewPage.js';
+import { ErrorPage } from './views/Error/index.js';
 
 /**
  * Main view layout
@@ -114,6 +115,8 @@ export default (model) => {
         'tag-create': TagCreate,
 
         'eos-report-create': EosReportCreationPage,
+
+        error: ErrorPage,
     };
 
     return [

lib/public/views/DataPasses/PerSimulationPassOverview/DataPassesPerSimulationPassOverviewPage.js

@@ -53,7 +53,7 @@ export const DataPassesPerSimulationPassOverviewPage = ({ dataPasses: {
 
     const { items, simulationPass, pagination } = dataPassesPerSimulationPassOverviewModel;
 
-    const commonTitle = h('h2', 'Data Passes per MC');
+    const commonTitle = h('h2#breadcrumb-header', 'Data Passes per MC');
 
     return h('', {
         onremove: () => dataPassesPerSimulationPassOverviewModel.reset(),
@@ -63,7 +63,7 @@ export const DataPassesPerSimulationPassOverviewPage = ({ dataPasses: {
             h(
                 '.flex-row.g1.items-center',
                 simulationPass.match({
-                    Success: (payload) => breadcrumbs([commonTitle, h('h2', payload.name)]),
+                    Success: (payload) => breadcrumbs([commonTitle, h('h2#breadcrumb-simulation-pass-name', payload.name)]),
                     Failure: () => [commonTitle, tooltip(h('.f3', iconWarning()), 'Not able to load simulation pass info')],
                     Loading: () => [commonTitle, h('', spinner({ size: 2, absolute: false }))],
                     NotAsked: () => [commonTitle, tooltip(h('.f3', iconWarning()), 'No data was asked for')],

lib/public/views/Error/ErrorModel.js

@@ -0,0 +1,61 @@
+/**
+ * @license
+ * Copyright CERN and copyright holders of ALICE O2. This software is
+ * distributed under the terms of the GNU General Public License v3 (GPL
+ * Version 3), copied verbatim in the file "COPYING".
+ *
+ * See http://alice-o2.web.cern.ch/license for full licensing information.
+ *
+ * In applying this license CERN does not waive the privileges and immunities
+ * granted to it by virtue of its status as an Intergovernmental Organization
+ * or submit itself to any jurisdiction.
+ */
+
+import { Observable } from '/js/src/index.js';
+
+/**
+ * Model representing handlers for errorPage.js
+ */
+export class ErrorModel extends Observable {
+    /**
+     * The ApplicationError object.
+     * @typedef {(object)} ApplicationError
+     * @property {string} code - The error code
+     * @property {string} codeDescription - The description of the error code
+     * @property {string} message - The error message
+     */
+
+    /**
+     * The constructor for the Error model object
+     * @returns {object} Constructs the Error model
+     */
+    constructor() {
+        super();
+        this.error = {
+            code: 'Unknown Error',
+            codeDescription: 'Something unexpected happened.',
+            message: 'Please try again later.',
+        };
+    }
+
+    /**
+     * Sets the error object for the model
+     * @param {ApplicationError} error The error object
+     * @returns {void}
+     */
+    setError(error) {
+        if (!error.code || !error.codeDescription || !error.message) {
+            return;
+        }
+        this.error = error;
+        this.notify();
+    }
+
+    /**
+     * Returns the error object for the model
+     * @returns {ApplicationError} The error object
+     */
+    getError() {
+        return this.error;
+    }
+}

lib/public/views/Error/index.js

@@ -0,0 +1,42 @@
+/**
+ * @license
+ * Copyright CERN and copyright holders of ALICE O2. This software is
+ * distributed under the terms of the GNU General Public License v3 (GPL
+ * Version 3), copied verbatim in the file "COPYING".
+ *
+ * See http://alice-o2.web.cern.ch/license for full licensing information.
+ *
+ * In applying this license CERN does not waive the privileges and immunities
+ * granted to it by virtue of its status as an Intergovernmental Organization
+ * or submit itself to any jurisdiction.
+ */
+import { frontLink } from '../../components/common/navigation/frontLink.js';
+import { h, iconHome } from '/js/src/index.js';
+
+/**
+ * Error page component that dynamically displays error details based on the model
+ * @param {Model} model - Represents the current application state
+ * @returns {Component} Error page component
+ */
+export const ErrorPage = (model) => {
+    const { code, codeDescription, message } = model.errorModel.error;
+    return h('div.flex-column.justify-center ', [
+        h('.flex-column.items-center.g3.mv4', [
+            h('img', {
+                src: 'assets/alice.png',
+                alt: 'Alice logo',
+                style: 'width: 200px',
+            }),
+            h('h2', 'Oops! Something went wrong.'),
+            h('h3', `${code} - ${codeDescription}`),
+            h('.f5', message),
+            frontLink(
+                h('div.flex-row.justify-center.items-center.g1', [
+                    iconHome(),
+                    'Go to Home Page',
+                ]),
+                'home',
+            ),
+        ]),
+    ]);
+};

lib/public/views/Runs/RunPerDataPass/RunsPerDataPassOverviewPage.js

@@ -200,7 +200,7 @@ export const RunsPerDataPassOverviewPage = ({
         ),
     };
 
-    const commonTitle = h('h2', { style: 'white-space: nowrap;' }, 'Physics Runs');
+    const commonTitle = h('h2#breadcrumb-header', { style: 'white-space: nowrap;' }, 'Physics Runs');
 
     return h('', { onremove: () => perDataPassOverviewModel.reset(false) }, [
         h('.flex-row.justify-between.items-center.g2', [
@@ -210,7 +210,7 @@ export const RunsPerDataPassOverviewPage = ({
                 '.flex-row.g1.items-center',
                 remoteDataPass.match({
                     Success: (dataPass) => h('.flex-row.items-center.g1', [
-                        breadcrumbs([commonTitle, h('h2', dataPass.name)]),
+                        breadcrumbs([commonTitle, h('h2#breadcrumb-data-pass-name', dataPass.name)]),
                         h('#skimmableControl', skimmableControl(
                             dataPass,
                             () => {

lib/public/views/Runs/RunsPerSimulationPass/RunsPerSimulationPassOverviewPage.js

@@ -95,13 +95,13 @@ export const RunsPerSimulationPassOverviewPage = ({
         ),
     };
 
-    const commonTitle = h('h2', 'Runs per MC');
+    const commonTitle = h('h2#breadcrumb-header', 'Runs per MC');
     return h('', [
         h('.flex-row.justify-between.items-center.g2', [
             h(
                 '.flex-row.g1.items-center',
                 remoteSimulationPass.match({
-                    Success: ({ name }) => breadcrumbs([commonTitle, h('h2', name)]),
+                    Success: ({ name }) => breadcrumbs([commonTitle, h('h2#breadcrumb-simulation-pass-name', name)]),
                     Failure: () => [commonTitle, tooltip(h('.f3', iconWarning()), 'Not able to load simulation pass info')],
                     Loading: () => [commonTitle, h('', spinner({ size: 2, absolute: false }))],
                     NotAsked: () => [commonTitle, tooltip(h('.f3', iconWarning()), 'No data was asked for')],