add runs filter to the filteringmodel

Author: Guust

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

@@ -16,7 +16,6 @@ import { iconCommentSquare, iconPaperclip } from '/js/src/icons.js';
 
 import { authorFilter } from '../../../components/Filters/LogsFilter/author/authorFilter.js';
 import createdFilter from '../../../components/Filters/LogsFilter/created.js';
-import runsFilter from '../../../components/Filters/LogsFilter/runs.js';
 import { formatTimestamp } from '../../../utilities/formatting/formatTimestamp.js';
 import { frontLink } from '../../../components/common/navigation/frontLink.js';
 import { frontLinks } from '../../../components/common/navigation/frontLinks.js';
@@ -28,6 +27,7 @@ import { environmentFilter } from '../../../components/Filters/LogsFilter/enviro
 import { formatLhcFillsList } from '../../LhcFills/format/formatLhcFillsList.js';
 import { lhcFillsFilter } from '../../../components/Filters/LogsFilter/lhcFill.js';
 import { formatTagsList } from '../../Tags/format/formatTagsList.js';
+import { rawTextFilter } from '../../../components/Filters/common/filters/rawTextFilter.js';
 
 /**
  * A method to display a small and simple number/icon collection as a column
@@ -108,11 +108,11 @@ export const logsActiveColumns = {
          * @param {FilteringModel} logOverviewModel.filteringModel filtering model
          * @return {Component} the filter component
          */
-        filter: ({ filteringModel }) => textFilter(
+        filter: ({ filteringModel }) => rawTextFilter(
             filteringModel.get('contentFilter'),
             {
                 id: 'contentFilterText',
-                class: 'w-75 mt1',
+                classes: ['w-75', 'mt1'],
             },
         ),
     },
@@ -168,7 +168,22 @@ export const logsActiveColumns = {
         sortable: true,
         size: 'w-15',
         format: formatRunsList,
-        filter: runsFilter,
+
+        /**
+         * Runs 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('run'),
+            {
+                id: 'runsFilterText',
+                classes: ['w-75', 'mt1'],
+                placeholder: 'e.g. 553203, 553221, ...',
+            },
+        ),
         balloon: true,
         profiles: [profiles.none, 'embeded'],
     },

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

@@ -42,6 +42,7 @@ export class LogsOverviewModel extends Observable {
             titleFilter: new RawTextFilterModel(),
             contentFilter: new RawTextFilterModel(),
             listingTagsFilterModel: new TagFilterModel(tagsProvider.items$),
+            run: new RawTextFilterModel(),
         });
 
         this._filteringModel.observe(() => this._applyFilters());
@@ -357,6 +358,7 @@ export class LogsOverviewModel extends Observable {
         const contentFilter = this._filteringModel.get('contentFilter');
         const authorFilter = this._filteringModel.get('authorFilter');
         const listingTagsFilterModel = this._filteringModel.get('listingTagsFilterModel');
+        const run = this._filteringModel.get('run');
 
         return {
             ...!titleFilter.isEmpty && {
@@ -380,8 +382,8 @@ export class LogsOverviewModel extends Observable {
                 'filter[tags][values]': listingTagsFilterModel.selected.join(),
                 'filter[tags][operation]': listingTagsFilterModel.combinationOperator,
             },
-            ...this.runFilterValues.length > 0 && {
-                'filter[run][values]': this.runFilterValues.join(),
+            ...!run.isEmpty && {
+                'filter[run][values]': run.normalized,
                 'filter[run][operation]': this.runFilterOperation.toLowerCase(),
             },
             ...this.environmentFilterValues.length > 0 && {