wip

Author: xsalonx

lib/domain/dtos/filters/RunFilterDto.js

@@ -120,15 +120,15 @@ exports.RunFilterDto = Joi.object({
 
     detectorsQc: Joi.object()
         .pattern(
-            Joi.string().regex(/^_\d+$/),
+            Joi.string().regex(/^_\d+$/), // Detector id prefixed with '_'
             Joi.object({ notBadFraction: FloatComparisonDto }),
         )
         .keys({
             mcReproducibleAsNotBad: Joi.boolean().optional(),
         })
         .custom((value, helpers) => {
             const [{ dataPassIds, simulationPassIds, lhcPeriodIds }] = helpers.state.ancestors;
-            const filters = [dataPassIds, simulationPassIds, lhcPeriodIds].filter((x) => Array.isArray(x) && x.length === 1);
+            const filters = [dataPassIds, simulationPassIds, lhcPeriodIds].filter(({ length }) => length === 1);
 
             if (filters.length !== 1 && Object.keys(value).some((k) => /^_\d+$/.test(k))) {
                 return helpers.error('any.invalid', {

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

@@ -35,6 +35,14 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
         super(model);
         this._detectors$ = detectorsProvider.qc$;
         this._detectors$.bubbleTo(this);
+        this._detectors$.observe((observableData) => observableData.getCurrent().apply({
+            Success: (detectors) => detectors.forEach(({ id }) => {
+                this._filteringModel.put(`detectorsQC[_${id}][notBadFraction]`, new NumericalComparisonFilterModel({
+                    scale: 0.1,
+                    integer: false,
+                }));
+            }),
+        }));
         this._dataPass = new ObservableData(RemoteData.notAsked());
         this._dataPass.bubbleTo(this);
         this._qcSummary$ = new ObservableData(RemoteData.notAsked());

lib/usecases/run/GetAllRunsUseCase.js

@@ -358,7 +358,6 @@ class GetAllRunsUseCase {
             }
 
             const badEffectiveRunCoverageComparison = (badEffectiveRunCoverage, operator, value) => {
-                console.log(badEffectiveRunCoverage, operator, value)
                 switch (operator) {
                     case '<':
                         return 1 - badEffectiveRunCoverage < value;
@@ -400,10 +399,14 @@ class GetAllRunsUseCase {
                 delete detectorsQc.operator;
 
                 const qcSummary = await qcFlagSummaryService.getSummary(
-                    { dataPassId, simulationPassId, lhcPeriodId, dplDetectorIds: Object.keys(detectorsQc).map((id) => parseInt(id.slice(1), 10)) },
+                    {
+                        dataPassId,
+                        simulationPassId,
+                        lhcPeriodId,
+                        dplDetectorIds: Object.keys(detectorsQc).map((id) => parseInt(id.slice(1), 10)),
+                    },
                     { mcReproducibleAsNotBad },
                 );
-                console.log(qcSummary)
 
                 const runNumbers = Object.entries(qcSummary)
                     .filter(([_, runSummary]) => {
@@ -414,14 +417,12 @@ class GetAllRunsUseCase {
                             const { operator: forDetectorOperator, limit } = detectorsQc[`_${dplDetecotrId}`].notBadFraction;
                             return badEffectiveRunCoverageComparison(badEffectiveRunCoverage, forDetectorOperator, limit);
                         });
-                        console.log(mask)
                         switch (operator) {
                             case 'and': return mask.every((id) => id);
                             case 'or': return mask.some((id) => id);
                         }
                     })
                     .map(([runNumber]) => runNumber);
-                    console.log(runNumbers)
                 filteringQueryBuilder.where('runNumber').oneOf(...runNumbers);
             }