Add redirect for packages without any published versions

Signed-off-by: Tim Goudriaan <tim@codedmonkey.com>

Author: codedmonkey

src/Controller/Dashboard/DashboardPackagesInfoController.php

@@ -32,6 +32,10 @@ public function info(string $packageName): Response
         $package = $this->packageRepository->findOneBy(['name' => $packageName]);
         $version = $package->getLatestVersion();
 
+        if (!$version) {
+            return $this->redirectToRoute('dashboard_packages_versions', ['packageName' => $packageName]);
+        }
+
         return $this->versionInfo($packageName, $version->getNormalizedVersion());
     }
 

templates/dashboard/packages/_package_header.html.twig

@@ -4,8 +4,12 @@
 
 <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 = path('dashboard_packages_info', {packageName: package.name}) %}
-    <a {{ (currentPage == 'info' ? attrActive : attr)|raw }} href="{{ packageInfoUrl }}">{{ 'Info'|trans }}</a>
+    {% if package.versions|length > 0 %}
+      {% set packageInfoUrl = path('dashboard_packages_info', {packageName: package.name}) %}
+      <a {{ (currentPage == 'info' ? attrActive : attr)|raw }} href="{{ packageInfoUrl }}">{{ 'Info'|trans }}</a>
+    {% else %}
+      <span class="nav-link disabled">{{ 'Info'|trans }}</span>
+    {% endif %}
   </li>
   <li class="nav-item">
     {% set packageVersionsUrl = path('dashboard_packages_versions', {packageName: package.name}) %}

templates/dashboard/packages/package_versions.html.twig

@@ -5,10 +5,35 @@
 {% block page_content %}
   {{ include('dashboard/packages/_package_header.html.twig', {currentPage: 'versions'}) }}
 
-  {{ _self.versionList('Latest versions', package.activeVersions) }}
-  {{ _self.versionList('Development versions', package.devVersions) }}
-  {{ _self.versionList('Historical versions', package.historicalVersions) }}
-  {{ _self.versionList('Development branch versions', package.devBranchVersions) }}
+  {% if package.versions|length > 0 %}
+    {{ _self.versionList('Latest versions', package.activeVersions) }}
+    {{ _self.versionList('Development versions', package.devVersions) }}
+    {{ _self.versionList('Historical versions', package.historicalVersions) }}
+    {{ _self.versionList('Development branch versions', package.devBranchVersions) }}
+  {% 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">
+                {{ 'No published versions found'|trans }}
+              </td>
+            </tr>
+          {% endif %}
+        {% endfor %}
+      </tbody>
+    </table>
+  {% endif %}
 {% endblock %}
 
 {% macro versionList(title, versions) %}

tests/FunctionalTests/Controller/Dashboard/DashboardPackagesControllerTest.php

@@ -5,15 +5,15 @@
 use CodedMonkey\Dirigent\Doctrine\Entity\Package;
 use CodedMonkey\Dirigent\Doctrine\Repository\PackageRepository;
 use CodedMonkey\Dirigent\Doctrine\Repository\RegistryRepository;
-use CodedMonkey\Dirigent\Tests\Helper\TestEntityFactoryTrait;
+use CodedMonkey\Dirigent\Tests\Helper\MockEntityFactoryTrait;
 use CodedMonkey\Dirigent\Tests\Helper\WebTestCaseTrait;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
 class DashboardPackagesControllerTest extends WebTestCase
 {
-    use TestEntityFactoryTrait;
+    use MockEntityFactoryTrait;
     use WebTestCaseTrait;
 
     public function testAddMirroring(): void
@@ -95,11 +95,10 @@ public function testDelete(): void
 
         $entityManager = $this->getService(EntityManagerInterface::class);
 
-        $package = $this->createPackageEntity();
-
-        $entityManager->persist($package);
-        $entityManager->flush();
+        $package = $this->createMockPackage();
+        $this->persistEntities($package);
 
+        // Fetch package id prior to deleting it
         $packageId = $package->getId();
 
         $client->request('GET', "/packages/{$package->getName()}/delete");

tests/FunctionalTests/Controller/Dashboard/DashboardPackagesInfoControllerTest.php

@@ -3,12 +3,14 @@
 namespace CodedMonkey\Dirigent\Tests\FunctionalTests\Controller\Dashboard;
 
 use CodedMonkey\Dirigent\Doctrine\Repository\PackageRepository;
+use CodedMonkey\Dirigent\Tests\Helper\MockEntityFactoryTrait;
 use CodedMonkey\Dirigent\Tests\Helper\WebTestCaseTrait;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
 class DashboardPackagesInfoControllerTest extends WebTestCase
 {
+    use MockEntityFactoryTrait;
     use WebTestCaseTrait;
 
     public function testInfo(): void
@@ -21,6 +23,23 @@ public function testInfo(): void
         $this->assertResponseStatusCodeSame(Response::HTTP_OK);
     }
 
+    public function testInfoRedirectsWithNoVersions(): void
+    {
+        $client = static::createClient();
+        $this->loginUser();
+
+        $package = $this->createMockPackage();
+        $this->persistEntities($package);
+
+        $client->request('GET', "/packages/{$package->getName()}");
+
+        $this->assertResponseStatusCodeSame(Response::HTTP_FOUND);
+
+        $client->followRedirect();
+
+        $this->assertSame(sprintf('/packages/%s/versions', $package->getName()), $client->getRequest()->getRequestUri());
+    }
+
     public function testPackageInfo(): void
     {
         $client = static::createClient();

tests/Helper/TestEntityFactoryTrait.php tests/Helper/MockEntityFactoryTrait.phptests/Helper/TestEntityFactoryTrait.php renamed to tests/Helper/MockEntityFactoryTrait.php

@@ -5,18 +5,19 @@
 use CodedMonkey\Dirigent\Doctrine\Entity\Package;
 use CodedMonkey\Dirigent\Doctrine\Entity\Version;
 use Composer\Semver\VersionParser;
+use Doctrine\ORM\EntityManagerInterface;
 
-trait TestEntityFactoryTrait
+trait MockEntityFactoryTrait
 {
-    protected function createPackageEntity(): Package
+    protected function createMockPackage(): Package
     {
         $package = new Package();
         $package->setName(sprintf('%s/%s', uniqid(), uniqid()));
 
         return $package;
     }
 
-    protected function createVersionEntity(Package $package, string $versionName = '1.0.0'): Version
+    protected function createMockVersion(Package $package, string $versionName = '1.0.0'): Version
     {
         $version = new Version();
 
@@ -29,4 +30,20 @@ protected function createVersionEntity(Package $package, string $versionName = '
 
         return $version;
     }
+
+    /**
+     * Persist and flush all given entities.
+     *
+     * @param object ...$entities
+     */
+    protected function persistEntities(...$entities): void
+    {
+        $entityManager = $this->getService(EntityManagerInterface::class);
+
+        foreach ($entities as $entity) {
+            $entityManager->persist($entity);
+        }
+
+        $entityManager->flush();
+    }
 }

translations/messages.en.yaml

@@ -52,6 +52,8 @@ Providers: Providers
 Statistics: Statistics
 Suggesters: Suggesters
 
+No published versions found: No published versions found.
+
 # Package labels (Statistics)
 Daily installations: Daily installations
 Daily installations per version: Daily installations per version