Merge branch 'main' of github.com:AliceO2Group/Bookkeeping into improv/O2B-1570/split-sql-requests-with-sequalize

Author: graduta

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

@@ -140,36 +140,49 @@ export class RunsWithQcModel extends RunsOverviewModel {
     }
 
     /**
-     * Register not-bad fraction detectors filtering model
+     * Register not-bad fraction detectors filtering model and update it when detectors are loaded
+     * Also, trigger an immediate update if detectors are already loaded at the moment of registration
      *
      * @param {ObservableData<RemoteData<Detector>>} detectors$ detectors remote data observable
      */
     registerDetectorsNotBadFractionFilterModels(detectors$) {
-        detectors$.observe((observableData) => observableData.getCurrent().apply({
-            Success: (detectors) => detectors.forEach(({ id }) => {
-                this._filteringModel.put(`detectorsQc[_${id}][notBadFraction]`, new NumericalComparisonFilterModel({
-                    scale: 0.01,
-                    integer: false,
-                }));
-            }),
-        }));
+        const callback = (observableData) => {
+            const current = observableData.getCurrent();
+            current?.apply({
+                Success: (detectors) => detectors.forEach(({ id }) => {
+                    this._filteringModel.put(`detectorsQc[_${id}][notBadFraction]`, new NumericalComparisonFilterModel({
+                        scale: 0.01,
+                        integer: false,
+                    }));
+                }),
+            });
+        };
+        detectors$.observe(callback);
+        callback(detectors$);
     }
 
     /**
-     * Register detectors for QC flags data export
+     * Register detectors for QC flags data export and update export configuration when detectors are loaded
+     * Also, trigger an immediate update if detectors are already loaded at the moment of registration
      *
      * @param {ObservableData<RemoteData<Detector>>} detectors$ detectors remote data observable
      */
     registerDetectorsForQcFlagsDataExport(detectors$) {
-        detectors$.observe((observableData) => observableData.getCurrent().apply({
-            Success: (detectors) => {
-                this._exportModel.setDataExportConfiguration({
-                    ...baseDataExportConfiguration,
-                    ...qcFlagsExportConfigurationFactory(detectors),
-                });
-            },
-            Other: () => null,
-        }));
+        const callback = (observableData) => {
+            const current = observableData.getCurrent();
+            current?.apply({
+                Success: (detectors) => {
+                    this._exportModel.setDataExportConfiguration({
+                        ...baseDataExportConfiguration,
+                        ...qcFlagsExportConfigurationFactory(detectors),
+                    });
+                },
+                Other: () => null,
+            });
+        };
+        detectors$.observe(callback);
+        // Also trigger immediately if detectors are already loaded
+        callback(detectors$);
     }
 
     /**
@@ -179,9 +192,13 @@ export class RunsWithQcModel extends RunsOverviewModel {
      */
     registerObservablesQcSummaryDependsOn(detectors$) {
         this._observablesQcFlagsSummaryDependsOn$ = detectors$;
-
-        this._observablesQcFlagsSummaryDependsOn$
-            .observe((observableData) => observableData.getCurrent().apply({ Success: () => this._fetchQcSummary() }));
+        const callback = (observableData) => {
+            const current = observableData.getCurrent();
+            current?.apply({ Success: () => this._fetchQcSummary() });
+        };
+        this._observablesQcFlagsSummaryDependsOn$.observe(callback);
+        // Also trigger immediately if detectors are already loaded
+        callback(this._observablesQcFlagsSummaryDependsOn$);
     }
 
     /**
@@ -208,7 +225,7 @@ export class RunsWithQcModel extends RunsOverviewModel {
     async _fetchQcSummary() {
         const qcSummaryScopeValid = Object.entries(this.qcSummaryScope).filter(([, id]) => id).length == 1;
 
-        if (qcSummaryScopeValid && this.detectors && this._observablesQcFlagsSummaryDependsOn$.getCurrent()) {
+        if (qcSummaryScopeValid && this.detectors && this._observablesQcFlagsSummaryDependsOn$?.getCurrent()) {
             mergeRemoteData([this.detectors, this._observablesQcFlagsSummaryDependsOn$.getCurrent()]).match({
                 Success: async ([detectors]) => {
                     this._qcSummary$.setCurrent(RemoteData.loading());

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

@@ -52,9 +52,6 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
             .build();
 
         this._detectors$.bubbleTo(this);
-        this.registerDetectorsNotBadFractionFilterModels(this._detectors$);
-        this.registerDetectorsForQcFlagsDataExport(this._detectors$);
-        this.registerObservablesQcSummaryDependsOn(this._detectors$);
 
         this._markAsSkimmableRequestResult$ = new ObservableData(RemoteData.notAsked());
         this._markAsSkimmableRequestResult$.bubbleTo(this);
@@ -135,6 +132,11 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
                 },
                 Other: () => null,
             }));
+
+        this.registerDetectorsNotBadFractionFilterModels(this._detectors$);
+        this.registerDetectorsForQcFlagsDataExport(this._detectors$);
+        this.registerObservablesQcSummaryDependsOn(this._detectors$);
+
         super.load();
     }
 

lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewModel.js

@@ -49,9 +49,6 @@ export class RunsPerLhcPeriodOverviewModel extends FixedPdpBeamTypeRunsOverviewM
                 }))
             .build();
 
-        this.registerDetectorsForQcFlagsDataExport(this._syncDetectors$);
-        this.registerObservablesQcSummaryDependsOn(this._syncDetectors$);
-
         this._syncDetectors$.bubbleTo(this);
         this._onlineDetectors$.bubbleTo(this);
         this._lhcPeriodStatistics$.bubbleTo(this);
@@ -82,12 +79,15 @@ export class RunsPerLhcPeriodOverviewModel extends FixedPdpBeamTypeRunsOverviewM
             return;
         }
 
-        await this._fetchLhcPeriod().then(() => {
-            this._lhcPeriodStatistics$.getCurrent().match({
-                Success: ({ pdpBeamTypes }) => this.setPdpBeamTypes(pdpBeamTypes),
-                Other: () => null,
-            });
+        await this._fetchLhcPeriod();
+        this._lhcPeriodStatistics$.getCurrent().match({
+            Success: ({ pdpBeamTypes }) => this.setPdpBeamTypes(pdpBeamTypes),
+            Other: () => null,
         });
+
+        this.registerDetectorsForQcFlagsDataExport(this._syncDetectors$);
+        this.registerObservablesQcSummaryDependsOn(this._syncDetectors$);
+
         super.load();
     }
 

lib/public/views/Runs/RunsModel.js

@@ -142,7 +142,14 @@ export class RunsModel extends Observable {
     loadPerSimulationPassOverview({ simulationPassId }) {
         if (!this._perSimulationPassOverviewModel.pagination.isInfiniteScrollEnabled) {
             this._perSimulationPassOverviewModel.simulationPassId = parseInt(simulationPassId, 10);
-            this._perSimulationPassOverviewModel.load();
+            if (this._perSimulationPassOverviewModel.pagination._defaultItemsPerPage) {
+                /**
+                 * If the default items per page is set, it means model has loaded already once,
+                 * so the pagination trigger will not refresh the data.
+                 * Thus, we need to trigger the load here.
+                 */
+                this._perSimulationPassOverviewModel.load();
+            }
         }
     }
 

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

