Merge pull request #2572 from nextcloud/feature/add-is-not-empty-filter

feat: add is not empty filter support

Author: enjeck

lib/Constants/FilterOperator.php

@@ -20,4 +20,5 @@ enum FilterOperator: string {
 	case IS_LESS_THAN = 'is-lower-than';
 	case IS_LESS_THAN_OR_EQUAL = 'is-lower-than-or-equal';
 	case IS_EMPTY = 'is-empty';
+	case IS_NOT_EMPTY = 'is-not-empty';
 }

lib/Db/Row2Mapper.php

@@ -564,10 +564,31 @@ private function getFilterExpression(IQueryBuilder $qb, Column $column, string $
 						$qb->expr()->isNull('value'),
 						$qb->expr()->eq('value', $qb->createNamedParameter('', $paramType))
 					);
+				} elseif ($column->getType() === 'selection' && $column->getSubtype() === 'multi') {
+					$filterExpression = $qb2->expr()->orX(
+						$qb->expr()->isNull('value'),
+						$qb->expr()->eq('value', $qb->createNamedParameter('[]', $paramType))
+					);
 				} else {
 					$filterExpression = $qb->expr()->isNull('value');
 				}
 				break;
+			case 'is-not-empty':
+				$includeDefault = !empty($defaultValue);
+				if ($column->getType() === Column::TYPE_TEXT) {
+					$filterExpression = $qb2->expr()->andX(
+						$qb->expr()->isNotNull('value'),
+						$qb->expr()->neq('value', $qb->createNamedParameter('', $paramType))
+					);
+				} elseif ($column->getType() === 'selection' && $column->getSubtype() === 'multi') {
+					$filterExpression = $qb2->expr()->andX(
+						$qb->expr()->isNotNull('value'),
+						$qb->expr()->neq('value', $qb->createNamedParameter('[]', $paramType))
+					);
+				} else {
+					$filterExpression = $qb->expr()->isNotNull('value');
+				}
+				break;
 			default:
 				throw new InternalError('Operator ' . $operator . ' is not supported.');
 		}
@@ -636,6 +657,7 @@ private function getSqlOperator(string $operator, IQueryBuilder $qb, string $col
 			'is-lower-than' => $qb->expr()->lt($columnName, $qb->createNamedParameter($value, $paramType)),
 			'is-lower-than-or-equal' => $qb->expr()->lte($columnName, $qb->createNamedParameter($value, $paramType)),
 			'is-empty' => $qb->expr()->isNull($columnName),
+			'is-not-empty' => $qb->expr()->isNotNull($columnName),
 			default => throw new InternalError('Operator ' . $operator . ' is not supported.'),
 		};
 	}

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

@@ -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)
 	}

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

@@ -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)
 	}

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

@@ -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)
 	}

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

@@ -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)
 	}

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

@@ -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)
 	}

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

@@ -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)
 	}

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

@@ -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)
 	}

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

@@ -62,6 +62,7 @@ export default class SelectionColumn extends AbstractSelectionColumn {
 			[FilterIds.IsEqual]() { return cellLabel === filterValue.toLowerCase() },
 			[FilterIds.IsNotEqual]() { return cellLabel !== filterValue.toLowerCase() },
 			[FilterIds.IsEmpty]() { return !cellLabel },
+			[FilterIds.IsNotEmpty]() { return !!cellLabel },
 		}[filter.operator.id]
 		return super.isFilterFound(filterMethod, cell)
 	}