Merge pull request #395 from api-platform/390-replace-apipropertytype-by-apipropertyiris-when-httpschemaorgname-is-used

Author: vincentchalamon

api/Dockerfile

@@ -27,6 +27,7 @@ RUN apt-get update; \
 		file \
 		gettext \
 		git \
+		zip \
 	; \
 	rm -rf /var/lib/apt/lists/*
 

api/src/Entity/Book.php

@@ -120,7 +120,7 @@ class Book
     #[ApiFilter(OrderFilter::class)]
     #[ApiFilter(SearchFilter::class, strategy: 'i' . SearchFilterInterface::STRATEGY_PARTIAL)]
     #[ApiProperty(
-        types: ['https://schema.org/name'],
+        iris: ['https://schema.org/name'],
         example: 'Hyperion'
     )]
     #[Groups(groups: ['Book:read', 'Book:read:admin', 'Bookmark:read', 'Review:read:admin'])]

api/src/Entity/User.php

@@ -121,7 +121,7 @@ public function getUserIdentifier(): string
     /**
      * @see https://schema.org/name
      */
-    #[ApiProperty(types: ['https://schema.org/name'])]
+    #[ApiProperty(iris: ['https://schema.org/name'])]
     #[Groups(groups: ['User:read', 'Review:read'])]
     public function getName(): ?string
     {

compose.e2e.yaml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   keycloak:
     environment:

compose.override.yaml

@@ -1,5 +1,3 @@
-version: "3.4"
-
 # Development environment override
 services:
   php:

compose.prod.yaml

@@ -1,5 +1,3 @@
-version: "3.4"
-
 # Production environment override
 services:
   php:

compose.yaml

@@ -1,5 +1,3 @@
-version: "3.4"
-
 services:
   php:
     image: ${IMAGES_PREFIX:-}app-php

pwa/app/books/page.tsx

@@ -46,7 +46,6 @@ async function getServerSideProps(query: Query, session: Session|null): Promise<
   try {
     const response: FetchResponse<PagedCollection<Book>> | undefined = await fetchApi(buildUriFromFilters("/books", filters), {
       cache: "force-cache",
-      next: { revalidate: 3600 },
     }, session);
     if (!response?.data) {
       throw new Error('Unable to retrieve data from /books.');

pwa/components/admin/book/Create.tsx

@@ -1,6 +1,6 @@
 import { CreateGuesser, type CreateGuesserProps } from "@api-platform/admin";
 
-import { Form } from "../../../components/admin/book/Form";
+import { Form } from "./Form";
 
 export const Create = (props: CreateGuesserProps) => (
   <CreateGuesser {...props} title="Create book">

pwa/components/admin/book/Edit.tsx

@@ -1,8 +1,8 @@
 import { EditGuesser, type EditGuesserProps } from "@api-platform/admin";
 import { TopToolbar } from 'react-admin';
 
-import { Form } from "../../../components/admin/book/Form";
-import { ShowButton } from "../../../components/admin/book/ShowButton";
+import { Form } from "./Form";
+import { ShowButton } from "./ShowButton";
 
 // @ts-ignore
 const Actions = ({ data }) => (