[O2B-1471] Remove unnecessary PdpBeamType parameter from url (#1958)

* fixes, refactor

* rename

* rename

* renames

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* add ppBeamTypes to front links and fix set method

* fix

* rm unncessary param

* rm pdpBeamType

* use lhc period Id

* mv from another b

* cleanup

* typo

* cleanup

* fix

* fix

Author: xsalonx

lib/database/adapters/DataPassAdapter.js

@@ -40,14 +40,14 @@ class DataPassAdapter {
 
         const runsCount = databaseObject.get('runsCount');
         const simulationPassesCount = databaseObject.get('simulationPassesCount');
-        const pdpBeamType = databaseObject.get('pdpBeamType');
+        const pdpBeamTypes = databaseObject.get('pdpBeamTypes')?.split(',') || [];
 
         return {
             id,
             name,
             skimmingStage,
             versions: (versions ?? []).map(this.dataPassVersionAdapter.toEntity),
-            pdpBeamType,
+            pdpBeamTypes,
             runsCount,
             simulationPassesCount,
             isFrozen,

lib/database/adapters/LhcPeriodStatisticsAdapter.js

@@ -34,7 +34,7 @@ class LhcPeriodStatisticsAdapter {
 
         const runsCount = databaseObject.get('runsCount');
         const distinctEnergies = databaseObject.get('distinctEnergies')?.split(',').map((energy) => parseFloat(energy)) || [];
-        const beamTypes = databaseObject.get('beamTypes')?.split(',') || [];
+        const pdpBeamTypes = databaseObject.get('pdpBeamTypes')?.split(',') || [];
         const dataPassesCount = databaseObject.get('dataPassesCount');
         const simulationPassesCount = databaseObject.get('simulationPassesCount');
 
@@ -43,7 +43,7 @@ class LhcPeriodStatisticsAdapter {
             avgCenterOfMassEnergy,
             runsCount,
             distinctEnergies,
-            beamTypes,
+            pdpBeamTypes,
             dataPassesCount,
             simulationPassesCount,
             lhcPeriod: lhcPeriod ? this.lhcPeriodAdapter.toEntity(lhcPeriod) : null,

lib/database/adapters/SimulationPassAdapter.js

@@ -42,6 +42,7 @@ class SimulationPassAdapter {
 
         const dataPassesCount = databaseObject.get('dataPassesCount');
         const runsCount = databaseObject.get('runsCount');
+        const pdpBeamTypes = databaseObject.get('pdpBeamTypes')?.split(',') || [];
 
         return {
             id,
@@ -54,6 +55,7 @@ class SimulationPassAdapter {
             outputSize,
             runsCount,
             dataPassesCount,
+            pdpBeamTypes,
         };
     }
 }

lib/database/models/typedefs/SequelizeLhcPeriodStatistics.js

@@ -17,7 +17,7 @@
  * @property {number} id
  * @property {number|null} avgCenterOfMassEnergy
  * @property {number[]} distinctEnergies
- * @property {string[]} beamTypes
+ * @property {string[]} pdpBeamTypes
  * @property {number} runsCount
  * @property {number} dataPassesCount
  * @property {number} simulationPassesCount

lib/domain/entities/LhcPeriodStatistics.js

@@ -17,7 +17,7 @@
  * @property {number} id
  * @property {LhcPeriod} lhcPeriod
  * @property {number[]|null} distinctEnergies
- * @property {string[]} beamTypes
+ * @property {string[]} pdpBeamTypes
  * @property {number} runsCount
  * @property {number} dataPassesCount
  * @property {number} simulationPassesCount

lib/public/views/DataPasses/ActiveColumns/dataPassesActiveColumns.js

@@ -46,13 +46,13 @@ export const dataPassesActiveColumns = {
     associatedRuns: {
         name: 'Runs',
         visible: true,
-        format: (_, { id, runsCount, pdpBeamType }) =>
+        format: (_, { id, runsCount }) =>
             runsCount === 0
                 ? 'No runs'
                 : frontLink(
                     badge(runsCount),
                     'runs-per-data-pass',
-                    { dataPassId: id, pdpBeamType },
+                    { dataPassId: id },
                 ),
         classes: 'w-10',
     },

lib/public/views/QcFlags/QcFlagsModel.js

@@ -95,9 +95,9 @@ export class QcFlagsModel extends Observable {
     /**
      * Load the creation for data pass page model
      *
-     * @param {Object} params - Parameters for the method
-     * @param {number} params.dataPassId - The data pass ID
-     * @param {string} [params.runNumberDetectorsMap] - String representation of run number to detector map
+     * @param {Object} parameters - Parameters for the method
+     * @param {number} parameters.dataPassId - The data pass ID
+     * @param {string} parameters.runNumberDetectorsMap - String representation of run number to detector map
      * @returns {void}
      */
     loadCreationForDataPass({ dataPassId, runNumberDetectorsMap }) {
@@ -190,7 +190,7 @@ export class QcFlagsModel extends Observable {
      * Load the creation for simulation pass page model
      * @param {object} parameters parameters for the model
      * @param {number} parameters.simulationPassId - The simulation pass ID
-     * @param {string} [parameters.runNumberDetectorsMap] - String representation of run number to detector map
+     * @param {string} parameters.runNumberDetectorsMap - String representation of run number to detector map
      * @returns {void}
      */
     loadCreationForSimulationPass({ simulationPassId, runNumberDetectorsMap }) {

lib/public/views/Runs/ActiveColumns/getInelasticInteractionRateActiveColumns.js

@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright CERN and copyright holders of ALICE O2. This software is
+ * distributed under the terms of the GNU General Public License v3 (GPL
+ * Version 3), copied verbatim in the file "COPYING".
+ *
+ * See http://alice-o2.web.cern.ch/license for full licensing information.
+ *
+ * In applying this license CERN does not waive the privileges and immunities
+ * granted to it by virtue of its status as an Intergovernmental Organization
+ * or submit itself to any jurisdiction.
+ */
+
+import { PdpBeamType } from '../../../domain/enums/PdpBeamType.js';
+import { inelasticInteractionRateActiveColumnsForPbPb as inelForPbPb } from './inelasticInteractionRateActiveColumnsForPbPb.js';
+import { inelasticInteractionRateActiveColumnsForProtonProton as inelForPP } from './inelasticInteractionRateActiveColumnsForProtonProton.js';
+
+/**
+ * Get appropriate runs' activate columns dependent on their pdp beam types
+ *
+ * @param {string[]} pdpBeamTypes lit of pdp beam types
+ * @return {ActiveColumn} active column
+ */
+export const getInelasticInteractionRateColumns = (pdpBeamTypes) => ({
+    ...pdpBeamTypes?.includes(PdpBeamType.LEAD_LEAD) ? inelForPbPb : {},
+    ...pdpBeamTypes?.includes(PdpBeamType.PROTON_PROTON) ? inelForPP : {},
+});

lib/public/views/Runs/Overview/FixedPdpBeamTypeRunsOverviewModel.js

@@ -26,25 +26,26 @@ export class FixedPdpBeamTypeRunsOverviewModel extends RunsWithQcModel {
      */
     constructor(model) {
         super(model);
-
-        this._pdpBeamType = null;
+        this._pdpBeamTypes = [];
     }
 
     /**
      * Get pdp_beam_type of fetched runs
      *
-     * @return {string} beam type
+     * @return {string[]} beam type
      */
     get pdpBeamTypes() {
-        return this._pdpBeamType;
+        return this._pdpBeamTypes;
     }
 
     /**
      * Set pdp_beam_type of fetched runs
      *
-     * @param {string} pdpBeamType beam type
+     * @param {string|string[]|null} pdpBeamTypes beam type, nullish values are ignored
      */
-    set pdpBeamTypes(pdpBeamType) {
-        this._pdpBeamType = pdpBeamType;
+    setPdpBeamTypes(pdpBeamTypes) {
+        if (pdpBeamTypes) {
+            this._pdpBeamTypes = typeof pdpBeamTypes === 'string' ? pdpBeamTypes.split(',') : pdpBeamTypes;
+        }
     }
 }

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

@@ -122,11 +122,16 @@ export class RunsPerDataPassOverviewModel extends FixedPdpBeamTypeRunsOverviewMo
 
         this._fetchQcSummary();
         this._fetchGaqSummary();
-        await this._fetchDataPass();
-        this._dataPass$.getCurrent().match({
-            Success: ({ skimmingStage }) => skimmingStage === SkimmingStage.SKIMMABLE && this._fetchSkimmableRuns(),
-            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();
     }