Refactor dashboard URLs in templates

Author: codedmonkey

src/Twig/DashboardExtension.php

@@ -2,27 +2,17 @@
 
 namespace CodedMonkey\Dirigent\Twig;
 
-use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Twig\Extension\AbstractExtension;
 use Twig\Extension\GlobalsInterface;
-use Twig\TwigFunction;
 
 class DashboardExtension extends AbstractExtension implements GlobalsInterface
 {
     public function __construct(
-        private readonly AdminUrlGenerator $adminUrlGenerator,
         private readonly ParameterBagInterface $parameterBag,
     ) {
     }
 
-    public function getFunctions(): array
-    {
-        return [
-            new TwigFunction('dashboard_path', [$this, 'path']),
-        ];
-    }
-
     public function getGlobals(): array
     {
         return [
@@ -31,9 +21,4 @@ public function getGlobals(): array
             ],
         ];
     }
-
-    public function path(string $route, array $routeParams = []): string
-    {
-        return $this->adminUrlGenerator->setRoute($route, $routeParams)->generateUrl();
-    }
 }

templates/dashboard/docs/admin.html.twig

@@ -4,7 +4,7 @@
 
 {% block page_content %}
   {% if pageName != 'readme' %}
-    {% set rootPath = dashboard_path('dashboard_admin_docs') %}
+    {% set rootPath = path('dashboard_admin_docs') %}
     <a href="{{ rootPath }}">
       <span class="fa-solid fa-chevron-left fa-fw" aria-hidden="true"></span>
       <span>Back to index</span>

templates/dashboard/docs/usage.html.twig

@@ -4,7 +4,7 @@
 
 {% block page_content %}
   {% if pageName != 'readme' %}
-    {% set rootPath = dashboard_path('dashboard_usage_docs') %}
+    {% set rootPath = path('dashboard_usage_docs') %}
     <a href="{{ rootPath }}">
       <span class="fa-solid fa-chevron-left fa-fw" aria-hidden="true"></span>
       <span>Back to index</span>

templates/dashboard/packages/add_mirroring.html.twig

@@ -5,7 +5,7 @@
 {% block page_title %}Mirror packages from registry{% endblock %}
 
 {% block page_content %}
-  <div {{ stimulus_controller('packages-mirroring', {packageUrl: dashboard_path('dashboard_packages_info', {packageName: 'place/holder'})}) }}>
+  <div {{ stimulus_controller('packages-mirroring', {packageUrl: path('dashboard_packages_info', {packageName: 'place/holder'})}) }}>
     <div
       class="border-top border-bottom my-3"
       {{ stimulus_target('packages-mirroring', 'packageList') }}
