diff --git a/src/shared/components/ncTable/mixins/columnsTypes/selectionMulti.js b/src/shared/components/ncTable/mixins/columnsTypes/selectionMulti.js index afc0374d8f..5f5bc31cf3 100644 --- a/src/shared/components/ncTable/mixins/columnsTypes/selectionMulti.js +++ b/src/shared/components/ncTable/mixins/columnsTypes/selectionMulti.js @@ -71,8 +71,8 @@ export default class SelectionMutliColumn extends AbstractSelectionColumn { const valueString = this.getValueString(cell) const filterMethod = { - [FilterIds.Contains]() { return valueString?.includes(filterValue) }, - [FilterIds.DoesNotContain]() { return !valueString?.includes(filterValue) }, + [FilterIds.Contains]() { return valueString?.toLowerCase().includes(filterValue.toLowerCase()) }, + [FilterIds.DoesNotContain]() { return !valueString?.toLowerCase().includes(filterValue.toLowerCase()) }, [FilterIds.IsEqual]() { return valueString === filterValue }, [FilterIds.IsNotEqual]() { return valueString !== filterValue }, [FilterIds.IsEmpty]() { return !valueString }, diff --git a/src/shared/components/ncTable/mixins/columnsTypes/usergroup.js b/src/shared/components/ncTable/mixins/columnsTypes/usergroup.js index 3cd565dc84..d4f1378612 100644 --- a/src/shared/components/ncTable/mixins/columnsTypes/usergroup.js +++ b/src/shared/components/ncTable/mixins/columnsTypes/usergroup.js @@ -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 { @@ -29,7 +30,7 @@ export default class UsergroupColumn extends AbstractUsergroupColumn { ret += ', ' + obj.id } }) - return ret + return ret.toLowerCase() } getObjects(values) { @@ -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 + const valueString = this.getValueString(cell) + + const filterMethod = { + [FilterIds.Contains]() { return valueString?.toLowerCase().includes(filterValue.toLowerCase()) }, + [FilterIds.DoesNotContain]() { return !valueString?.toLowerCase().includes(filterValue.toLowerCase()) }, + [FilterIds.IsEqual]() { return valueString === filterValue }, + [FilterIds.IsNotEqual]() { return valueString !== filterValue }, + [FilterIds.IsEmpty]() { return !valueString }, + }[filter.operator.id] + return super.isFilterFound(filterMethod, cell) + } + }