5566: Add security contract entity and controller, refactor crud controller and styling

Author: turegjorup

assets/styles/app.css

@@ -13,3 +13,14 @@
     --text-color-dark: rgb(66, 66, 66);
     --bs-danger-rgb: 228, 73, 48;
 }
+
+/* Grouped dropdown group styling for index pages */
+.dropdown-menu {
+    .btn-danger i, .text-danger i {
+        color: var(--button-invisible-danger-color);
+    }
+
+    a.btn-danger:hover , a.text-danger:hover {
+        background: var(--button-invisible-danger-hover-hover-bg);
+    }
+}

migrations/Version20251021113753.php migrations/Version20251023091529.phpmigrations/Version20251021113753.php renamed to migrations/Version20251023091529.php

@@ -10,7 +10,7 @@
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
-final class Version20251021113753 extends AbstractMigration
+final class Version20251023091529 extends AbstractMigration
 {
     public function getDescription(): string
     {
@@ -37,11 +37,39 @@ public function up(Schema $schema): void
               PRIMARY KEY (id)
             ) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci`
         SQL);
+        $this->addSql(<<<'SQL'
+            CREATE TABLE security_contract (
+              id BINARY(16) NOT NULL,
+              created_at DATETIME NOT NULL,
+              modified_at DATETIME NOT NULL,
+              created_by VARCHAR(255) DEFAULT '' NOT NULL,
+              modified_by VARCHAR(255) DEFAULT '' NOT NULL,
+              economics_report_url VARCHAR(255) DEFAULT NULL,
+              operational_contract_url LONGTEXT DEFAULT NULL,
+              monthly_price DOUBLE PRECISION DEFAULT NULL,
+              quarterly_hours DOUBLE PRECISION DEFAULT NULL,
+              valid_from DATE NOT NULL,
+              valid_to DATE NOT NULL,
+              active TINYINT(1) NOT NULL,
+              notes LONGTEXT NOT NULL,
+              project_id BINARY(16) NOT NULL,
+              UNIQUE INDEX UNIQ_8AE4AF8B166D1F9C (project_id),
+              PRIMARY KEY (id)
+            ) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci`
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE
+              security_contract
+            ADD
+              CONSTRAINT FK_8AE4AF8B166D1F9C FOREIGN KEY (project_id) REFERENCES project (id)
+        SQL);
     }
 
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE security_contract DROP FOREIGN KEY FK_8AE4AF8B166D1F9C');
         $this->addSql('DROP TABLE project');
+        $this->addSql('DROP TABLE security_contract');
     }
 }

src/Controller/Admin/AbstractFullCrudController.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Controller\Admin;
+
+use App\Trait\ExportCrudControllerTrait;
+use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
+use EasyCorp\Bundle\EasyAdminBundle\Config\ActionGroup;
+use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
+use EasyCorp\Bundle\EasyAdminBundle\Config\Assets;
+use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
+use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
+
+abstract class AbstractFullCrudController extends AbstractCrudController
+{
+    use ExportCrudControllerTrait;
+
+    #[\Override]
+    public function configureCrud(Crud $crud): Crud
+    {
+        return $crud->showEntityActionsInlined();
+    }
+
+    #[\Override]
+    public function configureActions(Actions $actions): Actions
+    {
+        // Remove default actions
+        $actions
+            ->remove(Crud::PAGE_INDEX, Action::EDIT)
+            ->remove(Crud::PAGE_INDEX, Action::DELETE);
+
+        // Re-add default actions as grouped action.
+        $groupedDefaultActions = ActionGroup::new('default', 'Default')
+            ->addMainAction(
+                Action::new('show', 'Show')
+                    ->linkToCrudAction(Action::DETAIL)
+            )
+            ->addAction(
+                Action::new('edit', 'Edit')
+                    ->linkToCrudAction(Action::EDIT)
+                    ->setIcon('fa fa-edit')
+            )
+            ->addDivider()
+            ->addAction(
+                Action::new('delete', 'Delete')
+                    ->linkToCrudAction(Action::DELETE)
+                    ->setIcon('fa fa-trash')
+                    ->setCssClass('btn-danger text-danger')
+            );
+
+        return $actions
+            ->add(Crud::PAGE_INDEX, $groupedDefaultActions)
+            ->add(Crud::PAGE_INDEX, $this->createExportAction())
+            ->update(Crud::PAGE_INDEX, Action::NEW,
+                static fn (Action $action) => $action->setIcon('fa fa-plus')
+            )
+            ;
+    }
+
+    #[\Override]
+    public function configureAssets(Assets $assets): Assets
+    {
+        return $assets
+            ->addWebpackEncoreEntry('easyadmin');
+    }
+}

src/Controller/Admin/DashboardController.php

@@ -4,6 +4,7 @@
 
 namespace App\Controller\Admin;
 
+use App\EasyAdmin\Config\AutoBadgeMenuItem;
 use App\Entity\Advisory;
 use App\Entity\DetectionResult;
 use App\Entity\DockerImage;
