Merge branch 'main' into improv/O2B-1578/Change-timeRange-filters-to-only-trigger-filters-when-both-time-and-date-have-been-filled-in

Author: graduta

.github/CODEOWNERS

@@ -1 +1,2 @@
 * @graduta
+* @isaachilly

.github/workflows/bookkeeping.yml

@@ -10,6 +10,10 @@ on:
     branches:
       - main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   parallel_tests:
     name: ${{ matrix.test_type }}
@@ -39,7 +43,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: Set up Docker
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
       - name: Create Coverage Directory
         run: mkdir -p ${{ github.workspace }}/coverage
 
@@ -71,7 +75,7 @@ jobs:
         env:
           TEST_TYPE: ${{ matrix.test_type }}
       - name: Upload Coverage to Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v6
         with:
           files: ./coverage/lcov.info
         env:

.github/workflows/docker.yml

@@ -9,6 +9,10 @@ on:
 permissions:
   contents: read
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   linter:
     runs-on: ubuntu-latest

Dockerfile

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

lib/domain/dtos/GetAllLogsDto.js

@@ -17,32 +17,25 @@ const PaginationDto = require('./PaginationDto');
 const { CustomJoi } = require('./CustomJoi.js');
 const { TagsFilterDto } = require('./filters/TagsFilterDto.js');
 const { FromToFilterDto } = require('./filters/FromToFilterDto.js');
-const { EnvironmentsFilterDto } = require('./filters/EnvironmentsFilterDto');
 
