Refactor document-list macro for compatibility Jinja2 templates (#3179)

* update document list macro * Update src/components/document-list/_macro.njk Co-authored-by: rmccar <42928680+rmccar@users.noreply.github.com> * update macro --------- Co-authored-by: rmccar <42928680+rmccar@users.noreply.github.com>
ONSdigital · May 13, 2024 · b3f3014 · b3f3014
1 parent 8e702df
commit b3f3014
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/components/document-list/_macro.njk b/src/components/document-list/_macro.njk
@@ -32,10 +32,11 @@
                                 <a href="{{ document.url }}">{{ document.title }}
                                 {%- if document.metadata and document.metadata.file %}
                                 <span class="ons-u-vh">
-                                    {% set fileMetadataItems = [] %}
-                                    {% if document.metadata.file.fileType %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.fileType + ' document download'), fileMetadataItems) %}{% endif %}
-                                    {% if document.metadata.file.fileSize %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.fileSize), fileMetadataItems) %}{% endif %}
-                                    {% if document.metadata.file.filePages %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.filePages), fileMetadataItems) %}{% endif %}
+                                    {% set fileMetadataItems = [
+                                        document.metadata.file.fileType + ' document download' if document.metadata.file.fileType,
+                                        document.metadata.file.fileSize if document.metadata.file.fileSize,
+                                        document.metadata.file.filePages if document.metadata.file.filePages ]
+                                    %}
 
                                     , {{ fileMetadataItems | join(', ') }}
 
@@ -76,12 +77,11 @@
                                     {%- if document.metadata.file and document.metadata.file.fileType %}
 
                                         <li class="ons-document-list__item-attribute" aria-hidden="true">
-                                            {% set fileMetadataItems = [] %}
-
-                                            {% if document.metadata.file.fileType %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.fileType), fileMetadataItems) %}{% endif %}
-                                            {% if document.metadata.file.fileSize %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.fileSize), fileMetadataItems) %}{% endif %}
-                                            {% if document.metadata.file.filePages %}{% set fileMetadataItems = (fileMetadataItems.push(document.metadata.file.filePages), fileMetadataItems) %}{% endif %}
-
+                                            {% set fileMetadataItems = [
+                                                document.metadata.file.fileType if document.metadata.file.fileType,
+                                                document.metadata.file.fileSize if document.metadata.file.fileSize,
+                                                document.metadata.file.filePages if document.metadata.file.filePages ]
+                                             %}
                                             {{ fileMetadataItems | join(', ') }}
                                         </li>