Change muiGridFilterToGql fallback operator to 'and' (#2061)

MUI uses and per default, not or.

---------

Co-authored-by: Denise Buder <[email protected]>
Co-authored-by: Johannes Obermair <[email protected]>
Co-authored-by: Niko Sams <[email protected]>

.changeset/fair-hats-decide.md

@@ -0,0 +1,5 @@
+---
+"@comet/admin": patch
+---
+
+muiGridFilterToGql: change fallback operator to 'and' to match MUI default

packages/admin/admin/src/dataGrid/muiGridFilterToGql.test.ts

@@ -0,0 +1,78 @@
+import { GridColDef, GridLinkOperator } from "@mui/x-data-grid";
+import { GridFilterModel } from "@mui/x-data-grid/models/gridFilterModel";
+
+import { muiGridFilterToGql } from "./muiGridFilterToGql";
+
+const columns: GridColDef<{ tag: string }>[] = [{ field: "tag" }];
+
+const mockedFilterModelAndOperator: GridFilterModel = {
+    items: [
+        {
+            columnField: "tag",
+            operatorValue: "contains",
+            id: 1,
+            value: "de",
+        },
+        {
+            columnField: "tag",
+            operatorValue: "contains",
+            id: 2,
+            value: "en",
+        },
+    ],
+    linkOperator: GridLinkOperator.And,
+};
+
+const mockedFilterModelOrOperator: GridFilterModel = {
+    items: [
+        {
+            columnField: "tag",
+            operatorValue: "contains",
+            id: 1,
+            value: "de",
+        },
+        {
+            columnField: "tag",
+            operatorValue: "contains",
+            id: 2,
+            value: "en",
+        },
+    ],
+    linkOperator: GridLinkOperator.Or,
+};
+const mockedFilterModelWithoutOperator: GridFilterModel = {
+    items: [
+        {
+            columnField: "tag",
+            operatorValue: "contains",
+            id: 1,
+            value: "de",
+        },
+        {
+            columnField: "tag",
+            operatorValue: "contains",
+            id: 2,
+            value: "en",
+        },
+    ],
+};
+
+describe("muiGridFilterToGql", () => {
+    it("should use correct and filter for specified and operator", () => {
+        const result = muiGridFilterToGql(columns, mockedFilterModelAndOperator);
+
+        expect(result).toEqual({ filter: { and: [{ tag: { contains: "de" } }, { tag: { contains: "en" } }] } });
+    });
+
+    it("should use correct or filter for specified or operator", () => {
+        const result = muiGridFilterToGql(columns, mockedFilterModelOrOperator);
+
+        expect(result).toEqual({ filter: { or: [{ tag: { contains: "de" } }, { tag: { contains: "en" } }] } });
+    });
+
+    it("should use correct and filter for no operator specified ", () => {
+        const result = muiGridFilterToGql(columns, mockedFilterModelWithoutOperator);
+
+        expect(result).toEqual({ filter: { and: [{ tag: { contains: "de" } }, { tag: { contains: "en" } }] } });
+    });
+});

packages/admin/admin/src/dataGrid/muiGridFilterToGql.tsx

@@ -73,7 +73,7 @@ export function muiGridFilterToGql(columns: GridColDef[], filterModel?: GridFilt
             };
         });
     const filter: GqlFilter = {};
-    const op: "and" | "or" = filterModel.linkOperator ?? "or";
+    const op: "and" | "or" = filterModel.linkOperator ?? "and";
     filter[op] = filterItems;
 
     let search: undefined | string = undefined;