Skip to content

Commit e095876

Browse files
author
NarrowsProjects
committed
replace the rest of the rawTextFilters
1 parent 6fec661 commit e095876

5 files changed

Lines changed: 40 additions & 75 deletions

File tree

‎lib/public/views/DataPasses/ActiveColumns/dataPassesActiveColumns.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { h } from '/js/src/index.js';
2020
import { formatDataPassName } from '../format/formatDataPassName.js';
2121
import { formatDataPassStatusHistory } from '../format/formatStatusHistory.js';
2222
import { checkboxes } from '../../../components/Filters/common/filters/checkboxFilter.js';
23-
import { rawTextFilter } from '../../../components/Filters/common/filters/rawTextFilter.js';
23+
import { textInputFilter } from '../../../components/Filters/common/filters/textInputFilter.js';
2424

2525
/**
2626
* List of active columns for a generic data passes table
@@ -35,10 +35,7 @@ export const dataPassesActiveColumns = {
3535
visible: true,
3636
sortable: true,
3737
format: (_, dataPass) => formatDataPassName(dataPass),
38-
filter: (filteringModel) => rawTextFilter(
39-
filteringModel.get('names'),
40-
{ classes: ['w-75', 'mt1'], placeholder: 'e.g. LHC22a_apass1, ...' },
41-
),
38+
filter: (filteringModel) => textInputFilter(filteringModel, 'names', 'e.g. LHC22a_apass1, ...', 'w-75'),
4239
balloon: true,
4340
classes: 'w-20',
4441
},

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

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { aliEcsEnvironmentLinkComponent } from '../../../components/common/exter
2626
import { StatusAcronym } from '../../../domain/enums/statusAcronym.mjs';
2727
import { timeRangeFilter } from '../../../components/Filters/common/filters/timeRangeFilter.js';
2828
import { checkboxes } from '../../../components/Filters/common/filters/checkboxFilter.js';
29-
import { rawTextFilter } from '../../../components/Filters/common/filters/rawTextFilter.js';
29+
import { textInputFilter } from '../../../components/Filters/common/filters/textInputFilter.js';
3030

3131
/**
3232
* List of active columns for a generic Environments component
@@ -60,13 +60,10 @@ export const environmentsActiveColumns = {
6060
/**
6161
* Environment IDs filter component
6262
*
63-
* @param {EnvironmentOverviewModel} environmentOverviewModel the environment overview model
63+
* @param {EnvironmentOverviewModel} environmentOverviewModel.filteringModel the filtering model
6464
* @return {Component} the filter component
6565
*/
66-
filter: (environmentOverviewModel) => rawTextFilter(
67-
environmentOverviewModel.filteringModel.get('ids'),
68-
{ classes: ['w-100'], placeholder: 'e.g. CmCvjNbg, TDI59So3d...' },
69-
),
66+
filter: ({ filteringModel }) => textInputFilter(filteringModel, 'ids', 'e.g. CmCvjNbg, TDI59So3d...'),
7067
},
7168
runs: {
7269
name: 'Runs',
@@ -79,13 +76,10 @@ export const environmentsActiveColumns = {
7976
/**
8077
* Run numbers filter component
8178
*
82-
* @param {EnvironmentOverviewModel} environmentOverviewModel the environment overview model
79+
* @param {EnvironmentOverviewModel} environmentOverviewModel.filteringModel the filtering model
8380
* @return {Component} the filter component
8481
*/
85-
filter: (environmentOverviewModel) => rawTextFilter(
86-
environmentOverviewModel.filteringModel.get('runNumbers'),
87-
{ classes: ['w-100'], placeholder: 'e.g. 553203, 553221, ...' },
88-
),
82+
filter: ({ filteringModel }) => textInputFilter(filteringModel, 'runNumbers', 'e.g. CmCvjNbg, TDI59So3d...'),
8983
},
9084
updatedAt: {
9185
name: 'Last Update',
@@ -140,12 +134,9 @@ export const environmentsActiveColumns = {
140134
/**
141135
* Status history filter component
142136
*
143-
* @param {EnvironmentOverviewModel} environmentOverviewModel the environment overview model
137+
* @param {EnvironmentOverviewModel} environmentOverviewModel.filteringModel the filtering model
144138
* @return {Component} the filter component
145139
*/
146-
filter: (environmentOverviewModel) => rawTextFilter(
147-
environmentOverviewModel.filteringModel.get('statusHistory'),
148-
{ classes: ['w-100'], placeholder: 'e.g. D-R-X' },
149-
),
140+
filter: ({ filteringModel }) => textInputFilter(filteringModel, 'statusHistory', 'e.g. D-R-X'),
150141
},
151142
};

‎lib/public/views/LhcFills/ActiveColumns/lhcFillsActiveColumns.js‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@ import { infologgerLinksComponents } from '../../../components/common/externalLi
2424
import { formatBeamType } from '../../../utilities/formatting/formatBeamType.js';
2525
import { frontLink } from '../../../components/common/navigation/frontLink.js';
2626
import { toggleStableBeamOnlyFilter } from '../../../components/Filters/LhcFillsFilter/stableBeamFilter.js';
27-
import { fillNumberFilter } from '../../../components/Filters/LhcFillsFilter/fillNumberFilter.js';
2827
import { durationFilter } from '../../../components/Filters/LhcFillsFilter/durationFilter.js';
2928
import { beamTypeFilter } from '../../../components/Filters/LhcFillsFilter/beamTypeFilter.js';
30-
import { schemeNameFilter } from '../../../components/Filters/LhcFillsFilter/schemeNameFilter.js';
3129
import { timeRangeFilter } from '../../../components/Filters/common/filters/timeRangeFilter.js';
30+
import { textInputFilter } from '../../../components/Filters/common/filters/textInputFilter.js';
3231

3332
/**
3433
* List of active columns for a lhc fills table
@@ -54,7 +53,14 @@ export const lhcFillsActiveColumns = {
5453
),
5554
],
5655
),
57-
filter: (lhcFillModel) => fillNumberFilter(lhcFillModel.filteringModel.get('fillNumbers')),
56+
57+
/**
58+
* FillNumber filter component
59+
*
60+
* @param {FilteringModel} LhcFillsOverviewModel.filteringModel the filtering model
61+
* @return {Component} the filter component
62+
*/
63+
filter: ({ filteringModel }) => textInputFilter(filteringModel, 'fillNumbers', 'e.g. 7966, 7954, 7948...'),
5864
profiles: {
5965
lhcFill: true,
6066
environment: true,
@@ -193,7 +199,14 @@ export const lhcFillsActiveColumns = {
193199
visible: true,
194200
size: 'w-10',
195201
format: (value) => value ? value : '-',
196-
filter: (lhcFillModel) => schemeNameFilter(lhcFillModel.filteringModel.get('schemeName')),
202+
203+
/**
204+
* Schema filter component
205+
*
206+
* @param {FilteringModel} LhcFillsOverviewModel.filteringModel the filtering model
207+
* @return {Component} the filter component
208+
*/
209+
filter: ({ filteringModel }) => textInputFilter(filteringModel, 'schemeName', 'e.g. Single_12b_8_1024_8_2018'),
197210
balloon: true,
198211
},
199212
runs: {

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

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import { formatRunsList } from '../../Runs/format/formatRunsList.js';
2323
import { profiles } from '../../../components/common/table/profiles.js';
2424
import { formatLhcFillsList } from '../../LhcFills/format/formatLhcFillsList.js';
2525
import { formatTagsList } from '../../Tags/format/formatTagsList.js';
26-
import { rawTextFilter } from '../../../components/Filters/common/filters/rawTextFilter.js';
2726
import { timeRangeFilter } from '../../../components/Filters/common/filters/timeRangeFilter.js';
2827
import { textInputFilter } from '../../../components/Filters/common/filters/textInputFilter.js';
2928

@@ -76,11 +75,7 @@ export const logsActiveColumns = {
7675
* @param {FilteringModel} logOverviewModel.filteringModel filtering model
7776
* @return {Component} the filter component
7877
*/
79-
filter: ({ filteringModel }) =>
80-
rawTextFilter(
81-
filteringModel.get('title'),
82-
{ id: 'titleFilterText', classes: ['w-100 mt1'], placeholder: 'e.g. Report on runs: ...' },
83-
),
78+
filter: ({ filteringModel }) => textInputFilter(filteringModel, 'title', 'e.g. Report on runs: ...'),
8479
balloon: true,
8580
profiles: {
8681
embeded: true,
@@ -99,14 +94,10 @@ export const logsActiveColumns = {
9994
/**
10095
* Content filter component
10196
*
102-
* @param {FilteringModel} logOverviewModel.filteringModel filtering model
97+
* @param {FilteringModel} logOverviewModel.filteringModel the filtering model
10398
* @return {Component} the filter component
10499
*/
105-
filter: ({ filteringModel }) =>
106-
rawTextFilter(
107-
filteringModel.get('content'),
108-
{ id: 'contentFilterText', classes: ['w-100 mt1'], placeholder: 'e.g. Quality of run 52...' },
109-
),
100+
filter: ({ filteringModel }) => textInputFilter(filteringModel, 'content', 'e.g. Quality of run 52...'),
110101
},
111102
author: {
112103
name: 'Author',
@@ -204,14 +195,7 @@ export const logsActiveColumns = {
204195
* @param {FilteringModel} logOverviewModel.filteringModel filtering model
205196
* @return {Component} the filter component
206197
*/
207-
filter: ({ filteringModel }) => rawTextFilter(
208-
filteringModel.get('environmentIds'),
209-
{
210-
id: 'environmentFilterText',
211-
classes: ['w-100 mt1'],
212-
placeholder: 'e.g. Dxi029djX, TDI59So3d...',
213-
},
214-
),
198+
filter: ({ filteringModel }) => textInputFilter(filteringModel, 'environmentIds', 'e.g. Dxi029djX, TDI59So3d...'),
215199
balloon: true,
216200
profiles: [profiles.none, 'embeded'],
217201
},
@@ -228,14 +212,7 @@ export const logsActiveColumns = {
228212
* @param {FilteringModel} logOverviewModel.filteringModel filtering model
229213
* @return {Component} the filter component
230214
*/
231-
filter: ({ filteringModel }) => rawTextFilter(
232-
filteringModel.get('fillNumbers'),
233-
{
234-
id: 'lhcFillsFilterText',
235-
classes: ['w-100 mt1'],
236-
placeholder: 'e.g. 11392, 11383, 7625',
237-
},
238-
),
215+
filter: ({ filteringModel }) => textInputFilter(filteringModel, 'fillNumbers', 'e.g. 11392, 11383, 7625'),
239216
balloon: true,
240217
profiles: [profiles.none, 'embeded'],
241218
},

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

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import { isRunConsideredRunning } from '../../../services/run/isRunConsideredRun
4343
import { aliEcsEnvironmentLinkComponent } from '../../../components/common/externalLinks/aliEcsEnvironmentLinkComponent.js';
4444
import { detectorsFilterComponent } from '../../../components/Filters/RunsFilter/detectorsFilterComponent.js';
4545
import { timeRangeFilter } from '../../../components/Filters/common/filters/timeRangeFilter.js';
46-
import { rawTextFilter } from '../../../components/Filters/common/filters/rawTextFilter.js';
4746
import { numericalComparisonFilter } from '../../../components/Filters/common/filters/numericalComparisonFilter.js';
4847
import { checkboxes } from '../../../components/Filters/common/filters/checkboxFilter.js';
4948
import { triggerValueFilter } from '../../../components/Filters/RunsFilter/triggerValueFilter.js';
@@ -189,13 +188,10 @@ export const runsActiveColumns = {
189188
/**
190189
* Fill number filter component
191190
*
192-
* @param {RunsOverviewModel} runsOverviewModel the runs overview model
191+
* @param {FilteringModel} RunsOverviewModel.filteringModel the filtering model
193192
* @return {Component} the filter component
194193
*/
195-
filter: (runsOverviewModel) => rawTextFilter(
196-
runsOverviewModel.filteringModel.get('fillNumbers'),
197-
{ classes: ['w-100', 'fill-numbers-filter'], placeholder: 'e.g. 7966, 7954, 7948...' },
198-
),
194+
filter: ({ filteringModel }) => textInputFilter(filteringModel, 'fillNumbers', 'e.g. 7966, 7954, 7948...'),
199195
},
200196
lhcPeriod: {
201197
name: 'LHC Period',
@@ -207,13 +203,10 @@ export const runsActiveColumns = {
207203
/**
208204
* LHC Periods filter
209205
*
210-
* @param {RunsOverviewModel} runsOverviewModel the runs overview model
206+
* @param {FilteringModel} RunsOverviewModel.filteringModel the filtering model
211207
* @return {Component} the filter component
212208
*/
213-
filter: (runsOverviewModel) => rawTextFilter(
214-
runsOverviewModel.filteringModel.get('lhcPeriods'),
215-
{ classes: ['w-100'], placeholder: 'e.g. LHC22b, LHC22a...' },
216-
),
209+
filter: ({ filteringModel }) => textInputFilter(filteringModel, 'lhcPeriods', 'e.g. LHC22b, LHC22a...'),
217210
},
218211
timeO2Start: {
219212
name: 'Start',
@@ -399,13 +392,10 @@ export const runsActiveColumns = {
399392
/**
400393
* Environment ids filter component
401394
*
402-
* @param {RunsOverviewModel} runsOverviewModel the runs overview model
403-
* @return {Component} the environment ids filter component
395+
* @param {FilteringModel} RunsOverviewModel.filteringModel the filtering model
396+
* @return {Component} the filter component
404397
*/
405-
filter: (runsOverviewModel) => rawTextFilter(
406-
runsOverviewModel.filteringModel.get('environmentIds'),
407-
{ classes: ['environment-ids-filter', 'w-100'], placeholder: 'e.g. Dxi029djX, TDI59So3d...' },
408-
),
398+
filter: ({ filteringModel }) => textInputFilter(filteringModel, 'environmentIds', 'e.g. Dxi029djX, TDI59So3d...'),
409399
format: (id) => id ? frontLink(id, 'env-details', { environmentId: id }) : '-',
410400
},
411401
runType: {
@@ -568,13 +558,10 @@ export const runsActiveColumns = {
568558
/**
569559
* ODC topology full name filter component
570560
*
571-
* @param {RunsOverviewModel} runsOverviewModel the runs overview model
561+
* @param {FilteringModel} RunsOverviewModel.filteringModel the filtering model
572562
* @return {Component} the filter component
573563
*/
574-
filter: (runsOverviewModel) => rawTextFilter(
575-
runsOverviewModel.filteringModel.get('odcTopologyFullName'),
576-
{ classes: ['w-100'] },
577-
),
564+
filter: ({ filteringModel }) => textInputFilter(filteringModel, 'odcTopologyFullName'),
578565
balloon: true,
579566
},
580567
eorReasons: {

0 commit comments

Comments
 (0)