[O2B-1505] LHCfills beam duration filter

lib/domain/dtos/filters/LhcFillsFilterDto.js

@@ -11,7 +11,16 @@
  *  or submit itself to any jurisdiction.
  */
 const Joi = require('joi');
+const { validateRange } = require('../../../utilities/rangeUtils');
+const { validateTime } = require('../../../utilities/validateTime');
 
 exports.LhcFillsFilterDto = Joi.object({
     hasStableBeams: Joi.boolean(),
+    fillNumbers: Joi.string().trim().custom(validateRange).messages({
+        'any.invalid': '{{#message}}',
+    }),
+    beamDuration: Joi.string().trim().min(8).max(8).custom(validateTime).messages({
+        'any.invalid': '{{#message}}',
+    }),
+    beamDurationOperator: Joi.string().trim().min(1).max(2),
 });

lib/domain/dtos/filters/RunFilterDto.js

@@ -18,6 +18,7 @@ const { IntegerComparisonDto, FloatComparisonDto } = require('./NumericalCompari
 const { RUN_CALIBRATION_STATUS } = require('../../enums/RunCalibrationStatus.js');
 const { RUN_DEFINITIONS } = require('../../enums/RunDefinition.js');
 const { singleRunsCollectionCustomCheck } = require('../utils.js');
+const { validateRange } = require('../../../utilities/rangeUtils.js');
 
 const DetectorsFilterDto = Joi.object({
     operator: Joi.string().valid('or', 'and', 'none').required(),
@@ -30,35 +31,6 @@ const EorReasonFilterDto = Joi.object({
     description: Joi.string(),
 });
 
-/**
- * Validates run numbers ranges to not exceed 100 runs
- *
- * @param {*} value  The value to validate
- * @param {*} helpers The helpers object
- * @returns {Object} The value if validation passes
- */
-const validateRange = (value, helpers) => {
-    const MAX_RANGE_SIZE = 100;
-
-    const runNumbers = value.split(',').map((runNumber) => runNumber.trim());
-
-    for (const runNumber of runNumbers) {
-        if (runNumber.includes('-')) {
-            const [start, end] = runNumber.split('-').map((n) => parseInt(n, 10));
-            if (Number.isNaN(start) || Number.isNaN(end) || start > end) {
-                return helpers.error('any.invalid', { message: `Invalid range: ${runNumber}` });
-            }
-            const rangeSize = end - start + 1;
-
-            if (rangeSize > MAX_RANGE_SIZE) {
-                return helpers.error('any.invalid', { message: `Given range exceeds max size of ${MAX_RANGE_SIZE} runs: ${runNumber}` });
-            }
-        }
-    }
-
-    return value;
-};
-
 exports.RunFilterDto = Joi.object({
     runNumbers: Joi.string().trim().custom(validateRange).messages({
         'any.invalid': '{{#message}}',

lib/public/components/Filters/LhcFillsFilter/StableBeamFilterModel.js

@@ -0,0 +1,76 @@
+/**
+ * @license
+ * Copyright CERN and copyright holders of ALICE Trg. 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-Trg.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 { SelectionModel } from '../../common/selection/SelectionModel.js';
+
+/**
+ * Stable beam filter model
+ * Holds true or false value
+ */
+export class StableBeamFilterModel extends SelectionModel {
+    /**
+     * Constructor
+     */
+    constructor() {
+        super({ availableOptions: [{ value: true }, { value: false }],
+            defaultSelection: [{ value: false }],
+            multiple: false,
+            allowEmpty: false });
+    }
+
+    /**
+     * Returns true if the current filter is stable beams only
+     *
+     * @return {boolean} true if filter is stable beams only
+     */
+    isStableBeamsOnly() {
+        return this.current;
+    }
+
+    /**
+     * Sets the current filter to stable beams only
+     *
+     * @param {boolean} value value to set this stable beams only filter with
+     * @return {void}
+     */
+    setStableBeamsOnly(value) {
+        this.select({ value });
+    }
+
+    /**
+     * Get normalized selected option
+     */
+    get normalized() {
+        return this.current;
+    }
+
+    /**
+     * Overrides SelectionModel.isEmpty to respect the fact that stable beam filter cannot be empty.
+     * @returns {boolean} true if the current value of the filter is false.
+     */
+    get isEmpty() {
+        return this.current === false;
+    }
+
+    /**
+     * Reset the filter to default values
+     *
+     * @return {void}
+     */
+    resetDefaults() {
+        if (!this.isEmpty) {
+            this.reset();
+            this.notify();
+        }
+    }
+}

lib/public/components/Filters/LhcFillsFilter/beamDurationFilter.js

@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright CERN and copyright holders of ALICE Trg. 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-Trg.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 { comparisonOperatorFilter } from '../common/filters/comparisonOperatorFilter.js';
+import { rawTextFilter } from '../common/filters/rawTextFilter.js';
+
+/**
+ * Component to filter LHC-fills by beam duration
+ *
+ * @param {rawTextFilter} beamDurationFilterModel beamDurationFilterModel
+ * @param {string} beamDurationOperator beam duration operator value
+ * @param {(string) => undefined} beamDurationOperatorUpdate beam duration operator setter function
+ * @returns {Component} the text field
+ */
+export const beamDurationFilter = (beamDurationFilterModel, beamDurationOperator, beamDurationOperatorUpdate) => {
+    const amountFilter = rawTextFilter(
+        beamDurationFilterModel,
+        { classes: ['w-100', 'beam-duration-filter'], placeholder: 'e.g 16:14:15 (HH:MM:SS)' },
+    );
+
+    return comparisonOperatorFilter(amountFilter, beamDurationOperator, (value) => beamDurationOperatorUpdate(value));
+};

lib/public/components/Filters/LhcFillsFilter/fillNumberFilter.js

@@ -0,0 +1,25 @@
+/**
+ * @license
+ * Copyright CERN and copyright holders of ALICE Trg. 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-Trg.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 { rawTextFilter } from '../common/filters/rawTextFilter.js';
+
+/**
+ * Component to filter LHC-fills by fill number
+ *
+ * @param {RawTextFilterModel} filterModel the filter model
+ * @returns {Component} the text field
+ */
+export const fillNumberFilter = (filterModel) => rawTextFilter(
+    filterModel,
+    { classes: ['w-100', 'fill-numbers-filter'], placeholder: 'e.g. 11392, 11383, 7625' },
+);

lib/public/components/Filters/LhcFillsFilter/stableBeamFilter.js

@@ -0,0 +1,49 @@
+/**
+ * @license
+ * Copyright CERN and copyright holders of ALICE Trg. 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-Trg.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 { h } from '/js/src/index.js';
+import { switchInput } from '../../common/form/switchInput.js';
+import { radioButton } from '../../common/form/inputs/radioButton.js';
+
+/**
+ * Display a toggle switch or radio buttons to filter stable beams only
+ *
+ * @param {StableBeamFilterModel} stableBeamFilterModel the stableBeamFilterModel
+ * @param {boolean} radioButtonMode define whether or not to return radio buttons or a switch.
+ * @returns {Component} the toggle switch
+ */
+export const toggleStableBeamOnlyFilter = (stableBeamFilterModel, radioButtonMode = false) => {
+    const name = 'stableBeamsOnlyRadio';
+    const labelOff = 'OFF';
+    const labelOn = 'ON';
+    if (radioButtonMode) {
+        return h('.form-group-header.flex-row.w-100', [
+            radioButton({
+                label: labelOff,
+                isChecked: !stableBeamFilterModel.isStableBeamsOnly(),
+                action: () => stableBeamFilterModel.setStableBeamsOnly(false),
+                name: name,
+            }),
+            radioButton({
+                label: labelOn,
+                isChecked: stableBeamFilterModel.isStableBeamsOnly(),
+                action: () => stableBeamFilterModel.setStableBeamsOnly(true),
+                name: name,
+            }),
+        ]);
+    } else {
+        return switchInput(stableBeamFilterModel.isStableBeamsOnly(), (newState) => {
+            stableBeamFilterModel.setStableBeamsOnly(newState);
+        }, { labelAfter: 'STABLE BEAM ONLY' });
+    }
+};

lib/public/components/Filters/RunsFilter/dcs.js

@@ -11,6 +11,7 @@
  * or submit itself to any jurisdiction.
  */
 
+import { radioButton } from '../../common/form/inputs/radioButton.js';
 import { h } from '/js/src/index.js';
 
 /**
@@ -20,33 +21,30 @@ import { h } from '/js/src/index.js';
  */
 const dcsOperationRadioButtons = (runModel) => {
     const state = runModel.getDcsFilterOperation();
+    const name = 'dcsFilterRadio';
+    const labelAny = 'ANY';
+    const labelOff = 'OFF';
+    const labelOn = 'ON';
     return h('.form-group-header.flex-row.w-100', [
-        radioButton('ANY', state === '', () => runModel.removeDcs()),
-        radioButton('OFF', state === false, () => runModel.setDcsFilterOperation(false)),
-        radioButton('ON', state === true, () => runModel.setDcsFilterOperation(true)),
+        radioButton({
+            label: labelAny,
+            isChecked: state === '',
+            action: () => runModel.removeDcs(),
+            name,
+        }),
+        radioButton({
+            label: labelOff,
+            isChecked: state === false,
+            action: () => runModel.setDcsFilterOperation(false),
+            name,
+        }),
+        radioButton({
+            label: labelOn,
+            isChecked: state === true,
+            action: () => runModel.setDcsFilterOperation(true),
+            name,
+        }),
     ]);
 };
 
-/**
- * Build a radio button with its configuration and actions
- * @param {string} label - label to be displayed to the user for radio button
- * @param {boolean} isChecked - is radio button selected or not
- * @param {Function} action - action to be followed on user click
- * @return {vnode} - radio button with label associated
- */
-const radioButton = (label, isChecked, action) => h('.w-33.form-check', [
-    h('input.form-check-input', {
-        onchange: action,
-        type: 'radio',
-        id: `dcsFilterRadio${label}`,
-        name: 'dcsFilterRadio',
-        value: label,
-        checked: isChecked,
-    }, ''),
-    h('label.form-check-label', {
-        style: 'cursor: pointer;',
-        for: `dcsFilterRadio${label}`,
-    }, label),
-]);
-
 export default dcsOperationRadioButtons;

lib/public/components/Filters/RunsFilter/ddflp.js

@@ -11,6 +11,7 @@
  * or submit itself to any jurisdiction.
  */
 
+import { radioButton } from '../../common/form/inputs/radioButton.js';
 import { h } from '/js/src/index.js';
 
 /**
@@ -20,33 +21,30 @@ import { h } from '/js/src/index.js';
  */
 const ddflpOperationRadioButtons = (runModel) => {
     const state = runModel.getDdflpFilterOperation();
+    const name = 'ddFlpFilterRadio';
+    const labelAny = 'ANY';
+    const labelOff = 'OFF';
+    const labelOn = 'ON';
     return h('.form-group-header.flex-row.w-100', [
-        radioButton('ANY', state === '', () => runModel.removeDdflp()),
-        radioButton('OFF', state === false, () => runModel.setDdflpFilterOperation(false)),
-        radioButton('ON', state === true, () => runModel.setDdflpFilterOperation(true)),
+        radioButton({
+            label: labelAny,
+            isChecked: state === '',
+            action: () => runModel.removeDdflp(),
+            name,
+        }),
+        radioButton({
+            label: labelOff,
+            isChecked: state === false,
+            action: () => runModel.setDdflpFilterOperation(false),
+            name,
+        }),
+        radioButton({
+            label: labelOn,
+            isChecked: state === true,
+            action: () => runModel.setDdflpFilterOperation(true),
+            name,
+        }),
     ]);
 };
 
-/**
- * Build a radio button with its configuration and actions
- * @param {string} label - label to be displayed to the user for radio button
- * @param {boolean} isChecked - is radio button selected or not
- * @param {Function} action - action to be followed on user click
- * @return {vnode} - radio button with label associated
- */
-const radioButton = (label, isChecked, action) => h('.w-33.form-check', [
-    h('input.form-check-input', {
-        onchange: action,
-        type: 'radio',
-        id: `ddFlpFilterRadio${label}`,
-        name: 'ddFlpFilterRadio',
-        value: label,
-        checked: isChecked,
-    }, ''),
-    h('label.form-check-label', {
-        style: 'cursor: pointer;',
-        for: `ddFlpFilterRadio${label}`,
-    }, label),
-]);
-
 export default ddflpOperationRadioButtons;