[O2B-536] Improve runs overview run quality filter

Author: martinboulais

lib/public/components/Filters/RunsFilter/runQuality.js

@@ -10,6 +10,7 @@
  *  granted to it by virtue of its status as an Intergovernmental Organization
  *  or submit itself to any jurisdiction.
  */
+
 import { FilterModel } from '../FilterModel.js';
 import { SelectionModel } from '../../../common/selection/SelectionModel.js';
 

lib/public/components/Filters/common/filters/SelectionFilterModel.js

@@ -20,7 +20,6 @@ import { displayRunEorReasonsOverview } from '../format/displayRunEorReasonOverv
 import ddflpFilter from '../../../components/Filters/RunsFilter/ddflp.js';
 import dcsFilter from '../../../components/Filters/RunsFilter/dcs.js';
 import epnFilter from '../../../components/Filters/RunsFilter/epn.js';
-import runQualityFilter from '../../../components/Filters/RunsFilter/runQuality.js';
 import { formatTimestamp } from '../../../utilities/formatting/formatTimestamp.js';
 import { displayRunDuration } from '../format/displayRunDuration.js';
 import { frontLink } from '../../../components/common/navigation/frontLink.js';
@@ -53,6 +52,7 @@ import { detectorsFilterComponent } from '../../../components/Filters/RunsFilter
 import { timeRangeFilter } from '../../../components/Filters/common/filters/timeRangeFilter.js';
 import { rawTextFilter } from '../../../components/Filters/common/filters/rawTextFilter.js';
 import { numericalComparisonFilter } from '../../../components/Filters/common/filters/numericalComparisonFilter.js';
+import { checkboxes } from '../../../components/Filters/common/filters/checkboxFilter.js';
 
 /**
  * List of active columns for a generic runs table
@@ -437,7 +437,14 @@ export const runsActiveColumns = {
                 }, runQuality),
             },
         },
-        filter: runQualityFilter,
+
+        /**
+         * Run quality filter component
+         *
+         * @param {RunsOverviewModel} runsOverviewModel the runs overview model
+         * @return {Component} the run quality filter component
+         */
+        filter: (runsOverviewModel) => checkboxes(runsOverviewModel.filteringModel.get('runQualities').selectionModel),
     },
     nDetectors: {
         name: 'DETs #',

lib/public/views/Runs/ActiveColumns/runsActiveColumns.js

@@ -34,6 +34,8 @@ import { TimeRangeFilterModel } from '../../../components/Filters/RunsFilter/Tim
 import { magnetsCurrentLevelsProvider } from '../../../services/magnets/magnetsCurrentLevelsProvider.js';
 import { RawTextFilterModel } from '../../../components/Filters/common/filters/RawTextFilterModel.js';
 import { RunDefinitionFilterModel } from '../../../components/Filters/RunsFilter/RunDefinitionFilterModel.js';
+import { RUN_QUALITIES } from '../../../domain/enums/RunQualities.js';
+import { SelectionFilterModel } from '../../../components/Filters/common/filters/SelectionFilterModel.js';
 
 /**
  * Model representing handlers for runs page
@@ -67,6 +69,12 @@ export class RunsOverviewModel extends OverviewPageModel {
             runDuration: new NumericalComparisonFilterModel({ scale: 60 * 1000 }),
             environmentIds: new RawTextFilterModel(),
             runTypes: new RunTypesFilterModel(runTypesProvider.items$),
+            runQualities: new SelectionFilterModel({
+                availableOptions: RUN_QUALITIES.map((quality) => ({
+                    label: quality.toUpperCase(),
+                    value: quality,
+                })),
+            }),
             eorReason: new EorReasonFilterModel(eorReasonTypeProvider.items$),
             magnets: new MagnetsFilteringModel(magnetsCurrentLevelsProvider.items$),
             muInelasticInteractionRate: new NumericalComparisonFilterModel({ useOperatorAsNormalizationKey: true }),
@@ -173,8 +181,6 @@ export class RunsOverviewModel extends OverviewPageModel {
     resetFiltering(fetch = true) {
         this._filteringModel.reset();
 
-        this.runQualitiesFilters = [];
-
         this._triggerValuesFilters = new Set();
 
         this.nDetectorsFilter = null;
@@ -202,7 +208,6 @@ export class RunsOverviewModel extends OverviewPageModel {
      */
     isAnyFilterActive() {
         return this._filteringModel.isAnyFilterActive()
-               || this.runQualitiesFilters.length !== 0
                || this._triggerValuesFilters.size !== 0
                || this.nDetectorsFilter !== null
                || this._nEpnsFilter !== null
@@ -245,41 +250,6 @@ export class RunsOverviewModel extends OverviewPageModel {
         this.notify();
     }
 
-    /**
-     * States if the given run quality is currently in the run quality filter
-     *
-     * @param {string} runQuality the run quality to look for
-     * @return {boolean} true if the run quality is included in the filter
-     */
-    isRunQualityInFilter(runQuality) {
-        return this.runQualitiesFilters.includes(runQuality);
-    }
-
-    /**
-     * Add a given run quality in the current run quality filter if it is not already present, then refresh runs list
-     *
-     * @param {string} runQuality the run quality to add
-     * @return {void}
-     */
-    addRunQualityFilter(runQuality) {
-        if (!this.isRunQualityInFilter(runQuality)) {
-            this.runQualitiesFilters.push(runQuality);
-            this._applyFilters();
-        }
-    }
-
-    /**
-     * Remove a given run quality from the current run quality filter if it is in it (else do nothing) then refresh
-     * runs list
-     *
-     * @param {string} runQuality the run quality to add
-     * @return {void}
-     */
-    removeRunQualityFilter(runQuality) {
-        this.runQualitiesFilters = this.runQualitiesFilters.filter((existingRunQuality) => runQuality !== existingRunQuality);
-        this._applyFilters();
-    }
-
     /**
      * Getter for the trigger values filter Set
      * @return {Set} set of trigger filter values
@@ -494,9 +464,6 @@ export class RunsOverviewModel extends OverviewPageModel {
      */
     _getFilterQueryParams() {
         return {
-            ...this.runQualitiesFilters.length !== 0 && {
-                'filter[runQualities]': this.runQualitiesFilters.join(),
-            },
             ...this._triggerValuesFilters.size !== 0 && {
                 'filter[triggerValues]': Array.from(this._triggerValuesFilters).join(),
             },

lib/public/views/Runs/Overview/RunsOverviewModel.js

@@ -511,7 +511,7 @@ module.exports = () => {
 
     it('Should successfully filter runs by their run quality', async () => {
         await goToPage(page, 'run-overview');
-        const filterInputSelectorPrefix = '#runQualityCheckbox';
+        const filterInputSelectorPrefix = '#checkboxes-checkbox-';
         const badFilterSelector = `${filterInputSelectorPrefix}bad`;
         const testFilterSelector = `${filterInputSelectorPrefix}test`;
 
@@ -937,7 +937,7 @@ module.exports = () => {
         // Second export
 
         // Apply filtering
-        const filterInputSelectorPrefix = '#runQualityCheckbox';
+        const filterInputSelectorPrefix = '#checkboxes-checkbox-';
         const badFilterSelector = `${filterInputSelectorPrefix}bad`;
 
         await pressElement(page, '#openFilterToggle');