@@ -18,10 +19,14 @@
 use App\Entity\Package;
 use App\Entity\PackageVersion;
 use App\Entity\Project;
+use App\Entity\SecurityContract;
 use App\Entity\Server;
 use App\Entity\ServiceCertificate;
 use App\Entity\Site;
 use App\Repository\AdvisoryRepository;
+use App\Repository\OIDCRepository;
+use App\Repository\SecurityContractRepository;
+use App\Repository\ServiceCertificateRepository;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Assets;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Dashboard;
@@ -35,6 +40,9 @@ class DashboardController extends AbstractDashboardController
     public function __construct(
         private readonly AdminUrlGenerator $adminUrlGenerator,
         private readonly AdvisoryRepository $advisoryRepository,
+        private readonly ServiceCertificateRepository $serviceCertificateRepository,
+        private readonly OIDCRepository $oidcRepository,
+        private readonly SecurityContractRepository $securityContractRepository,
     ) {
     }
 
@@ -62,17 +70,27 @@ public function configureDashboard(): Dashboard
     public function configureMenuItems(): iterable
     {
         yield MenuItem::linkToDashboard('Dashboard', 'fa fa-home');
-        yield MenuItem::linkToCrud('Servers', 'fas fa-server', Server::class);
+
+        yield MenuItem::section('Projects');
         yield MenuItem::linkToCrud('Projects', 'fas fa-folder', Project::class);
+        yield AutoBadgeMenuItem::linkToCrud('Cyber Security', 'fas fa-file-contract', SecurityContract::class)
+            ->setBadge($this->securityContractRepository->countExpiredContracts(), 'danger');
+        yield AutoBadgeMenuItem::linkToCrud('OIDC', 'fas fa-shield-halved', OIDC::class)
+            ->setBadge($this->oidcRepository->countExpiredCertificates(), 'danger');
+        yield AutoBadgeMenuItem::linkToCrud('Service certificates', 'fas fa-passport', ServiceCertificate::class)
+            ->setBadge($this->serviceCertificateRepository->countExpiredCertificates(), 'danger');
+
+        yield MenuItem::section('Hosting');
+        yield MenuItem::linkToCrud('Servers', 'fas fa-server', Server::class);
         yield MenuItem::linkToCrud('Installations', 'fas fa-folder', Installation::class);
         yield MenuItem::linkToCrud('Sites', 'fas fa-bookmark', Site::class);
         yield MenuItem::linkToCrud('Domains', 'fas fa-link', Domain::class);
-        yield MenuItem::linkToCrud('OIDC', 'fas fa-key', OIDC::class);
-        yield MenuItem::linkToCrud('Service certificates', 'fas fa-lock', ServiceCertificate::class);
+
         yield MenuItem::section('Dependencies');
         yield MenuItem::linkToCrud('Packages', 'fas fa-cube', Package::class);
         yield MenuItem::linkToCrud('Package Versions', 'fas fa-cubes', PackageVersion::class);
-        yield MenuItem::linkToCrud('Advisories', 'fas fa-skull-crossbones', Advisory::class)->setBadge($this->advisoryRepository->count([]), 'dark');
+        yield AutoBadgeMenuItem::linkToCrud('Advisories', 'fas fa-skull-crossbones', Advisory::class)
+            ->setBadge($this->advisoryRepository->count([]), 'danger');
         yield MenuItem::linkToCrud('Modules', 'fas fa-cube', Module::class);
         yield MenuItem::linkToCrud('Modules Versions', 'fas fa-cubes', ModuleVersion::class);
         yield MenuItem::linkToCrud('Docker Images', 'fas fa-cube', DockerImage::class);

src/Controller/Admin/OIDCCrudController.php

@@ -8,20 +8,18 @@
 use App\Repository\SiteRepository;
 use App\Trait\ExportCrudControllerTrait;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
+use EasyCorp\Bundle\EasyAdminBundle\Config\ActionGroup;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
-use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
 use EasyCorp\Bundle\EasyAdminBundle\Field\ChoiceField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\DateField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\TextareaField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\UrlField;
 use Symfony\Component\Translation\TranslatableMessage;
 
-class OIDCCrudController extends AbstractCrudController
+class OIDCCrudController extends AbstractFullCrudController
 {
-    use ExportCrudControllerTrait;
-
     public function __construct(
         private readonly SiteRepository $siteRepository)
     {
@@ -32,24 +30,6 @@ public static function getEntityFqcn(): string
         return OIDC::class;
     }
 
-    #[\Override]
-    public function configureCrud(Crud $crud): Crud
-    {
-        return $crud->showEntityActionsInlined();
-    }
-
-    #[\Override]
-    public function configureActions(Actions $actions): Actions
-    {
-        return $actions
-            ->add(Crud::PAGE_INDEX, Action::DETAIL)
-            ->add(Crud::PAGE_INDEX, $this->createExportAction())
-            ->update(Crud::PAGE_INDEX, Action::NEW,
-                static fn (Action $action) => $action->setIcon('fa fa-plus')
-            )
-        ;
-    }
-
     #[\Override]
     public function configureFields(string $pageName): iterable
     {

src/Controller/Admin/ProjectCrudController.php

@@ -38,7 +38,7 @@ public function configureCrud(Crud $crud): Crud
             ->setDefaultSort(['name' => 'ASC'])
             ->setSearchFields(['name', 'details'])
             ->showEntityActionsInlined()
-            ->setPageTitle(Crud::PAGE_INDEX, 'Leantime projects')
+            ->setPageTitle(Crud::PAGE_INDEX, 'Projects')
             ->setHelp(Crud::PAGE_INDEX, 'Projects are synced from Leantime. Click on the "Sync all" button to update all projects.');
     }
 
@@ -80,7 +80,13 @@ public function createUpdateAllProjectsAction(): Action
 
     public function updateAllProjects(SiteRepository $siteRepository): RedirectResponse
     {
-        $this->projectSyncService->syncAllProjects();
+        try {
+            $this->projectSyncService->syncAllProjects();
+
+            $this->addFlash('info', 'All projects have been synced.', );
+        } catch (\Throwable $e) {
+            $this->addFlash('error', 'An error occurred while syncing projects. Check the log for details.');
+        }
 
         return $this->redirectToRoute('admin_project_index');
     }

src/Controller/Admin/SecurityContractCrudController.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Controller\Admin;
+
+use App\Entity\SecurityContract;
+use App\Repository\SecurityContractRepository;
+use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
+use EasyCorp\Bundle\EasyAdminBundle\Config\KeyValueStore;
+use EasyCorp\Bundle\EasyAdminBundle\Context\AdminContext;
+use EasyCorp\Bundle\EasyAdminBundle\Field\AssociationField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\BooleanField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\DateField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\FormField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\NumberField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextareaField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\UrlField;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Response;
+
+class SecurityContractCrudController extends AbstractFullCrudController
+{
+    public function __construct(
+        private readonly SecurityContractRepository $securityContractRepository,
+    )
+    {
+    }
+
+    public static function getEntityFqcn(): string
+    {
+        return SecurityContract::class;
+    }
+
+    #[\Override]
+    public function configureCrud(Crud $crud): Crud
+    {
+        return $crud
+            ->setDefaultSort(['project.name' => 'ASC'])
+            //->setSearchFields(['name', 'details'])
+            ->showEntityActionsInlined()
+            ->setPageTitle(Crud::PAGE_INDEX, 'Cyber Security Contracts');
+    }
+
+    #[\Override]
+    public function configureFields(string $pageName): iterable
+    {
+        yield FormField::addFieldset('Project');
+        yield BooleanField::new('active')->renderAsSwitch(false)->setColumns(2);
+        yield AssociationField::new('project')->setColumns(10);
+
+        yield FormField::addFieldset('Links');
+        yield UrlField::new('project.leantimeUrl')->setLabel('Leantime URL')->setDisabled()->hideOnIndex()->hideWhenCreating();
+        yield UrlField::new('economicsReportUrl')->setLabel('Economics URL')->hideOnIndex()->setColumns(12);
+        yield UrlField::new('operationalContractUrl')->setLabel('Contract URL')->hideOnIndex()->setColumns(12);
+
+        yield FormField::addFieldset('Budget');
+        yield NumberField::new('monthlyPrice')->setTextAlign('right')->setColumns(6);
+        yield NumberField::new('quarterlyHours')->setTextAlign('right')->setColumns(6);
+
+        yield FormField::addFieldset('Validity');
+        yield DateField::new('validFrom')->setColumns(6);
+        yield DateField::new('validTo')->setColumns(6);
+
+        yield FormField::addFieldset('Notes');
+        yield TextareaField::new('notes')->hideOnIndex()->setColumns(12);
+    }
+}

src/Controller/Admin/ServerCrudController.php

@@ -28,10 +28,8 @@
 use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
 use Symfony\Component\HttpFoundation\RequestStack;
 
-class ServerCrudController extends AbstractCrudController
+class ServerCrudController extends AbstractFullCrudController
 {
-    use ExportCrudControllerTrait;
-
     public function __construct(
         private readonly RequestStack $requestStack,
     ) {
@@ -54,20 +52,6 @@ public function configureCrud(Crud $crud): Crud
         return $crud;
     }
 
-    #[\Override]
-    public function configureActions(Actions $actions): Actions
-    {
-        return $actions
-            ->remove(Crud::PAGE_INDEX, Action::EDIT)
-            ->remove(Crud::PAGE_INDEX, Action::DELETE)
-            ->add(Crud::PAGE_INDEX, Action::DETAIL)
-            ->add(Crud::PAGE_INDEX, $this->createExportAction())
-            ->update(Crud::PAGE_INDEX, Action::NEW,
-                static fn (Action $action) => $action->setIcon('fa fa-plus')
-            )
-        ;
-    }
-
     #[\Override]
     public function configureFields(string $pageName): iterable
     {