From 00f0b60f48cfca7b1db1851ad822c88cbe5d48e2 Mon Sep 17 00:00:00 2001 From: George Raduta Date: Mon, 17 Aug 2026 12:44:55 +0200 Subject: [PATCH 1/2] Use detectors rather than sync detectors as per inherited prop --- .../RunsPerLhcPeriodOverviewModel.js | 20 +++++-------------- .../RunsPerLhcPeriodOverviewPage.js | 8 ++++---- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewModel.js b/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewModel.js index cd61bc63a9..ea4aed5b6e 100644 --- a/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewModel.js +++ b/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewModel.js @@ -34,15 +34,14 @@ export class RunsPerLhcPeriodOverviewModel extends FixedPdpBeamTypeRunsOverviewM this._lhcPeriodId = null; this._lhcPeriodStatistics$ = new ObservableData(RemoteData.notAsked()); - this._syncDetectors$ = this._setDetectorsObservable( + this._detectors$ = this._setDetectorsObservable( [rctDetectorsProvider.qc$, this._lhcPeriodStatistics$], ([detectors, lhcPeriodStatistics]) => { const filteredDetectors = filterOutLegacyDetectorsForNewerPeriods(detectors, lhcPeriodStatistics.lhcPeriod.name); - return filteredDetectors.filter(({ type }) => [DetectorType.PHYSICAL, DetectorType.MUON_GLO].includes(type)); + return filteredDetectors.filter(({ type }) => [DetectorType.QC_ONLY, DetectorType.PHYSICAL, DetectorType.MUON_GLO,].includes(type)); }, ); - this._detectors$ = this._syncDetectors$; this._lhcPeriodStatistics$.bubbleTo(this); } @@ -74,8 +73,8 @@ export class RunsPerLhcPeriodOverviewModel extends FixedPdpBeamTypeRunsOverviewM Other: () => null, }); - this.registerDetectorsForQcFlagsDataExport(this._syncDetectors$); - this.registerObservablesQcSummaryDependsOn(this._syncDetectors$); + this.registerDetectorsForQcFlagsDataExport(this._detectors$); + this.registerObservablesQcSummaryDependsOn(this._detectors$); super.load(); } @@ -95,20 +94,11 @@ export class RunsPerLhcPeriodOverviewModel extends FixedPdpBeamTypeRunsOverviewM return this._lhcPeriodStatistics$.getCurrent(); } - /** - * Get all detectors for synchronous QC flags - * - * @return {RemoteData} detectors - */ - get syncDetectors() { - return this._syncDetectors$.getCurrent(); - } - /** * @inheritdoc */ get detectors() { - return this._syncDetectors$.getCurrent(); + return this._detectors$.getCurrent(); } /** diff --git a/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewPage.js b/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewPage.js index 8c7b14c7e5..6413d41eae 100644 --- a/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewPage.js +++ b/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewPage.js @@ -51,7 +51,7 @@ export const RunsPerLhcPeriodOverviewPage = ({ runs: { perLhcPeriodOverviewModel const { items: remoteRuns, lhcPeriodStatistics: remoteLhcPeriodStatistics, - syncDetectors: remoteSyncDetectors, + detectors: remoteDetectors, displayOptions, sortModel, mcReproducibleAsNotBad, @@ -115,10 +115,10 @@ export const RunsPerLhcPeriodOverviewPage = ({ runs: { perLhcPeriodOverviewModel Failure: (errors) => errorAlert(errors), Loading: () => spinner(), Success: () => [ - mergeRemoteData([remoteSyncDetectors, remoteQcSummary]).match({ - Success: ([syncDetectors, synchronousQcSummary]) => getTableWithGivenDetectorsColumns( + mergeRemoteData([remoteDetectors, remoteQcSummary]).match({ + Success: ([detectors, synchronousQcSummary]) => getTableWithGivenDetectorsColumns( activeColumns, - runDetectorsQualitiesAndSyncQcActiveColumns(syncDetectors, { + runDetectorsQualitiesAndSyncQcActiveColumns(detectors, { profiles: 'runsPerLhcPeriod', qcSummary: synchronousQcSummary, }), From a759562b04c6bac0789ec94b73bb3bb40fcc670b Mon Sep 17 00:00:00 2001 From: George Raduta Date: Mon, 17 Aug 2026 12:48:29 +0200 Subject: [PATCH 2/2] Revert filtered type of detectors --- .../views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewModel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewModel.js b/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewModel.js index ea4aed5b6e..23413b2071 100644 --- a/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewModel.js +++ b/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewModel.js @@ -39,7 +39,7 @@ export class RunsPerLhcPeriodOverviewModel extends FixedPdpBeamTypeRunsOverviewM ([detectors, lhcPeriodStatistics]) => { const filteredDetectors = filterOutLegacyDetectorsForNewerPeriods(detectors, lhcPeriodStatistics.lhcPeriod.name); - return filteredDetectors.filter(({ type }) => [DetectorType.QC_ONLY, DetectorType.PHYSICAL, DetectorType.MUON_GLO,].includes(type)); + return filteredDetectors.filter(({ type }) => [DetectorType.PHYSICAL, DetectorType.MUON_GLO].includes(type)); }, ); this._lhcPeriodStatistics$.bubbleTo(this);