refactor

Author: xsalonx

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

@@ -12,6 +12,7 @@
  */
 
 import { NumericalComparisonFilterModel } from '../../../components/Filters/common/filters/NumericalComparisonFilterModel.js';
+import { RunDetectorsSelectionModel } from '../RunDetectorsSelectionModel.js';
 import { RunsOverviewModel } from './RunsOverviewModel.js';
 
 /**
@@ -27,13 +28,55 @@ export class RunsWithQcModel extends RunsOverviewModel {
     constructor(model) {
         super(model);
 
+        this._mcReproducibleAsNotBad = false;
+
+        this._runDetectorsSelectionModel = new RunDetectorsSelectionModel();
+        this._runDetectorsSelectionModel.bubbleTo(this);
+
         this.patchDisplayOptions({
             horizontalScrollEnabled: true,
             verticalScrollEnabled: true,
             freezeFirstColumn: true,
         });
     }
 
+    /**
+     * Set mcReproducibleAsNotBad
+     *
+     * @param {boolean} mcReproducibleAsNotBad new value
+     * @return {void}
+     */
+    setMcReproducibleAsNotBad(mcReproducibleAsNotBad) {
+        this._mcReproducibleAsNotBad = mcReproducibleAsNotBad;
+        this.load();
+    }
+
+    /**
+     * Get mcReproducibleAsNotBad
+     *
+     * @return {boolean} mcReproducibleAsNotBad
+     */
+    get mcReproducibleAsNotBad() {
+        return this._mcReproducibleAsNotBad;
+    }
+
+    /**
+     * Returns the run detectors selection model
+     *
+     * @return {RunDetectorsSelectionModel} selection model
+     */
+    get runDetectorsSelectionModel() {
+        return this._runDetectorsSelectionModel;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async load() {
+        this._runDetectorsSelectionModel.reset();
+        super.load();
+    }
+
     /**
      * Register not-bad fraction detectors filtering model
      * @param {ObservableData<RemoteData<Detector>>} detectors$ detectors remote data observable

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

@@ -20,7 +20,6 @@ import { jsonPatch } from '../../../utilities/fetch/jsonPatch.js';
 import { jsonPut } from '../../../utilities/fetch/jsonPut.js';
 import { SkimmingStage } from '../../../domain/enums/SkimmingStage.js';
 import { NumericalComparisonFilterModel } from '../../../components/Filters/common/filters/NumericalComparisonFilterModel.js';
-import { RunDetectorsSelectionModel } from '../RunDetectorsSelectionModel.js';
 import { jsonFetch } from '../../../utilities/fetch/jsonFetch.js';
 
 /**
@@ -44,8 +43,6 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
         this._gaqSummary$ = new ObservableData(RemoteData.notAsked());
         this._gaqSummary$.bubbleTo(this);
 
-        this._mcReproducibleAsNotBad = false;
-
         this._markAsSkimmableRequestResult$ = new ObservableData(RemoteData.notAsked());
         this._markAsSkimmableRequestResult$.bubbleTo(this);
 
@@ -57,9 +54,6 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
             integer: false,
         }));
 
-        this._runDetectorsSelectionModel = new RunDetectorsSelectionModel();
-        this._runDetectorsSelectionModel.bubbleTo(this);
-
         this._freezeOrUnfreezeActionState$ = new ObservableData(RemoteData.notAsked());
         this._freezeOrUnfreezeActionState$.bubbleTo(this);
 
@@ -110,8 +104,6 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
             return;
         }
 
-        this._runDetectorsSelectionModel.reset();
-
         this._fetchQcSummary();
         this._fetchGaqSummary();
         await this._fetchDataPass();
@@ -308,35 +300,6 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
         return this._dataPassId;
     }
 
-    /**
-     * Set mcReproducibleAsNotBad
-     *
-     * @param {boolean} mcReproducibleAsNotBad new value
-     * @return {void}
-     */
-    setMcReproducibleAsNotBad(mcReproducibleAsNotBad) {
-        this._mcReproducibleAsNotBad = mcReproducibleAsNotBad;
-        this.load();
-    }
-
-    /**
-     * Get mcReproducibleAsNotBad
-     *
-     * @return {boolean} mcReproducibleAsNotBad
-     */
-    get mcReproducibleAsNotBad() {
-        return this._mcReproducibleAsNotBad;
-    }
-
-    /**
-     * Returns the run detectors selection model
-     *
-     * @return {RunDetectorsSelectionModel} selection model
-     */
-    get runDetectorsSelectionModel() {
-        return this._runDetectorsSelectionModel;
-    }
-
     /**
      * Fetch data pass data which runs are fetched
      * @return {Promise<void>} promise

lib/public/views/Runs/RunsPerSimulationPass/RunsPerSimulationPassOverviewModel.js

@@ -15,7 +15,6 @@ import { RunsWithQcModel } from '../Overview/RunsWithQcModel.js';
 import { ObservableData } from '../../../utilities/ObservableData.js';
 import { getRemoteData } from '../../../utilities/fetch/getRemoteData.js';
 import { detectorsProvider } from '../../../services/detectors/detectorsProvider.js';
-import { RunDetectorsSelectionModel } from '../RunDetectorsSelectionModel.js';
 
 /**
  * Runs Per Simulation Pass overview model
@@ -29,13 +28,12 @@ export class RunsPerSimulationPassOverviewModel extends RunsWithQcModel {
         super(model);
         this._detectors$ = detectorsProvider.qc$;
         this._detectors$.bubbleTo(this);
+        this.registerDetectorsNotBadFractionFilterModels(this._detectors$);
+
         this._simulationPass$ = new ObservableData(RemoteData.notAsked());
         this._simulationPass$.bubbleTo(this);
         this._qcSummary$ = new ObservableData(RemoteData.NotAsked());
         this._qcSummary$.bubbleTo(this);
-
-        this._runDetectorsSelectionModel = new RunDetectorsSelectionModel();
-        this._runDetectorsSelectionModel.bubbleTo(this);
     }
 
     /**
@@ -70,8 +68,6 @@ export class RunsPerSimulationPassOverviewModel extends RunsWithQcModel {
      * @inheritdoc
      */
     async load() {
-        this._runDetectorsSelectionModel.reset();
-
         this._fetchQcSummary();
         this._fetchSimulationPass();
         super.load();
@@ -129,13 +125,4 @@ export class RunsPerSimulationPassOverviewModel extends RunsWithQcModel {
     get qcSummary() {
         return this._qcSummary$.getCurrent();
     }
-
-    /**
-     * Returns the run detectors selection model
-     *
-     * @return {RunDetectorsSelectionModel} selection model
-     */
-    get runDetectorsSelectionModel() {
-        return this._runDetectorsSelectionModel;
-    }
 }

lib/public/views/Runs/RunsPerSimulationPass/RunsPerSimulationPassOverviewPage.js

@@ -92,7 +92,7 @@ export const RunsPerSimulationPassOverviewPage = ({
 
             return [
                 h('.flex-row.justify-between.items-center.g2', [
-                    filtersPanelPopover(perSimulationPassOverviewModel.filteringModel, activeColumns, { profile: 'runsPerSimulationPass' }),
+                    filtersPanelPopover(perSimulationPassOverviewModel, activeColumns, { profile: 'runsPerSimulationPass' }),
                     h('.pl2#runOverviewFilter', runNumbersFilter(perSimulationPassOverviewModel.filteringModel.get('runNumbers'))),
                     h(
                         '.flex-row.g1.items-center',