Revert "Merge branch 'main' into feature/O2B-1563/Create-GAQ-summary-invalidation-mechanism"

This reverts commit ce0ac8c, reversing
changes made to 9c1116b.

Author: isaachilly

.github/CODEOWNERS

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

.github/workflows/bookkeeping.yml

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

.github/workflows/docker.yml

@@ -9,10 +9,6 @@ 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=20260413-r0
+    ca-certificates=20250911-r0
 
 # Tell Puppeteer to skip installing Chrome. We'll be using the installed package.
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true

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

@@ -281,21 +281,6 @@ module.exports = {
                         created_at: '2024-08-12 12:00:10',
                         updated_at: '2024-08-12 12:00:10',
                     },
-                    {
-                        id: 103,
-                        deleted: true,
-                        from: null,
-                        to: '2019-08-08 20:50:00',
-                        comment: 'deleted flag',
-
-                        run_number: 56,
-                        flag_type_id: 13, // Bad
-                        created_by_id: 2,
-                        detector_id: 7, // FT0
-
-                        created_at: '2024-08-12 12:00:15',
-                        updated_at: '2024-08-12 12:00:15',
-                    },
 
                     // Run : 56, ITS
                     {
@@ -409,12 +394,6 @@ module.exports = {
                         from: '2019-08-08 20:50:00',
                         to: null,
                     },
-                    {
-                        id: 103,
-                        flag_id: 103,
-                        from: null,
-                        to: '2019-08-08 20:50:00',
-                    },
 
                     // Run : 56, ITS
                     {

lib/database/seeders/20240404100811-qc-flags.js

@@ -17,25 +17,32 @@ 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 = CustomJoi.stringArray().items(EntityIdDto).single();
-const EnvironmentsFilterDto = CustomJoi.stringArray().items(Joi.string()).single();
-const LhcFillFilterDto = CustomJoi.stringArray().items(EntityIdDto).single();
+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 FilterDto = Joi.object({
     title: Joi.string().trim(),
     content: Joi.string().trim(),
     author: Joi.string().trim(),
     created: FromToFilterDto,
     tags: TagsFilterDto,
-    fillNumbers: LhcFillFilterDto,
-    runNumbers: RunFilterDto,
+    lhcFills: LhcFillFilterDto,
+    run: RunFilterDto,
     origin: Joi.string()
         .valid('human', 'process'),
     parentLog: EntityIdDto,
     rootLog: EntityIdDto,
     rootOnly: Joi.boolean(),
-    environmentIds: EnvironmentsFilterDto,
+    environments: EnvironmentsFilterDto,
 });
 
 const SortDto = Joi.object({

lib/domain/dtos/GetAllLogsDto.js

@@ -11,12 +11,10 @@
  * or submit itself to any jurisdiction.
  */
 
-const ToUrlSuite = require('./filtersToUrl.test.js');
-const ToFilterSuite = require('./urlToFilter.test.js');
-const FilteringModelSuite = require('./filteringModel.test.js');
+const Joi = require('joi');
+const { CustomJoi } = require('../CustomJoi.js');
 
-module.exports = () => {
-    describe('Filters to URL', ToUrlSuite);
-    describe('URL to Filters', ToFilterSuite);
-    describe('FilteringModel', FilteringModelSuite);
-};
+exports.EnvironmentsFilterDto = Joi.object({
+    values: CustomJoi.stringArray().items(Joi.string()).single().required(),
+    operation: Joi.string().valid('and', 'or').required(),
+});

test/public/Filters/index.js …in/dtos/filters/EnvironmentsFilterDto.jstest/public/Filters/index.js renamed to lib/domain/dtos/filters/EnvironmentsFilterDto.js test/public/Filters/index.js renamed to lib/domain/dtos/filters/EnvironmentsFilterDto.js

@@ -88,27 +88,26 @@ exports.RunFilterDto = Joi.object({
     inelasticInteractionRateAtEnd: FloatComparisonDto,
 
     gaq: Joi.object({
-        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;
-        }),
+        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')),
+            },
+        ),
         mcReproducibleAsNotBad: Joi.boolean().optional(),
     }),
 
-    detectorsQcNotBadFraction: Joi.object()
+    detectorsQc: Joi.object()
         .pattern(
             Joi.string().regex(/^_\d+$/), // Detector id with '_' prefix
-            FloatComparisonDto,
+            Joi.object({ notBadFraction: FloatComparisonDto }),
         )
         .keys({
             mcReproducibleAsNotBad: Joi.boolean().optional(),
         })
-        .custom((detectorsQcNotBadFractionObj, helpers) => {
+        .custom((detectorsQcObj, helpers) => {
             const [{ dataPassIds, simulationPassIds, lhcPeriodIds }] = helpers.state.ancestors;
 
             singleRunsCollectionCustomCheck(
@@ -118,6 +117,6 @@ exports.RunFilterDto = Joi.object({
                 'the dataPassIds, simulationPassIds and lhcPeriodIds filters collectively contain exactly one ID',
             );
 
-            return detectorsQcNotBadFractionObj;
+            return detectorsQcObj;
         }),
 });

lib/domain/dtos/filters/RunFilterDto.js

@@ -23,5 +23,3 @@ 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;