Merge branch 'main' into feature/O2B-1491/Add-filtering-by-last-status-to-envs-filtering-panel

Author: isaachilly

.github/workflows/bookkeeping.yml

@@ -37,7 +37,7 @@ jobs:
                     qc-flags]
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Docker
         uses: docker/setup-buildx-action@v3
       - name: Create Coverage Directory
@@ -91,7 +91,7 @@ jobs:
     timeout-minutes: 5
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup NodeJS
         uses: actions/setup-node@v6
         with:

.github/workflows/docker.yml

@@ -15,7 +15,7 @@ jobs:
     timeout-minutes: 5
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Lint Dockerfile
         uses: brpaz/hadolint-action@master
         with:
@@ -26,7 +26,7 @@ jobs:
     timeout-minutes: 5
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Validate docker-compose.yml
         run: |
           docker compose \

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
     outputs:
       VERSION: ${{ steps.set-project.outputs.version }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-node@v6
       with:
         node-version: '22.x'
@@ -43,7 +43,7 @@ jobs:
     outputs:
       ASSET_URL: ${{ steps.upload.outputs.asset_url }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-node@v6
       with:
         node-version: '22.x'

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

@@ -25,6 +25,7 @@ import { infoTooltip } from '../../../components/common/popover/infoTooltip.js';
 import { aliEcsEnvironmentLinkComponent } from '../../../components/common/externalLinks/aliEcsEnvironmentLinkComponent.js';
 import { StatusAcronym } from '../../../domain/enums/statusAcronym.mjs';
 import { checkboxes } from '../../../components/Filters/common/filters/checkboxFilter.js';
+import { rawTextFilter } from '../../../components/Filters/common/filters/rawTextFilter.js';
 
 /**
  * List of active columns for a generic Environments component
@@ -54,6 +55,17 @@ export const environmentsActiveColumns = {
             ],
             '125px',
         ),
+
+        /**
+         * Environment IDs filter component
+         *
+         * @param {EnvironmentOverviewModel} environmentOverviewModel the environment overview model
+         * @return {Component} the filter component
+         */
+        filter: (environmentOverviewModel) => rawTextFilter(
+            environmentOverviewModel.filteringModel.get('ids'),
+            { classes: ['w-100'], placeholder: 'e.g. CmCvjNbg, TDI59So3d...' },
+        ),
     },
     runs: {
         name: 'Runs',

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

@@ -15,6 +15,7 @@ import { buildUrl } from '/js/src/index.js';
 import { FilteringModel } from '../../../components/Filters/common/FilteringModel.js';
 import { OverviewPageModel } from '../../../models/OverviewModel.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';
@@ -38,6 +39,7 @@ export class EnvironmentOverviewModel extends OverviewPageModel {
                     rawLabel: status,
                 })).concat({ value: 'UNKNOWN', label: coloredEnvironmentStatusComponent('UNKNOWN'), rawLabel: 'UNKNOWN' }),
             }),
+            ids: new RawTextFilterModel(),
         });
 
         this._filteringModel.observe(() => this._applyFilters(true));

test/public/envs/overview.test.js

@@ -26,6 +26,9 @@ const {
     getPopoverSelector,
     goToPage,
     openFilteringPanel,
+    fillInput,
+    expectAttributeValue,
+    resetFilters,
 } = require('../defaults.js');
 const dateAndTime = require('date-and-time');
 const { resetDatabaseContent } = require('../../utilities/resetDatabaseContent.js');
@@ -318,5 +321,32 @@ module.exports = () => {
         await page.$eval(getCurrentStatusCheckboxSelector("DEPLOYED"), (element) => element.click());
         await waitForTableLength(page, 3);
         await checkTableCurrentStatuses(["RUNNING", "DEPLOYED"]);
+    };
+
+    it('should successfully filter environments by their IDs', async () => {
+        /**
+         * This is the sequence to test filtering the environments on IDs.
+         *
+         * @param {string} selector the filter input selector
+         * @param {string} inputValue the value to type in the filter input
+         * @param {string[]} expectedIds the list of expected environment IDs after filtering
+         * @return {void}
+         */
+        const filterOnID = async (selector, inputValue, expectedIds) => {
+            await fillInput(page, selector, inputValue, ['change']);
+            await waitForTableLength(page, expectedIds.length);
+            expect(await page.$$eval('tbody tr', (rows) => rows.map((row) => row.id))).to.eql(expectedIds.map(id => `row${id}`));
+        };
+
+        await expectAttributeValue(page, '.id-filter input', 'placeholder', 'e.g. CmCvjNbg, TDI59So3d...');
+
+        await filterOnID('.id-filter input', 'CmCvjNbg', ['CmCvjNbg']);
+        await resetFilters(page);
+
+        await filterOnID('.id-filter input', 'CmCvjNbg, TDI59So3d', ['CmCvjNbg', 'TDI59So3d']);
+        await resetFilters(page);
+
+        await filterOnID('.id-filter input', 'j', ['CmCvjNbg', 'GIDO1jdkD', '8E4aZTjY', 'Dxi029djX']);
+        await resetFilters(page);
     });
 };