Improve details sidebar on package info page with browsable repository URLs

Author: codedmonkey

assets/stylesheets/dashboard-theme.css

@@ -64,3 +64,8 @@
 .ea-dark-scheme .bg-body-secondary {
   --bs-secondary-bg-rgb: var(--dirigent-body-bg-subtle-rgb);
 }
+
+.dirigent-package-sidebar div span {
+  display: inline-block;
+  width: 120px;
+}

src/Doctrine/Entity/Package.php

@@ -343,6 +343,38 @@ public function setDumpedAt(?\DateTimeInterface $dumpedAt): void
         $this->dumpedAt = $dumpedAt;
     }
 
+    public function getBrowsableRepositoryUrl(): ?string
+    {
+        if (!$this->repositoryUrl) {
+            return null;
+        }
+
+        if (Preg::isMatch('{(://|@)bitbucket.org[:/]}i', $this->repositoryUrl)) {
+            return Preg::replace('{^(?:git@|https://|git://)bitbucket.org[:/](.+?)(?:\.git)?$}i', 'https://bitbucket.org/$1', $this->repositoryUrl);
+        }
+
+        if (Preg::isMatch('{(://|@)github.com[:/]}i', $this->repositoryUrl)) {
+            return Preg::replace('{^(git://github.com/|git@github.com:)}', 'https://github.com/', $this->repositoryUrl);
+        }
+
+        if (Preg::isMatch('{(://|@)gitlab.com[:/]}i', $this->repositoryUrl)) {
+            return Preg::replace('{^(git://gitlab.com/|git@gitlab.com:)}', 'https://gitlab.com/', $this->repositoryUrl);
+        }
+
+        return $this->repositoryUrl;
+    }
+
+    public function getPrettyBrowsableRepositoryUrl(): ?string
+    {
+        if (null === $url = $this->getBrowsableRepositoryUrl()) {
+            return null;
+        }
+
+        $url = preg_replace('#^https?://#', '', $url);
+
+        return $url;
+    }
+
     /**
      * Returns the default branch or latest version of the package.
      */

src/Doctrine/Entity/Version.php

@@ -512,6 +512,11 @@ public function setReleasedAt(?\DateTimeInterface $releasedAt): void
         $this->releasedAt = $releasedAt;
     }
 
+    public function getSourceUrl(): ?string
+    {
+        return $this->source['url'] ?? null;
+    }
+
     public function getDistReference(): ?string
     {
         return $this->dist['reference'] ?? null;
@@ -568,28 +573,6 @@ public function getFundingSorted(): ?array
         return $funding;
     }
 
-    public function getPublicUrl(): ?string
-    {
-        $url = $this->getHomepage() ?? $this->getSource()['url'] ?? null;
-
-        if (!$url || (!str_starts_with($url, 'http://') && !str_starts_with($url, 'https://'))) {
-            return null;
-        }
-
-        return $url;
-    }
-
-    public function getPrettyPublicUrl(): ?string
-    {
-        if (null === $url = $this->getPublicUrl()) {
-            return null;
-        }
-
-        $url = preg_replace('#^https?://#', '', $url);
-
-        return $url;
-    }
-
     public function getMajorVersion(): int
     {
         $split = explode('.', $this->version);

src/Package/PackageMetadataResolver.php

@@ -154,6 +154,7 @@ private function resolveVcsRepository(Package $package): void
         foreach ($composerPackages as $composerPackage) {
             if ($composerPackage->isDefaultBranch()) {
                 $package->setRepositoryUrl($composerPackage->getSourceUrl());
+                return;
             }
         }
     }
@@ -198,6 +199,11 @@ private function updatePackage(Package $package, array $composerPackages, ?VcsDr
         if ($primaryVersionName) {
             $primaryVersion = $processedVersions[$primaryVersionName];
 
+            // Only update the repository URL if the package is mirrored
+            if ($package->getMirrorRegistry()) {
+                $package->setRepositoryUrl($primaryVersion->getSourceUrl());
+            }
+
             $this->packageRepository->updatePackageLinks($package->getId(), $primaryVersion->getId());
         }
 

templates/dashboard/packages/package_info.html.twig

@@ -26,35 +26,36 @@
       <p class="mb-0">Last updated at {{ package.updatedAt|date }}</p>
     </div>
     <div class="col-md-4">
-      <div class="bg-body-secondary px-3 py-2 rounded">
-        {% if version.publicUrl %}
+      <div class="dirigent-package-sidebar bg-body-secondary px-3 py-2 rounded">
+        {% if package.browsableRepositoryUrl %}
           <div>
-            <a href="{{ version.publicUrl }}">{{ version.prettyPublicUrl }}</a>
+            <a href="{{ package.browsableRepositoryUrl }}">{{ package.prettyBrowsableRepositoryUrl }}</a>
           </div>
         {% endif %}
         {% if package.mirrorRegistry %}
           <div>Mirrored from {{ package.mirrorRegistry.name }}</div>
         {% endif %}
-        {% if version.publicUrl or package.mirrorRegistry %}
+        {% if package.browsableRepositoryUrl or package.mirrorRegistry %}
           <hr class="my-1">
         {% endif %}
         {% if version.homepage %}
           <div><a href="{{ version.homepage }}">Homepage</a></div>
         {% endif %}
-        {% if version.source %}
-          <div><a href="{{ version.source.url }}">Source</a></div>
+        {% if version.sourceUrl %}
+          <div><a href="{{ version.sourceUrl }}">Source</a></div>
         {% endif %}
-        <div>Installs: {{ package.installations.total }}</div>
+        {% set packageStatisticsUrl = path('dashboard_packages_statistics', {packageName: package.name}) %}
+        <div><span><a href="{{ packageStatisticsUrl }}">Installations</a></span> {{ package.installations.total }}</div>
         {% set packageDependentsUrl = path('dashboard_packages_dependents', {packageName: package.name}) %}
-        <div><a href="{{ packageDependentsUrl }}">{{ 'Dependents'|trans }}</a>: {{ dependentCount }}</div>
+        <div><span><a href="{{ packageDependentsUrl }}">{{ 'Dependents'|trans }}</a></span> {{ dependentCount }}</div>
         {% set packageSuggestersUrl = path('dashboard_packages_suggesters', {packageName: package.name}) %}
-        <div><a href="{{ packageSuggestersUrl }}">{{ 'Suggesters'|trans }}</a>: {{ suggesterCount }}</div>
+        <div><span><a href="{{ packageSuggestersUrl }}">{{ 'Suggesters'|trans }}</a></span> {{ suggesterCount }}</div>
         {% set packageImplementationsUrl = path('dashboard_packages_implementations', {packageName: package.name}) %}
-        <div><a href="{{ packageImplementationsUrl }}">{{ 'Implementations'|trans }}</a>: {{ implementationCount }}</div>
+        <div><span><a href="{{ packageImplementationsUrl }}">{{ 'Implementations'|trans }}</a></span> {{ implementationCount }}</div>
         {% set packageProvidersUrl = path('dashboard_packages_providers', {packageName: package.name}) %}
-        <div><a href="{{ packageProvidersUrl }}">{{ 'Providers'|trans }}</a>: {{ providerCount }}</div>
+        <div><span><a href="{{ packageProvidersUrl }}">{{ 'Providers'|trans }}</a></span> {{ providerCount }}</div>
         {% if version.license %}
-          <div>License: {{ version.license|join(', ') }}</div>
+          <div><span>License</span> {{ version.license|join(', ') }}</div>
         {% else %}
           <div>No license specified</div>
         {% endif %}