Skip to content

Fix: Make case-insensitive search for the usergroup and multi selection columns #2446

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
+36 −19
Open

Fix: Make case-insensitive search for the usergroup and multi selection columns #2446

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
8 changes: 4 additions & 4 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 @@ -79,11 +79,11 @@ export default class RelationColumn extends AbstractColumn {
* @return {boolean} Whether the filter matches
*/
isFilterFound(cell, filter) {
const filterValue = filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value
const cellLabel = this.getLabel(cell.value)
const filterValue = (filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value).toLowerCase()
const cellLabel = this.getLabel(cell.value)?.toLowerCase()
const filterMethod = {
[FilterIds.Contains]() { return cellLabel?.toLowerCase().includes(filterValue?.toLowerCase()) },
[FilterIds.DoesNotContain]() { return !cellLabel?.toLowerCase().includes(filterValue?.toLowerCase()) },
[FilterIds.Contains]() { return cellLabel?.includes(filterValue) },
[FilterIds.DoesNotContain]() { return !cellLabel?.includes(filterValue) },
[FilterIds.IsEqual]() { return cellLabel === filterValue },
[FilterIds.IsNotEqual]() { return cellLabel !== filterValue },
[FilterIds.IsEmpty]() { return !cellLabel },
Expand Down
8 changes: 4 additions & 4 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 @@ -51,12 +51,12 @@ export default class SelectionColumn extends AbstractSelectionColumn {
}

isFilterFound(cell, filter) {
const filterValue = filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value
const cellLabel = this.getLabel(cell.value)
const filterValue = (filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value).toLowerCase()
const cellLabel = this.getLabel(cell.value)?.toLowerCase()
const filterMethod = {
[FilterIds.ContainsItem]() { return filterValue.map(option => option.id).includes(cell.value) },
[FilterIds.Contains]() { return cellLabel?.toLowerCase().includes(filterValue?.toLowerCase()) },
[FilterIds.DoesNotContain]() { return !cellLabel?.toLowerCase().includes(filterValue?.toLowerCase()) },
[FilterIds.Contains]() { return cellLabel.includes(filterValue) },
[FilterIds.DoesNotContain]() { return !cellLabel?.includes(filterValue) },
[FilterIds.BeginsWith]() { return cellLabel?.startsWith(filterValue) },
[FilterIds.EndsWith]() { return cellLabel?.endsWith(filterValue) },
[FilterIds.IsEqual]() { return cellLabel === filterValue },
Expand Down
4 changes: 2 additions & 2 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 @@ -67,8 +67,8 @@ export default class SelectionMutliColumn extends AbstractSelectionColumn {
}

isFilterFound(cell, filter) {
const filterValue = filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value
const valueString = this.getValueString(cell)
const filterValue = (filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value).toLowerCase()
const valueString = this.getValueString(cell)?.toLowerCase()

const filterMethod = {
[FilterIds.ContainsItem]() {
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -52,7 +52,7 @@ export default class TextLinkColumn extends AbstractTextColumn {
}

isFilterFound(cell, filter) {
const filterValue = filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value
const filterValue = (filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value).toLowerCase()
const value = this.getValueFromCellValue(cell.value)

const filterMethod = {
Expand Down
7 changes: 4 additions & 3 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 @@ -22,11 +22,12 @@ export default class TextLongColumn extends AbstractTextColumn {
}

isFilterFound(cell, filter) {
const filterValue = filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value
const filterValue = (filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value).toLowerCase()
const cellValue = cell.value.toLowerCase()

const filterMethod = {
[FilterIds.Contains]() { return cell.value.includes(filterValue) },
[FilterIds.DoesNotContain]() { return !cell.value.includes(filterValue) },
[FilterIds.Contains]() { return cellValue && cellValue.includes(filterValue) },
[FilterIds.DoesNotContain]() { return cellValue && !cellValue.includes(filterValue) },
[FilterIds.IsEmpty]() { return !cell.value },
}[filter.operator.id]
return super.isFilterFound(filterMethod, cell)
Expand Down
7 changes: 4 additions & 3 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 @@ -18,11 +18,12 @@ export default class TextRichColumn extends AbstractTextColumn {
}

isFilterFound(cell, filter) {
const filterValue = filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value
const filterValue = (filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value).toLowerCase()
const cellValue = cell.value?.toLowerCase()

const filterMethod = {
[FilterIds.Contains]() { return cell.value && cell.value.includes(filterValue) },
[FilterIds.DoesNotContain]() { return cell.value && !cell.value.includes(filterValue) },
[FilterIds.Contains]() { return cellValue && cellValue.includes(filterValue) },
[FilterIds.DoesNotContain]() { return cellValue && !cellValue.includes(filterValue) },
[FilterIds.IsEmpty]() { return !cell.value },
}[filter.operator.id]
return super.isFilterFound(filterMethod, cell)
Expand Down
15 changes: 15 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,18 @@ export default class UsergroupColumn extends AbstractUsergroupColumn {
return super.isSearchStringFound(this.getValueString(cell), cell, searchString)
}

isFilterFound(cell, filter) {
const filterValue = (filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value).toLowerCase()
const valueString = this.getValueString(cell).toLowerCase()

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

}
4 changes: 2 additions & 2 deletions src/shared/components/ncTable/partials/TableHeaderColumnOptions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,8 +367,8 @@ export default {
const columnFilters = this.getFilterForColumn(this.column)
if (columnFilters && columnFilters
.filter(fil => fil.operator.id === this.selectedOperator.id)
.map(fil => fil.value)
.includes(this.searchValue)) {
.map(fil => fil.value.toLowerCase())
.includes(this.searchValue.toLowerCase())) {
this.reset()
return
}
Expand Down
Loading