Merge branch 'feature/O2B-1503/lhcfills-fill-numbers-filter' into feature/O2B-1505/lhcfills-beam-duration-filter

Author: Houwie7000

lib/domain/enums/StatusAcronyms.js

@@ -19,6 +19,7 @@ const statusAcronyms = Object.freeze({
     RUNNING: 'R',
     ERROR: 'E',
     DESTROYED: 'X',
+    DONE: 'X',
 });
 
 exports.statusAcronyms = statusAcronyms;

lib/public/components/environments/environmentStatusHistoryComponent.js

@@ -25,8 +25,8 @@ export const environmentStatusHistoryLegendComponent = () =>
         h('h5', 'Status History Legend'),
         Object.keys(StatusAcronym).map((status) =>
             h('.flex-row.justify-between', [
-                h('', status),
-                h('', StatusAcronym[status]),
+                coloredEnvironmentStatusComponent(status),
+                h('', coloredEnvironmentStatusComponent(status, StatusAcronym[status])),
             ])),
     ]);
 

lib/public/domain/enums/statusAcronym.mjs

@@ -18,7 +18,6 @@ export const StatusAcronym = Object.freeze({
     CONFIGURED: 'C',
     RUNNING: 'R',
     ERROR: 'E',
-    MIXED: 'M',
     DESTROYED: 'X',
     DONE: 'X',
 });

lib/public/views/Environments/ActiveColumns/environmentsActiveColumns.js

@@ -24,6 +24,8 @@ import { environmentStatusHistoryLegendComponent } from '../../../components/env
 import { infoTooltip } from '../../../components/common/popover/infoTooltip.js';
 import { aliEcsEnvironmentLinkComponent } from '../../../components/common/externalLinks/aliEcsEnvironmentLinkComponent.js';
 import { StatusAcronym } from '../../../domain/enums/statusAcronym.mjs';
+import { timeRangeFilter } from '../../../components/Filters/common/filters/timeRangeFilter.js';
+import { checkboxes } from '../../../components/Filters/common/filters/checkboxFilter.js';
 import { rawTextFilter } from '../../../components/Filters/common/filters/rawTextFilter.js';
 
 /**
@@ -73,6 +75,17 @@ export const environmentsActiveColumns = {
         size: 'w-10',
         format: formatRunsList,
         balloon: true,
+
+        /**
+         * Run numbers filter component
+         *
+         * @param {EnvironmentOverviewModel} environmentOverviewModel the environment overview model
+         * @return {Component} the filter component
+         */
+        filter: (environmentOverviewModel) => rawTextFilter(
+            environmentOverviewModel.filteringModel.get('runNumbers'),
+            { classes: ['w-100'], placeholder: 'e.g. 553203, 553221, ...' },
+        ),
     },
     updatedAt: {
         name: 'Last Update',
@@ -83,10 +96,18 @@ export const environmentsActiveColumns = {
     },
     createdAt: {
         name: 'Created At',
-        visible: false,
+        visible: true,
         sortable: false,
         size: 'w-10',
         format: (timestamp) => formatTimestamp(timestamp, false),
+
+        /**
+         * CreatedAt filter component
+         *
+         * @param {EnvironmentOverviewModel} environmentOverviewModel the environment overview model
+         * @return {Component} the filter component
+         */
+        filter: (environmentOverviewModel) => timeRangeFilter(environmentOverviewModel.filteringModel.get('created')),
     },
     status: {
         name: 'Current Status',
@@ -95,6 +116,14 @@ export const environmentsActiveColumns = {
         size: 'w-10',
         noEllipsis: true,
         format: (_, environment) => displayEnvironmentStatus(environment),
+
+        /**
+         * Status filter component
+         *
+         * @param {EnvironmentOverviewModel} environmentOverviewModel the environment overview model
+         * @return {Component} the filter component
+         */
+        filter: (environmentOverviewModel) => checkboxes(environmentOverviewModel.filteringModel.get('currentStatus').selectionModel),
     },
     historyItems: {
         name: h('.flex-row.g2.items-center', ['Status History', infoTooltip(environmentStatusHistoryLegendComponent())]),
@@ -107,5 +136,16 @@ export const environmentsActiveColumns = {
                 coloredEnvironmentStatusComponent(status, StatusAcronym[status]),
             ]).slice(1),
         balloon: true,
+
+        /**
+         * Status history filter component
+         *
+         * @param {EnvironmentOverviewModel} environmentOverviewModel the environment overview model
+         * @return {Component} the filter component
+         */
+        filter: (environmentOverviewModel) => rawTextFilter(
+            environmentOverviewModel.filteringModel.get('statusHistory'),
+            { classes: ['w-100'], placeholder: 'e.g. D-R-X' },
+        ),
     },
 };

