Merge branch 'main' into feature/O2B-1503/lhcfills-fill-numbers-filter

Houwie7000 · Houwie7000 · commit fd055ca53488 · 2025-12-17T11:02:44.000+01:00
diff --git a/lib/domain/enums/StatusAcronyms.js b/lib/domain/enums/StatusAcronyms.js
@@ -19,6 +19,7 @@ const statusAcronyms = Object.freeze({
     RUNNING: 'R',
     ERROR: 'E',
     DESTROYED: 'X',
+    DONE: 'X',
 });
 
 exports.statusAcronyms = statusAcronyms;
diff --git a/lib/public/components/environments/environmentStatusHistoryComponent.js b/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])),
             ])),
     ]);
 
diff --git a/lib/public/domain/enums/statusAcronym.mjs b/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',
 });
diff --git a/lib/public/views/Environments/ActiveColumns/environmentsActiveColumns.js b/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' },
+        ),
     },
 };
diff --git a/lib/public/views/Environments/Overview/EnvironmentOverviewModel.js b/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(),
         });
 
diff --git a/lib/usecases/environment/GetAllEnvironmentsUseCase.js b/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) {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -51,13 +51,13 @@
     "chai": "4.5.0",
     "date-and-time": "3.6.0",
     "eslint": "^9.37.0",
-    "eslint-plugin-jsdoc": "^61.4.1",
+    "eslint-plugin-jsdoc": "^61.5.0",
     "globals": "^16.5.0",
     "js-yaml": "4.1.1",
     "mocha": "11.7.0",
     "nodemon": "3.1.3",
     "nyc": "17.1.0",
-    "puppeteer": "24.31.0",
+    "puppeteer": "24.33.0",
     "puppeteer-to-istanbul": "1.4.0",
     "sequelize-cli": "6.6.0",
     "sinon": "21.0.0",
diff --git a/test/api/environments.test.js b/test/api/environments.test.js
@@ -171,6 +171,15 @@ module.exports = () => {
             expect(withChar[1].id).to.be.equal(withoutChar[1].id);
         });
 
+        it('should successfully filter environments on status history with a partial sequence', async () => {
+            const response = await request(server).get('/api/environments?filter[statusHistory]=D-E');
+            
+            expect(response.status).to.equal(200);
+            const environments = response.body.data;
+            expect(environments.length).to.be.equal(1);
+            expect(environments[0].id).to.be.equal('KGIS12DS');
+        });
+
         it('should successfully filter environments status history with limit', async () => {
             const response = await request(server).get('/api/environments?filter[statusHistory]=SE&page[limit]=1');
 
diff --git a/test/public/envs/overview.test.js b/test/public/envs/overview.test.js
