chore: replace runNumbersFilter and rawTextFileters with logsActiveColumns

Author: NarrowsProjects

lib/public/components/Filters/RunsFilter/runNumbersFilter.js

@@ -25,6 +25,7 @@ import { formatLhcFillsList } from '../../LhcFills/format/formatLhcFillsList.js'
 import { formatTagsList } from '../../Tags/format/formatTagsList.js';
 import { rawTextFilter } from '../../../components/Filters/common/filters/rawTextFilter.js';
 import { timeRangeFilter } from '../../../components/Filters/common/filters/timeRangeFilter.js';
+import { textInputFilter } from '../../../components/Filters/common/filters/textInputFilter.js';
 
 /**
  * A method to display a small and simple number/icon collection as a column
@@ -179,14 +180,7 @@ export const logsActiveColumns = {
          * @param {FilteringModel} logOverviewModel.filteringModel filtering model
          * @return {Component} the filter component
          */
-        filter: ({ filteringModel }) => rawTextFilter(
-            filteringModel.get('runNumbers'),
-            {
-                id: 'runsFilterText',
-                classes: ['w-100', 'mt1'],
-                placeholder: 'e.g. 553203, 553221, ...',
-            },
-        ),
+        filter: ({ filteringModel }) => textInputFilter(filteringModel, 'runNumbers', 'e.g. 553203, 553221, ...'),
         balloon: true,
         profiles: [profiles.none, 'embeded'],
     },

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

@@ -12,7 +12,6 @@
  */
 
 import { CopyToClipboardComponent, h } from '/js/src/index.js';
-import { runNumbersFilter } from '../../../components/Filters/RunsFilter/runNumbersFilter.js';
 import { displayRunEorReasonsOverview } from '../format/displayRunEorReasonOverview.js';
 import ddflpFilter from '../../../components/Filters/RunsFilter/ddflp.js';
 import dcsFilter from '../../../components/Filters/RunsFilter/dcs.js';
@@ -48,6 +47,7 @@ import { rawTextFilter } from '../../../components/Filters/common/filters/rawTex
 import { numericalComparisonFilter } from '../../../components/Filters/common/filters/numericalComparisonFilter.js';
 import { checkboxes } from '../../../components/Filters/common/filters/checkboxFilter.js';
 import { triggerValueFilter } from '../../../components/Filters/RunsFilter/triggerValueFilter.js';
+import { textInputFilter } from '../../../components/Filters/common/filters/textInputFilter.js';
 
 /**
  * List of active columns for a generic runs table
@@ -67,10 +67,10 @@ export const runsActiveColumns = {
         /**
          * Run numbers filter component
          *
-         * @param {RunsOverviewModel} runsOverviewModel the runs overview model
+         * @param {FilteringModel} runsOverviewModel.filteringModel the filtering model
          * @return {Component} the filter component
          */
