Update test to use Flow crud classes

vaadin · Dec 20, 2024 · 4fe3541 · 4fe3541
1 parent 3880eb2
commit 4fe3541
Show file tree

Hide file tree

Showing 11 changed files with 75 additions and 63 deletions.
diff --git a/packages/java/tests/spring/react-grid-test/frontend/views/GridUseDataProviderHookView.tsx b/packages/java/tests/spring/react-grid-test/frontend/views/GridUseDataProviderHookView.tsx
@@ -1,14 +1,14 @@
 import { useDataProvider } from '@vaadin/hilla-react-crud';
-import type Person from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/Person.js';
-import { PersonService } from 'Frontend/generated/endpoints.js';
+import { Button } from '@vaadin/react-components/Button.js';
 import { Grid } from '@vaadin/react-components/Grid';
 import { GridSortColumn } from '@vaadin/react-components/GridSortColumn';
-import { Button } from '@vaadin/react-components/Button.js';
 import { TextField } from '@vaadin/react-components/TextField.js';
-import PropertyStringFilter from 'Frontend/generated/com/vaadin/hilla/crud/filter/PropertyStringFilter';
 import { useState } from 'react';
-import Matcher from 'Frontend/generated/com/vaadin/hilla/crud/filter/PropertyStringFilter/Matcher';
+import type PropertyStringFilter from 'Frontend/generated/com/vaadin/flow/spring/data/filter/PropertyStringFilter';
+import Matcher from 'Frontend/generated/com/vaadin/flow/spring/data/filter/PropertyStringFilter/Matcher';
 import Gender from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/Person/Gender';
+import type Person from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/Person.js';
+import { PersonService } from 'Frontend/generated/endpoints.js';
 
 type GridBodyReactRendererProps<TItem> = {
   item: TItem;

diff --git a/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridCustomFilter.tsx b/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridCustomFilter.tsx
@@ -1,42 +1,40 @@
+import { AutoGrid, type HeaderFilterRendererProps } from '@vaadin/hilla-react-crud';
+import { GridColumn } from '@vaadin/react-components/GridColumn';
 import { TextField } from '@vaadin/react-components/TextField.js';
-import { AutoGrid, HeaderFilterRendererProps } from '@vaadin/hilla-react-crud';
+import type FilterUnion from 'Frontend/generated/com/vaadin/flow/spring/data/filter/FilterUnion';
+import type OrFilter from 'Frontend/generated/com/vaadin/flow/spring/data/filter/OrFilter';
+import type Person from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/Person';
 import PersonModel from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/PersonModel.js';
-import Person from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/Person';
 import { PersonService } from 'Frontend/generated/endpoints.js';
-import { GridColumn } from '@vaadin/react-components/GridColumn';
-import type FilterUnion from 'Frontend/generated/com/vaadin/hilla/crud/filter/FilterUnion.js';
-import type OrFilter from 'Frontend/generated/com/vaadin/hilla/crud/filter/OrFilter.js';
 
-const HeaderFilterRenderer = ({ setFilter }: HeaderFilterRendererProps) => {
-  return (
-    <TextField
-      id="filter"
-      style={{ width: '20em' }}
-      placeholder="Search for first or last name"
-      onValueChanged={({ detail: { value } }) => {
-        const firstNameFilter = {
-          '@type': 'propertyString',
-          propertyId: 'firstName',
-          matcher: 'CONTAINS',
-          filterValue: value,
-        };
-        const lastNameFilter = {
-          '@type': 'propertyString',
-          propertyId: 'lastName',
-          matcher: 'CONTAINS',
-          filterValue: value,
-        };
+const HeaderFilterRenderer = ({ setFilter }: HeaderFilterRendererProps) => (
+  <TextField
+    id="filter"
+    style={{ width: '20em' }}
+    placeholder="Search for first or last name"
+    onValueChanged={({ detail: { value } }) => {
+      const firstNameFilter = {
+        '@type': 'propertyString',
+        propertyId: 'firstName',
+        matcher: 'CONTAINS',
+        filterValue: value,
+      };
+      const lastNameFilter = {
+        '@type': 'propertyString',
+        propertyId: 'lastName',
+        matcher: 'CONTAINS',
+        filterValue: value,
+      };
 
-        const filter: OrFilter = {
-          '@type': 'or',
-          children: [firstNameFilter, lastNameFilter],
-        };
+      const filter: OrFilter = {
+        '@type': 'or',
+        children: [firstNameFilter, lastNameFilter],
+      };
 
-        setFilter(filter as FilterUnion);
-      }}
-    ></TextField>
-  );
-};
+      setFilter(filter as FilterUnion);
+    }}
+  ></TextField>
+);
 
 const FullNameRenderer = ({ item }: { item: Person }): JSX.Element => (
   <span>

diff --git a/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridOrFilter.tsx b/packages/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridOrFilter.tsx
@@ -1,7 +1,7 @@
-import { TextField } from '@vaadin/react-components/TextField.js';
 import { AutoGrid } from '@vaadin/hilla-react-crud';
+import { TextField } from '@vaadin/react-components/TextField.js';
 import { useState } from 'react';
-import type FilterUnion from 'Frontend/generated/com/vaadin/hilla/crud/filter/FilterUnion.js';
+import type FilterUnion from 'Frontend/generated/com/vaadin/flow/spring/data/filter/FilterUnion';
 import PersonModel from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/PersonModel.js';
 import { PersonService } from 'Frontend/generated/endpoints.js';
 
@@ -27,7 +27,7 @@ export function ReadOnlyGridOrFilter(): JSX.Element {
             matcher: 'CONTAINS',
             filterValue: value,
           };
-          setFilter({ '@type': 'or', children: [firstNameFilter, lasttNameFilter]});
+          setFilter({ '@type': 'or', children: [firstNameFilter, lasttNameFilter] });
         }}
       ></TextField>
       <AutoGrid service={PersonService} model={PersonModel} experimentalFilter={filter} noHeaderFilters />

