Merge pull request #7427 from carlobeltrame/fix-entity-ordering

Consistently open the next future period in the picasso

Author: carlobeltrame

api/config/packages/api_platform.yaml

@@ -36,8 +36,6 @@ api_platform:
                 input_formats: [ 'jsonld', 'jsonapi', 'json' ]
         normalization_context:
             skip_null_values: false
-        order:
-            createTime: DESC
 
     # On API-Platform Update - test, if this config is still needed.
     # See PR 5948: https://github.com/ecamp/ecamp3/pull/5948

api/src/Entity/Period.php

@@ -56,7 +56,8 @@
         ),
     ],
     denormalizationContext: ['groups' => ['write']],
-    normalizationContext: ['groups' => ['read']]
+    normalizationContext: ['groups' => ['read']],
+    order: ['start']
 )]
 #[ApiFilter(filterClass: SearchFilter::class, properties: ['camp'])]
 #[ORM\Entity(repositoryClass: PeriodRepository::class)]

e2e/specs/httpCache/content-types.cy.js

@@ -3,7 +3,7 @@ import itemResponse from './responses/content_types_entity.json'
 import { bipiUser, cachedEndpoint, castorUser } from '../constants'
 
 const collectionXKeys =
-  'a4211c11211c c462edd869f3 5e2028c55ee4 a4211c112939 f17470519474 1a0f84e322c8 3ef17bd1df72 4f0c657fecef 44dcc7493c65 cfccaecd4bad 318e064ea0c9 /api/content_types'
+  'a4211c11211c f17470519474 1a0f84e322c8 c462edd869f3 5e2028c55ee4 3ef17bd1df72 4f0c657fecef a4211c112939 44dcc7493c65 cfccaecd4bad 318e064ea0c9 /api/content_types'
 
 describe('cache test: /content-types', () => {
   it('caches collection separately for each login', () => {

e2e/specs/httpCache/responses/content_types_collection.json

@@ -8,26 +8,26 @@
         "href": "/api/content_types/a4211c11211c"
       },
       {
-        "href": "/api/content_types/c462edd869f3"
-      },
-      {
-        "href": "/api/content_types/5e2028c55ee4"
+        "href": "/api/content_types/f17470519474"
       },
       {
-        "href": "/api/content_types/a4211c112939"
+        "href": "/api/content_types/1a0f84e322c8"
       },
       {
-        "href": "/api/content_types/f17470519474"
+        "href": "/api/content_types/c462edd869f3"
       },
       {
-        "href": "/api/content_types/1a0f84e322c8"
+        "href": "/api/content_types/5e2028c55ee4"
       },
       {
         "href": "/api/content_types/3ef17bd1df72"
       },
       {
         "href": "/api/content_types/4f0c657fecef"
       },
+      {
+        "href": "/api/content_types/a4211c112939"
+      },
       {
         "href": "/api/content_types/44dcc7493c65"
       },
@@ -58,93 +58,93 @@
       {
         "_links": {
           "self": {
-            "href": "/api/content_types/c462edd869f3"
+            "href": "/api/content_types/f17470519474"
           },
           "contentNodes": {
-            "href": "/api/content_node/single_texts?contentType=%2Fapi%2Fcontent_types%2Fc462edd869f3"
+            "href": "/api/content_node/column_layouts?contentType=%2Fapi%2Fcontent_types%2Ff17470519474"
           }
         },
-        "name": "LearningObjectives",
+        "name": "ColumnLayout",
         "active": true,
-        "id": "c462edd869f3"
+        "id": "f17470519474"
       },
       {
         "_links": {
           "self": {
-            "href": "/api/content_types/5e2028c55ee4"
+            "href": "/api/content_types/1a0f84e322c8"
           },
           "contentNodes": {
-            "href": "/api/content_node/single_texts?contentType=%2Fapi%2Fcontent_types%2F5e2028c55ee4"
+            "href": "/api/content_node/multi_selects?contentType=%2Fapi%2Fcontent_types%2F1a0f84e322c8"
           }
         },
-        "name": "LearningTopics",
+        "name": "LAThematicArea",
         "active": true,
-        "id": "5e2028c55ee4"
+        "id": "1a0f84e322c8"
       },
       {
         "_links": {
           "self": {
-            "href": "/api/content_types/a4211c112939"
+            "href": "/api/content_types/c462edd869f3"
           },
           "contentNodes": {
-            "href": "/api/content_node/responsive_layouts?contentType=%2Fapi%2Fcontent_types%2Fa4211c112939"
+            "href": "/api/content_node/single_texts?contentType=%2Fapi%2Fcontent_types%2Fc462edd869f3"
           }
         },
-        "name": "ResponsiveLayout",
+        "name": "LearningObjectives",
         "active": true,
-        "id": "a4211c112939"
+        "id": "c462edd869f3"
       },
       {
         "_links": {
           "self": {
-            "href": "/api/content_types/f17470519474"
+            "href": "/api/content_types/5e2028c55ee4"
           },
           "contentNodes": {
-            "href": "/api/content_node/column_layouts?contentType=%2Fapi%2Fcontent_types%2Ff17470519474"
+            "href": "/api/content_node/single_texts?contentType=%2Fapi%2Fcontent_types%2F5e2028c55ee4"
           }
         },
-        "name": "ColumnLayout",
+        "name": "LearningTopics",
         "active": true,
-        "id": "f17470519474"
+        "id": "5e2028c55ee4"
       },
       {
         "_links": {
           "self": {
-            "href": "/api/content_types/1a0f84e322c8"
+            "href": "/api/content_types/3ef17bd1df72"
           },
           "contentNodes": {
-            "href": "/api/content_node/multi_selects?contentType=%2Fapi%2Fcontent_types%2F1a0f84e322c8"
+            "href": "/api/content_node/material_nodes?contentType=%2Fapi%2Fcontent_types%2F3ef17bd1df72"
           }
         },
-        "name": "LAThematicArea",
+        "name": "Material",
         "active": true,
-        "id": "1a0f84e322c8"
+        "id": "3ef17bd1df72"
       },
       {
         "_links": {
           "self": {
-            "href": "/api/content_types/3ef17bd1df72"
+            "href": "/api/content_types/4f0c657fecef"
           },
           "contentNodes": {
-            "href": "/api/content_node/material_nodes?contentType=%2Fapi%2Fcontent_types%2F3ef17bd1df72"
+            "href": "/api/content_node/single_texts?contentType=%2Fapi%2Fcontent_types%2F4f0c657fecef"
           }
         },
-        "name": "Material",
+        "name": "Notes",
         "active": true,
-        "id": "3ef17bd1df72"
+        "id": "4f0c657fecef"
       },
       {
         "_links": {
           "self": {
-            "href": "/api/content_types/4f0c657fecef"
+            "href": "/api/content_types/a4211c112939"
           },
           "contentNodes": {
-            "href": "/api/content_node/single_texts?contentType=%2Fapi%2Fcontent_types%2F4f0c657fecef"
+            "href": "/api/content_node/responsive_layouts?contentType=%2Fapi%2Fcontent_types%2Fa4211c112939"
           }
         },
-        "name": "Notes",
+        "name": "ResponsiveLayout",
         "active": true,
-        "id": "4f0c657fecef"
+        "id": "a4211c112939"
       },
       {
         "_links": {