wip

Author: xsalonx

lib/domain/dtos/filters/RunFilterDto.js

@@ -121,7 +121,7 @@ exports.RunFilterDto = Joi.object({
 
     detectorsQc: Joi.object()
         .pattern(
-            Joi.string().regex(/^_[0-9]+$/),
+            Joi.string().regex(/^_\d+$/),
             Joi.object({ notBadFraction: FloatComparisonDto }),
         )
         .keys({
@@ -131,9 +131,10 @@ exports.RunFilterDto = Joi.object({
             const [{ dataPassIds, simulationPassIds, lhcPeriodIds }] = helpers.state.ancestors;
             const filters = [dataPassIds, simulationPassIds, lhcPeriodIds].filter((x) => Array.isArray(x) && x.length === 1);
 
-            if (filters.length !== 1 && Object.keys(value).some((k) => /^_[0-9]+$/.test(k))) {
+            if (filters.length !== 1 && Object.keys(value).some((k) => /^_\d+$/.test(k))) {
                 return helpers.error('any.invalid', {
-                    message: 'Filtering by detector not-bad fraction is allowed only with exactly one of: dataPassIds, simulationPassIds, lhcPeriodIds with exactly one ID.',
+                    message: 'Filtering by detector not-bad fraction is allowed only with exactly one of: ' +
+                    'dataPassIds, simulationPassIds, lhcPeriodIds with exactly one ID.',
                 });
             }
 

lib/public/components/Filters/common/FilteringModel.js

@@ -97,4 +97,18 @@ export class FilteringModel extends Observable {
 
         return this._filters[key];
     }
+
+    /**
+     * Add new filter
+     *
+     * @param {string} key key of a new filter
+     * @param {FilterModel} filter the new filter
+     */
+    put(key, filter) {
+        if (key in this._filters) {
+            throw new Error(`Filter under key ${key} already exists`);
+        }
+
+        this._filters[key] = filter;
+    }
 }