@@ -31,10 +31,6 @@ export class RunsPerSimulationPassOverviewModel extends FixedPdpBeamTypeRunsOver
 
         this._detectors$ = rctDetectorsProvider.qc$;
 
-        this.registerObservablesQcSummaryDependsOn(this._detectors$);
-        this.registerDetectorsNotBadFractionFilterModels(this._detectors$);
-        this.registerDetectorsForQcFlagsDataExport(this._detectors$);
-
         this._detectors$.bubbleTo(this);
         this._simulationPass$.bubbleTo(this);
     }
@@ -61,12 +57,16 @@ export class RunsPerSimulationPassOverviewModel extends FixedPdpBeamTypeRunsOver
             return;
         }
 
-        this._fetchSimulationPass().then(() => {
-            this._simulationPass$.getCurrent().match({
-                Success: ({ pdpBeamTypes }) => this.setPdpBeamTypes(pdpBeamTypes),
-                Other: () => null,
-            });
+        await this._fetchSimulationPass();
+        this._simulationPass$.getCurrent().match({
+            Success: ({ pdpBeamTypes }) => this.setPdpBeamTypes(pdpBeamTypes),
+            Other: () => null,
         });
+
+        this.registerDetectorsNotBadFractionFilterModels(this._detectors$);
+        this.registerDetectorsForQcFlagsDataExport(this._detectors$);
+        this.registerObservablesQcSummaryDependsOn(this._detectors$);
+
         super.load();
     }