Merge branch 'release/1.10.0'

Author: turegjorup

.github/workflows/github_build_release.yml

@@ -16,7 +16,7 @@ jobs:
             APP_ENV: prod
         steps:
             - name: Checkout
-              uses: actions/checkout@v4
+              uses: actions/checkout@v6
 
             - name: Composer install
               run: |

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.10.0] - 2026-04-23
+
+- [#68](https://github.com/itk-dev/devops_itksites/pull/68)
+  6667: Update advisories on Detailed site display
+
+- [#68](https://github.com/itk-dev/devops_itksites/pull/68)
+  6667: Show sites affected on advisories.
+
 ## [1.9.2] - 2026-04-07
 
 - [#67](https://github.com/itk-dev/devops_itksites/pull/67)
@@ -151,7 +159,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.0.0] - 2022-09-15
 
-[Unreleased]: https://github.com/itk-dev/devops_itksites/compare/1.9.2...HEAD
+[Unreleased]: https://github.com/itk-dev/devops_itksites/compare/1.10.0...HEAD
+[1.10.0]: https://github.com/itk-dev/devops_itksites/compare/1.9.2...1.10.0
 [1.9.2]: https://github.com/itk-dev/devops_itksites/compare/1.9.1...1.9.2
 [1.9.1]: https://github.com/itk-dev/devops_itksites/compare/1.9.0...1.9.1
 [1.9.0]: https://github.com/itk-dev/devops_itksites/compare/1.8.9...1.9.0

src/Admin/Field/AdvisoryCountField.php

@@ -19,6 +19,6 @@ public static function new(string $propertyName, TranslatableInterface|string|bo
             ->setLabel($label)
 
             // this template is used in 'index' and 'detail' pages
-            ->setTemplatePath('EasyAdminBundle/Fields/advisory_count.html.twig');
+            ->setTemplatePath('EasyAdminBundle/Fields/advisories.html.twig');
     }
 }

src/Admin/Field/AffectedSitesField.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Admin\Field;
+
+use EasyCorp\Bundle\EasyAdminBundle\Contracts\Field\FieldInterface;
+use EasyCorp\Bundle\EasyAdminBundle\Field\FieldTrait;
+use Symfony\Contracts\Translation\TranslatableInterface;
+
+class AffectedSitesField implements FieldInterface
+{
+    use FieldTrait;
+
+    public static function new(string $propertyName, TranslatableInterface|string|bool|null $label = null): self
+    {
+        return new self()
+            ->setProperty($propertyName)
+            ->setLabel($label)
+            ->setTemplatePath('EasyAdminBundle/Fields/affected_sites.html.twig');
+    }
+}

src/Controller/Admin/AdvisoryCrudController.php

@@ -4,6 +4,7 @@
 
 namespace App\Controller\Admin;
 
+use App\Admin\Field\AffectedSitesField;
 use App\Admin\Field\SourcesField;
 use App\Admin\Field\TextMonospaceField;
 use App\Entity\Advisory;
@@ -58,6 +59,7 @@ public function configureFields(string $pageName): iterable
         yield DateField::new('reportedAt')->setColumns(6)->onlyOnIndex();
         yield DateTimeField::new('reportedAt')->setColumns(6)->onlyOnDetail();
         yield SourcesField::new('sourceLinks')->setColumns(6)->onlyOnDetail();
+        yield AffectedSitesField::new('sites')->setLabel('Affected Sites');
     }
 
     #[\Override]

src/Entity/Advisory.php

@@ -190,6 +190,23 @@ public function removePackageVersion(PackageVersion $packageVersion): self
         return $this;
     }
 
+    /**
+     * @return Collection<int, Site>
+     */
+    public function getSites(): Collection
+    {
+        $sites = [];
+        foreach ($this->packageVersions as $packageVersion) {
+            foreach ($packageVersion->getInstallations() as $installation) {
+                foreach ($installation->getSites() as $site) {
+                    $sites[$site->getId()->toRfc4122()] = $site;
+                }
+            }
+        }
+
+        return new ArrayCollection(array_values($sites));
+    }
+
     public function getPackage(): ?Package
     {
         return $this->package;

src/Entity/Site.php

@@ -200,7 +200,10 @@ public function setType(string $type): self
         return $this;
     }
 
-    public function getAdvisoryCount(): int
+    /**
+     * @return Collection<int, Advisory>
+     */
+    public function getAdvisories(): Collection
     {
         $advisories = new ArrayCollection();
         foreach ($this->installation->getPackageVersions() as $packageVersion) {
@@ -209,6 +212,11 @@ public function getAdvisoryCount(): int
             }
         }
 
-        return $advisories->count();
+        return $advisories;
+    }
+
+    public function getAdvisoryCount(): int
+    {
+        return $this->getAdvisories()->count();
     }
 }

templates/EasyAdminBundle/Fields/advisories.html.twig

@@ -0,0 +1,33 @@
+{# @var ea \EasyCorp\Bundle\EasyAdminBundle\Context\AdminContext #}
+{# @var field \EasyCorp\Bundle\EasyAdminBundle\Dto\FieldDto #}
+{# @var entity \EasyCorp\Bundle\EasyAdminBundle\Dto\EntityDto #}
+{% if ea().crud.currentAction == 'detail' %}
+    {% set advisories = entity.instance.advisories %}
+    {% if advisories|length > 0 %}
+        <table class="table table-sm table-borderless">
+            <thead>
+                <tr>
+                    <th>Package</th>
+                    <th>CVE</th>
+                    <th>Title</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for advisory in advisories %}
+                    {% set url = ea_url()
+                        .unsetAll()
+                        .setController('App\\Controller\\Admin\\AdvisoryCrudController')
+                        .setAction('detail')
+                        .setEntityId(advisory.id) %}
+                    <tr>
+                        <td>{{ advisory.package }}</td>
+                        <td><a href="{{ url }}">{{ advisory.cve ?? advisory.advisoryId }}</a></td>
+                        <td>{{ advisory.title }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    {% endif %}
+{% elseif field.formattedValue != 0 %}
+    <span class="badge badge-danger">{{ field.formattedValue }}</span>
+{% endif %}

templates/EasyAdminBundle/Fields/affected_sites.html.twig

@@ -0,0 +1,33 @@
+{# @var ea \EasyCorp\Bundle\EasyAdminBundle\Context\AdminContext #}
+{# @var field \EasyCorp\Bundle\EasyAdminBundle\Dto\FieldDto #}
+{# @var entity \EasyCorp\Bundle\EasyAdminBundle\Dto\EntityDto #}
+{% set sites = entity.instance.sites %}
+{% if ea().crud.currentAction == 'detail' %}
+    {% if sites|length > 0 %}
+        <table class="table table-sm table-borderless">
+            <thead>
+                <tr>
+                    <th>Domain</th>
+                    <th>Server</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for site in sites %}
+                    {% set url = ea_url()
+                        .unsetAll()
+                        .setController('App\\Controller\\Admin\\SiteCrudController')
+                        .setAction('detail')
+                        .setEntityId(site.id) %}
+                    <tr>
+                        <td><a href="{{ url }}">{{ site.primaryDomain }}</a></td>
+                        <td>{{ site.server }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    {% else %}
+        <span class="text-muted">None</span>
+    {% endif %}
+{% else %}
+    <span class="badge badge-info">{{ sites|length }}</span>
+{% endif %}