add lhcFills filter to the filteringmodel

Author: Guust

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

@@ -24,7 +24,6 @@ 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 { 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';
 
@@ -157,7 +156,7 @@ export const logsActiveColumns = {
          * @param {FilteringModel} logOverviewModel.filteringModel filtering model
          * @return {Component} the filter component
          */
-        filter: ({ filteringModel }) => tagFilter(filteringModel.get('listingTagsFilterModel')),
+        filter: ({ filteringModel }) => tagFilter(filteringModel.get('tags')),
         balloon: true,
         profiles: [profiles.none, 'embeded'],
     },
@@ -210,7 +209,7 @@ export const logsActiveColumns = {
         filter: ({ filteringModel }) => rawTextFilter(
             filteringModel.get('environments'),
             {
-                id: 'runsFilterText',
+                id: 'environmentFilterText',
                 classes: ['w-75', 'mt1'],
                 placeholder: 'e.g. Dxi029djX, TDI59So3d...',
             },
@@ -224,7 +223,22 @@ export const logsActiveColumns = {
         sortable: false,
         size: 'w-10',
         format: formatLhcFillsList,
-        filter: lhcFillsFilter,
+
+        /**
+         * LhcFills 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('lhcFills'),
+            {
+                id: 'lhcFillsFilterText',
+                classes: ['w-75', 'mt1'],
+                placeholder: 'e.g. 11392, 11383, 7625',
+            },
+        ),
         balloon: true,
         profiles: [profiles.none, 'embeded'],
     },

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

@@ -41,9 +41,10 @@ export class LogsOverviewModel extends Observable {
             authorFilter: new AuthorFilterModel(),
             titleFilter: new RawTextFilterModel(),
             contentFilter: new RawTextFilterModel(),
-            listingTagsFilterModel: new TagFilterModel(tagsProvider.items$),
+            tags: new TagFilterModel(tagsProvider.items$),
             run: new RawTextFilterModel(),
             environments: new RawTextFilterModel(),
+            lhcFills: new RawTextFilterModel(),
         });
 
         this._filteringModel.observe(() => this._applyFilters());
@@ -125,8 +126,6 @@ export class LogsOverviewModel extends Observable {
         this.runFilterOperation = 'AND';
         this.environmentFilterOperation = 'AND';
         this.lhcFillFilterOperation = 'AND';
-        this.lhcFillFilterValues = [];
-        this._lhcFillFilterRawValue = '';
 
         this._pagination.reset();
 
@@ -144,7 +143,6 @@ export class LogsOverviewModel extends Observable {
             !this._filteringModel.isAnyFilterActive()
             || this.createdFilterFrom !== ''
             || this.createdFilterTo !== ''
-            || this.lhcFillFilterValues.length !== 0
         );
     }
 
@@ -198,27 +196,6 @@ export class LogsOverviewModel extends Observable {
         return this._lhcFillFilterRawValue;
     }
 
-    /**
-     * Add a lhcFill to the filter
-     * @param {string} rawLhcFills The LHC fills to be added to the filter criteria
-     * @returns {void}
-     */
-    setLhcFillsFilter(rawLhcFills) {
-        this._lhcFillFilterRawValue = rawLhcFills;
-
-        // Split the lhc fills string by comma or whitespace, remove falsy values like empty strings, and convert to int
-        const lhcFills = rawLhcFills
-            .split(/[ ,]+/)
-            .filter(Boolean)
-            .map((fillNumberStr) => parseInt(fillNumberStr.trim(), 10));
-
-        // Allow empty lhcFills only if raw lhcFills is an empty string
-        if (lhcFills.length > 0 || rawLhcFills.length === 0) {
-            this.lhcFillFilterValues = lhcFills;
-            this._applyFilters();
-        }
-    }
-
     /**
      * Returns the current minimum creation datetime
      * @returns {Integer} The current minimum creation datetime
@@ -327,9 +304,10 @@ export class LogsOverviewModel extends Observable {
         const titleFilter = this._filteringModel.get('titleFilter');
         const contentFilter = this._filteringModel.get('contentFilter');
         const authorFilter = this._filteringModel.get('authorFilter');
-        const listingTagsFilterModel = this._filteringModel.get('listingTagsFilterModel');
+        const tags = this._filteringModel.get('tags');
         const run = this._filteringModel.get('run');
         const environments = this._filteringModel.get('environments');
+        const lhcFills = this._filteringModel.get('lhcFills');
 
         return {
             ...!titleFilter.isEmpty && {
@@ -349,9 +327,9 @@ export class LogsOverviewModel extends Observable {
                 'filter[created][to]':
                     new Date(`${this.createdFilterTo.replace(/\//g, '-')}T23:59:59.999`).getTime(),
             },
-            ...!listingTagsFilterModel.isEmpty && {
-                'filter[tags][values]': listingTagsFilterModel.selected.join(),
-                'filter[tags][operation]': listingTagsFilterModel.combinationOperator,
+            ...!tags.isEmpty && {
+                'filter[tags][values]': tags.selected.join(),
+                'filter[tags][operation]': tags.combinationOperator,
             },
             ...!run.isEmpty && {
                 'filter[run][values]': run.normalized,
@@ -361,8 +339,8 @@ export class LogsOverviewModel extends Observable {
                 'filter[environments][values]': environments.normalized,
                 'filter[environments][operation]': this.environmentFilterOperation.toLowerCase(),
             },
-            ...this.lhcFillFilterValues.length > 0 && {
-                'filter[lhcFills][values]': this.lhcFillFilterValues.join(),
+            ...!lhcFills.isEmpty && {
+                'filter[lhcFills][values]': lhcFills.normalized,
                 'filter[lhcFills][operation]': this.lhcFillFilterOperation.toLowerCase(),
             },
             ...sortOn && sortDirection && {