use lhc period Id

xsalonx · xsalonx · commit 79b192798662 · 2025-08-07T15:49:46.000+02:00
diff --git a/lib/public/views/Runs/RunPerDataPass/RunsPerDataPassOverviewModel.js b/lib/public/views/Runs/RunPerDataPass/RunsPerDataPassOverviewModel.js
@@ -43,8 +43,8 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
                 }));
             }),
         }));
-        this._dataPass = new ObservableData(RemoteData.notAsked());
-        this._dataPass.bubbleTo(this);
+        this._dataPass$ = new ObservableData(RemoteData.notAsked());
+        this._dataPass$.bubbleTo(this);
         this._qcSummary$ = new ObservableData(RemoteData.notAsked());
         this._qcSummary$.bubbleTo(this);
         this._gaqSummary$ = new ObservableData(RemoteData.notAsked());
@@ -120,16 +120,16 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
 
         this._fetchQcSummary();
         this._fetchGaqSummary();
-        await this._fetchDataPass();
-        this._dataPass.getCurrent().match({
-            Success: ({ skimmingStage, pdpBeamTypes }) => {
-                if (skimmingStage === SkimmingStage.SKIMMABLE) {
-                    this._fetchSkimmableRuns();
-                }
-                this.setPdpBeamTypes(pdpBeamTypes);
-            },
-            Other: () => null,
-        });
+        await this._fetchDataPass().then(() =>
+            this._dataPass$.getCurrent().match({
+                Success: ({ skimmingStage, pdpBeamTypes }) => {
+                    if (skimmingStage === SkimmingStage.SKIMMABLE) {
+                        this._fetchSkimmableRuns();
+                    }
+                    this.setPdpBeamTypes(pdpBeamTypes);
+                },
+                Other: () => null,
+            }));
         super.load();
     }
 
@@ -284,7 +284,7 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
      * Get current data pass which runs are fetched
      */
     get dataPass() {
-        return this._dataPass.getCurrent();
+        return this._dataPass$.getCurrent();
     }
 
     /**
@@ -353,12 +353,12 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
      * @return {Promise<void>} promise
      */
     async _fetchDataPass() {
-        this._dataPass.setCurrent(RemoteData.loading());
+        this._dataPass$.setCurrent(RemoteData.loading());
         try {
             const { items: [dataPass] = [] } = await getRemoteDataSlice(`/api/dataPasses?filter[ids][]=${this._dataPassId}`);
-            this._dataPass.setCurrent(RemoteData.success(dataPass));
+            this._dataPass$.setCurrent(RemoteData.success(dataPass));
         } catch (error) {
-            this._dataPass.setCurrent(RemoteData.failure(error));
+            this._dataPass$.setCurrent(RemoteData.failure(error));
         }
     }
 
diff --git a/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewModel.js b/lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewModel.js
@@ -14,6 +14,7 @@ import { buildUrl, RemoteData } from '/js/src/index.js';
 import { TabbedPanelModel } from '../../../components/TabbedPanel/TabbedPanelModel.js';
 import { detectorsProvider } from '../../../services/detectors/detectorsProvider.js';
 import { jsonFetch } from '../../../utilities/fetch/jsonFetch.js';
+import { ObservableData } from '../../../utilities/ObservableData.js';
 import { FixedPdpBeamTypeRunsOverviewModel } from '../Overview/FixedPdpBeamTypeRunsOverviewModel.js';
 
 export const RUNS_PER_LHC_PERIOD_PANELS_KEYS = {
@@ -35,38 +36,73 @@ export class RunsPerLhcPeriodOverviewModel extends FixedPdpBeamTypeRunsOverviewM
         this._detectors$ = detectorsProvider.physical$;
         this._detectors$.bubbleTo(this);
 
+        this._lhcPeriodId = null;
+        this._lhcPeriod$ = new ObservableData(RemoteData.notAsked());
+        this._lhcPeriod$.bubbleTo(this);
+
         this._tabbedPanelModel = new RunsPerLhcPeriodTabbedPanelModel();
         this._tabbedPanelModel.bubbleTo(this);
     }
 
