fix: fix onQuickAddClick for nodes/tree and update filters template

Author: roadiz-ci

templates/macros/rz_page_header.html.twig

@@ -82,7 +82,7 @@
 {% macro translations_bar(available_translations, path, pathParams, current, pathAddTranslations, pathAddTranslationsTitle) %}
     {% import '@RoadizRozier/macros/rz_link.html.twig' as rz_link %}
     {% if available_translations %}
-        <div class="rz-button-group rz-button-group--sm rz-button-group--collapsed">
+        <div class="rz-page-header__translations rz-button-group rz-button-group--sm rz-button-group--collapsed">
             {%- for translation in available_translations -%}
                 {% set class = 'rz-button rz-button-group__button' %}
                 {% if current == translation.getId %}
@@ -95,7 +95,7 @@
                     'locale': translation.locale
                 })) %}
 
-                {% set attr = { href: href } %}
+                {% set attr = { href: href, 'data-translation-id': translation.id } %}
                 {% if current == translation.getId %}
                     {% set attr = attr|merge({ 'aria-current': 'page' }) %}
                 {% endif %}

templates/nodes/head.html.twig

@@ -54,11 +54,12 @@
             <div class="stack-tree-quick-creation rz-button-group rz-button-group--gap-md rz-page-header__item--right">
                 {% for stackType in node.stackTypes %}
                     {% set nodeType = getNodeType(stackType) %}
-                    <button type="button"
-                            class="rz-button rz-button--primary rz-button-group__button"
-                            data-children-node-type="{{ nodeType.name }}"
-                            data-children-parent-node="{{ node.id }}"
-                            {% if specificNodeTree is defined and specificNodeTree.tag is defined %}data-filter-tag="{{ specificNodeTree.tag.id }}"{% endif %}
+                    <button
+                        type="button"
+                        class="rz-button rz-button--primary rz-button-group__button"
+                        data-children-node-type="{{ nodeType.name }}"
+                        data-children-parent-node="{{ node.id }}"
+                        {% if specificNodeTree is defined and specificNodeTree.tag is defined %}data-filter-tag="{{ specificNodeTree.tag.id }}"{% endif %}
                     >
                         <span class="rz-button__label">{{ nodeType.displayName }}</span>
                         <span class="rz-button__icon rz-icon-ri--add-line"></span>

templates/nodes/tree.html.twig

@@ -48,7 +48,7 @@
     {% endif %}
 
     {% include '@RoadizRozier/nodes/filtersBar.html.twig' with {
-        filters: filters,
+        filters: specificNodeTree.filters,
         tags: tags,
     } only %}
 

templates/widgets/rz_filters_bar.html.twig

@@ -50,11 +50,12 @@
         </form>
     {% endif %}
 
-    {% if filters.itemCount > filters.itemPerPage %}
+    {% set hasItemPerPageParams = app.request.get('item_per_page') is not same as("20") %}
+    {% if (filters.itemCount > filters.itemPerPage) or hasItemPerPageParams %}
         <div class="rz-filters-bar__group rz-filters-bar__group--right">
             {{ rz_filters_bar.pagination(filters) }}
 
-            {% if filters.itemPerPage and filters.itemCount > 10 %}
+            {% if (filters.itemPerPage and filters.itemCount > 10) or hasItemPerPageParams %}
                 {{ rz_filters_bar.item_per_page(filters.itemPerPage) }}
             {% endif %}
         </div>