Merge branch 'hotfix/v2.4.16'

roadiz · Feb 17, 2025 · 650330b · 650330b
2 parents f85dd1d + a32d099
commit 650330b
Show file tree

Hide file tree

Showing 20 changed files with 71 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to Roadiz will be documented in this file.
 
+## [2.4.16](https://github.com/roadiz/core-bundle-dev-app/compare/v2.4.15...v2.4.16) - 2025-02-17
+
+### Bug Fixes
+
+- **(Rozier)** Generate ordered query-string arrays to prevent Varnish to sort `ids` arbitrarily - ([9c1b0cb](https://github.com/roadiz/core-bundle-dev-app/commit/9c1b0cb67ecd23e5ce9637344f88561c14912615))
+
 ## [2.4.15](https://github.com/roadiz/core-bundle-dev-app/compare/v2.4.14...v2.4.15) - 2025-02-17
 
 ### Bug Fixes

diff --git a/lib/RoadizCoreBundle/config/services.yaml b/lib/RoadizCoreBundle/config/services.yaml
@@ -1,6 +1,6 @@
 ---
 parameters:
-    roadiz_core.cms_version: '2.4.15'
+    roadiz_core.cms_version: '2.4.16'
     roadiz_core.cms_version_prefix: 'main'
     env(APP_NAMESPACE): "roadiz"
     env(APP_VERSION): "0.1.0"

diff --git a/lib/Rozier/src/Resources/app/api/CustomFormApi.js b/lib/Rozier/src/Resources/app/api/CustomFormApi.js
@@ -10,7 +10,13 @@ import request from 'axios'
 export function getCustomFormsByIds({ ids = [], filters }) {
     const postData = {
         _token: window.RozierRoot.ajaxToken,
-        ids: ids,
+    }
+    /*
+     * We need to send the ids as an object with keys as string
+     * when Varnish is enabled, the query string is sorted
+     */
+    for (let i = 0; i < ids.length; i++) {
+        postData['ids[' + i + ']'] = ids[i]
     }
 
     return request({

diff --git a/lib/Rozier/src/Resources/app/api/DocumentApi.js b/lib/Rozier/src/Resources/app/api/DocumentApi.js
@@ -10,7 +10,13 @@ export function getDocumentsByIds({ ids = [] }) {
     const postData = {
         _token: window.RozierRoot.ajaxToken,
         _action: 'documentsByIds',
-        ids: ids,
+    }
+    /*
+     * We need to send the ids as an object with keys as string
+     * when Varnish is enabled, the query string is sorted
+     */
+    for (let i = 0; i < ids.length; i++) {
+        postData['ids[' + i + ']'] = ids[i]
     }
 
     return request({

diff --git a/lib/Rozier/src/Resources/app/api/ExplorerProviderApi.js b/lib/Rozier/src/Resources/app/api/ExplorerProviderApi.js
@@ -11,9 +11,15 @@ import qs from 'qs'
 export function getItemsByIds({ ids = [], filters }) {
     const postData = {
         _token: window.RozierRoot.ajaxToken,
-        ids: ids,
         providerClass: filters.providerClass,
     }
+    /*
+     * We need to send the ids as an object with keys as string
+     * when Varnish is enabled, the query string is sorted
+     */
+    for (let i = 0; i < ids.length; i++) {
+        postData['ids[' + i + ']'] = ids[i]
+    }
 
     return request({
         method: 'GET',

diff --git a/lib/Rozier/src/Resources/app/api/JoinApi.js b/lib/Rozier/src/Resources/app/api/JoinApi.js
@@ -10,9 +10,15 @@ import request from 'axios'
 export function getJoinsByIds({ ids = [], filters }) {
     const postData = {
         _token: window.RozierRoot.ajaxToken,
-        ids: ids,
         nodeTypeFieldId: filters.nodeTypeField,
     }
+    /*
+     * We need to send the ids as an object with keys as string
+     * when Varnish is enabled, the query string is sorted
+     */
+    for (let i = 0; i < ids.length; i++) {
+        postData['ids[' + i + ']'] = ids[i]
+    }
 
     return request({
         method: 'GET',

diff --git a/lib/Rozier/src/Resources/app/api/NodeApi.js b/lib/Rozier/src/Resources/app/api/NodeApi.js
@@ -10,7 +10,13 @@ export function getNodesByIds({ ids = [] }) {
     const postData = {
         _token: window.RozierRoot.ajaxToken,
         _action: 'nodesByIds',
-        ids: ids,
+    }
+    /*
+     * We need to send the ids as an object with keys as string
+     * when Varnish is enabled, the query string is sorted
+     */
+    for (let i = 0; i < ids.length; i++) {
+        postData['ids[' + i + ']'] = ids[i]
     }
 
     return request({

diff --git a/lib/Rozier/src/Resources/app/api/NodeTypeApi.js b/lib/Rozier/src/Resources/app/api/NodeTypeApi.js
@@ -13,7 +13,13 @@ export function getNodeTypesByIds({ ids = [] }) {
     const postData = {
         _token: window.RozierRoot.ajaxToken,
         _action: 'nodeTypesByIds',
-        names: ids,
+    }
+    /*
+     * We need to send the ids as an object with keys as string
+     * when Varnish is enabled, the query string is sorted
+     */
+    for (let i = 0; i < ids.length; i++) {
+        postData['names[' + i + ']'] = ids[i]
     }
 
     return request({

diff --git a/lib/Rozier/src/Resources/app/api/TagApi.js b/lib/Rozier/src/Resources/app/api/TagApi.js
@@ -59,7 +59,14 @@ export function getTagsByIds({ ids = [] }) {
     const postData = {
         _token: window.RozierRoot.ajaxToken,
         _action: 'documentsByIds',
-        ids: ids,
+    }
+
+    /*
+     * We need to send the ids as an object with keys as string
+     * when Varnish is enabled, the query string is sorted
+     */
+    for (let i = 0; i < ids.length; i++) {
+        postData['ids[' + i + ']'] = ids[i]
     }
 
     return request({

diff --git a/lib/Rozier/src/Resources/views/forms.html.twig b/lib/Rozier/src/Resources/views/forms.html.twig
@@ -399,7 +399,7 @@
 {# Children node tree field #}
 {% block childrennodes_widget %}
     {% apply spaceless %}
-        <div class="uk-form-row children-nodes-widget" data-children-nodes-widget {{ block('widget_attributes') }}>
+        <div class="uk-form-row children-nodes-widget" data-translation-id="{{ nodeTree.translation.id }}" data-children-nodes-widget {{ block('widget_attributes') }}>
             {% if label is empty -%}
                 {% set label = name|humanize %}
             {%- endif -%}
@@ -418,9 +418,9 @@
                                     {% for linkedType in linkedTypes %}
                                         <a class="uk-button uk-button-small"
                                            href="#"
-                                           data-children-node-type="{{ linkedType.getId }}"
-                                           data-children-parent-node="{{ nodeTree.rootNode.getId }}"
-                                           data-translation-id="{{ nodeTree.translation.getId }}">
+                                           data-children-node-type="{{ linkedType.id }}"
+                                           data-children-parent-node="{{ nodeTree.rootNode.id }}"
+                                           data-translation-id="{{ nodeTree.translation.id }}">
                                             <i class="uk-icon-rz-plus-simple"></i>{{ linkedType.getDisplayName }}
                                         </a>
                                     {% endfor %}

diff --git a/lib/Rozier/src/Resources/views/partials/css-inject.html.twig b/lib/Rozier/src/Resources/views/partials/css-inject.html.twig
@@ -1,7 +1,7 @@
 
 <link href="{{ asset('css/vendor.9b59501e29a05f532c3c.css', 'Rozier') }}" rel="stylesheet">
 
-<link href="{{ asset('css/app.9826a3f175f9eecf80f0.css', 'Rozier') }}" rel="stylesheet">
+<link href="{{ asset('css/app.d3346cef2aa49b6daaca.css', 'Rozier') }}" rel="stylesheet">
 
 
 

diff --git a/lib/Rozier/src/Resources/views/partials/js-inject.html.twig b/lib/Rozier/src/Resources/views/partials/js-inject.html.twig
@@ -1,5 +1,5 @@
 
-<script src="{{ asset('js/vendor.b12fa697ba450a228471.js', 'Rozier') }}" defer type="text/javascript"></script>
+<script src="{{ asset('js/vendor.beab77f70f36848b9577.js', 'Rozier') }}" defer type="text/javascript"></script>
 
-<script src="{{ asset('js/app.b12fa697ba450a228471.js', 'Rozier') }}" defer type="text/javascript"></script>
+<script src="{{ asset('js/app.beab77f70f36848b9577.js', 'Rozier') }}" defer type="text/javascript"></script>
 
diff --git a/lib/Rozier/src/Resources/views/partials/simple-js-inject.html.twig b/lib/Rozier/src/Resources/views/partials/simple-js-inject.html.twig
@@ -1,3 +1,3 @@
 
-<script src="{{ asset('js/simple.b12fa697ba450a228471.js', 'Rozier') }}" defer type="text/javascript"></script>
+<script src="{{ asset('js/simple.beab77f70f36848b9577.js', 'Rozier') }}" defer type="text/javascript"></script>
 
diff --git a/lib/Rozier/src/static/css/app.9826a3f175f9eecf80f0.css.map b/lib/Rozier/src/static/css/app.9826a3f175f9eecf80f0.css.map
diff --git a/...c/static/css/app.9826a3f175f9eecf80f0.css → ...c/static/css/app.d3346cef2aa49b6daaca.css b/...c/static/css/app.9826a3f175f9eecf80f0.css → ...c/static/css/app.d3346cef2aa49b6daaca.css
diff --git a/lib/Rozier/src/static/css/app.d3346cef2aa49b6daaca.css.map b/lib/Rozier/src/static/css/app.d3346cef2aa49b6daaca.css.map
diff --git a/lib/Rozier/src/static/css/vendor.9b59501e29a05f532c3c.css.map b/lib/Rozier/src/static/css/vendor.9b59501e29a05f532c3c.css.map
diff --git a/...src/static/js/app.b12fa697ba450a228471.js → ...src/static/js/app.beab77f70f36848b9577.js b/...src/static/js/app.b12fa697ba450a228471.js → ...src/static/js/app.beab77f70f36848b9577.js
diff --git a/.../static/js/simple.b12fa697ba450a228471.js → .../static/js/simple.beab77f70f36848b9577.js b/.../static/js/simple.b12fa697ba450a228471.js → .../static/js/simple.beab77f70f36848b9577.js
diff --git a/.../static/js/vendor.b12fa697ba450a228471.js → .../static/js/vendor.beab77f70f36848b9577.js b/.../static/js/vendor.b12fa697ba450a228471.js → .../static/js/vendor.beab77f70f36848b9577.js
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,3 @@

		<script src="{{ asset('js/simple.b12fa697ba450a228471.js', 'Rozier') }}" defer type="text/javascript"></script>
		<script src="{{ asset('js/simple.beab77f70f36848b9577.js', 'Rozier') }}" defer type="text/javascript"></script>