Skip to content

Commit 30d7b39

Browse files
author
GuustMetz
committed
rename te bad filter to be a generic component
1 parent e2ab763 commit 30d7b39

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

lib/public/components/Filters/QcFlagTypesFilter/bad.js renamed to lib/public/components/Filters/common/filters/radioButtonFilter.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,18 @@
1111
* or submit itself to any jurisdiction.
1212
*/
1313

14-
import { radioButton } from '../../common/form/inputs/radioButton.js';
14+
import { radioButton } from '../../../common/form/inputs/radioButton.js';
1515
import { h } from '/js/src/index.js';
1616

1717
/**
18-
* Radiobutton filter for the qcFlag 'bad' filter
19-
* @param {SelectionModel} selectionModel the a selectionmodel
18+
* Radiobutton filter component
19+
*
20+
* @param {RadioSelectionModel} selectionModel the a selectionmodel
21+
* @param {string} filterName the name of the filter
2022
* @return {vnode} A number of radiobuttons corresponding with the selection options
2123
*/
22-
const badFilterRadioButtons = (selectionModel) => {
23-
const name = 'badFilterRadio';
24+
const radioButtonFilter = (selectionModel, filterName) => {
25+
const name = `${filterName}FilterRadio`;
2426
return h(
2527
'.form-group-header.flex-row.w-100',
2628
selectionModel.options.map((option) => {
@@ -33,4 +35,4 @@ const badFilterRadioButtons = (selectionModel) => {
3335
);
3436
};
3537

36-
export default badFilterRadioButtons;
38+
export default radioButtonFilter;

lib/public/views/QcFlagTypes/ActiveColumns/qcFlagTypesActiveColumns.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { h } from '/js/src/index.js';
1515
import { formatTimestamp } from '../../../utilities/formatting/formatTimestamp.js';
1616
import { textFilter } from '../../../components/Filters/common/filters/textFilter.js';
1717
import { qcFlagTypeColoredBadge } from '../../../components/qcFlags/qcFlagTypeColoredBadge.js';
18-
import badFilterRadioButtons from '../../../components/Filters/QcFlagTypesFilter/bad.js';
18+
import radioButtonFilter from '../../../components/Filters/common/filters/radioButtonFilter.js';
1919

2020
/**
2121
* List of active columns for a QC Flag Types table
@@ -54,7 +54,7 @@ export const qcFlagTypesActiveColumns = {
5454
name: 'Bad',
5555
visible: true,
5656
sortable: true,
57-
filter: ({ filteringModel }) => badFilterRadioButtons(filteringModel.get('bad')),
57+
filter: ({ filteringModel }) => radioButtonFilter(filteringModel.get('bad'), 'bad'),
5858
classes: 'f6 w-5',
5959
format: (bad) => bad ? h('.danger', 'Yes') : h('.success', 'No'),
6060
},

0 commit comments

Comments
 (0)