Skip to content

feat: add is not empty filter support #2572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Koc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add is not empty filter support #2572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/shared/components/ncTable/mixins/columnsTypes/datetime.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ export default class DatetimeColumn extends AbstractDatetimeColumn {
[FilterIds.IsLowerThan]() { return filterDate.isAfter(valueDate) },
[FilterIds.IsLowerThanOrEqual]() { return filterDate.isSameOrAfter(valueDate) },
[FilterIds.IsEmpty]() { return !cell.value },
[FilterIds.IsNotEmpty]() { return !!cell.value },
}[filter.operator.id]
return super.isFilterFound(filterMethod, cell)
}
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/ncTable/mixins/columnsTypes/datetimeDate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export default class DatetimeDateColumn extends AbstractDatetimeColumn {
[FilterIds.IsLowerThan]() { return filterDate.isAfter(valueDate) },
[FilterIds.IsLowerThanOrEqual]() { return filterDate.isSameOrAfter(valueDate) },
[FilterIds.IsEmpty]() { return !cell.value },
[FilterIds.IsNotEmpty]() { return !!cell.value },
}[filter.operator.id]
return super.isFilterFound(filterMethod, cell)
}
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/ncTable/mixins/columnsTypes/datetimeTime.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export default class DatetimeTimeColumn extends AbstractDatetimeColumn {
[FilterIds.IsLowerThan]() { return filterTime.isAfter(valueTime) },
[FilterIds.IsLowerThanOrEqual]() { return filterTime.isSameOrAfter(valueTime) },
[FilterIds.IsEmpty]() { return !cell.value },
[FilterIds.IsNotEmpty]() { return !!cell.value },
}[filter.operator.id]
return super.isFilterFound(filterMethod, cell)
}
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/ncTable/mixins/columnsTypes/number.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export default class NumberColumn extends AbstractNumberColumn {
[FilterIds.IsLowerThan]() { return parseInt(cell.value) < parseInt(filterValue) },
[FilterIds.IsLowerThanOrEqual]() { return parseInt(cell.value) <= parseInt(filterValue) },
[FilterIds.IsEmpty]() { return !cell.value },
[FilterIds.IsNotEmpty]() { return !!cell.value },
}[filter.operator.id]
return super.isFilterFound(filterMethod, cell)
}
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/ncTable/mixins/columnsTypes/numberProgress.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export default class NumberProgressColumn extends AbstractNumberColumn {
[FilterIds.IsLowerThan]() { return parseInt(cell.value) < parseInt(filterValue) },
[FilterIds.IsLowerThanOrEqual]() { return parseInt(cell.value) <= parseInt(filterValue) },
[FilterIds.IsEmpty]() { return !cell.value },
[FilterIds.IsNotEmpty]() { return !!cell.value },
}[filter.operator.id]
return super.isFilterFound(filterMethod, cell)
}
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/ncTable/mixins/columnsTypes/numberStars.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export default class NumberStarsColumn extends AbstractNumberColumn {
[FilterIds.IsLowerThan]() { return parseInt(cell.value ? cell.value : 0) < parseInt(filterValue) },
[FilterIds.IsLowerThanOrEqual]() { return parseInt(cell.value ? cell.value : 0) <= parseInt(filterValue) },
[FilterIds.IsEmpty]() { return !cell.value },
[FilterIds.IsNotEmpty]() { return !!cell.value },
}[filter.operator.id]
return super.isFilterFound(filterMethod, cell)
}
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/ncTable/mixins/columnsTypes/relation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ export default class RelationColumn extends AbstractColumn {
[FilterIds.IsEqual]() { return cellLabel === filterValue },
[FilterIds.IsNotEqual]() { return cellLabel !== filterValue },
[FilterIds.IsEmpty]() { return !cellLabel },
[FilterIds.IsNotEmpty]() { return !!cellLabel },
}[filter.operator.id]
return super.isFilterFound(filterMethod, cell)
}
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/ncTable/mixins/columnsTypes/selection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ export default class SelectionColumn extends AbstractSelectionColumn {
[FilterIds.IsEqual]() { return cellLabel === filterValue },
[FilterIds.IsNotEqual]() { return cellLabel !== filterValue },
[FilterIds.IsEmpty]() { return !cellLabel },
[FilterIds.IsNotEmpty]() { return !!cellLabel },
}[filter.operator.id]
return super.isFilterFound(filterMethod, cell)
}
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/ncTable/mixins/columnsTypes/selectionCheck.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ export default class SelectionCheckColumn extends AbstractSelectionColumn {
[FilterIds.IsEqual]() { return cellBoolean === filterBoolean },
[FilterIds.IsNotEqual]() { return cellBoolean !== filterBoolean },
[FilterIds.IsEmpty]() { return cell.value === null || cell.value === undefined || cell.value === '' },
[FilterIds.IsNotEmpty]() { return cell.value !== null && cell.value !== undefined && cell.value !== '' },
}[filter.operator.id]
return filterMethod ? filterMethod() : super.isFilterFound(filterMethod, cell)
}
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/ncTable/mixins/columnsTypes/selectionMulti.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ export default class SelectionMutliColumn extends AbstractSelectionColumn {
[FilterIds.IsEqual]() { return valueString === filterValue },
[FilterIds.IsNotEqual]() { return valueString !== filterValue },
[FilterIds.IsEmpty]() { return !valueString },
[FilterIds.IsNotEmpty]() { return !!valueString },
}[filter.operator.id]
return super.isFilterFound(filterMethod, cell)
}
Expand Down
3 changes: 2 additions & 1 deletion src/shared/components/ncTable/mixins/columnsTypes/textLine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default class TextLineColumn extends AbstractTextColumn {
isFilterFound(cell, filter) {
const filterValue = (filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value).toLowerCase()
const cellValue = cell.value?.toLowerCase()
if (!cellValue & filter.operator.id !== FilterIds.IsEmpty) return false
if (!cellValue && filter.operator.id !== FilterIds.IsEmpty) return false
const filterMethod = {
[FilterIds.Contains]() { return cellValue.includes(filterValue) },
[FilterIds.DoesNotContain]() { return !cellValue.includes(filterValue) },
Expand All @@ -53,6 +53,7 @@ export default class TextLineColumn extends AbstractTextColumn {
[FilterIds.IsEqual]() { return cellValue === filterValue },
[FilterIds.IsNotEqual]() { return cellValue !== filterValue },
[FilterIds.IsEmpty]() { return !cellValue },
[FilterIds.IsNotEmpty]() { return !!cellValue },
}[filter.operator.id]

return super.isFilterFound(filterMethod, cell)
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/ncTable/mixins/columnsTypes/textLink.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ export default class TextLinkColumn extends AbstractTextColumn {
[FilterIds.IsEqual]() { return value === filterValue },
[FilterIds.IsNotEqual]() { return value !== filterValue },
[FilterIds.IsEmpty]() { return !value },
[FilterIds.IsNotEmpty]() { return !!value },
}[filter.operator.id]
return super.isFilterFound(filterMethod, cell)
}
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/ncTable/mixins/columnsTypes/textLong.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export default class TextLongColumn extends AbstractTextColumn {
[FilterIds.Contains]() { return cell.value.includes(filterValue) },
[FilterIds.DoesNotContain]() { return !cell.value.includes(filterValue) },
[FilterIds.IsEmpty]() { return !cell.value },
[FilterIds.IsNotEmpty]() { return !!cell.value },
}[filter.operator.id]
return super.isFilterFound(filterMethod, cell)
}
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/ncTable/mixins/columnsTypes/textRich.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export default class TextRichColumn extends AbstractTextColumn {
[FilterIds.Contains]() { return cell.value && cell.value.includes(filterValue) },
[FilterIds.DoesNotContain]() { return cell.value && !cell.value.includes(filterValue) },
[FilterIds.IsEmpty]() { return !cell.value },
[FilterIds.IsNotEmpty]() { return !!cell.value },
}[filter.operator.id]
return super.isFilterFound(filterMethod, cell)
}
Expand Down
14 changes: 14 additions & 0 deletions src/shared/components/ncTable/mixins/columnsTypes/usergroup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*/
import { AbstractUsergroupColumn } from '../columnClass.js'
import { ColumnTypes } from '../columnHandler.js'
import { FilterIds } from '../filter.js'

