use abastraction

Author: xsalonx

lib/domain/dtos/filters/RunFilterDto.js

@@ -17,7 +17,6 @@ const { RUN_QUALITIES } = require('../../enums/RunQualities.js');
 const { IntegerComparisonDto, FloatComparisonDto } = require('./NumericalComparisonDto.js');
 const { RUN_CALIBRATION_STATUS } = require('../../enums/RunCalibrationStatus.js');
 const { RUN_DEFINITIONS } = require('../../enums/RunDefinition.js');
-const { regex } = require('../FileDto.js');
 
 const DetectorsFilterDto = Joi.object({
     operator: Joi.string().valid('or', 'and', 'none').required(),

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

@@ -11,6 +11,7 @@
  * or submit itself to any jurisdiction.
  */
 
+import { expandQueryLikeNestedKey } from '../../../utilities/expandNestedKey.js';
 import { Observable } from '/js/src/index.js';
 
 /**
@@ -52,13 +53,13 @@ export class FilteringModel extends Observable {
      * @return {object} the normalized values
      */
     get normalized() {
-        const ret = {};
+        const result = {};
         for (const [filterKey, filter] of Object.entries(this._filters)) {
             if (filter && !filter.isEmpty) {
-                ret[filterKey] = filter.normalized;
+                result[filterKey] = filter.normalized;
             }
         }
-        return ret;
+        return expandQueryLikeNestedKey(result);
     }
 
     /**
@@ -110,5 +111,7 @@ export class FilteringModel extends Observable {
         }
 
         this._filters[key] = filter;
+        filter.bubbleTo(this);
+        filter.visualChange$?.bubbleTo(this._visualChange$);
     }
 }

lib/public/utilities/expandNestedKey.js

@@ -0,0 +1,42 @@
+/**
+ * @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.
+ */
+
+/**
+ * Expand query-like formatted keys of a object { a[b][c]: x } to { a: { b: { c: x } } }
+ *
+ * @param {object} obj a object
+ * @return {object} obj
+ */
+export function expandQueryLikeNestedKey(obj) {
+    const result = {};
+
+    for (const nestedKey in obj) {
+        const value = obj[nestedKey];
+        const subKeys = nestedKey.split(/[[\]]/).filter(Boolean);
+
+        let currentNestedObj = result;
+        for (let i = 0; i < subKeys.length; i++) {
+            const key = subKeys[i];
+            if (i === subKeys.length - 1) {
+                currentNestedObj[key] = value;
+            } else {
+                if (!(key in currentNestedObj)) {
+                    currentNestedObj[key] = {};
+                }
+                currentNestedObj = currentNestedObj[key];
+            }
+        }
+    }
+
+    return result;
+}

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

@@ -50,12 +50,10 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
         this._skimmableRuns$ = new ObservableData(RemoteData.notAsked());
         this._skimmableRuns$.bubbleTo(this);
 
-        this._gaqNotBadFractionFilterModel = new NumericalComparisonFilterModel({
+        this._filteringModel.put('gaq[notBadFraction]', new NumericalComparisonFilterModel({
             scale: 0.01,
             integer: false,
-        });
-        this._gaqNotBadFractionFilterModel.observe(() => this._applyFilters());
-        this._gaqNotBadFractionFilterModel.visualChange$.bubbleTo(this);
+        }));
 
         this._runDetectorsSelectionModel = new RunDetectorsSelectionModel();
         this._runDetectorsSelectionModel.bubbleTo(this);
@@ -67,13 +65,6 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
         this._discardAllQcFlagsActionState$.bubbleTo(this);
     }
 
-    /**
-     * @inheritDoc
-     */
-    isAnyFilterActive() {
-        return super.isAnyFilterActive() || !this._gaqNotBadFractionFilterModel.isEmpty;
-    }
-
     /**
      * Change ready for skimming flag for given run
      *
@@ -133,10 +124,10 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
      * @inheritdoc
      */
     getRootEndpoint() {
+        const gaqNotBadFilter = this._filteringModel.get('gaq[notBadFraction]');
         const filter = { dataPassIds: [this._dataPassId] };
-        if (!this._gaqNotBadFractionFilterModel.isEmpty) {
+        if (!gaqNotBadFilter.isEmpty) {
             filter.gaq = {
-                notBadFraction: this._gaqNotBadFractionFilterModel.normalized,
                 mcReproducibleAsNotBad: this._mcReproducibleAsNotBad,
             };
         }
@@ -149,7 +140,6 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
      */
     resetFiltering(fetch = true) {
         super.resetFiltering(fetch);
-        this._gaqNotBadFractionFilterModel?.reset(); // Reset is called in super class
     }
 
     /**
@@ -227,15 +217,6 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
         return this._discardAllQcFlagsActionState$.getCurrent();
     }
 
-    /**
-     * Get gaqNotBadFraction filter model
-     *
-     * @return {NumericalComparisonFilterModel} filter model
-     */
-    get gaqNotBadFractionFilterModel() {
-        return this._gaqNotBadFractionFilterModel;
-    }
-
     /**
      * Send request to mark current data pass as skimmable
      * @return {Promise<void>} resolved once request is handled

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

@@ -192,8 +192,8 @@ export const RunsPerDataPassOverviewPage = ({
 
                             return frontLink(gaqDisplay, 'gaq-flags', { dataPassId, runNumber });
                         },
-                        filter: ({ gaqNotBadFractionFilterModel }) => numericalComparisonFilter(
-                            gaqNotBadFractionFilterModel,
+                        filter: ({ filteringModel }) => numericalComparisonFilter(
+                            filteringModel.get('gaq[notBadFraction]'),
                             { step: 0.0001, selectorPrefix: 'gaqNotBadFraction' },
                         ),
                         filterTooltip: 'expressed as a percentage',