a

Author: xsalonx

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

@@ -65,29 +65,22 @@ export const RunsPerLhcPeriodOverviewPage = ({ runs: { perLhcPeriodOverviewModel
         tabbedPanelModel,
     } = perLhcPeriodOverviewModel;
 
-    const activeColumns = {
-
-    };
-
     /**
      * Render runs table with given detectors' active columns configuration
      *
-     * @param {Run[]} runs runs
-     * @param {object} detectorsActiveColumns active columns
+     * @param {object} activeColumns common acctivte column
+     * @param {object} detectorsActiveColumns detectors specific columns
      * @return {Component} table with pagination
      */
-    const getTableWithGivenDetectorsColumns = (runs, detectorsActiveColumns) =>
+    const getTableWithGivenDetectorsColumns = (activeColumns, detectorsActiveColumns) =>
         table(
 
             /*
              * Columns depends on detectors' list, it's not useful to render the table when detectors are missing
              */
             remoteRuns,
             {
-                ...runsActiveColumns,
-                ...runs.some((run) => run.pdpBeamType === PdpBeamType.LEAD_LEAD) ? inelasticInteractionRateActiveColumnsForPbPb : {},
-                ...runs.some((run) => run.pdpBeamType === PdpBeamType.PROTON_PROTON)
-                    ? inelasticInteractionRateActiveColumnsForProtonProton : {},
+                ...activeColumns,
                 ...detectorsActiveColumns,
             },
             { classes: getRowClasses },
@@ -106,37 +99,46 @@ export const RunsPerLhcPeriodOverviewPage = ({ runs: { perLhcPeriodOverviewModel
             NotAsked: () => null,
             Failure: (errors) => errorAlert(errors),
             Loading: () => spinner(),
-            Success: ([lhcPeriod, runs, detectors]) => [
-                h('.flex-row.justify-between.items-center.g2', [
-                    filtersPanelPopover(perLhcPeriodOverviewModel, activeColumns, { profile: 'runsPerLhcPeriod' }),
-                    h('.pl2#runOverviewFilter', runNumbersFilter(perLhcPeriodOverviewModel.filteringModel.get('runNumbers'))),
-                    h('h2', `Good, physics runs of ${lhcPeriod.lhcPeriod.name}`),
+            Success: ([lhcPeriod, runs, detectors]) => {
+                const activeColumns = {
+                    ...runsActiveColumns,
+                    ...runs.some((run) => run.pdpBeamType === PdpBeamType.LEAD_LEAD) ? inelasticInteractionRateActiveColumnsForPbPb : {},
+                    ...runs.some((run) => run.pdpBeamType === PdpBeamType.PROTON_PROTON)
+                        ? inelasticInteractionRateActiveColumnsForProtonProton : {},
+                };
 
-                    exportRunsTriggerAndModal(perLhcPeriodOverviewModel, modalModel),
-                ]),
-                ...tabbedPanelComponent(
-                    tabbedPanelModel,
-                    {
-                        [RUNS_PER_LHC_PERIOD_PANELS_KEYS.DETECTOR_QUALITIES]: 'Qualities of detectors',
-                        [RUNS_PER_LHC_PERIOD_PANELS_KEYS.SYNCHRONOUS_FLAGS]: 'Synchronous QC flags',
-                    },
-                    {
-                        [RUNS_PER_LHC_PERIOD_PANELS_KEYS.DETECTOR_QUALITIES]:
+                return [
+                    h('.flex-row.justify-between.items-center.g2', [
+                        filtersPanelPopover(perLhcPeriodOverviewModel, activeColumns, { profile: 'runsPerLhcPeriod' }),
+                        h('.pl2#runOverviewFilter', runNumbersFilter(perLhcPeriodOverviewModel.filteringModel.get('runNumbers'))),
+                        h('h2', `Good, physics runs of ${lhcPeriod.lhcPeriod.name}`),
+
+                        exportRunsTriggerAndModal(perLhcPeriodOverviewModel, modalModel),
+                    ]),
+                    ...tabbedPanelComponent(
+                        tabbedPanelModel,
+                        {
+                            [RUNS_PER_LHC_PERIOD_PANELS_KEYS.DETECTOR_QUALITIES]: 'Qualities of detectors',
+                            [RUNS_PER_LHC_PERIOD_PANELS_KEYS.SYNCHRONOUS_FLAGS]: 'Synchronous QC flags',
+                        },
+                        {
+                            [RUNS_PER_LHC_PERIOD_PANELS_KEYS.DETECTOR_QUALITIES]:
                         () => getTableWithGivenDetectorsColumns(
-                            runs,
+                            activeColumns,
                             runDetectorsQualitiesActiveColumns(detectors, { profiles: 'runsPerLhcPeriod' }),
                         ),
 
-                        [RUNS_PER_LHC_PERIOD_PANELS_KEYS.SYNCHRONOUS_FLAGS]:
-                            (remoteSynchronousQcSummary) => getTableWithGivenDetectorsColumns(runs, runDetectorsSyncQcActiveColumns(detectors, {
-                                profiles: 'runsPerLhcPeriod',
-                                qcSummary: remoteSynchronousQcSummary?.match({ Success: (qcSummary) => qcSummary, Other: () => null }),
-                            })),
-                    },
-                    { panelClass: ['scroll-auto'] },
-                ),
-                paginationComponent(perLhcPeriodOverviewModel.pagination),
-            ],
+                            [RUNS_PER_LHC_PERIOD_PANELS_KEYS.SYNCHRONOUS_FLAGS]: (remoteSynchronousQcSummary) =>
+                                getTableWithGivenDetectorsColumns(activeColumns, runDetectorsSyncQcActiveColumns(detectors, {
+                                    profiles: 'runsPerLhcPeriod',
+                                    qcSummary: remoteSynchronousQcSummary?.match({ Success: (qcSummary) => qcSummary, Other: () => null }),
+                                })),
+                        },
+                        { panelClass: ['scroll-auto'] },
+                    ),
+                    paginationComponent(perLhcPeriodOverviewModel.pagination),
+                ];
+            },
         }),
 
     );