Merge branch 'main' into improv/O2B-1533/Move-AOT-MUON-columns

Author: isaachilly

lib/database/migrations/v1/20260305110000-add-qcf-run-detector-index.js

@@ -0,0 +1,28 @@
+/*
+ *  @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.
+ */
+
+'use strict';
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+    up: async (queryInterface) => queryInterface.sequelize.transaction(async (transaction) => {
+        await queryInterface.addIndex('quality_control_flags', {
+            name: 'quality_control_flags_run_detector_idx',
+            fields: ['run_number', 'detector_id'],
+        }, { transaction });
+    }),
+
+    down: async (queryInterface) => queryInterface.sequelize.transaction(async (transaction) => {
+        await queryInterface.removeIndex('quality_control_flags', 'quality_control_flags_run_detector_idx', { transaction });
+    }),
+};

lib/domain/dtos/filters/LhcFillsFilterDto.js

@@ -14,6 +14,7 @@ const Joi = require('joi');
 const { validateRange, RANGE_INVALID } = require('../../../utilities/rangeUtils');
 const { validateBeamTypes, BEAM_TYPE_INVALID } = require('../../../utilities/beamTypeUtils');
 const { validateTimeDuration } = require('../../../utilities/validateTime');
+const { FromToFilterDto } = require('./FromToFilterDto.js');
 
 exports.LhcFillsFilterDto = Joi.object({
     hasStableBeams: Joi.boolean(),
@@ -23,6 +24,8 @@ exports.LhcFillsFilterDto = Joi.object({
     }),
     runDuration: validateTimeDuration,
     beamDuration: validateTimeDuration,
+    stableBeamsStart: FromToFilterDto,
+    stableBeamsEnd: FromToFilterDto,
     schemeName: Joi.string().trim().max(64),
     beamTypes: Joi.string()
         .trim()

lib/public/views/LhcFills/ActiveColumns/lhcFillsActiveColumns.js

@@ -28,6 +28,7 @@ import { fillNumberFilter } from '../../../components/Filters/LhcFillsFilter/fil
 import { durationFilter } from '../../../components/Filters/LhcFillsFilter/durationFilter.js';
 import { beamTypeFilter } from '../../../components/Filters/LhcFillsFilter/beamTypeFilter.js';
 import { schemeNameFilter } from '../../../components/Filters/LhcFillsFilter/schemeNameFilter.js';
+import { timeRangeFilter } from '../../../components/Filters/common/filters/timeRangeFilter.js';
 
 /**
  * List of active columns for a lhc fills table
@@ -65,6 +66,14 @@ export const lhcFillsActiveColumns = {
         visible: true,
         size: 'w-8',
         format: (timestamp) => formatTimestamp(timestamp, false),
+
+        /**
+         * Stable Beam start filter component
+         *
+         * @param {RunsOverviewModel} lhcFillsOverviewModel the lhcFills overview model
+         * @return {Component} the filter component
+         */
+        filter: (lhcFillsOverviewModel) => timeRangeFilter(lhcFillsOverviewModel.filteringModel.get('stableBeamsStart').timeRangeInputModel),
         profiles: {
             lhcFill: true,
             environment: true,
@@ -80,6 +89,14 @@ export const lhcFillsActiveColumns = {
         visible: true,
         size: 'w-8',
         format: (timestamp) => formatTimestamp(timestamp, false),
+
+        /**
+         * Stable Beam end filter component
+         *
+         * @param {LhcFillsOverviewModel} lhcFillsOverviewModel the lhcFills overview model
+         * @return {Component} the filter component
+         */
+        filter: (lhcFillsOverviewModel) => timeRangeFilter(lhcFillsOverviewModel.filteringModel.get('stableBeamsEnd').timeRangeInputModel),
         profiles: {
             lhcFill: true,
             environment: true,

lib/public/views/LhcFills/Overview/LhcFillsOverviewModel.js

@@ -19,6 +19,7 @@ import { OverviewPageModel } from '../../../models/OverviewModel.js';
 import { addStatisticsToLhcFill } from '../../../services/lhcFill/addStatisticsToLhcFill.js';
 import { BeamTypeFilterModel } from '../../../components/Filters/LhcFillsFilter/BeamTypeFilterModel.js';
 import { TextComparisonFilterModel } from '../../../components/Filters/common/filters/TextComparisonFilterModel.js';
+import { TimeRangeFilterModel } from '../../../components/Filters/RunsFilter/TimeRangeFilter.js';
 
 /**
  * Model for the LHC fills overview page
@@ -39,6 +40,8 @@ export class LhcFillsOverviewModel extends OverviewPageModel {
             beamDuration: new TextComparisonFilterModel(),
             runDuration: new TextComparisonFilterModel(),
             hasStableBeams: new StableBeamFilterModel(),
+            stableBeamsStart: new TimeRangeFilterModel(),
+            stableBeamsEnd: new TimeRangeFilterModel(),
             beamTypes: new BeamTypeFilterModel(),
             schemeName: new RawTextFilterModel(),
         });

lib/public/views/Runs/Details/RunPatch.js

@@ -9,6 +9,7 @@ import { RunQualities } from '../../../domain/enums/RunQualities.js';
  * @property {string} category
  * @property {string} title
  * @property {string} description
+ * @property {string|null} [lastEditedName]
  */
 
 /**
@@ -75,7 +76,8 @@ export class RunPatch extends Observable {
         }
 
         if (this._eorReasons.length !== this._run.eorReasons.length || this._eorReasons.some(({ id }) => id === undefined)) {
-            ret.eorReasons = this._eorReasons;
+            // Strip lastEditedName — the server's EorReasonDto only accepts id, reasonTypeId, and description
+            ret.eorReasons = this._eorReasons.map(({ id, reasonTypeId, description }) => ({ id, reasonTypeId, description }));
         }
 
         if (this._hasRunQualityChange()) {
@@ -126,7 +128,12 @@ export class RunPatch extends Observable {
         } = this._run || {};
 
         this._runQuality = runQuality;
-        this._eorReasons = eorReasons.map(({ id, description, reasonTypeId }) => ({ id, description, reasonTypeId }));
+        this._eorReasons = eorReasons.map(({ id, description, reasonTypeId, lastEditedName }) => ({
+            id,
+            description,
+            reasonTypeId,
+            lastEditedName,
+        }));
         this._tags = tags.map(({ text }) => text);
 
         this.formData = {

lib/public/views/Runs/Details/runDetailsComponent.js

@@ -40,7 +40,7 @@ import { RunDefinition } from '../../../domain/enums/RunDefinition.js';
 import { formatFloat } from '../../../utilities/formatting/formatFloat.js';
 import { formatEditableNumber } from '../format/formatEditableNumber.js';
 import { editRunEorReasons } from '../format/editRunEorReasons.js';
-import { formatEorReason } from '../format/formatEorReason.mjs';
+import { formatRunEorReason } from '../format/formatRunEorReason.js';
 import { selectionDropdown } from '../../../components/common/selection/dropdown/selectionDropdown.js';
 import { formatRunCalibrationStatus } from '../format/formatRunCalibrationStatus.js';
 import { BeamModes } from '../../../domain/enums/BeamModes.js';
@@ -533,7 +533,10 @@ export const runDetailsComponent = (runDetailsModel, router) => runDetailsModel.
                             h('#eor-reasons.flex-row', [
                                 runDetailsModel.isEditModeEnabled
                                     ? editRunEorReasons(runDetailsModel)
-                                    : h('.flex-column.g2', run.eorReasons.map((eorReason) => h('.eor-reason', formatEorReason(eorReason)))),
+                                    : h(
+                                        '.flex-column.g2.w-100',
+                                        run.eorReasons.map((eorReason) => h('.eor-reason', formatRunEorReason(eorReason))),
+                                    ),
                             ]),
                         ]),
                     ]),

lib/public/views/Runs/format/editRunEorReasons.js

@@ -94,20 +94,23 @@ export const editRunEorReasons = (runDetailsModel) => {
                  */
                 runDetailsModel.runPatch.eorReasons.length > 0
                     ? runDetailsModel.runPatch.eorReasons.map((eorReason) => {
-                        const { reasonTypeId, description } = eorReason;
+                        const { reasonTypeId, description, lastEditedName } = eorReason;
                         const { category = '-', title } = eorReasonTypes.find((eorReasonType) => eorReasonType.id === reasonTypeId) || {};
                         const titleString = title ? ` - ${title}` : '';
                         const descriptionString = description ? ` - ${description}` : '';
                         return h(
-                            '.flex-row.items-center',
+                            '.flex-row.justify-between',
                             {
                                 key: `${category} ${titleString} ${descriptionString}`,
                             },
                             [
-                                h('label.remove-eor-reason.danger.ph1.actionable-icon', {
-                                    onclick: () => runDetailsModel.runPatch.removeEorReason(eorReason),
-                                }, iconTrash()),
-                                h('.w-wrapped', `${category} ${titleString} ${descriptionString}`),
+                                h('.flex-row.items-center', [
+                                    h('label.remove-eor-reason.danger.ph1.actionable-icon', {
+                                        onclick: () => runDetailsModel.runPatch.removeEorReason(eorReason),
+                                    }, iconTrash()),
+                                    h('.w-wrapped', `${category} ${titleString} ${descriptionString}`),
+                                ]),
+                                h('.w-wrapped', lastEditedName || null),
                             ],
                         );
                     })

lib/public/views/Runs/format/formatRunEorReason.js

@@ -0,0 +1,36 @@
+/**
+ *  @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 { h } from '/js/src/index.js';
+import { tooltip } from '../../../../components/common/popover/tooltip.js';
+import { formatEorReason } from './formatEorReason.mjs';
+
+/**
+ * Display the given EoR reason as a vnode component with lastEditedName tooltip
+ *
+ * @param {Partial<{
+ *   category: string,
+ *   title: string,
+ *   description: string,
+ *   lastEditedName: string,
+ * }>} eorReason the EoR reason to display
+ * @return {VNode} the vnode component
+ */
+export const formatRunEorReason = (eorReason) => {
+    const { lastEditedName } = eorReason;
+    const reasonText = formatEorReason(eorReason);
+    return h('.w-100.flex-row.justify-between', [
+        h('', reasonText),
+        lastEditedName ? tooltip(h('.w-wrapped', lastEditedName), 'Last edited by') : null,
+    ]);
+};

lib/usecases/environment/GetAllEnvironmentsUseCase.js

@@ -23,6 +23,7 @@ const { dataSource } = require('../../database/DataSource.js');
 const { statusAcronyms } = require('../../domain/enums/StatusAcronyms.js');
 const { unpackNumberRange } = require('../../utilities/rangeUtils.js');
 const { splitStringToStringsTrimmed } = require('../../utilities/stringUtils.js');
+const { setTimeRangeQuery } = require('../../utilities/setTimeRangeQuery.js');
 
 /**
  * Subquery to select the latest history item for each environment.
@@ -69,18 +70,11 @@ class GetAllEnvironmentsUseCase {
         const { filter, page = {} } = query;
         const { limit = ApiConfig.pagination.limit, offset = 0 } = page;
 
-        /**
-         * Prepare a query builder with ordering, limit and offset
-         *
-         * @return {QueryBuilder} the created query builder
-         */
-        const prepareQueryBuilder = () => dataSource.createQueryBuilder()
+        const queryBuilder = dataSource.createQueryBuilder()
             .orderBy('updatedAt', 'desc')
             .limit(limit)
             .offset(offset);
 
-        const fetchQueryBuilder = prepareQueryBuilder();
-
         if (filter) {
             const {
                 ids: idsExpression,
@@ -90,38 +84,34 @@ class GetAllEnvironmentsUseCase {
                 created,
             } = filter;
 
-            const filterQueryBuilder = prepareQueryBuilder();
-
             if (created) {
-                const from = created.from !== undefined ? created.from : 0;
-                const to = created.to !== undefined ? created.to : Date.now();
-                filterQueryBuilder.where('createdAt').between(from, to);
+                setTimeRangeQuery(created, 'createdAt', queryBuilder);
             }
 
             if (idsExpression) {
                 const filters = idsExpression.split(',').map((id) => id.trim());
 
                 // Filter should be like with only one filter
                 if (filters.length === 1) {
-                    filterQueryBuilder.where('id').substring(filters[0]);
+                    queryBuilder.where('id').substring(filters[0]);
                 }
 
                 // Filters should be exact with more than one filter
                 if (filters.length > 1) {
-                    filterQueryBuilder.andWhere({ id: { [Op.in]: filters } });
+                    queryBuilder.andWhere({ id: { [Op.in]: filters } });
                 }
             }
 
             if (currentStatusExpression) {
                 const filters = currentStatusExpression.split(',').map((status) => status.trim());
 
                 // Filter the environments by current status using the subquery
-                filterQueryBuilder.literalWhere(
+                queryBuilder.literalWhere(
                     `${ENVIRONMENT_LATEST_HISTORY_ITEM_SUBQUERY} IN (:filters)`,
                     { filters },
                 );
 
-                filterQueryBuilder.includeAttribute({
+                queryBuilder.includeAttribute({
                     query: ENVIRONMENT_LATEST_HISTORY_ITEM_SUBQUERY,
                     alias: 'currentStatus',
                 });
@@ -157,7 +147,7 @@ class GetAllEnvironmentsUseCase {
                      * Use OR condition to match subsequences ending with either DESTROYED or DONE
                      * Filter the environments by using LIKE for subsequence matching
                      */
-                    filterQueryBuilder.literalWhere(
+                    queryBuilder.literalWhere(
                         `(${ENVIRONMENT_STATUS_HISTORY_SUBQUERY} LIKE :statusFiltersWithDestroyed OR ` +
                         `${ENVIRONMENT_STATUS_HISTORY_SUBQUERY} LIKE :statusFiltersWithDone)`,
                         {
@@ -166,17 +156,17 @@ class GetAllEnvironmentsUseCase {
                         },
                     );
 
-                    filterQueryBuilder.includeAttribute({
+                    queryBuilder.includeAttribute({
                         query: ENVIRONMENT_STATUS_HISTORY_SUBQUERY,
                         alias: 'statusHistory',
                     });
                 } else {
-                    filterQueryBuilder.literalWhere(
+                    queryBuilder.literalWhere(
                         `${ENVIRONMENT_STATUS_HISTORY_SUBQUERY} LIKE :statusFilters`,
                         { statusFilters: `%${statusFilters.join(',')}%` },
                     );
 
-                    filterQueryBuilder.includeAttribute({
+                    queryBuilder.includeAttribute({
                         query: ENVIRONMENT_STATUS_HISTORY_SUBQUERY,
                         alias: 'statusHistory',
                     });
@@ -190,30 +180,20 @@ class GetAllEnvironmentsUseCase {
 
                 // Check that the final run numbers list contains at least one valid run number
                 if (finalRunNumberList.length > 0) {
-                    filterQueryBuilder.include({
+                    queryBuilder.include({
                         association: 'runs',
                         where: {
                             // Filter should be like with only one filter and exact with more than one filter
                             runNumber: { [finalRunNumberList.length === 1 ? Op.substring : Op.in]: finalRunNumberList },
                         },
                     });
                 }
-            };
-
-            const filteredEnvironmentsIds = (await EnvironmentRepository.findAll(filterQueryBuilder)).map(({ id }) => id);
-            // If no environments match the filter, return an empty result
-            if (filteredEnvironmentsIds.length === 0) {
-                return {
-                    count: 0,
-                    environments: [],
-                };
             }
-            fetchQueryBuilder.where('id').oneOf(filteredEnvironmentsIds);
         }
 
-        fetchQueryBuilder.include({ association: 'runs' });
-        fetchQueryBuilder.include({ association: 'historyItems' });
-        const { count, rows } = await EnvironmentRepository.findAndCountAll(fetchQueryBuilder);
+        queryBuilder.include({ association: 'runs' });
+        queryBuilder.include({ association: 'historyItems' });
+        const { count, rows } = await EnvironmentRepository.findAndCountAll(queryBuilder);
         return {
             count,
             environments: rows.map((environment) => environmentAdapter.toEntity(environment)),

lib/usecases/lhcFill/GetAllLhcFillsUseCase.js

@@ -24,6 +24,7 @@ const { ApiConfig } = require('../../config/index.js');
 const { RunDefinition } = require('../../domain/enums/RunDefinition.js');
 const { unpackNumberRange } = require('../../utilities/rangeUtils.js');
 const { splitStringToStringsTrimmed } = require('../../utilities/stringUtils.js');
+const { setTimeRangeQuery } = require('../../utilities/setTimeRangeQuery.js');
 
 /**
  * GetAllLhcFillsUseCase
@@ -47,12 +48,20 @@ class GetAllLhcFillsUseCase {
         let associatedStatisticsRequired = false;
 
         if (filter) {
-            const { hasStableBeams, fillNumbers, schemeName, beamDuration, runDuration, beamTypes } = filter;
+            const { hasStableBeams, fillNumbers, schemeName, beamDuration, stableBeamsStart, stableBeamsEnd, runDuration, beamTypes } = filter;
             if (hasStableBeams) {
                 // For now, if a stableBeamsStart is present, then a beam is stable
                 queryBuilder.where('stableBeamsStart').not().is(null);
             }
 
+            if (stableBeamsStart) {
+                setTimeRangeQuery(stableBeamsStart, 'stableBeamsStart', queryBuilder);
+            }
+
+            if (stableBeamsEnd) {
+                setTimeRangeQuery(stableBeamsEnd, 'stableBeamsEnd', queryBuilder);
+            }
+
             if (fillNumbers) {
                 const fillNumberCriteria = splitStringToStringsTrimmed(fillNumbers, SEARCH_ITEMS_SEPARATOR);