@@ -14,7 +14,7 @@
 
     {{ form_start(form, {
       attr: {
-        'action': dashboard_path('dashboard_packages_add_mirroring'),
+        'action': path('dashboard_packages_add_mirroring'),
         'data-action': 'packages-mirroring#submitForm',
         'data-packages-mirroring-target': 'form',
       },

templates/dashboard/packages/list.html.twig

@@ -14,9 +14,9 @@
           Add Package
         </button>
         <ul class="dropdown-menu">
-          {% set addVcsUrl = dashboard_path('dashboard_packages_add_vcs') %}
+          {% set addVcsUrl = path('dashboard_packages_add_vcs') %}
           <li><a class="dropdown-item" href="{{ addVcsUrl }}">Add VCS repository</a></li>
-          {% set addMirroringUrl = dashboard_path('dashboard_packages_add_mirroring') %}
+          {% set addMirroringUrl = path('dashboard_packages_add_mirroring') %}
           <li><a class="dropdown-item" href="{{ addMirroringUrl }}">Mirror from registry</a></li>
         </ul>
       </div>
@@ -29,7 +29,7 @@
     {% for package in packages %}
       <div class="card">
         <div class="card-body py-2">
-          {% set packageInfoUrl = dashboard_path('dashboard_packages_info', {packageName: package.name}) %}
+          {% 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>

templates/dashboard/packages/package_base.html.twig

@@ -12,10 +12,10 @@
           <span class="fa-solid fa-ellipsis-h" aria-hidden="true"></span>
         </button>
         <ul class="dropdown-menu">
-          <li><a class="dropdown-item" href="{{ dashboard_path('dashboard_packages_update', {packageName: package.name}) }}">Update package</a></li>
+          <li><a class="dropdown-item" href="{{ path('dashboard_packages_update', {packageName: package.name}) }}">Update package</a></li>
           <li><div class="dropdown-divider"></div></li>
-          <li><a class="dropdown-item" href="{{ dashboard_path('dashboard_packages_edit', {packageName: package.name}) }}">Edit package</a></li>
-          <li><a class="dropdown-item" href="{{ dashboard_path('dashboard_packages_delete', {packageName: package.name}) }}">Delete package</a></li>
+          <li><a class="dropdown-item" href="{{ path('dashboard_packages_edit', {packageName: package.name}) }}">Edit package</a></li>
+          <li><a class="dropdown-item" href="{{ path('dashboard_packages_delete', {packageName: package.name}) }}">Delete package</a></li>
         </ul>
       </div>
     </div>

templates/dashboard/packages/package_header.html.twig

@@ -2,18 +2,18 @@
 
 <ul class="nav nav-pills nav-justified d-grid d-md-flex gap-1 pb-3 mb-3 border-bottom">
   <li class="nav-item">
-    {% set packageInfoUrl = dashboard_path('dashboard_packages_info', {packageName: package.name}) %}
+    {% set packageInfoUrl = path('dashboard_packages_info', {packageName: package.name}) %}
     <a {% if currentPage == 'info' %}class="nav-link active" aria-current="page"{% else %}class="nav-link text-primary"{% endif%} href="{{ packageInfoUrl }}">{{ 'Info'|trans }}</a>
   </li>
   <li class="nav-item">
-    {% set packageVersionsUrl = dashboard_path('dashboard_packages_versions', {packageName: package.name}) %}
+    {% set packageVersionsUrl = path('dashboard_packages_versions', {packageName: package.name}) %}
     <a {% if currentPage == 'versions' %}class="nav-link active" aria-current="page"{% else %}class="nav-link text-primary"{% endif%} href="{{ packageVersionsUrl }}">{{ 'Versions'|trans }}</a>
   </li>
   <li class="nav-item">
     <span class="nav-link disabled">{{ 'Dependants'|trans }}</span>
   </li>
   <li class="nav-item">
-    {% set packageVersionsUrl = dashboard_path('dashboard_packages_statistics', {packageName: package.name}) %}
+    {% set packageVersionsUrl = path('dashboard_packages_statistics', {packageName: package.name}) %}
     <a {% if currentPage == 'statistics' %}class="nav-link active" aria-current="page"{% else %}class="nav-link text-primary"{% endif%} href="{{ packageVersionsUrl }}">{{ 'Statistics'|trans }}</a>
   </li>
 </ul>

templates/dashboard/packages/package_info.html.twig

@@ -84,7 +84,7 @@
     <ul>
       {% for link in links %}
         {% if link.packageName is existing_package %}
-          <li><a href="{{ dashboard_path('dashboard_packages_info', {packageName: link.packageName}) }}">{{ link.packageName }}</a>: {{ link.packageVersion }}</li>
+          <li><a href="{{ path('dashboard_packages_info', {packageName: link.packageName}) }}">{{ link.packageName }}</a>: {{ link.packageVersion }}</li>
         {% else %}
           <li>{{ link.packageName }}: {{ link.packageVersion }}</li>
         {% endif %}
@@ -102,7 +102,7 @@
     <ul>
       {% for link in links %}
         {% if link.packageName is existing_package %}
-          <li><a href="{{ dashboard_path('dashboard_packages_info', {packageName: link.packageName}) }}">{{ link.packageName }}</a>: {{ link.packageVersion }}</li>
+          <li><a href="{{ path('dashboard_packages_info', {packageName: link.packageName}) }}">{{ link.packageName }}</a>: {{ link.packageVersion }}</li>
         {% else %}
           <li>{{ link.packageName }}: {{ link.packageVersion }}</li>
         {% endif %}

templates/dashboard/packages/package_versions.html.twig

@@ -7,7 +7,7 @@
 
   <div class="list-group list-group-flush mb-3">
     {% for version in versions %}
-      {% set packageVersionInfoUrl = dashboard_path('dashboard_packages_info', {packageName: package.name, packageVersion: version.version}) %}
+      {% set packageVersionInfoUrl = path('dashboard_packages_info', {packageName: package.name, packageVersion: version.version}) %}
       <a href="{{ packageVersionInfoUrl }}" class="list-group-item">
         <div class="d-flex justify-content-between">
           <span>

templates/dashboard/reset_password/sent.html.twig

@@ -21,7 +21,7 @@
         If an account matching your email exists, then an email was just sent that contains a link that you can use to reset your password.
         This link will expire in {{ resetToken.expirationMessageKey|trans(resetToken.expirationMessageData, 'ResetPasswordBundle') }}.
       </p>
-      {% set requestUrl = dashboard_path('dashboard_reset_password_request') %}
+      {% set requestUrl = path('dashboard_reset_password_request') %}
       <p>If you don't receive an email please check your spam folder or <a href="{{ requestUrl }}">try again</a>.</p>
     </section>
   </div>