Add indicator icon for multiple revisions on package version list

Author: codedmonkey

src/Controller/Dashboard/DashboardPackagesInfoController.php

@@ -106,6 +106,7 @@ public function versions(#[MapPackage] Package $package): Response
     {
         return $this->render('dashboard/packages/package_versions.html.twig', [
             'package' => $package,
+            'metadataCounts' => $this->metadataRepository->getMetadataCountsForPackage($package),
         ]);
     }
 

src/Doctrine/Repository/MetadataRepository.php

@@ -3,6 +3,7 @@
 namespace CodedMonkey\Dirigent\Doctrine\Repository;
 
 use CodedMonkey\Dirigent\Doctrine\Entity\Metadata;
+use CodedMonkey\Dirigent\Doctrine\Entity\Package;
 use CodedMonkey\Dirigent\Doctrine\Entity\Version;
 use CodedMonkey\Dirigent\Entity\MetadataLinkType;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
@@ -55,6 +56,30 @@ public function getMetadataCollectionForVersion(Version $version): array
         );
     }
 
+    /**
+     * Returns a map of version ID => metadata count for all versions of the given package.
+     *
+     * @return array<int, int>
+     */
+    public function getMetadataCountsForPackage(Package $package): array
+    {
+        $rows = $this->createQueryBuilder('metadata')
+            ->select('IDENTITY(metadata.version) as version_id, COUNT(metadata.id) as revision_count')
+            ->join('metadata.version', 'version')
+            ->where('version.package = :package')
+            ->groupBy('metadata.version')
+            ->setParameter('package', $package)
+            ->getQuery()
+            ->getResult();
+
+        $counts = [];
+        foreach ($rows as $row) {
+            $counts[(int) $row['version_id']] = (int) $row['revision_count'];
+        }
+
+        return $counts;
+    }
+
     /**
      * Initializes all link and keyword collections for the given metadata.
      */

templates/dashboard/packages/package_versions.html.twig

@@ -16,10 +16,10 @@
   {% endapply %}
 
   {% 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) }}
+    {{ _self.versionList('Latest versions', package.activeVersions, metadataCounts) }}
+    {{ _self.versionList('Development versions', package.devVersions, metadataCounts) }}
+    {{ _self.versionList('Historical versions', package.historicalVersions, metadataCounts) }}
+    {{ _self.versionList('Development branch versions', package.devBranchVersions, metadataCounts) }}
   {% else %}
     <table class="table datagrid datagrid-empty">
       <tbody>
@@ -46,22 +46,30 @@
   {% endif %}
 {% endblock %}
 
-{% macro versionList(title, versions) %}
+{% macro versionList(title, versions, metadataCounts) %}
   {% if versions|length %}
     <h2 class="h4">{{ title|trans }}</h2>
     <div class="list-group list-group-flush border-bottom mb-3">
       {% for version in versions %}
-        {{ _self.versionListItem(version) }}
+        {{ _self.versionListItem(version, metadataCounts) }}
       {% endfor %}
     </div>
   {% endif %}
 {% endmacro %}
 
-{% macro versionListItem(version) %}
+{% macro versionListItem(version, metadataCounts) %}
   {% set packageVersionInfoUrl = path('dashboard_packages_version_info', {package: version.package.name, version: version.name}) %}
   <a href="{{ packageVersionInfoUrl }}" class="list-group-item">
     <div class="d-flex justify-content-between">
-      <span>{{ version.extendedName }}</span>
+      <span>
+        <span>{{ version.extendedName }}</span>
+        {% if metadataCounts[version.id] > 1 %}
+          <span class="text-muted ms-1" title="{{ 'This version has multiple revisions'|trans }}">
+            <span class="fa-solid fa-file-alt" aria-hidden="true"></span>
+            <span class="visually-hidden">{{ 'This version has multiple revisions'|trans }}</span>
+          </span>
+        {% endif %}
+      </span>
       <span class="text-muted">{{ version.currentMetadata.releasedAt ? version.currentMetadata.releasedAt.format('Y-m-d') }}</span>
     </div>
   </a>

translations/messages.en.yaml

@@ -78,6 +78,7 @@ Indexed on %date%: Indexed on %date%
 Multiple revisions found for version %version% of package %package%: Multiple revisions found for version %version% of package %package%.
 Revision: Revision
 Revisions: Revisions
+This version has multiple revisions: This version has multiple revisions
 You're viewing an inactive revision of this package: You're viewing an inactive revision of this package.
 
 # Package labels (Statistics)