diff --git a/...ges/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridSinglePropertyFilter.tsx b/...ges/java/tests/spring/react-grid-test/frontend/views/ReadOnlyGridSinglePropertyFilter.tsx
@@ -1,8 +1,8 @@
-import { TextField } from '@vaadin/react-components/TextField.js';
 import { AutoGrid } from '@vaadin/hilla-react-crud';
+import { TextField } from '@vaadin/react-components/TextField.js';
 import { useState } from 'react';
-import type FilterUnion from 'Frontend/generated/com/vaadin/hilla/crud/filter/FilterUnion.js';
-import Matcher from 'Frontend/generated/com/vaadin/hilla/crud/filter/PropertyStringFilter/Matcher.js';
+import type FilterUnion from 'Frontend/generated/com/vaadin/flow/spring/data/filter/FilterUnion';
+import Matcher from 'Frontend/generated/com/vaadin/flow/spring/data/filter/PropertyStringFilter/Matcher';
 import PersonModel from 'Frontend/generated/com/vaadin/hilla/test/reactgrid/PersonModel.js';
 import { PersonService } from 'Frontend/generated/endpoints.js';
 

diff --git a/...ing/react-grid-test/src/main/java/com/vaadin/hilla/test/reactgrid/AppointmentService.java b/...ing/react-grid-test/src/main/java/com/vaadin/hilla/test/reactgrid/AppointmentService.java
@@ -1,14 +1,18 @@
 package com.vaadin.hilla.test.reactgrid;
 
-import com.vaadin.hilla.BrowserCallable;
-import com.vaadin.hilla.crud.CrudRepositoryService;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.stereotype.Service;
 
 import com.vaadin.flow.server.auth.AnonymousAllowed;
+import com.vaadin.flow.spring.data.jpa.CrudRepositoryService;
+import com.vaadin.hilla.BrowserCallable;
 
 @BrowserCallable
 @Service
 @AnonymousAllowed
 public class AppointmentService extends
         CrudRepositoryService<Appointment, Long, AppointmentRepository> {
+    AppointmentService(AppointmentRepository repository) {
+        super(repository);
+    }
 }
diff --git a/.../spring/react-grid-test/src/main/java/com/vaadin/hilla/test/reactgrid/CompanyService.java b/.../spring/react-grid-test/src/main/java/com/vaadin/hilla/test/reactgrid/CompanyService.java
@@ -1,12 +1,14 @@
 package com.vaadin.hilla.test.reactgrid;
 
-import com.vaadin.hilla.BrowserCallable;
-import com.vaadin.hilla.crud.CrudRepositoryService;
-
 import com.vaadin.flow.server.auth.AnonymousAllowed;
+import com.vaadin.flow.spring.data.jpa.CrudRepositoryService;
+import com.vaadin.hilla.BrowserCallable;
 
 @BrowserCallable
 @AnonymousAllowed
 public class CompanyService
         extends CrudRepositoryService<Company, Long, CompanyRepository> {
+    CompanyService(CompanyRepository repository) {
+        super(repository);
+    }
 }