lib/public/views/Environments/Overview/EnvironmentOverviewModel.js

@@ -14,8 +14,12 @@
 import { buildUrl } from '/js/src/index.js';
 import { FilteringModel } from '../../../components/Filters/common/FilteringModel.js';
 import { OverviewPageModel } from '../../../models/OverviewModel.js';
+import { TimeRangeInputModel } from '../../../components/Filters/common/filters/TimeRangeInputModel.js';
+import { SelectionFilterModel } from '../../../components/Filters/common/filters/SelectionFilterModel.js';
 import { RawTextFilterModel } from '../../../components/Filters/common/filters/RawTextFilterModel.js';
 import { debounce } from '../../../utilities/debounce.js';
+import { coloredEnvironmentStatusComponent } from '../ColoredEnvironmentStatusComponent.js';
+import { StatusAcronym } from '../../../domain/enums/statusAcronym.mjs';
 
 /**
  * Environment overview page model
@@ -29,6 +33,16 @@ export class EnvironmentOverviewModel extends OverviewPageModel {
         super();
 
         this._filteringModel = new FilteringModel({
+            created: new TimeRangeInputModel(),
+            runNumbers: new RawTextFilterModel(),
+            statusHistory: new RawTextFilterModel(),
+            currentStatus: new SelectionFilterModel({
+                availableOptions: Object.keys(StatusAcronym).map((status) => ({
+                    value: status,
+                    label: coloredEnvironmentStatusComponent(status),
+                    rawLabel: status,
+                })),
+            }),
             ids: new RawTextFilterModel(),
         });
 

lib/usecases/environment/GetAllEnvironmentsUseCase.js

@@ -126,8 +126,10 @@ class GetAllEnvironmentsUseCase {
             }
 
             if (statusHistory) {
-                // Split the string into separate characters
-                const historyItems = statusHistory.split('');
+                // Check if status history ends with 'X' and remove it if present to handle the special case later
+                const containsX = statusHistory.endsWith('X');
+                const cleanedStatusHistory = containsX ? statusHistory.slice(0, -1) : statusHistory;
+                const historyItems = cleanedStatusHistory.split('');
 
                 // Swap the acronyms with the status (=acronym -> status)
                 const acronymToStatus = {};
@@ -145,17 +147,38 @@ class GetAllEnvironmentsUseCase {
                     }
                 }
 
-                // Filter the environments by status history using the subquery
-                filterQueryBuilder.literalWhere(
-                    `${ENVIRONMENT_STATUS_HISTORY_SUBQUERY} = :statusFilters`,
-                    // Create a string of the status filters separated by a comma
-                    { statusFilters: statusFilters.join(',') },
-                );
+                if (containsX) {
+                    const statusFiltersWithDestroyed = [...statusFilters, 'DESTROYED'].join(',');
+                    const statusFiltersWithDone = [...statusFilters, 'DONE'].join(',');
+
+                    /*
+                     * Use OR condition to match subsequences ending with either DESTROYED or DONE
+                     * Filter the environments by using LIKE for subsequence matching
+                     */
+                    filterQueryBuilder.literalWhere(
+                        `(${ENVIRONMENT_STATUS_HISTORY_SUBQUERY} LIKE :statusFiltersWithDestroyed OR ` +
+                        `${ENVIRONMENT_STATUS_HISTORY_SUBQUERY} LIKE :statusFiltersWithDone)`,
+                        {
+                            statusFiltersWithDestroyed: `%${statusFiltersWithDestroyed}`,
+                            statusFiltersWithDone: `%${statusFiltersWithDone}`,
+                        },
+                    );
 
