Merge branch 'main' into xsalonx/MICS/O2B-1099/mode-reset-filter-btn-…

…on-top
AliceO2Group · Apr 25, 2024 · 950ef22 · 950ef22
2 parents 4c684e8 + ddeedac
commit 950ef22
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/lib/public/views/SimulationPasses/ActiveColumns/simulationPassesActiveColumns.js b/lib/public/views/SimulationPasses/ActiveColumns/simulationPassesActiveColumns.js
@@ -51,7 +51,14 @@ export const simulationPassesActiveColumns = {
     associatedDataPasses: {
         name: 'Anchorage',
         visible: true,
-        format: (_, { id }) => frontLink('Anchorage', 'data-passes-per-simulation-pass-overview', { simulationPassId: id }),
+        format: (_, { id, dataPassesCount }) =>
+            dataPassesCount === 0
+                ? 'No anchorage'
+                : frontLink(
+                    badge(dataPassesCount),
+                    'data-passes-per-simulation-pass-overview',
+                    { simulationPassId: id },
+                ),
         classes: 'w-10 f6',
     },
 

diff --git a/test/public/simulationPasses/overviewAnchoredSimulationPasses.test.js b/test/public/simulationPasses/overviewAnchoredSimulationPasses.test.js
@@ -58,7 +58,7 @@ module.exports = () => {
         const tableDataValidators = {
             name: (name) => periodNameRegex.test(name),
             associatedRuns: (display) => /(No runs)|(\d+)/.test(display),
-            associatedDataPasses: (display) => 'Anchorage' === display,
+            associatedDataPasses: (display) => /(No anchorage)|(\d+)/.test(display),
             pwg: (pwg) => /PWG.+/.test(pwg),
             jiraId: (jiraId) => /[A-Z][A-Z0-9]+-[0-9]+/.test(jiraId),
             requestedEventsCount: (requestedEventsCount) => !isNaN(requestedEventsCount.replace(/,/g, '')),

diff --git a/test/public/simulationPasses/overviewPerLhcPeriod.test.js b/test/public/simulationPasses/overviewPerLhcPeriod.test.js
@@ -58,7 +58,7 @@ module.exports = () => {
         const headerDatatypes = {
             name: (name) => periodNameRegex.test(name),
             associatedRuns: (display) => /(No runs)|(\d+)/.test(display),
-            associatedDataPasses: (display) => 'Anchorage' === display,
+            associatedDataPasses: (display) => /(No anchorage)|(\d+)/.test(display),
             pwg: (pwg) => /PWG.+/.test(pwg),
             jiraId: (jiraId) => /[A-Z]+[A-Z0-9]+-\d+/.test(jiraId),
             requestedEventsCount: (requestedEventsCount) => !isNaN(requestedEventsCount.replace(/,/g, '')),