Skip to content

Fix: add contains-item filter support in views #2940

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鈥檒l 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

Fix: add contains-item filter support in views #2940

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 lib/Constants/FilterOperator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ enum FilterOperator: string {
case BEGINS_WITH = 'begins-with';
case ENDS_WITH = 'ends-with';
case CONTAINS = 'contains';
case CONTAINS_ITEM = 'contains-item';
case DOES_NOT_CONTAIN = 'does-not-contain';
case IS_EQUAL = 'is-equal';
case IS_NOT_EQUAL = 'is-not-equal';
Expand Down
30 changes: 30 additions & 0 deletions lib/Db/Row2Mapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,36 @@ private function getFilterExpression(IQueryBuilder $qb, Column $column, string $
}
$filterExpression = $qb->expr()->iLike('value', $qb->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%', $paramType));
break;
case 'contains-item':
$filterItems = $value;
if (!is_array($filterItems)) {
$filterItems = json_decode((string)$filterItems, true) ?? null;
if (is_string($filterItems)) {
$filterItems = json_decode($filterItems, true) ?? null;
}
if (!is_array($filterItems) || $filterItems === []) {
$filterItems = [(string)$value];
}
}
$filterExpressions = [];
$includeDefault = false;
foreach ($filterItems as $filterItem) {
if ($column->getType() === 'selection' && $column->getSubtype() === 'multi') {
$filterItem = str_replace(['"', '\''], '', (string)$filterItem);
$filterExpressions[] = $qb2->expr()->orX(
$qb->expr()->iLike('value', $qb->createNamedParameter('[' . $this->db->escapeLikeParameter($filterItem) . ']')),
$qb->expr()->iLike('value', $qb->createNamedParameter('[' . $this->db->escapeLikeParameter($filterItem) . ',%')),
$qb->expr()->iLike('value', $qb->createNamedParameter('%,' . $this->db->escapeLikeParameter($filterItem) . ']%')),
$qb->expr()->iLike('value', $qb->createNamedParameter('%,' . $this->db->escapeLikeParameter($filterItem) . ',%'))
);
$includeDefault = $includeDefault || str_contains((string)($defaultValue ?? ''), $filterItem);
} else {
$filterExpressions[] = $qb->expr()->eq('value', $qb->createNamedParameter($filterItem, $paramType));
$includeDefault = $includeDefault || ((string)($defaultValue ?? '') === (string)$filterItem);
}
}
$filterExpression = $qb2->expr()->orX(...$filterExpressions);
break;
case 'does-not-contain':
if (is_array($value) && $column->getType() === Column::TYPE_USERGROUP) {
$filterExpressions = [];
Expand Down
12 changes: 12 additions & 0 deletions tests/unit/Db/Row2MapperFilterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,18 @@ public static function filterDataProvider(): array {
'Filter non-empty skills'
],

'status contains-item Active,Pending' => [
[['columnId' => 'status', 'operator' => 'contains-item', 'value' => '[0,2]']],
['Alice', 'Charlie', 'Diana', 'Eve'],
'Filter status containing one of Active (0) or Pending (2)'
],

'skills contains-item PHP,SQL' => [
[['columnId' => 'skills', 'operator' => 'contains-item', 'value' => '[0,2]']],
['Alice'],
'Filter skills containing one of PHP (0) or SQL (2)'
],

// Selection checkbox column (is_available)
'available is checked' => [
[['columnId' => 'is_available', 'operator' => 'is-equal', 'value' => '@checked']],
Expand Down
Loading