-        filter: (runsOverviewModel) => runNumbersFilter(runsOverviewModel.filteringModel.get('runNumbers')),
+        filter: ({ filteringModel }) => textInputFilter(filteringModel, 'runNumbers', 'e.g. 534454, 534455...'),
         format: (runNumber, run) => buttonLinkWithDropdown(
             runNumber,
             'run-detail',

lib/public/views/Runs/ActiveColumns/runsActiveColumns.js

@@ -17,7 +17,6 @@ import { filtersPanelPopover } from '../../../components/Filters/common/filtersP
 import { paginationComponent } from '../../../components/Pagination/paginationComponent.js';
 import { runsActiveColumns } from '../ActiveColumns/runsActiveColumns.js';
 import { table } from '../../../components/common/table/table.js';
-import { runNumbersFilter } from '../../../components/Filters/RunsFilter/runNumbersFilter.js';
 import { switchInput } from '../../../components/common/form/switchInput.js';
 import { exportTriggerAndModal } from '../../../components/common/dataExport/exportTriggerAndModal.js';
 import { textInputFilter } from '../../../components/Filters/common/filters/textInputFilter.js';
@@ -55,7 +54,7 @@ export const RunsOverviewPage = ({ runs: { overviewModel: runsOverviewModel }, m
     return h('', [
         h('.flex-row.header-container.g2.pv2', [
             filtersPanelPopover(runsOverviewModel, runsActiveColumns),
-            h('.pl2#runOverviewFilter', runNumbersFilter(runsOverviewModel.filteringModel.get('runNumbers'))),
+            h('.pl2#runOverviewFilter', textInputFilter(runsOverviewModel.filteringModel, 'runNumbers', 'e.g. 534454, 534455...')),
             togglePhysicsOnlyFilter(runsOverviewModel.filteringModel.get('definitions')),
             exportTriggerAndModal(runsOverviewModel.exportModel, modalModel),
         ]),

lib/public/views/Runs/Overview/RunsOverviewPage.js

@@ -21,7 +21,6 @@ import { tooltip } from '../../../components/common/popover/tooltip.js';
 import { breadcrumbs } from '../../../components/common/navigation/breadcrumbs.js';
 import { createRunDetectorsAsyncQcActiveColumns } from '../ActiveColumns/runDetectorsAsyncQcActiveColumns.js';
 import { filtersPanelPopover } from '../../../components/Filters/common/filtersPanelPopover.js';
-import { runNumbersFilter } from '../../../components/Filters/RunsFilter/runNumbersFilter.js';
 import { qcSummaryLegendTooltip } from '../../../components/qcFlags/qcSummaryLegendTooltip.js';
 import { isRunNotSubjectToQc } from '../../../components/qcFlags/isRunNotSubjectToQc.js';
 import { frontLink } from '../../../components/common/navigation/frontLink.js';
@@ -39,6 +38,7 @@ import { BkpRoles } from '../../../domain/enums/BkpRoles.js';
 import { getInelasticInteractionRateColumns } from '../ActiveColumns/getInelasticInteractionRateActiveColumns.js';
 import { exportTriggerAndModal } from '../../../components/common/dataExport/exportTriggerAndModal.js';
 import { mcReproducibleAsNotBadToggle } from '../mcReproducibleAsNotBadToggle.js';
+import { textInputFilter } from '../../../components/Filters/common/filters/textInputFilter.js';
 
 const TABLEROW_HEIGHT = 59;
 // Estimate of the navbar and pagination elements height total; Needs to be updated in case of changes;

lib/public/views/Runs/RunPerDataPass/RunsPerDataPassOverviewPage.js

@@ -26,9 +26,9 @@ import errorAlert from '../../../components/common/errorAlert.js';
 import spinner from '../../../components/common/spinner.js';
 import { getInelasticInteractionRateColumns } from '../ActiveColumns/getInelasticInteractionRateActiveColumns.js';
 import { filtersPanelPopover } from '../../../components/Filters/common/filtersPanelPopover.js';
-import { runNumbersFilter } from '../../../components/Filters/RunsFilter/runNumbersFilter.js';
 import { mcReproducibleAsNotBadToggle } from '../mcReproducibleAsNotBadToggle.js';
 import { exportTriggerAndModal } from '../../../components/common/dataExport/exportTriggerAndModal.js';
+import { textInputFilter } from '../../../components/Filters/common/filters/textInputFilter.js';
 
 const TABLEROW_HEIGHT = 62;
 // Estimate of the navbar and pagination elements height total; Needs to be updated in case of changes;
@@ -108,7 +108,7 @@ export const RunsPerLhcPeriodOverviewPage = ({ runs: { perLhcPeriodOverviewModel
     return [
         h('.flex-row.justify-between.items-center.g2', [
             filtersPanelPopover(perLhcPeriodOverviewModel, activeColumns, { profile: 'runsPerLhcPeriod' }),
-            h('.pl2#runOverviewFilter', runNumbersFilter(perLhcPeriodOverviewModel.filteringModel.get('runNumbers'))),
+            h('.pl2#runOverviewFilter', textInputFilter(perLhcPeriodOverviewModel.filteringModel, 'runNumbers', 'e.g. 534454, 534455...')),
             h('h2.flex-row', ['Good, physics runs of ', lhcPeriodName]),
             mcReproducibleAsNotBadToggle(
                 mcReproducibleAsNotBad,

lib/public/views/Runs/RunPerPeriod/RunsPerLhcPeriodOverviewPage.js

@@ -27,8 +27,8 @@ import errorAlert from '../../../components/common/errorAlert.js';
 import { getInelasticInteractionRateColumns } from '../ActiveColumns/getInelasticInteractionRateActiveColumns.js';
 import { exportTriggerAndModal } from '../../../components/common/dataExport/exportTriggerAndModal.js';
 import { filtersPanelPopover } from '../../../components/Filters/common/filtersPanelPopover.js';
-import { runNumbersFilter } from '../../../components/Filters/RunsFilter/runNumbersFilter.js';
 import { mcReproducibleAsNotBadToggle } from '../mcReproducibleAsNotBadToggle.js';
+import { textInputFilter } from '../../../components/Filters/common/filters/textInputFilter.js';
 
 const TABLEROW_HEIGHT = 59;
 // Estimate of the navbar and pagination elements height total; Needs to be updated in case of changes;

lib/public/views/Runs/RunsPerSimulationPass/RunsPerSimulationPassOverviewPage.js

@@ -485,13 +485,13 @@ module.exports = () => {
 
         it('can filter by run number', async () => {
             // Insert some text into the filter
-            await fillInput(page, '#runsFilterText', '1, 2', ['change']);
+            await fillInput(page, '.runNumbers-filter', '1, 2', ['change']);
             await waitForTableLength(page, 2);
             await resetFilters(page);
 
             await waitForTableLength(page, 10);
 
-            await fillInput(page, '#runsFilterText', '1234567890', ['change']);
+            await fillInput(page, '.runNumbers-filter', '1234567890', ['change']);
             await waitForEmptyTable(page);
         });
 

test/public/logs/overview.test.js

@@ -54,7 +54,7 @@ const banIconPath =
  */
 const goToRunDetails = async (page, runNumber) => {
     await waitForNavigation(page, () => pressElement(page, '#run-overview'));
-    await fillInput(page, '.run-numbers-filter', `${runNumber},${runNumber}`, ['change']);
+    await fillInput(page, '.runNumbers-filter`', `${runNumber},${runNumber}`, ['change']);
     await waitForTableLength(page, 1);
     return waitForNavigation(page, () => pressElement(page, `a[href="?page=run-detail&runNumber=${runNumber}"]`));
 };

test/public/runs/detail.test.js

@@ -671,7 +671,7 @@ module.exports = () => {
             };
 
             // First filter validation on the main page.
-            await filterOnRun('#runOverviewFilter .run-numbers-filter');
+            await filterOnRun('#runOverviewFilter .runNumbers-filter');
             // Validate if the filter tab value is equal to the main page value.
             await expectInputValue(page, filterPanelRunNumbersInputSelector, inputValue);
             await resetFilters(page);
@@ -698,7 +698,7 @@ module.exports = () => {
                 await expectColumnValues(page, 'runNumber', ['10']);
             };
 
-            await filterOnRun('#runOverviewFilter .run-numbers-filter');
+            await filterOnRun('#runOverviewFilter .runNumbers-filter');
             await expectInputValue(page, filterPanelRunNumbersInputSelector, inputValue);
             await resetFilters(page);
             await filterOnRun(filterPanelRunNumbersInputSelector);