[pull] develop from baserow:develop

backend/src/baserow/contrib/database/fields/filter_support/base.py

@@ -30,7 +30,7 @@
 class HasValueEmptyFilterSupport:
     def get_in_array_empty_value(self, field: "Field") -> Any:
         """
-        Returns a sigle value or a list of values to use for filtering empty values in
+        Returns a single value or a list of values to use for filtering empty values in
         an arrays with the `get_jsonb_has_any_in_value_filter_expr`. See
         `get_in_array_empty_query` and `get_all_empty_query` for more details
         on how this value is used.

backend/src/baserow/contrib/database/formula/types/formula_types.py

@@ -6,7 +6,9 @@
 
 from django.contrib.postgres.fields import ArrayField, JSONField
 from django.db import models
-from django.db.models import Expression, F, Func, Q, QuerySet, TextField, Value
+from django.db.models import Expression, F
+from django.db.models import Field as DjangoField
+from django.db.models import Func, Q, QuerySet, TextField, Value
 from django.db.models.functions import Cast, Concat
 
 from dateutil import parser
@@ -1694,14 +1696,52 @@ def contains_word_query(self, field_name, value, model_field, field):
 
 
 class BaserowFormulaMultipleCollaboratorsType(
-    HasValueEmptyFilterSupport, BaserowJSONBObjectBaseType
+    HasValueContainsWordFilterSupport,
+    HasValueContainsFilterSupport,
+    HasValueEmptyFilterSupport,
+    HasValueEqualFilterSupport,
+    BaserowJSONBObjectBaseType,
 ):
     type = "multiple_collaborators"
     baserow_field_type = "multiple_collaborators"
     can_order_by = False
     can_order_by_in_array = False
     can_group_by = False
 
+    def get_in_array_contains_word_query(
+        self, field_name: str, value: str, model_field: DjangoField, field: "Field"
+    ) -> OptionallyAnnotatedQ:
+        return get_jsonb_contains_word_filter_expr(
+            model_field, value, query_path="$[*].value.first_name"
+        )
+
+    def get_in_array_contains_query(
+        self, field_name: str, value: str, model_field: DjangoField, field: "Field"
+    ) -> OptionallyAnnotatedQ:
+        return get_jsonb_contains_filter_expr(
+            model_field, value, query_path="$[*].value.first_name"
+        )
+
+    def get_in_array_is_query(
+        self, field_name: str, value: str, model_field: DjangoField, field: "Field"
+    ) -> OptionallyAnnotatedQ:
+        try:
+            value = [int(value)]
+
+        except (TypeError, ValueError):
+            return Q()
+
+        return get_jsonb_has_any_in_value_filter_expr(
+            model_field, value, query_path="$[*].value.id"
+        )
+
+    def get_in_array_empty_query(
+        self, field_name: str, model_field: DjangoField, field: "Field"
+    ) -> OptionallyAnnotatedQ:
+        return get_jsonb_has_any_in_value_filter_expr(
+            model_field, [0], query_path="$[*].value.size()"
+        )
+
     def get_all_empty_query(
         self, field_name: str, model_field: Field, field, in_array: bool = True
     ) -> OptionallyAnnotatedQ:

backend/src/baserow/contrib/database/views/array_view_filters.py

@@ -18,6 +18,7 @@
 )
 from baserow.contrib.database.fields.registries import field_type_registry
 from baserow.contrib.database.formula import (
+    BaserowFormulaMultipleCollaboratorsType,
     BaserowFormulaNumberType,
     BaserowFormulaTextType,
 )
@@ -53,6 +54,7 @@ class HasEmptyValueViewFilterType(ViewFilterType):
             FormulaFieldType.array_of(BaserowFormulaSingleSelectType.type),
             FormulaFieldType.array_of(BaserowFormulaNumberType.type),
             FormulaFieldType.array_of(BaserowFormulaMultipleSelectType.type),
+            FormulaFieldType.array_of(BaserowFormulaMultipleCollaboratorsType.type),
         ),
     ]
 
@@ -121,6 +123,7 @@ class HasValueEqualViewFilterType(ComparisonHasValueFilter):
             FormulaFieldType.array_of(BaserowFormulaSingleSelectType.type),
             FormulaFieldType.array_of(BaserowFormulaNumberType.type),
             FormulaFieldType.array_of(BaserowFormulaMultipleSelectType.type),
+            FormulaFieldType.array_of(BaserowFormulaMultipleCollaboratorsType.type),
         ),
     ]
 
@@ -153,6 +156,7 @@ class HasValueContainsViewFilterType(ViewFilterType):
             FormulaFieldType.array_of(BaserowFormulaSingleSelectType.type),
             FormulaFieldType.array_of(BaserowFormulaNumberType.type),
             FormulaFieldType.array_of(BaserowFormulaMultipleSelectType.type),
+            FormulaFieldType.array_of(BaserowFormulaMultipleCollaboratorsType.type),
         ),
     ]
 
@@ -185,6 +189,7 @@ class HasValueContainsWordViewFilterType(ViewFilterType):
             FormulaFieldType.array_of(BaserowFormulaURLType.type),
             FormulaFieldType.array_of(BaserowFormulaSingleSelectType.type),
             FormulaFieldType.array_of(BaserowFormulaMultipleSelectType.type),
+            FormulaFieldType.array_of(BaserowFormulaMultipleCollaboratorsType.type),
         ),
     ]
 

backend/tests/baserow/contrib/database/utils.py

@@ -74,6 +74,7 @@ class LookupFieldSetup:
     target_field: Field
     row_handler: RowHandler
     view_handler: ViewHandler
+    extra: dict
 
 
 @dataclasses.dataclass
@@ -253,6 +254,7 @@ def setup_linked_table_and_lookup(
         lookup_field=lookup_field,
         view_handler=view_handler,
         model=model,
+        extra={},
     )