+    /**
+     * Fetch LHC period data which runs are fetched
+     * @return {Promise<void>} promise
+     */
+    async _fetchLhcPeriod() {
+        this._lhcPeriod$.setCurrent(RemoteData.loading());
+        try {
+            const { data: [lhcPeriod] } = await jsonFetch(`/api/lhcPeriodsStatistics?filter[ids][]=${this._lhcPeriodId}`);
+            this._lhcPeriod$.setCurrent(RemoteData.success(lhcPeriod));
+        } catch (error) {
+            this._lhcPeriod$.setCurrent(RemoteData.failure(error));
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    async load() {
+        if (!this._lhcPeriodId) {
+            return;
+        }
+
+        this._fetchLhcPeriod().then(() =>
+            this._lhcPeriod$.getCurrent().match({
+                Success: ({ pdpBeamTypes }) => this.setPdpBeamTypes(pdpBeamTypes),
+                Other: () => null,
+            }));
+
+        super.load();
+    }
+
     /**
      * @inheritdoc
      */
     getRootEndpoint() {
         return buildUrl(super.getRootEndpoint(), {
             filter: {
-                lhcPeriods: this._lhcPeriodName,
+                lhcPeriodIds: [this._lhcPeriodId],
                 runQualities: 'good',
                 definitions: 'PHYSICS',
             },
         });
     }
 
     /**
-     * Get name of current lhc period which runs are fetched
+     * Get LHC period which runs are fetched
      */
-    get lhcPeriodName() {
-        return this._lhcPeriodName;
+    get lhcPeriod() {
+        return this._lhcPeriod$.getCurrent();
     }
 
     /**
-     * Set name of current lhc period which runs are fetched
+     * Set id of current LHC period which runs are fetched
      *
-     * @param {string} lhcPeriodName name of LHC period
+     * @param {string} lhcPeriodId id of a LHC period
      */
-    set lhcPeriodName(lhcPeriodName) {
-        this._lhcPeriodName = lhcPeriodName;
-        this._tabbedPanelModel.lhcPeriodName = lhcPeriodName;
+    set lhcPeriodId(lhcPeriodId) {
+        this._lhcPeriodId = lhcPeriodId;
+        this._tabbedPanelModel.lhcPeriodId = lhcPeriodId;
     }
 
     /**
@@ -119,17 +155,17 @@ class RunsPerLhcPeriodTabbedPanelModel extends TabbedPanelModel {
      * @return {Promise<void>} resolved once data are fetched
      */
     async _fetchSynchronousQcSummary() {
-        if (this._lhcPeriodName) {
+        if (this._lhcPeriodId) {
             this.currentPanelData = RemoteData.loading();
             this.notify();
             try {
-                const { data: [lhcPeriod] } = await jsonFetch(`/api/lhcPeriodsStatistics?filter[names][]=${this._lhcPeriodName}`);
-                if (!lhcPeriod) {
-                    this.currentPanelData = RemoteData.failure([{ title: `Cannot find LHC period with name '${this._lhcPeriodName}'` }]);
-                } else {
-                    const { data: qcSummary } = await jsonFetch(`/api/qcFlags/summary?lhcPeriodId=${lhcPeriod.id}`);
-                    this.currentPanelData = RemoteData.success(qcSummary);
-                }
+                const { data: qcSummary } = await jsonFetch(buildUrl(
+                    '/api/qcFlags/summary',
+                    {
+                        lhcPeriodId: this._lhcPeriodId,
+                    },
+                ));
+                this.currentPanelData = RemoteData.success(qcSummary);
             } catch (errors) {
                 this.currentPanelData = RemoteData.failure(errors);
             }
@@ -138,12 +174,12 @@ class RunsPerLhcPeriodTabbedPanelModel extends TabbedPanelModel {
     }
 
     /**
-     * Set LHC period name
+     * Set LHC period id
      *
-     * @param {string} lhcPeriodName name of LHC period
+     * @param {id} lhcPeriodId id of LHC period
      */
-    set lhcPeriodName(lhcPeriodName) {
-        this._lhcPeriodName = lhcPeriodName;
+    set lhcPeriodId(lhcPeriodId) {
+        this._lhcPeriodId = lhcPeriodId;
         this._fetchCurrentPanelData();
     }
 }
diff --git a/lib/public/views/Runs/RunsModel.js b/lib/public/views/Runs/RunsModel.js
@@ -85,15 +85,14 @@ export class RunsModel extends Observable {
     /**
      * Load runs overview data
      * @param {object} params the parameters for the model
-     * @param {string} params.lhcPeriodName  the name of the LHC period to display
+     * @param {string} params.lhcPeriodId  the name of the LHC period to display
      * @param {string} params.panel the key of the panel to display
-     * @param {string} params.pdpBeamTypesx the key of the panel to display
      * @return {void}
      */
-    loadPerLhcPeriodOverview({ lhcPeriodName, panel }) {
+    loadPerLhcPeriodOverview({ lhcPeriodId, panel }) {
         this._perLhcPeriodOverviewModel.tabbedPanelModel.currentPanelKey = panel;
         if (!this._perLhcPeriodOverviewModel.pagination.isInfiniteScrollEnabled) {
-            this._perLhcPeriodOverviewModel.lhcPeriodName = lhcPeriodName;
+            this._perLhcPeriodOverviewModel.lhcPeriodId = lhcPeriodId;
             this._perLhcPeriodOverviewModel.load();
         }
     }
diff --git a/lib/public/views/lhcPeriods/ActiveColumns/lhcPeriodsActiveColumns.js b/lib/public/views/lhcPeriods/ActiveColumns/lhcPeriodsActiveColumns.js
@@ -40,13 +40,13 @@ export const lhcPeriodsActiveColumns = {
     associatedRuns: {
         name: 'Runs',
         visible: true,
-        format: (_, { name, runsCount }) =>
+        format: (_, { id, runsCount }) =>
             runsCount === 0
                 ? 'No runs'
                 : frontLink(
                     badge(runsCount),
                     'runs-per-lhc-period',
-                    { lhcPeriodName: name },
+                    { lhcPeriodId: id },
                 ),
         classes: 'w-10',
     },
