Remove use of NormalizationKey for NumericalComparisonFilterModel

Author: graduta

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

@@ -21,15 +21,12 @@ export class NumericalComparisonFilterModel extends FilterModel {
     /**
      * Constructor
      * @param {object} [options] options of the filter
-     * @param {boolean} [options.useOperatorAsNormalizationKey] if true, operator value will be used as normalization key, else operator will be
-     *     passed with key `operator` and `operand` will be passed as `limit`
      * @param {number} [options.scale] scale applied on the value of the operand in normalization
      * @param {boolean} [options.integer=false] if true, value is parsed as integer (else, it will be parsed as float)
      */
     constructor(options) {
         super();
-        const { useOperatorAsNormalizationKey, scale = 1, integer = false } = options || {};
-        this._useOperatorAsNormalizationKey = Boolean(useOperatorAsNormalizationKey);
+        const { scale = 1, integer = false } = options || {};
 
         this._operatorSelectionModel = new ComparisonSelectionModel();
         this._operatorSelectionModel.visualChange$.bubbleTo(this._visualChange$);
@@ -86,16 +83,10 @@ export class NumericalComparisonFilterModel extends FilterModel {
      * @inheritDoc
      */
     get normalized() {
-        if (this._useOperatorAsNormalizationKey) {
-            return {
-                [this._operatorSelectionModel.current]: this._operandInputModel.value,
-            };
-        } else {
-            return {
-                operator: this._operatorSelectionModel.current,
-                limit: this._operandInputModel.value,
-            };
-        }
+        return {
+            operator: this._operatorSelectionModel.current,
+            limit: this._operandInputModel.value,
+        };
     }
 
     // eslint-disable-next-line valid-jsdoc

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

@@ -83,11 +83,11 @@ export class RunsOverviewModel extends OverviewPageModel {
             odcTopologyFullName: new RawTextFilterModel(),
             eorReason: new EorReasonFilterModel(eorReasonTypeProvider.items$),
             magnets: new MagnetsFilteringModel(magnetsCurrentLevelsProvider.items$),
-            muInelasticInteractionRate: new NumericalComparisonFilterModel({ useOperatorAsNormalizationKey: true }),
-            inelasticInteractionRateAvg: new NumericalComparisonFilterModel({ useOperatorAsNormalizationKey: true }),
-            inelasticInteractionRateAtStart: new NumericalComparisonFilterModel({ useOperatorAsNormalizationKey: true }),
-            inelasticInteractionRateAtMid: new NumericalComparisonFilterModel({ useOperatorAsNormalizationKey: true }),
-            inelasticInteractionRateAtEnd: new NumericalComparisonFilterModel({ useOperatorAsNormalizationKey: true }),
+            muInelasticInteractionRate: new NumericalComparisonFilterModel(),
+            inelasticInteractionRateAvg: new NumericalComparisonFilterModel(),
+            inelasticInteractionRateAtStart: new NumericalComparisonFilterModel(),
+            inelasticInteractionRateAtMid: new NumericalComparisonFilterModel(),
+            inelasticInteractionRateAtEnd: new NumericalComparisonFilterModel(),
         });
 
         this._filteringModel.observe(() => this._applyFilters(true));

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

@@ -51,7 +51,6 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
         this._skimmableRuns$.bubbleTo(this);
 
         this._gaqNotBadFractionFilterModel = new NumericalComparisonFilterModel({
-            useOperatorAsNormalizationKey: true,
             scale: 0.01,
             integer: true,
         });