feat: replace ddflp's filter component with the common radiButton componnent

Author: GuustMetz

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

@@ -48,6 +48,7 @@ import { rawTextFilter } from '../../../components/Filters/common/filters/rawTex
 import { numericalComparisonFilter } from '../../../components/Filters/common/filters/numericalComparisonFilter.js';
 import { checkboxes } from '../../../components/Filters/common/filters/checkboxFilter.js';
 import { triggerValueFilter } from '../../../components/Filters/RunsFilter/triggerValueFilter.js';
+import radioButtonFilter from '../../../components/Filters/common/filters/radioButtonFilter.js';
 
 /**
  * List of active columns for a generic runs table
@@ -525,7 +526,7 @@ export const runsActiveColumns = {
         classes: 'w-2 f6 w-wrapped',
         format: (boolean) => boolean ? 'On' : 'Off',
         exportFormat: (boolean) => boolean ? 'On' : 'Off',
-        filter: ddflpFilter,
+        filter: ({ filteringModel }) => radioButtonFilter(filteringModel.get('ddflp'), 'ddFlp'),
     },
     dcs: {
         name: 'DCS',

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

@@ -36,6 +36,7 @@ import { DataExportModel } from '../../../models/DataExportModel.js';
 import { runsActiveColumns as dataExportConfiguration } from '../ActiveColumns/runsActiveColumns.js';
 import { BeamModeFilterModel } from '../../../components/Filters/RunsFilter/BeamModeFilterModel.js';
 import { beamModesProvider } from '../../../services/beamModes/beamModesProvider.js';
+import { RadioButtonFilterModel } from '../../../components/Filters/common/RadioButtonFilterModel.js';
 
 /**
  * Model representing handlers for runs page
@@ -90,6 +91,7 @@ export class RunsOverviewModel extends OverviewPageModel {
             inelasticInteractionRateAtStart: new NumericalComparisonFilterModel(),
             inelasticInteractionRateAtMid: new NumericalComparisonFilterModel(),
             inelasticInteractionRateAtEnd: new NumericalComparisonFilterModel(),
+            ddflp: new RadioButtonFilterModel([{ label: 'ANY' }, { label: 'ON', value: true }, { label: 'OFF', value: false }]),
         });
 
         this._filteringModel.observe(() => this._applyFilters(true));
@@ -147,8 +149,6 @@ export class RunsOverviewModel extends OverviewPageModel {
 
         this._triggerValuesFilters = new Set();
 
-        this.ddflpFilter = '';
-
         this.dcsFilter = '';
 
         this.epnFilter = '';
@@ -165,7 +165,6 @@ export class RunsOverviewModel extends OverviewPageModel {
     isAnyFilterActive() {
         return this._filteringModel.isAnyFilterActive()
                || this._triggerValuesFilters.size !== 0
-               || this.ddflpFilter !== ''
                || this.dcsFilter !== ''
                || this.epnFilter !== '';
     }
@@ -197,34 +196,6 @@ export class RunsOverviewModel extends OverviewPageModel {
         this._applyFilters();
     }
 
-    /**
-     * Returns the boolean of ddflp
-     * @return {Boolean} if ddflp is on
-     */
-    getDdflpFilterOperation() {
-        return this.ddflpFilter;
-    }
-
-    /**
-     * Sets the boolean of the filter if no new inputs were detected for 200 milliseconds
-     * @param {boolean} operation if the ddflp is on
-     * @return {undefined}
-     */
-    setDdflpFilterOperation(operation) {
-        this.ddflpFilter = operation;
-        this._applyFilters();
-    }
-
-    /**
-     * Unchecks the ddflp checkbox and fetches all the runs.
-     * @return {undefined}
-     *
-     */
-    removeDdflp() {
-        this.ddflpFilter = '';
-        this._applyFilters();
-    }
-
     /**
      * Returns the boolean of dcs
      * @return {Boolean} if dcs is on
@@ -291,9 +262,7 @@ export class RunsOverviewModel extends OverviewPageModel {
             ...this._triggerValuesFilters.size !== 0 && {
                 'filter[triggerValues]': Array.from(this._triggerValuesFilters).join(),
             },
-            ...(this.ddflpFilter === true || this.ddflpFilter === false) && {
-                'filter[ddflp]': this.ddflpFilter,
-            },
+            'filter[ddflp]': this._filteringModel.get('ddflp').normalized,
             ...(this.dcsFilter === true || this.dcsFilter === false) && {
                 'filter[dcs]': this.dcsFilter,
             },