Commit 42a972b

committed

Refactor filterByNumber to return the result of comparator directly

Doing the same operation of comparator might be more straightforward and we don't need to declare a `valid` variable.

1 parent 52062dd commit 42a972bCopy full SHA for 42a972b

File tree

-27

lines changed

-27

lines changed

Lines changed: 8 additions & 27 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,55 +39,36 @@ export const filterByNumber = _ => (`
`39`	`39`	`) => (`
`40`	`40`	`data.filter((row) => {`
`41`	`41`	`if (number === '' \|\| !comparator) return true;`
`42`		`- let valid = true;`
`43`	`42`	`let cell = _.get(row, dataField);`
	`43`	`+`
`44`	`44`	`if (customFilterValue) {`
`45`	`45`	`cell = customFilterValue(cell, row);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`switch (comparator) {`
`49`	`49`	`case EQ: {`
`50`		`- if (cell != number) {`
`51`		`- valid = false;`
`52`		`- }`
`53`		`- break;`
	`50`	`+ return cell == number;`
`54`	`51`	`}`
`55`	`52`	`case GT: {`
`56`		`- if (cell <= number) {`
`57`		`- valid = false;`
`58`		`- }`
`59`		`- break;`
	`53`	`+ return cell > number;`
`60`	`54`	`}`
`61`	`55`	`case GE: {`
`62`		`- if (cell < number) {`
`63`		`- valid = false;`
`64`		`- }`
`65`		`- break;`
	`56`	`+ return cell >= number;`
`66`	`57`	`}`
`67`	`58`	`case LT: {`
`68`		`- if (cell >= number) {`
`69`		`- valid = false;`
`70`		`- }`
`71`		`- break;`
	`59`	`+ return cell < number;`
`72`	`60`	`}`
`73`	`61`	`case LE: {`
`74`		`- if (cell > number) {`
`75`		`- valid = false;`
`76`		`- }`
`77`		`- break;`
	`62`	`+ return cell <= number;`
`78`	`63`	`}`
`79`	`64`	`case NE: {`
`80`		`- if (cell == number) {`
`81`		`- valid = false;`
`82`		`- }`
`83`		`- break;`
	`65`	`+ return cell != number;`
`84`	`66`	`}`
`85`	`67`	`default: {`
`86`	`68`	`console.error('Number comparator provided is not supported');`
`87`		`- break;`
	`69`	`+ returntrue;`
`88`	`70`	`}`
`89`	`71`	`}`
`90`		`- return valid;`
`91`	`72`	`})`
`92`	`73`	`);`
`93`	`74`

Comments

(0)