improve activeColumn computation

Author: GuustMetz

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

@@ -117,10 +117,14 @@ export const RunsPerDataPassOverviewPage = ({
 
     const commonTitle = h('h2#breadcrumb-header', { style: 'white-space: nowrap;' }, 'Physics Runs');
     const runDetectorsSelectionIsEmpty = perDataPassOverviewModel.runDetectorsSelectionModel.selectedQueryString.length === 0;
+    const dataPass = remoteDataPass.match({ Other: () => null, Success: (data) => data });
+    const detectors = remoteDetectors.match({ Other: () => null, Success: (data) => data });
+    const qcSummary = remoteQcSummary.match({ Other: () => null, Success: (data) => data });
 
     const activeColumns = {
         ...runsActiveColumns,
         ...getInelasticInteractionRateColumns(pdpBeamTypes),
+
         globalAggregatedQuality: {
             name: 'GAQ',
             information: h(
@@ -129,69 +133,84 @@ export const RunsPerDataPassOverviewPage = ({
                 h('', 'Default detectors: FT0, ITS, TPC (and ZDC for heavy-ion runs)'),
             ),
             visible: true,
+
             format: (_, { runNumber }) => {
-                const gaqLoadingSpinner = h('.flex-row.items-center.justify-center.black', spinner({ size: 2, absolute: false }));
+                const spinnerEl = h('.flex-row.items-center.justify-center.black', spinner({ size: 2, absolute: false }));
+
                 const runGaqSummary = remoteGaqSummary[runNumber];
 
                 return runGaqSummary.match({
                     Success: (gaqSummary) => {
-                        const gaqDisplay = gaqSummary?.undefinedQualityPeriodsCount === 0
-                            ? getQcSummaryDisplay(gaqSummary)
-                            : h('button.btn.btn-primary.w-100', 'GAQ');
+                        const gaqDisplay =
+                            gaqSummary?.undefinedQualityPeriodsCount === 0
+                                ? getQcSummaryDisplay(gaqSummary)
+                                : h('button.btn.btn-primary.w-100', 'GAQ');
 
                         return frontLink(gaqDisplay, 'gaq-flags', { dataPassId, runNumber });
                     },
-                    Loading: () => tooltip(gaqLoadingSpinner, 'Loading GAQ summary...'),
-                    NotAsked: () => tooltip(gaqLoadingSpinner, 'Loading GAQ summary...'),
-                    Failure: () => {
-                        const gaqDisplay = h('button.btn.btn-primary.w-100', [
-                            'GAQ',
-                            h(
-                                '.d-inline-block.va-t-bottom',
-                                tooltip(h('.f7', iconWarning()), 'GAQ Summary failed, please click to view GAQ flags'),
-                            ),
-                        ]);
-                        return frontLink(gaqDisplay, 'gaq-flags', { dataPassId, runNumber });
-                    },
+
+                    Loading: () => loadingTooltip(spinnerEl),
+                    NotAsked: () => loadingTooltip(spinnerEl),
+
+                    Failure: () =>
+                        frontLink(
+                            h('button.btn.btn-primary.w-100', [
+                                'GAQ',
+                                h(
+                                    '.d-inline-block.va-t-bottom',
+                                    tooltip(
+                                        h('.f7', iconWarning()),
+                                        'GAQ Summary failed, please click to view GAQ flags',
+                                    ),
+                                ),
+                            ]),
+                            'gaq-flags',
+                            { dataPassId, runNumber },
+                        ),
                 });
             },
-            filter: ({ filteringModel }) => numericalComparisonFilter(
-                filteringModel.get('gaq[notBadFraction]'),
-                { step: 0.1, selectorPrefix: 'gaqNotBadFraction' },
-            ),
+
+            filter: ({ filteringModel }) =>
+                numericalComparisonFilter(
+                    filteringModel.get('gaq[notBadFraction]'),
+                    { step: 0.1, selectorPrefix: 'gaqNotBadFraction' },
+                ),
+
             filterTooltip: 'not-bad fraction expressed as a percentage',
             profiles: ['runsPerDataPass'],
         },
-    };
 
-    const dataPass = remoteDataPass.match({ Other: () => null, Success: (data) => data });
-    const detectors = remoteDetectors.match({ Other: () => null, Success: (data) => data });
-    const qcSummary = remoteQcSummary.match({ Other: () => null, Success: (data) => data });
+        ...(dataPass?.skimmingStage === SkimmingStage.SKIMMABLE && {
+            readyForSkimming: {
+                name: 'Ready for skimming',
+                visible: true,
 
-    if (dataPass?.skimmingStage === SkimmingStage.SKIMMABLE) {
-        activeColumns.readyForSkimming = {
-            name: 'Ready for skimming',
-            visible: true,
-            format: (_, { runNumber }) => remoteSkimmableRuns.match({
-                Success: (skimmableRuns) => switchInput(
-                    skimmableRuns[runNumber],
-                    () => perDataPassOverviewModel.changeReadyForSkimmingFlagForRun({
-                        runNumber,
-                        readyForSkimming: !skimmableRuns[runNumber],
+                format: (_, { runNumber }) =>
+                    remoteSkimmableRuns.match({
+                        Success: (skimmableRuns) =>
+                            switchInput(
+                                skimmableRuns[runNumber],
+                                () =>
+                                    perDataPassOverviewModel.changeReadyForSkimmingFlagForRun({
+                                        runNumber,
+                                        readyForSkimming: !skimmableRuns[runNumber],
+                                    }),
+                                {
+                                    labelAfter: skimmableRuns[runNumber]
+                                        ? badge('ready', { color: Color.GREEN })
+                                        : badge('not ready', { color: Color.WARNING_DARKER }),
+                                },
+                            ),
+
+                        Loading: () => h('.mh3.ph4', '... ...'),
+                        Failure: () => tooltip(iconWarning(), 'Error occurred'),
+                        NotAsked: () => tooltip(iconWarning(), 'Not asked for data'),
                     }),
-                    {
-                        labelAfter: skimmableRuns[runNumber]
-                            ? badge('ready', { color: Color.GREEN })
-                            : badge('not ready', { color: Color.WARNING_DARKER }),
-                    },
-                ),
-                Loading: () => h('.mh3.ph4', '... ...'),
-                Failure: () => tooltip(iconWarning(), 'Error occurred'),
-                NotAsked: () => tooltip(iconWarning(), 'Not asked for data'),
-            }),
-            profiles: ['runsPerDataPass'],
-        };
-    }
+
+                profiles: ['runsPerDataPass'],
+            },
+        }),
+    };
 
     detectors && dataPass && Object.assign(
         activeColumns,