Skip to content

Commit d0f1ec1

Browse files
committed
feat: add is not empty filter support
Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>
1 parent 04724f0 commit d0f1ec1

18 files changed

Lines changed: 52 additions & 16 deletions

src/shared/components/ncTable/mixins/columnsTypes/datetime.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ export default class DatetimeColumn extends AbstractDatetimeColumn {
7070
[FilterIds.IsLowerThan]() { return filterDate.isAfter(valueDate) },
7171
[FilterIds.IsLowerThanOrEqual]() { return filterDate.isSameOrAfter(valueDate) },
7272
[FilterIds.IsEmpty]() { return !cell.value },
73+
[FilterIds.IsNotEmpty]() { return !!cell.value },
7374
}[filter.operator.id]
7475
return super.isFilterFound(filterMethod, cell)
7576
}

src/shared/components/ncTable/mixins/columnsTypes/datetimeDate.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ export default class DatetimeDateColumn extends AbstractDatetimeColumn {
5656
[FilterIds.IsLowerThan]() { return filterDate.isAfter(valueDate) },
5757
[FilterIds.IsLowerThanOrEqual]() { return filterDate.isSameOrAfter(valueDate) },
5858
[FilterIds.IsEmpty]() { return !cell.value },
59+
[FilterIds.IsNotEmpty]() { return !!cell.value },
5960
}[filter.operator.id]
6061
return super.isFilterFound(filterMethod, cell)
6162
}

src/shared/components/ncTable/mixins/columnsTypes/datetimeTime.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ export default class DatetimeTimeColumn extends AbstractDatetimeColumn {
5656
[FilterIds.IsLowerThan]() { return filterTime.isAfter(valueTime) },
5757
[FilterIds.IsLowerThanOrEqual]() { return filterTime.isSameOrAfter(valueTime) },
5858
[FilterIds.IsEmpty]() { return !cell.value },
59+
[FilterIds.IsNotEmpty]() { return !!cell.value },
5960
}[filter.operator.id]
6061
return super.isFilterFound(filterMethod, cell)
6162
}

src/shared/components/ncTable/mixins/columnsTypes/number.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ export default class NumberColumn extends AbstractNumberColumn {
5656
[FilterIds.IsLowerThan]() { return parseInt(cell.value) < parseInt(filterValue) },
5757
[FilterIds.IsLowerThanOrEqual]() { return parseInt(cell.value) <= parseInt(filterValue) },
5858
[FilterIds.IsEmpty]() { return !cell.value },
59+
[FilterIds.IsNotEmpty]() { return !!cell.value },
5960
}[filter.operator.id]
6061
return super.isFilterFound(filterMethod, cell)
6162
}

src/shared/components/ncTable/mixins/columnsTypes/numberProgress.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export default class NumberProgressColumn extends AbstractNumberColumn {
3939
[FilterIds.IsLowerThan]() { return parseInt(cell.value) < parseInt(filterValue) },
4040
[FilterIds.IsLowerThanOrEqual]() { return parseInt(cell.value) <= parseInt(filterValue) },
4141
[FilterIds.IsEmpty]() { return !cell.value },
42+
[FilterIds.IsNotEmpty]() { return !!cell.value },
4243
}[filter.operator.id]
4344
return super.isFilterFound(filterMethod, cell)
4445
}

src/shared/components/ncTable/mixins/columnsTypes/numberStars.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export default class NumberStarsColumn extends AbstractNumberColumn {
3939
[FilterIds.IsLowerThan]() { return parseInt(cell.value ? cell.value : 0) < parseInt(filterValue) },
4040
[FilterIds.IsLowerThanOrEqual]() { return parseInt(cell.value ? cell.value : 0) <= parseInt(filterValue) },
4141
[FilterIds.IsEmpty]() { return !cell.value },
42+
[FilterIds.IsNotEmpty]() { return !!cell.value },
4243
}[filter.operator.id]
4344
return super.isFilterFound(filterMethod, cell)
4445
}

src/shared/components/ncTable/mixins/columnsTypes/relation.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ export default class RelationColumn extends AbstractColumn {
8787
[FilterIds.IsEqual]() { return cellLabel === filterValue },
8888
[FilterIds.IsNotEqual]() { return cellLabel !== filterValue },
8989
[FilterIds.IsEmpty]() { return !cellLabel },
90+
[FilterIds.IsNotEmpty]() { return !!cellLabel },
9091
}[filter.operator.id]
9192
return super.isFilterFound(filterMethod, cell)
9293
}

src/shared/components/ncTable/mixins/columnsTypes/selection.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ export default class SelectionColumn extends AbstractSelectionColumn {
6262
[FilterIds.IsEqual]() { return cellLabel === filterValue },
6363
[FilterIds.IsNotEqual]() { return cellLabel !== filterValue },
6464
[FilterIds.IsEmpty]() { return !cellLabel },
65+
[FilterIds.IsNotEmpty]() { return !!cellLabel },
6566
}[filter.operator.id]
6667
return super.isFilterFound(filterMethod, cell)
6768
}

src/shared/components/ncTable/mixins/columnsTypes/selectionCheck.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ export default class SelectionCheckColumn extends AbstractSelectionColumn {
5353
[FilterIds.IsEqual]() { return cellBoolean === filterBoolean },
5454
[FilterIds.IsNotEqual]() { return cellBoolean !== filterBoolean },
5555
[FilterIds.IsEmpty]() { return cell.value === null || cell.value === undefined || cell.value === '' },
56+
[FilterIds.IsNotEmpty]() { return cell.value !== null && cell.value !== undefined && cell.value !== '' },
5657
}[filter.operator.id]
5758
return filterMethod ? filterMethod() : super.isFilterFound(filterMethod, cell)
5859
}

src/shared/components/ncTable/mixins/columnsTypes/selectionMulti.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ export default class SelectionMutliColumn extends AbstractSelectionColumn {
8383
[FilterIds.IsEqual]() { return valueString === filterValue },
8484
[FilterIds.IsNotEqual]() { return valueString !== filterValue },
8585
[FilterIds.IsEmpty]() { return !valueString },
86+
[FilterIds.IsNotEmpty]() { return !!valueString },
8687
}[filter.operator.id]
8788
return super.isFilterFound(filterMethod, cell)
8889
}

0 commit comments

Comments
 (0)