-const RunFilterDto = Joi.object({
-    values: CustomJoi.stringArray().items(EntityIdDto).single().required(),
-    operation: Joi.string().valid('and', 'or').required(),
-});
-
-const LhcFillFilterDto = Joi.object({
-    values: CustomJoi.stringArray().items(EntityIdDto).single().required(),
-    operation: Joi.string().valid('and', 'or').required(),
-});
+const RunFilterDto = CustomJoi.stringArray().items(EntityIdDto).single();
+const EnvironmentsFilterDto = CustomJoi.stringArray().items(Joi.string()).single();
+const LhcFillFilterDto = CustomJoi.stringArray().items(EntityIdDto).single();
 
 const FilterDto = Joi.object({
     title: Joi.string().trim(),
     content: Joi.string().trim(),
     author: Joi.string().trim(),
     created: FromToFilterDto,
     tags: TagsFilterDto,
-    lhcFills: LhcFillFilterDto,
-    run: RunFilterDto,
+    fillNumbers: LhcFillFilterDto,
+    runNumbers: RunFilterDto,
     origin: Joi.string()
         .valid('human', 'process'),
     parentLog: EntityIdDto,
     rootLog: EntityIdDto,
     rootOnly: Joi.boolean(),
-    environments: EnvironmentsFilterDto,
+    environmentIds: EnvironmentsFilterDto,
 });
 
 const SortDto = Joi.object({

lib/domain/dtos/filters/RunFilterDto.js

@@ -88,26 +88,27 @@ exports.RunFilterDto = Joi.object({
     inelasticInteractionRateAtEnd: FloatComparisonDto,
 
     gaq: Joi.object({
-        notBadFraction: FloatComparisonDto.when(
-            'dataPassIds',
-            {
-                is: Joi.array().length(1),
-                then: FloatComparisonDto,
-                otherwise: Joi.forbidden().error(new Error('Filtering by GAQ is enabled only when filtering with one dataPassId')),
-            },
-        ),
+        notBadFraction: FloatComparisonDto.custom((value, helpers) => {
+            const [, { dataPassIds }] = helpers.state.ancestors;
+
+            if (!dataPassIds || dataPassIds.length !== 1) {
+                return helpers.message('Filtering by GAQ is enabled only when filtering with one dataPassId');
+            }
+
+            return value;
+        }),
         mcReproducibleAsNotBad: Joi.boolean().optional(),
     }),
 
-    detectorsQc: Joi.object()
+    detectorsQcNotBadFraction: Joi.object()
         .pattern(
             Joi.string().regex(/^_\d+$/), // Detector id with '_' prefix
-            Joi.object({ notBadFraction: FloatComparisonDto }),
+            FloatComparisonDto,
         )
         .keys({
             mcReproducibleAsNotBad: Joi.boolean().optional(),
         })
-        .custom((detectorsQcObj, helpers) => {
+        .custom((detectorsQcNotBadFractionObj, helpers) => {
             const [{ dataPassIds, simulationPassIds, lhcPeriodIds }] = helpers.state.ancestors;
 
             singleRunsCollectionCustomCheck(
@@ -117,6 +118,6 @@ exports.RunFilterDto = Joi.object({
                 'the dataPassIds, simulationPassIds and lhcPeriodIds filters collectively contain exactly one ID',
             );
 
-            return detectorsQcObj;
+            return detectorsQcNotBadFractionObj;
         }),
 });

lib/domain/enums/NonPhysicsProductionsNamesWords.js

@@ -23,3 +23,5 @@ const NonPhysicsProductionsNamesWords = Object.freeze({
 module.exports.NonPhysicsProductionsNamesWords = NonPhysicsProductionsNamesWords;
 
 module.exports.NON_PHYSICS_PRODUCTIONS_NAMES_WORDS = Object.values(NonPhysicsProductionsNamesWords);
+
+module.exports.NON_PHYSICS_PRODUCTIONS_NAMES_TOTAL_LENGTH = Object.values(NonPhysicsProductionsNamesWords).join(',').length;

lib/public/Model.js

@@ -95,21 +95,27 @@ export default class Model extends Observable {
         this._appConfiguration$ = new Observable();
         this._inputDebounceTime = INPUT_DEBOUNCE_TIME;
 
+        // Setup router
+        this.router = new QueryRouter();
+        this.router.observe(this.handleLocationChange.bind(this));
+        this.router.bubbleTo(this);
+        registerFrontLinkListener((e) => this.router.handleLinkEvent(e));
+
         // Models
 
         this.home = new HomePageModel(this);
         this.home.bubbleTo(this);
 
-        this.lhcPeriods = new LhcPeriodsModel(this);
+        this.lhcPeriods = new LhcPeriodsModel(this.router);
         this.lhcPeriods.bubbleTo(this);
 
-        this.dataPasses = new DataPassesModel(this);
+        this.dataPasses = new DataPassesModel(this.router);
         this.dataPasses.bubbleTo(this);
 
         this.qcFlags = new QcFlagsModel(this);
         this.qcFlags.bubbleTo(this);
 
-        this.simulationPasses = new SimulationPassesModel(this);
+        this.simulationPasses = new SimulationPassesModel(this.router);
         this.simulationPasses.bubbleTo(this);
 
         this.qcFlagTypes = new QcFlagTypesModel(this);
@@ -178,12 +184,6 @@ export default class Model extends Observable {
         this.errorModel = new ErrorModel();
         this.errorModel.bubbleTo(this);
 
-        // Setup router
-        this.router = new QueryRouter();
-        this.router.observe(this.handleLocationChange.bind(this));
-        this.router.bubbleTo(this);
-        registerFrontLinkListener((e) => this.router.handleLinkEvent(e));
-
         // Init pages
         this.handleLocationChange();
         this.window.addEventListener('resize', debounce(() => this.notify(), 100));

lib/public/app.css

@@ -266,6 +266,12 @@ th.text-center, td.text-center {
     border-color: #f5c6cb;
 }
 
+.alert-warning {
+    color: var(--color-warning);
+    background-color: #ffe8c8;
+    border-color: #fdd69f;
+}
+
 .alert-danger hr {
     border-top-color: #f1b0b7;
 }

lib/public/components/Filters/LhcFillsFilter/BeamTypeFilterModel.js

@@ -12,12 +12,12 @@
  */
 
 import { beamTypesProvider } from '../../../services/beamTypes/beamTypesProvider.js';
-import { SelectionFilterModel } from '../common/filters/SelectionFilterModel.js';
+import { SelectionModel } from '../../common/selection/SelectionModel.js';
 
 /**
  * Beam type filter model
  */
-export class BeamTypeFilterModel extends SelectionFilterModel {
+export class BeamTypeFilterModel extends SelectionModel {
     /**
      * Constructor
      */
@@ -28,7 +28,7 @@ export class BeamTypeFilterModel extends SelectionFilterModel {
             beamTypesProvider.items$.getCurrent().apply({
                 Success: (types) => {
                     const beamTypes = types.map((type) => ({ value: type.beam_type }));
-                    this._selectionModel.setAvailableOptions(beamTypes);
+                    this.setAvailableOptions(beamTypes);
                 },
             });
         });