export default class UsergroupColumn extends AbstractUsergroupColumn {

Expand Down Expand Up @@ -44,4 +45,17 @@ export default class UsergroupColumn extends AbstractUsergroupColumn {
return super.isSearchStringFound(this.getValueString(cell), cell, searchString)
}

isFilterFound(cell, filter) {
const valueString = this.getValueString(cell)
const filterMethod = {
[FilterIds.Contains]() { return valueString?.toLowerCase().includes(filter.value?.toLowerCase()) },
[FilterIds.DoesNotContain]() { return !valueString?.toLowerCase().includes(filter.value?.toLowerCase()) },
[FilterIds.IsEqual]() { return valueString === filter.value },
[FilterIds.IsNotEqual]() { return valueString !== filter.value },
[FilterIds.IsEmpty]() { return !valueString },
[FilterIds.IsNotEmpty]() { return !!valueString },
}[filter.operator.id]
return super.isFilterFound(filterMethod, cell)
}

}
32 changes: 20 additions & 12 deletions src/shared/components/ncTable/mixins/filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,86 +50,94 @@ export const FilterIds = {
IsLowerThan: 'is-lower-than',
IsLowerThanOrEqual: 'is-lower-than-or-equal',
IsEmpty: 'is-empty',
IsNotEmpty: 'is-not-empty',
}

