add environments filter to the filteringmodel

Author: Guust

lib/public/views/Logs/ActiveColumns/logsActiveColumns.js

@@ -23,7 +23,6 @@ import { tagFilter } from '../../../components/Filters/common/filters/tagFilter.
 import { formatRunsList } from '../../Runs/format/formatRunsList.js';
 import { profiles } from '../../../components/common/table/profiles.js';
 import { textFilter } from '../../../components/Filters/common/filters/textFilter.js';
-import { environmentFilter } from '../../../components/Filters/LogsFilter/environments.js';
 import { formatLhcFillsList } from '../../LhcFills/format/formatLhcFillsList.js';
 import { lhcFillsFilter } from '../../../components/Filters/LogsFilter/lhcFill.js';
 import { formatTagsList } from '../../Tags/format/formatTagsList.js';
@@ -200,7 +199,22 @@ export const logsActiveColumns = {
                 parameters: { environmentId: id },
             }),
         ),
-        filter: environmentFilter,
+
+        /**
+         * Environment filter component
+         *
+         * @param {LogsOverviewModel} logOverviewModel the logs overview model
+         * @param {FilteringModel} logOverviewModel.filteringModel filtering model
+         * @return {Component} the filter component
+         */
+        filter: ({ filteringModel }) => rawTextFilter(
+            filteringModel.get('environments'),
+            {
+                id: 'runsFilterText',
+                classes: ['w-75', 'mt1'],
+                placeholder: 'e.g. Dxi029djX, TDI59So3d...',
+            },
+        ),
         balloon: true,
         profiles: [profiles.none, 'embeded'],
     },

lib/public/views/Logs/Overview/LogsOverviewModel.js

@@ -43,6 +43,7 @@ export class LogsOverviewModel extends Observable {
             contentFilter: new RawTextFilterModel(),
             listingTagsFilterModel: new TagFilterModel(tagsProvider.items$),
             run: new RawTextFilterModel(),
+            environments: new RawTextFilterModel(),
         });
 
         this._filteringModel.observe(() => this._applyFilters());
@@ -122,13 +123,7 @@ export class LogsOverviewModel extends Observable {
         this.createdFilterTo = '';
 
         this.runFilterOperation = 'AND';
-        this.runFilterValues = [];
-        this._runFilterRawValue = '';
-
         this.environmentFilterOperation = 'AND';
-        this.environmentFilterValues = [];
-        this._environmentFilterRawValue = '';
-
         this.lhcFillFilterOperation = 'AND';
         this.lhcFillFilterValues = [];
         this._lhcFillFilterRawValue = '';
@@ -149,8 +144,6 @@ export class LogsOverviewModel extends Observable {
             !this._filteringModel.isAnyFilterActive()
             || this.createdFilterFrom !== ''
             || this.createdFilterTo !== ''
-            || this.runFilterValues.length !== 0
-            || this.environmentFilterValues.length !== 0
             || this.lhcFillFilterValues.length !== 0
         );
     }
@@ -163,29 +156,6 @@ export class LogsOverviewModel extends Observable {
         return this._runFilterRawValue;
     }
 
-    /**
-     * Add a run to the filter
-     * @param {string} rawRuns The runs to be added to the filter criteria
-     * @returns {undefined}
-     */
-    setRunsFilter(rawRuns) {
-        this._runFilterRawValue = rawRuns;
-        const runs = [];
-        const valuesRegex = /([0-9]+),?/g;
-
-        let match = valuesRegex.exec(rawRuns);
-        while (match) {
-            runs.push(parseInt(match[1], 10));
-            match = valuesRegex.exec(rawRuns);
-        }
-
-        // Allow empty runs only if raw runs is an empty string
-        if (runs.length > 0 || rawRuns.length === 0) {
-            this.runFilterValues = runs;
-            this._applyFilters();
-        }
-    }
-
     /**
      * Returns the raw current environment filter
      * @returns {string} the raw current environment filter
@@ -359,6 +329,7 @@ export class LogsOverviewModel extends Observable {
         const authorFilter = this._filteringModel.get('authorFilter');
         const listingTagsFilterModel = this._filteringModel.get('listingTagsFilterModel');
         const run = this._filteringModel.get('run');
+        const environments = this._filteringModel.get('environments');
 
         return {
             ...!titleFilter.isEmpty && {
@@ -386,8 +357,8 @@ export class LogsOverviewModel extends Observable {
                 'filter[run][values]': run.normalized,
                 'filter[run][operation]': this.runFilterOperation.toLowerCase(),
             },
-            ...this.environmentFilterValues.length > 0 && {
-                'filter[environments][values]': this.environmentFilterValues,
+            ...!environments.isEmpty && {
+                'filter[environments][values]': environments.normalized,
                 'filter[environments][operation]': this.environmentFilterOperation.toLowerCase(),
             },
             ...this.lhcFillFilterValues.length > 0 && {