-                filterQueryBuilder.includeAttribute({
-                    query: ENVIRONMENT_STATUS_HISTORY_SUBQUERY,
-                    alias: 'statusHistory',
-                });
+                    filterQueryBuilder.includeAttribute({
+                        query: ENVIRONMENT_STATUS_HISTORY_SUBQUERY,
+                        alias: 'statusHistory',
+                    });
+                } else {
+                    filterQueryBuilder.literalWhere(
+                        `${ENVIRONMENT_STATUS_HISTORY_SUBQUERY} LIKE :statusFilters`,
+                        { statusFilters: `%${statusFilters.join(',')}%` },
+                    );
+
+                    filterQueryBuilder.includeAttribute({
+                        query: ENVIRONMENT_STATUS_HISTORY_SUBQUERY,
+                        alias: 'statusHistory',
+                    });
+                }
             }
 
             if (runNumbersExpression) {

lib/usecases/lhcFill/GetAllLhcFillsUseCase.js

@@ -58,7 +58,8 @@ class GetAllLhcFillsUseCase {
 
                 // Check that the final fill numbers list contains at least one valid fill number
                 if (finalFillnumberList.length > 0) {
-                    queryBuilder.where('fillNumber').oneOf(...finalFillnumberList);
+                    finalFillnumberList.length === 1 ? queryBuilder.where('fillNumber').is(finalFillnumberList[0])
+                        : queryBuilder.where('fillNumber').oneOf(...finalFillnumberList);
                 }
             }
             // Beam duration filter, limit and corresponding operator.

lib/utilities/rangeUtils.js

@@ -26,7 +26,11 @@ export const validateRange = (value, helpers) => {
 
     for (const number of numbers) {
         if (number.includes('-')) {
-            const [start, end] = number.split('-').map((n) => parseInt(n, 10));
+            // Check if '-' occurs more than once in this part of the range
+            if (number.lastIndexOf('-') !== number.indexOf('-')) {
+                return helpers.error('any.invalid', { message: `Invalid range: ${number}` });
+            }
+            const [start, end] = number.split('-').map((n) => Number(n));
             if (Number.isNaN(start) || Number.isNaN(end) || start > end) {
                 return helpers.error('any.invalid', { message: `Invalid range: ${number}` });
             }
@@ -35,6 +39,11 @@ export const validateRange = (value, helpers) => {
             if (rangeSize > MAX_RANGE_SIZE) {
                 return helpers.error('any.invalid', { message: `Given range exceeds max size of ${MAX_RANGE_SIZE} range: ${number}` });
             }
+        } else {
+            // Prevent non-numeric input.
+            if (isNaN(number)) {
+                return helpers.error('any.invalid', { message: `Invalid number: ${number}` });
+            }
         }
     }
 
@@ -44,15 +53,15 @@ export const validateRange = (value, helpers) => {
 /**
  * Unpacks a given string containing number ranges.
  * E.G. input: 5,7-9 => output: 5,7,8,9
- * @param {string} numbersRange numbers that may or may not contain ranges.
+ * @param {string[]} numbersRanges numbers that may or may not contain ranges.
  * @param {string} rangeSplitter string used to indicate and unpack a range.
  * @returns {Set<Number>} set containing the unpacked range.
  */
-export function unpackNumberRange(numbersRange, rangeSplitter = '-') {
+export function unpackNumberRange(numbersRanges, rangeSplitter = '-') {
     // Set to prevent duplicate values.
     const resultNumbers = new Set();
 
-    numbersRange.forEach((number) => {
+    numbersRanges.forEach((number) => {
         if (number.includes(rangeSplitter)) {
             const [start, end] = number.split(rangeSplitter).map((n) => parseInt(n, 10));
             if (!Number.isNaN(start) && !Number.isNaN(end)) {
@@ -61,7 +70,7 @@ export function unpackNumberRange(numbersRange, rangeSplitter = '-') {
                 }
             }
         } else {
-            if (!Number.isNaN(number)) {
+            if (!isNaN(number)) {
                 resultNumbers.add(Number(number));
             }
         }