[O2B-536] Improve runs overview ODC topology filter

Author: martinboulais

…ilters/RunsFilter/odcTopologyFullName.js …/RunsFilter/odcTopologyFullNameFilter.jslib/public/components/Filters/RunsFilter/odcTopologyFullName.js renamed to lib/public/components/Filters/RunsFilter/odcTopologyFullNameFilter.js lib/public/components/Filters/RunsFilter/odcTopologyFullName.js renamed to lib/public/components/Filters/RunsFilter/odcTopologyFullNameFilter.js

@@ -14,17 +14,19 @@
 import { h } from '/js/src/index.js';
 
 /**
- * Returns the title filter component
- * @param {RunsOverviewModel} runModel the run model object
- * @return {vnode} A text box that allows the user to enter a title substring to match against all logs
+ * Returns the ODC topology full name filter component
+ *
+ * @param {RawTextFilterModel} filterModel the filter model
+ * @return {Component} the ODC topology full name filter component
  */
-const odcTopologyFullName = (runModel) => h('input.w-75.mt1', {
-    type: 'text',
-    id: 'Topology Full Name',
-    value: runModel.odcTopologyFullNameFilter,
-    oninput: (e) => {
-        runModel.odcTopologyFullNameFilter = e.target.value;
+export const odcTopologyFullNameFilter = (filterModel) => h(
+    'input.w-75.mt1',
+    {
+        type: 'text',
+        value: filterModel.value,
+        oninput: (e) => {
+            filterModel.value = e.target.value;
+        },
     },
-}, '');
-
-export default odcTopologyFullName;
+    '',
+);

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

@@ -13,15 +13,16 @@
 
 import { h } from '/js/src/index.js';
 import { runNumbersFilter } from '../../../components/Filters/RunsFilter/runNumbersFilter.js';
-import odcTopologyFullName from '../../../components/Filters/RunsFilter/odcTopologyFullName.js';
+import { environmentIdsFilter } from '../../../components/Filters/RunsFilter/environmentIdsFilter.js';
+import { odcTopologyFullNameFilter } from '../../../components/Filters/RunsFilter/odcTopologyFullNameFilter.js';
 import { displayRunEorReasonsOverview } from '../format/displayRunEorReasonOverview.js';
 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 { formatTimestamp } from '../../../utilities/formatting/formatTimestamp.js';
 import { displayRunDuration } from '../format/displayRunDuration.js';
 import { frontLink } from '../../../components/common/navigation/frontLink.js';
-import { triggerValueFilter } from '../../../components/Filters/RunsFilter/triggerValueFilter.js';
+import { lhcPeriodsFilter } from '../../../components/Filters/RunsFilter/lhcPeriodsFilter.js';
 import { formatRunType } from '../../../utilities/formatting/formatRunType.js';
 import { runDefinitionFilter } from '../../../components/Filters/RunsFilter/runDefinitionFilter.js';
 import { profiles } from '../../../components/common/table/profiles.js';
@@ -545,7 +546,14 @@ export const runsActiveColumns = {
         classes: 'w-15 f6',
         visible: false,
         profiles: [profiles.none, 'lhcFill', 'environment'],
-        filter: odcTopologyFullName,
+
+        /**
+         * ODC topology full name filter component
+         *
+         * @param {RunsOverviewModel} runsOverviewModel the runs overview model
+         * @return {Component} the filter component
+         */
+        filter: (runsOverviewModel) => odcTopologyFullNameFilter(runsOverviewModel.filteringModel.get('odcTopologyFullName')),
         balloon: true,
     },
     eorReasons: {

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

@@ -78,6 +78,7 @@ export class RunsOverviewModel extends OverviewPageModel {
             nDetectors: new NumericalComparisonFilterModel({ integer: true }),
             nEpns: new NumericalComparisonFilterModel({ integer: true }),
             nFlps: new NumericalComparisonFilterModel({ integer: true }),
+            odcTopologyFullName: new RawTextFilterModel(),
             eorReason: new EorReasonFilterModel(eorReasonTypeProvider.items$),
             magnets: new MagnetsFilteringModel(magnetsCurrentLevelsProvider.items$),
             muInelasticInteractionRate: new NumericalComparisonFilterModel({ useOperatorAsNormalizationKey: true }),
@@ -105,7 +106,7 @@ export class RunsOverviewModel extends OverviewPageModel {
      * @inheritdoc
      */
     getRootEndpoint() {
-        return buildUrl('/api/runs', { ...this._getFilterQueryParams(), ...{ filter: this.filteringModel.normalized } });
+        return buildUrl('/api/runs', { filter: this.filteringModel.normalized });
     }
 
     // eslint-disable-next-line valid-jsdoc
@@ -192,8 +193,6 @@ export class RunsOverviewModel extends OverviewPageModel {
 
         this.epnFilter = '';
 
-        this._odcTopologyFullNameFilter = '';
-
         if (fetch) {
             this._applyFilters(true);
         }
@@ -208,8 +207,7 @@ export class RunsOverviewModel extends OverviewPageModel {
                || this._triggerValuesFilters.size !== 0
                || this.ddflpFilter !== ''
                || this.dcsFilter !== ''
-               || this.epnFilter !== ''
-               || this._odcTopologyFullNameFilter !== '';
+               || this.epnFilter !== '';
     }
 
     /**
@@ -344,24 +342,6 @@ export class RunsOverviewModel extends OverviewPageModel {
         this._applyFilters();
     }
 
-    /**
-     * Returns the current epnTopology substring filter
-     * @return {String} The current epnTopology substring filter
-     */
-    get odcTopologyFullNameFilter() {
-        return this._odcTopologyFullNameFilter;
-    }
-
-    /**
-     * Sets the epnTopology substring filter if no new inputs were detected for 200 milliseconds
-     * @param {string} newTopology The epnTopology substring to apply to the filter
-     * @return {undefined}
-     */
-    set odcTopologyFullNameFilter(newTopology) {
-        this._odcTopologyFullNameFilter = newTopology.trim();
-        this._applyFilters();
-    }
-
     /**
      * Return all the runs currently filtered, without paging
      *
@@ -409,9 +389,6 @@ export class RunsOverviewModel extends OverviewPageModel {
             ...(this.epnFilter === true || this.epnFilter === false) && {
                 'filter[epn]': this.epnFilter,
             },
-            ...this._odcTopologyFullNameFilter && {
-                'filter[odcTopologyFullName]': this._odcTopologyFullNameFilter,
-            },
         };
     }