refactor

Author: xsalonx

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

@@ -66,36 +66,28 @@ export const RunsPerLhcPeriodOverviewPage = ({ runs: { perLhcPeriodOverviewModel
     } = perLhcPeriodOverviewModel;
 
     const activeColumns = {
-        ...runsActiveColumns,
-        ...remoteRuns.match({
-            Success: (runs) => runs.some((run) => run.pdpBeamType === PdpBeamType.LEAD_LEAD)
-                ? inelasticInteractionRateActiveColumnsForPbPb
-                : {},
-            Other: () => {},
-        }),
-        ...remoteRuns.match({
-            Success: (runs) => runs.some((run) => run.pdpBeamType === PdpBeamType.PROTON_PROTON)
-                ? inelasticInteractionRateActiveColumnsForProtonProton
-                : {},
-            Other: () => {},
-        }),
+
     };
 
     /**
      * Render runs table with given detectors' active columns configuration
      *
+     * @param {Run[]} runs runs
      * @param {object} detectorsActiveColumns active columns
      * @return {Component} table with pagination
      */
-    const getTableWithGivenDetectorsColumns = (detectorsActiveColumns) =>
+    const getTableWithGivenDetectorsColumns = (runs, detectorsActiveColumns) =>
         table(
 
             /*
              * Columns depends on detectors' list, it's not useful to render the table when detectors are missing
              */
             remoteRuns,
             {
-                ...activeColumns,
+                ...runsActiveColumns,
+                ...runs.some((run) => run.pdpBeamType === PdpBeamType.LEAD_LEAD) ? inelasticInteractionRateActiveColumnsForPbPb : {},
+                ...runs.some((run) => run.pdpBeamType === PdpBeamType.PROTON_PROTON)
+                    ? inelasticInteractionRateActiveColumnsForProtonProton : {},
                 ...detectorsActiveColumns,
             },
             { classes: getRowClasses },
@@ -114,7 +106,7 @@ export const RunsPerLhcPeriodOverviewPage = ({ runs: { perLhcPeriodOverviewModel
             NotAsked: () => null,
             Failure: (errors) => errorAlert(errors),
             Loading: () => spinner(),
-            Success: ([lhcPeriod, _, detectors]) => [
+            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'))),
@@ -130,10 +122,13 @@ export const RunsPerLhcPeriodOverviewPage = ({ runs: { perLhcPeriodOverviewModel
                     },
                     {
                         [RUNS_PER_LHC_PERIOD_PANELS_KEYS.DETECTOR_QUALITIES]:
-                        () => getTableWithGivenDetectorsColumns(runDetectorsQualitiesActiveColumns(detectors, { profiles: 'runsPerLhcPeriod' })),
+                        () => getTableWithGivenDetectorsColumns(
+                            runs,
+                            runDetectorsQualitiesActiveColumns(detectors, { profiles: 'runsPerLhcPeriod' }),
+                        ),
 
                         [RUNS_PER_LHC_PERIOD_PANELS_KEYS.SYNCHRONOUS_FLAGS]:
-                            (remoteSynchronousQcSummary) => getTableWithGivenDetectorsColumns(runDetectorsSyncQcActiveColumns(detectors, {
+                            (remoteSynchronousQcSummary) => getTableWithGivenDetectorsColumns(runs, runDetectorsSyncQcActiveColumns(detectors, {
                                 profiles: 'runsPerLhcPeriod',
                                 qcSummary: remoteSynchronousQcSummary.match({ Success: (qcSummary) => qcSummary, Other: () => null }),
                             })),