diff --git a/.../react-grid-test/src/main/java/com/vaadin/hilla/test/reactgrid/PersonListOnlyService.java b/.../react-grid-test/src/main/java/com/vaadin/hilla/test/reactgrid/PersonListOnlyService.java
@@ -1,13 +1,16 @@
 package com.vaadin.hilla.test.reactgrid;
 
-import com.vaadin.hilla.BrowserCallable;
-import com.vaadin.hilla.crud.ListRepositoryService;
-
 import com.vaadin.flow.server.auth.AnonymousAllowed;
+import com.vaadin.flow.spring.data.jpa.ListRepositoryService;
+import com.vaadin.hilla.BrowserCallable;
 
 @BrowserCallable
 @AnonymousAllowed
 public class PersonListOnlyService
         extends ListRepositoryService<Person, Long, PersonRepository> {
 
+    PersonListOnlyService(PersonRepository repository) {
+        super(repository);
+    }
+
 }
diff --git a/...s/spring/react-grid-test/src/main/java/com/vaadin/hilla/test/reactgrid/PersonService.java b/...s/spring/react-grid-test/src/main/java/com/vaadin/hilla/test/reactgrid/PersonService.java
@@ -1,13 +1,15 @@
 package com.vaadin.hilla.test.reactgrid;
 
-import com.vaadin.hilla.BrowserCallable;
-import com.vaadin.hilla.crud.CrudRepositoryService;
-
 import com.vaadin.flow.server.auth.AnonymousAllowed;
+import com.vaadin.flow.spring.data.jpa.CrudRepositoryService;
+import com.vaadin.hilla.BrowserCallable;
 
 @BrowserCallable
 @AnonymousAllowed
 public class PersonService
         extends CrudRepositoryService<Person, Long, PersonRepository> {
 
+    PersonService(PersonRepository repository) {
+        super(repository);
+    }
 }
diff --git a/...-test/src/main/java/com/vaadin/hilla/test/reactgrid/entityreferences/EmployeeService.java b/...-test/src/main/java/com/vaadin/hilla/test/reactgrid/entityreferences/EmployeeService.java
@@ -1,13 +1,16 @@
 package com.vaadin.hilla.test.reactgrid.entityreferences;
 
-import com.vaadin.hilla.BrowserCallable;
-import com.vaadin.hilla.crud.ListRepositoryService;
-
 import com.vaadin.flow.server.auth.AnonymousAllowed;
+import com.vaadin.flow.spring.data.jpa.ListRepositoryService;
+import com.vaadin.hilla.BrowserCallable;
 
 @BrowserCallable
 @AnonymousAllowed
 public class EmployeeService
         extends ListRepositoryService<Employee, Long, EmployeeRepository> {
 
+    public EmployeeService(EmployeeRepository repository) {
+        super(repository);
+    }
+
 }
diff --git a/...ct-grid-test/src/test/java/com/vaadin/hilla/test/reactgrid/GridUseDataProviderHookIT.java b/...ct-grid-test/src/test/java/com/vaadin/hilla/test/reactgrid/GridUseDataProviderHookIT.java
@@ -1,11 +1,11 @@
 package com.vaadin.hilla.test.reactgrid;
 
-import com.vaadin.flow.component.button.testbench.ButtonElement;
-import com.vaadin.flow.component.textfield.testbench.TextFieldElement;
-import com.vaadin.testbench.TestBenchElement;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.flow.component.button.testbench.ButtonElement;
+import com.vaadin.flow.component.textfield.testbench.TextFieldElement;
+
 public class GridUseDataProviderHookIT extends AbstractGridTest {
 
     protected String getTestPath() {

diff --git a/...id-test/src/test/java/com/vaadin/hilla/test/reactgrid/ReadOnlyGridWithHeaderFilterIT.java b/...id-test/src/test/java/com/vaadin/hilla/test/reactgrid/ReadOnlyGridWithHeaderFilterIT.java
@@ -4,14 +4,14 @@
 import java.util.Locale;
 import java.util.function.Consumer;
 
-import com.vaadin.hilla.crud.filter.PropertyStringFilter.Matcher;
 import org.junit.Test;
 
 import com.vaadin.flow.component.datepicker.testbench.DatePickerElement;
-import com.vaadin.flow.component.timepicker.testbench.TimePickerElement;
 import com.vaadin.flow.component.select.testbench.SelectElement;
 import com.vaadin.flow.component.textfield.testbench.NumberFieldElement;
 import com.vaadin.flow.component.textfield.testbench.TextFieldElement;
+import com.vaadin.flow.component.timepicker.testbench.TimePickerElement;
+import com.vaadin.flow.spring.data.filter.PropertyStringFilter.Matcher;
 import com.vaadin.testbench.TestBench;
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elementsbase.Element;