Move the package list template to a separate file

Author: codedmonkey

src/Controller/Dashboard/DashboardPackagesController.php

@@ -43,10 +43,8 @@ public function list(Request $request): Response
         }
 
         $paginator = PackagePaginator::fromRequest($request, $queryBuilder, $this->container->get('router'));
-        $packages = $paginator->getResults();
 
         return $this->render('dashboard/packages/list.html.twig', [
-            'packages' => $packages,
             'paginator' => $paginator,
         ]);
     }

templates/dashboard/packages/_package_list.html.twig

@@ -0,0 +1,47 @@
+{% set packages = packages ?? paginator.results %}
+
+<div class="d-grid gap-3">
+  {% for package in packages %}
+    <div class="card">
+      <div class="card-body py-2">
+        {% set packageInfoUrl = path('dashboard_packages_info', {packageName: package.name}) %}
+        <a href="{{ packageInfoUrl }}"><h5 class="card-title">{{ package.name }}</h5></a>
+        {% if package.mirrorRegistry %}
+          <p class="card-text mb-1 text-body-secondary">Mirrored from {{ package.mirrorRegistry.name }}</p>
+        {% endif %}
+        <p class="card-text">{{ package.description ?? '<em>No description provided.</em>' }}</p>
+      </div>
+    </div>
+  {% else %}
+    <table class="table datagrid datagrid-empty">
+      <tbody>
+        {% for i in 1..14 %}
+          <tr class="empty-row">
+            <td><span></span></td>
+            <td><span></span></td>
+            <td><span></span></td>
+            <td><span></span></td>
+            <td><span></span></td>
+            <td><span></span></td>
+          </tr>
+
+          {% if 3 == loop.index %}
+            <tr class="no-results">
+              <td colspan="100">
+                {{ t('datagrid.no_results', ea.i18n.translationParameters, 'EasyAdminBundle')|trans }}
+              </td>
+            </tr>
+          {% endif %}
+        {% endfor %}
+      </tbody>
+    </table>
+  {% endfor %}
+</div>
+
+{% if packages|length or paginator.currentPage > 1 %}
+  <div class="content-panel-footer without-padding without-border">
+    {% block paginator %}
+      {{ include(ea.templatePath('crud/paginator')) }}
+    {% endblock paginator %}
+  </div>
+{% endif %}

templates/dashboard/packages/list.html.twig

@@ -25,49 +25,5 @@
 {% endblock %}
 
 {% block page_content %}
-  <div class="d-grid gap-3">
-    {% for package in packages %}
-      <div class="card">
-        <div class="card-body py-2">
-          {% set packageInfoUrl = path('dashboard_packages_info', {packageName: package.name}) %}
-          <a href="{{ packageInfoUrl }}"><h5 class="card-title">{{ package.name }}</h5></a>
-          {% if package.mirrorRegistry %}
-            <p class="card-text mb-1 text-body-secondary">Mirrored from {{ package.mirrorRegistry.name }}</p>
-          {% endif %}
-          <p class="card-text">{{ package.description ?? '<em>No description provided.</em>' }}</p>
-        </div>
-      </div>
-    {% else %}
-      <table class="table datagrid datagrid-empty">
-        <tbody>
-          {% for i in 1..14 %}
-            <tr class="empty-row">
-              <td><span></span></td>
-              <td><span></span></td>
-              <td><span></span></td>
-              <td><span></span></td>
-              <td><span></span></td>
-              <td><span></span></td>
-            </tr>
-
-            {% if 3 == loop.index %}
-              <tr class="no-results">
-                <td colspan="100">
-                  {{ t('datagrid.no_results', ea.i18n.translationParameters, 'EasyAdminBundle')|trans }}
-                </td>
-              </tr>
-            {% endif %}
-          {% endfor %}
-        </tbody>
-      </table>
-    {% endfor %}
-  </div>
-
-  {% if packages|length %}
-    <div class="content-panel-footer without-padding without-border">
-      {% block paginator %}
-        {{ include(ea.templatePath('crud/paginator')) }}
-      {% endblock paginator %}
-    </div>
-  {% endif %}
+  {{ include('dashboard/packages/_package_list.html.twig', {paginator: paginator}, with_context: false) }}
 {% endblock %}