export const Filters = {
ContainsItem: new Filter({
id: FilterIds.ContainsItem,
label: t('tables', 'Contains items'),
goodFor: [ColumnTypes.SelectionMulti, ColumnTypes.Selection],
incompatibleWith: [FilterIds.DoesNotContain, FilterIds.IsEmpty, FilterIds.IsEqual],
incompatibleWith: [FilterIds.DoesNotContain, FilterIds.IsEmpty, FilterIds.IsNotEmpty, FilterIds.IsEqual],
}),
Contains: new Filter({
id: FilterIds.Contains,
label: t('tables', 'Contains'),
goodFor: [ColumnTypes.TextLine, ColumnTypes.TextLong, ColumnTypes.TextLink, ColumnTypes.TextRich, ColumnTypes.SelectionMulti, ColumnTypes.Usergroup, ColumnTypes.Selection, ColumnTypes.Relation],
incompatibleWith: [FilterIds.DoesNotContain, FilterIds.IsEmpty, FilterIds.IsEqual],
incompatibleWith: [FilterIds.DoesNotContain, FilterIds.IsEmpty, FilterIds.IsNotEmpty, FilterIds.IsEqual],
}),
DoesNotContain: new Filter({
id: FilterIds.DoesNotContain,
label: t('tables', 'Does not contain'),
goodFor: [ColumnTypes.TextLine, ColumnTypes.TextLong, ColumnTypes.TextLink, ColumnTypes.TextRich, ColumnTypes.SelectionMulti, ColumnTypes.Usergroup, ColumnTypes.Selection, ColumnTypes.Relation],
incompatibleWith: [FilterIds.Contains, FilterIds.IsEmpty, FilterIds.IsEqual],
incompatibleWith: [FilterIds.Contains, FilterIds.IsEmpty, FilterIds.IsNotEmpty, FilterIds.IsEqual],
}),
BeginsWith: new Filter({
id: FilterIds.BeginsWith,
label: t('tables', 'Begins with'),
goodFor: [ColumnTypes.TextLine, ColumnTypes.TextLink],
incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsEqual, FilterIds.BeginsWith],
incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsNotEmpty, FilterIds.IsEqual, FilterIds.BeginsWith],
}),
EndsWith: new Filter({
id: FilterIds.EndsWith,
label: t('tables', 'Ends with'),
goodFor: [ColumnTypes.TextLine, ColumnTypes.TextLink],
incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsEqual, FilterIds.EndsWith],
incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsNotEmpty, FilterIds.IsEqual, FilterIds.EndsWith],
}),
IsEqual: new Filter({
id: FilterIds.IsEqual,
label: t('tables', 'Is equal'),
shortLabel: '=',
goodFor: [ColumnTypes.TextLine, ColumnTypes.Number, ColumnTypes.SelectionCheck, ColumnTypes.TextLink, ColumnTypes.NumberStars, ColumnTypes.NumberProgress, ColumnTypes.DatetimeDate, ColumnTypes.DatetimeTime, ColumnTypes.Datetime, ColumnTypes.Selection, ColumnTypes.SelectionMulti, ColumnTypes.Usergroup, ColumnTypes.Relation],
incompatibleWith: [FilterIds.IsNotEqual, FilterIds.IsEmpty, FilterIds.IsEqual, FilterIds.BeginsWith, FilterIds.EndsWith, FilterIds.Contains, FilterIds.IsGreaterThan, FilterIds.IsGreaterThanOrEqual, FilterIds.IsLowerThan, FilterIds.IsLowerThanOrEqual],
incompatibleWith: [FilterIds.IsNotEqual, FilterIds.IsEmpty, FilterIds.IsNotEmpty, FilterIds.IsEqual, FilterIds.BeginsWith, FilterIds.EndsWith, FilterIds.Contains, FilterIds.IsGreaterThan, FilterIds.IsGreaterThanOrEqual, FilterIds.IsLowerThan, FilterIds.IsLowerThanOrEqual],
}),
IsNotEqual: new Filter({
id: FilterIds.IsNotEqual,
label: t('tables', 'Is not equal'),
shortLabel: '!=',
goodFor: [ColumnTypes.TextLine, ColumnTypes.Number, ColumnTypes.SelectionCheck, ColumnTypes.TextLink, ColumnTypes.NumberStars, ColumnTypes.NumberProgress, ColumnTypes.DatetimeDate, ColumnTypes.DatetimeTime, ColumnTypes.Datetime, ColumnTypes.Selection, ColumnTypes.SelectionMulti, ColumnTypes.Usergroup, ColumnTypes.Relation],
incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsEqual, FilterIds.BeginsWith, FilterIds.EndsWith, FilterIds.Contains, FilterIds.IsGreaterThan, FilterIds.IsGreaterThanOrEqual, FilterIds.IsLowerThan, FilterIds.IsLowerThanOrEqual],
incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsNotEmpty, FilterIds.IsEqual, FilterIds.BeginsWith, FilterIds.EndsWith, FilterIds.Contains, FilterIds.IsGreaterThan, FilterIds.IsGreaterThanOrEqual, FilterIds.IsLowerThan, FilterIds.IsLowerThanOrEqual],
}),
IsGreaterThan: new Filter({
id: FilterIds.IsGreaterThan,
label: t('tables', 'Is greater than'),
shortLabel: '>',
goodFor: [ColumnTypes.Number, ColumnTypes.NumberStars, ColumnTypes.NumberProgress, ColumnTypes.DatetimeDate, ColumnTypes.DatetimeTime, ColumnTypes.Datetime],
incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsEqual, FilterIds.IsGreaterThan, FilterIds.IsGreaterThanOrEqual],
incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsNotEmpty, FilterIds.IsEqual, FilterIds.IsGreaterThan, FilterIds.IsGreaterThanOrEqual],
}),
IsGreaterThanOrEqual: new Filter({
id: FilterIds.IsGreaterThanOrEqual,
label: t('tables', 'Is greater than or equal'),
shortLabel: '>=',
goodFor: [ColumnTypes.Number, ColumnTypes.NumberStars, ColumnTypes.NumberProgress, ColumnTypes.DatetimeDate, ColumnTypes.DatetimeTime, ColumnTypes.Datetime],
incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsEqual, FilterIds.IsGreaterThan, FilterIds.IsGreaterThanOrEqual],
incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsNotEmpty, FilterIds.IsEqual, FilterIds.IsGreaterThan, FilterIds.IsGreaterThanOrEqual],
}),
IsLowerThan: new Filter({
id: FilterIds.IsLowerThan,
label: t('tables', 'Is lower than'),
shortLabel: '<',
goodFor: [ColumnTypes.Number, ColumnTypes.NumberStars, ColumnTypes.NumberProgress, ColumnTypes.DatetimeDate, ColumnTypes.DatetimeTime, ColumnTypes.Datetime],
incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsEqual, FilterIds.IsLowerThan, FilterIds.IsLowerThanOrEqual],
incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsNotEmpty, FilterIds.IsEqual, FilterIds.IsLowerThan, FilterIds.IsLowerThanOrEqual],
}),
IsLowerThanOrEqual: new Filter({
id: FilterIds.IsLowerThanOrEqual,
label: t('tables', 'Is lower than or equal'),
shortLabel: '<=',
goodFor: [ColumnTypes.Number, ColumnTypes.NumberStars, ColumnTypes.NumberProgress, ColumnTypes.DatetimeDate, ColumnTypes.DatetimeTime, ColumnTypes.Datetime],
incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsEqual, FilterIds.IsLowerThan, FilterIds.IsLowerThanOrEqual],
incompatibleWith: [FilterIds.IsEmpty, FilterIds.IsNotEmpty, FilterIds.IsEqual, FilterIds.IsLowerThan, FilterIds.IsLowerThanOrEqual],
}),
IsEmpty: new Filter({
id: FilterIds.IsEmpty,
label: t('tables', 'Is empty'),
goodFor: [ColumnTypes.TextLine, ColumnTypes.TextRich, ColumnTypes.Number, ColumnTypes.TextLink, ColumnTypes.NumberProgress, ColumnTypes.DatetimeDate, ColumnTypes.DatetimeTime, ColumnTypes.Datetime, ColumnTypes.SelectionCheck, ColumnTypes.Usergroup, ColumnTypes.Relation],
incompatibleWith: [FilterIds.Contains, FilterIds.BeginsWith, FilterIds.EndsWith, FilterIds.IsEqual, FilterIds.IsGreaterThan, FilterIds.IsGreaterThanOrEqual, FilterIds.IsLowerThan, FilterIds.IsLowerThanOrEqual, FilterIds.IsEmpty],
incompatibleWith: [FilterIds.Contains, FilterIds.BeginsWith, FilterIds.EndsWith, FilterIds.IsEqual, FilterIds.IsGreaterThan, FilterIds.IsGreaterThanOrEqual, FilterIds.IsLowerThan, FilterIds.IsLowerThanOrEqual, FilterIds.IsEmpty, FilterIds.IsNotEmpty],
noSearchValue: true,
}),
IsNotEmpty: new Filter({
id: FilterIds.IsNotEmpty,
label: t('tables', 'Is not empty'),
goodFor: [ColumnTypes.TextLine, ColumnTypes.TextRich, ColumnTypes.Number, ColumnTypes.TextLink, ColumnTypes.NumberProgress, ColumnTypes.DatetimeDate, ColumnTypes.DatetimeTime, ColumnTypes.Datetime, ColumnTypes.SelectionCheck, ColumnTypes.Usergroup, ColumnTypes.Relation],
incompatibleWith: [FilterIds.Contains, FilterIds.BeginsWith, FilterIds.EndsWith, FilterIds.IsEqual, FilterIds.IsGreaterThan, FilterIds.IsGreaterThanOrEqual, FilterIds.IsLowerThan, FilterIds.IsLowerThanOrEqual, FilterIds.IsEmpty, FilterIds.IsNotEmpty],
noSearchValue: true,
}),
}
Expand Down
4 changes: 2 additions & 2 deletions src/shared/components/ncTable/partials/FilterLabel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<script>
import Close from 'vue-material-design-icons/Close.vue'
import { MagicFields } from '../mixins/magicFields.js'
import { Filter, FilterIds } from '../mixins/filter.js'
import { Filter } from '../mixins/filter.js'

export default {

Expand Down Expand Up @@ -53,7 +53,7 @@ export default {
return value
},
labelText() {
if (this.operator.id === FilterIds.IsEmpty) {
if (this.operator.noSearchValue) {
return this.operator.getOperatorLabel()
} else if (this.operator.id === FilterIds.ContainsItem) {
return this.operator.getOperatorLabel() + ' "' + this.getValue.map(item => item.label).join(', ') + '"'
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/ncTable/partials/TableHeaderColumnOptions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ export default {
changeFilterOperator(op) {
this.selectedOperator = op
this.selectOperator = false
if (op.id === FilterIds.IsEmpty) {
if (op.noSearchValue) {
this.createFilter()
} else {
this.selectValue = true
Expand Down
Loading