Extract flash messages view into components/flash_messages.twig

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · May 16, 2024 · cf44e8b · cf44e8b
1 parent c10d265
commit cf44e8b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 28 deletions.
diff --git a/resources/templates/components/flash_messages.twig b/resources/templates/components/flash_messages.twig
@@ -0,0 +1,9 @@
+{% for flash_message in flash_messages() %}
+  {% if flash_message.statement is empty %}
+    <div class="alert alert-{{ flash_message.context }}" role="alert">
+      {{ flash_message.message }}
+    </div>
+  {% else %}
+    {{ statement_message(flash_message.message, flash_message.statement, flash_message.context) }}
+  {% endif %}
+{% endfor %}
diff --git a/resources/templates/database/structure/index.twig b/resources/templates/database/structure/index.twig
@@ -1,12 +1,4 @@
-{% for flash_message in flash() %}
-  {% if flash_message.statement is empty %}
-    <div class="alert alert-{{ flash_message.context }}" role="alert">
-      {{ flash_message.message }}
-    </div>
-  {% else %}
-    {{ statement_message(flash_message.message, flash_message.statement, flash_message.context) }}
-  {% endif %}
-{% endfor %}
+{{ include('components/flash_messages.twig', with_context = false) }}
 
 {% if has_tables %}
   <div id="tableslistcontainer">

diff --git a/resources/templates/export.twig b/resources/templates/export.twig
@@ -7,15 +7,7 @@
   {{ page_settings_error_html|raw }}
   {{ page_settings_html|raw }}
 
-  {% for flash_message in flash() %}
-    {% if flash_message.statement is empty %}
-      <div class="alert alert-{{ flash_message.context }}" role="alert">
-        {{ flash_message.message }}
-      </div>
-    {% else %}
-      {{ statement_message(flash_message.message, flash_message.statement, flash_message.context) }}
-    {% endif %}
-  {% endfor %}
+  {{ include('components/flash_messages.twig', with_context = false) }}
 
   {% block message %}{% endblock %}
 

diff --git a/resources/templates/table/page_with_secondary_tabs.twig b/resources/templates/table/page_with_secondary_tabs.twig
@@ -14,15 +14,7 @@
   </ul>
 {% endif %}
 
-{% for flash_message in flash() %}
-  {% if flash_message.statement is empty %}
-    <div class="alert alert-{{ flash_message.context }}" role="alert">
-      {{ flash_message.message }}
-    </div>
-  {% else %}
-    {{ statement_message(flash_message.message, flash_message.statement, flash_message.context) }}
-  {% endif %}
-{% endfor %}
+{{ include('components/flash_messages.twig', with_context = false) }}
 
 <div id="structure_content">
   {% block content %}{% endblock %}

diff --git a/src/Twig/FlashMessengerExtension.php b/src/Twig/FlashMessengerExtension.php
@@ -13,6 +13,6 @@ final class FlashMessengerExtension extends AbstractExtension
     /** @return TwigFunction[] */
     public function getFunctions(): array
     {
-        return [new TwigFunction('flash', [FlashMessenger::class, 'getMessages'])];
+        return [new TwigFunction('flash_messages', [FlashMessenger::class, 'getMessages'])];
     }
 }