Add different view modes for resource lists

application/controllers/ConfigmapsController.php

@@ -6,18 +6,13 @@
 
 use Icinga\Module\Kubernetes\Common\Auth;
 use Icinga\Module\Kubernetes\Common\Database;
+use Icinga\Module\Kubernetes\Common\ViewMode;
 use Icinga\Module\Kubernetes\Model\ConfigMap;
-use Icinga\Module\Kubernetes\Web\ConfigMapList;
 use Icinga\Module\Kubernetes\Web\ListController;
 use ipl\Orm\Query;
 
 class ConfigmapsController extends ListController
 {
-    protected function getContentClass(): string
-    {
-        return ConfigMapList::class;
-    }
-
     protected function getQuery(): Query
     {
         return ConfigMap::on(Database::connection());
@@ -41,4 +36,9 @@ protected function getPermission(): string
     {
         return AUTH::SHOW_CONFIG_MAPS;
     }
+
+    protected function getIgnoredViewModes(): array
+    {
+        return [ViewMode::Common, ViewMode::Detailed];
+    }
 }

application/controllers/CronjobController.php

@@ -6,9 +6,11 @@
 
 use Icinga\Module\Kubernetes\Common\Auth;
 use Icinga\Module\Kubernetes\Common\Database;
+use Icinga\Module\Kubernetes\Common\ViewMode;
 use Icinga\Module\Kubernetes\Model\CronJob;
 use Icinga\Module\Kubernetes\Web\Controller;
 use Icinga\Module\Kubernetes\Web\CronJobDetail;
+use Icinga\Module\Kubernetes\Web\ItemList\ResourceList;
 use ipl\Stdlib\Filter;
 use Ramsey\Uuid\Uuid;
 
@@ -32,6 +34,12 @@ public function indexAction(): void
             $this->httpNotFound($this->translate('Cron Job not found'));
         }
 
+        $this->addControl(
+            (new ResourceList([$cronJob]))
+                ->setDetailActionsDisabled()
+                ->setViewMode(ViewMode::Detailed)
+        );
+
         $this->addContent(new CronJobDetail($cronJob));
     }
 }

application/controllers/CronjobsController.php

@@ -7,17 +7,11 @@
 use Icinga\Module\Kubernetes\Common\Auth;
 use Icinga\Module\Kubernetes\Common\Database;
 use Icinga\Module\Kubernetes\Model\CronJob;
-use Icinga\Module\Kubernetes\Web\CronJobList;
 use Icinga\Module\Kubernetes\Web\ListController;
 use ipl\Orm\Query;
 
 class CronjobsController extends ListController
 {
-    protected function getContentClass(): string
-    {
-        return CronJobList::class;
-    }
-
     protected function getQuery(): Query
     {
         return CronJob::on(Database::connection());

application/controllers/DaemonsetController.php

@@ -6,10 +6,11 @@
 
 use Icinga\Module\Kubernetes\Common\Auth;
 use Icinga\Module\Kubernetes\Common\Database;
+use Icinga\Module\Kubernetes\Common\ViewMode;
 use Icinga\Module\Kubernetes\Model\DaemonSet;
 use Icinga\Module\Kubernetes\Web\Controller;
 use Icinga\Module\Kubernetes\Web\DaemonSetDetail;
-use Icinga\Module\Kubernetes\Web\DaemonSetList;
+use Icinga\Module\Kubernetes\Web\ItemList\ResourceList;
 use ipl\Stdlib\Filter;
 use Ramsey\Uuid\Uuid;
 
@@ -33,7 +34,11 @@ public function indexAction(): void
             $this->httpNotFound($this->translate('Daemon Set not found'));
         }
 
-        $this->addControl((new DaemonSetList([$daemonSet]))->setActionList(false));
+        $this->addControl(
+            (new ResourceList([$daemonSet]))
+                ->setDetailActionsDisabled()
+                ->setViewMode(ViewMode::Detailed)
+        );
 
         $this->addContent(new DaemonSetDetail($daemonSet));
     }

application/controllers/DaemonsetsController.php

@@ -7,17 +7,11 @@
 use Icinga\Module\Kubernetes\Common\Auth;
 use Icinga\Module\Kubernetes\Common\Database;
 use Icinga\Module\Kubernetes\Model\DaemonSet;
-use Icinga\Module\Kubernetes\Web\DaemonSetList;
 use Icinga\Module\Kubernetes\Web\ListController;
 use ipl\Orm\Query;
 
 class DaemonsetsController extends ListController
 {
-    protected function getContentClass(): string
-    {
-        return DaemonSetList::class;
-    }
-
     protected function getQuery(): Query
     {
         return DaemonSet::on(Database::connection());

application/controllers/DeploymentController.php

@@ -6,10 +6,11 @@
 
 use Icinga\Module\Kubernetes\Common\Auth;
 use Icinga\Module\Kubernetes\Common\Database;
+use Icinga\Module\Kubernetes\Common\ViewMode;
 use Icinga\Module\Kubernetes\Model\Deployment;
 use Icinga\Module\Kubernetes\Web\Controller;
 use Icinga\Module\Kubernetes\Web\DeploymentDetail;
-use Icinga\Module\Kubernetes\Web\DeploymentList;
+use Icinga\Module\Kubernetes\Web\ItemList\ResourceList;
 use ipl\Stdlib\Filter;
 use Ramsey\Uuid\Uuid;
 
@@ -33,7 +34,11 @@ public function indexAction(): void
             $this->httpNotFound($this->translate('Deployment not found'));
         }
 
-        $this->addControl((new DeploymentList([$deployment]))->setActionList(false));
+        $this->addControl(
+            (new ResourceList([$deployment]))
+                ->setDetailActionsDisabled()
+                ->setViewMode(ViewMode::Detailed)
+        );
 
         $this->addContent(new DeploymentDetail($deployment));
     }

application/controllers/DeploymentsController.php

@@ -7,17 +7,11 @@
 use Icinga\Module\Kubernetes\Common\Auth;
 use Icinga\Module\Kubernetes\Common\Database;
 use Icinga\Module\Kubernetes\Model\Deployment;
-use Icinga\Module\Kubernetes\Web\DeploymentList;
 use Icinga\Module\Kubernetes\Web\ListController;
 use ipl\Orm\Query;
 
 class DeploymentsController extends ListController
 {
-    protected function getContentClass(): string
-    {
-        return DeploymentList::class;
-    }
-
     protected function getQuery(): Query
     {
         return Deployment::on(Database::connection());

application/controllers/EventsController.php

@@ -6,19 +6,14 @@
 
 use Icinga\Module\Kubernetes\Common\Auth;
 use Icinga\Module\Kubernetes\Common\Database;
+use Icinga\Module\Kubernetes\Common\ViewMode;
 use Icinga\Module\Kubernetes\Model\Event;
-use Icinga\Module\Kubernetes\Web\EventList;
 use Icinga\Module\Kubernetes\Web\ListController;
 use ipl\Orm\Query;
 use ipl\Stdlib\Filter;
 
 class EventsController extends ListController
 {
-    protected function getContentClass(): string
-    {
-        return EventList::class;
-    }
-
     protected function getQuery(): Query
     {
         $events = Auth::getInstance()->withRestrictions(Auth::SHOW_EVENTS, Event::on(Database::connection()));
@@ -51,4 +46,9 @@ protected function getPermission(): string
     {
         return Auth::SHOW_EVENTS;
     }
+
+    protected function getIgnoredViewModes(): array
+    {
+        return [ViewMode::Detailed];
+    }
 }

application/controllers/IngressController.php

@@ -6,9 +6,11 @@
 
 use Icinga\Module\Kubernetes\Common\Auth;
 use Icinga\Module\Kubernetes\Common\Database;
+use Icinga\Module\Kubernetes\Common\ViewMode;
 use Icinga\Module\Kubernetes\Model\Ingress;
 use Icinga\Module\Kubernetes\Web\Controller;
 use Icinga\Module\Kubernetes\Web\IngressDetail;
+use Icinga\Module\Kubernetes\Web\ItemList\ResourceList;
 use ipl\Stdlib\Filter;
 use Ramsey\Uuid\Uuid;
 
@@ -32,6 +34,12 @@ public function indexAction(): void
             $this->httpNotFound($this->translate('Ingress not found'));
         }
 
+        $this->addControl(
+            (new ResourceList([$ingress]))
+                ->setDetailActionsDisabled()
+                ->setViewMode(ViewMode::Detailed)
+        );
+
         $this->addContent(new IngressDetail($ingress));
     }
 }

application/controllers/IngressesController.php

@@ -7,17 +7,11 @@
 use Icinga\Module\Kubernetes\Common\Auth;
 use Icinga\Module\Kubernetes\Common\Database;
 use Icinga\Module\Kubernetes\Model\Ingress;
-use Icinga\Module\Kubernetes\Web\IngressList;
 use Icinga\Module\Kubernetes\Web\ListController;
 use ipl\Orm\Query;
 
 class IngressesController extends ListController
 {
-    protected function getContentClass(): string
-    {
-        return IngressList::class;
-    }
-
     protected function getQuery(): Query
     {
         return Ingress::on(Database::connection());

application/controllers/JobController.php

@@ -6,10 +6,11 @@
 
 use Icinga\Module\Kubernetes\Common\Auth;
 use Icinga\Module\Kubernetes\Common\Database;
+use Icinga\Module\Kubernetes\Common\ViewMode;
 use Icinga\Module\Kubernetes\Model\Job;
 use Icinga\Module\Kubernetes\Web\Controller;
+use Icinga\Module\Kubernetes\Web\ItemList\ResourceList;
 use Icinga\Module\Kubernetes\Web\JobDetail;
-use Icinga\Module\Kubernetes\Web\JobList;
 use ipl\Stdlib\Filter;
 use Ramsey\Uuid\Uuid;
 
@@ -33,7 +34,11 @@ public function indexAction(): void
             $this->httpNotFound($this->translate('Job not found'));
         }
 
-        $this->addControl((new JobList([$job]))->setActionList(false));
+        $this->addControl(
+            (new ResourceList([$job]))
+                ->setDetailActionsDisabled()
+                ->setViewMode(ViewMode::Detailed)
+        );
 
         $this->addContent(new JobDetail($job));
     }

application/controllers/JobsController.php

@@ -7,17 +7,11 @@
 use Icinga\Module\Kubernetes\Common\Auth;
 use Icinga\Module\Kubernetes\Common\Database;
 use Icinga\Module\Kubernetes\Model\Job;
-use Icinga\Module\Kubernetes\Web\JobList;
 use Icinga\Module\Kubernetes\Web\ListController;
 use ipl\Orm\Query;
 
 class JobsController extends ListController
 {
-    protected function getContentClass(): string
-    {
-        return JobList::class;
-    }
-
     protected function getQuery(): Query
     {
         return Job::on(Database::connection());

application/controllers/NamespaceController.php

@@ -6,8 +6,10 @@
 
 use Icinga\Module\Kubernetes\Common\Auth;
 use Icinga\Module\Kubernetes\Common\Database;
+use Icinga\Module\Kubernetes\Common\ViewMode;
 use Icinga\Module\Kubernetes\Model\NamespaceModel;
 use Icinga\Module\Kubernetes\Web\Controller;
+use Icinga\Module\Kubernetes\Web\ItemList\ResourceList;
 use Icinga\Module\Kubernetes\Web\NamespaceDetail;
 use ipl\Stdlib\Filter;
 use Ramsey\Uuid\Uuid;
@@ -32,6 +34,12 @@ public function indexAction(): void
             $this->httpNotFound($this->translate('Namespace not found'));
         }
 
+        $this->addControl(
+            (new ResourceList([$namespace]))
+                ->setDetailActionsDisabled()
+                ->setViewMode(ViewMode::Detailed)
+        );
+
         $this->addContent(new NamespaceDetail($namespace));
     }
 }

application/controllers/NamespacesController.php

@@ -8,16 +8,10 @@
 use Icinga\Module\Kubernetes\Common\Database;
 use Icinga\Module\Kubernetes\Model\NamespaceModel;
 use Icinga\Module\Kubernetes\Web\ListController;
-use Icinga\Module\Kubernetes\Web\NamespaceList;
 use ipl\Orm\Query;
 
 class NamespacesController extends ListController
 {
-    protected function getContentClass(): string
-    {
-        return NamespaceList::class;
-    }
-
     protected function getQuery(): Query
     {
         return NamespaceModel::on(Database::connection());

application/controllers/NodeController.php

@@ -6,10 +6,11 @@
 
 use Icinga\Module\Kubernetes\Common\Auth;
 use Icinga\Module\Kubernetes\Common\Database;
+use Icinga\Module\Kubernetes\Common\ViewMode;
 use Icinga\Module\Kubernetes\Model\Node;
 use Icinga\Module\Kubernetes\Web\Controller;
+use Icinga\Module\Kubernetes\Web\ItemList\ResourceList;
 use Icinga\Module\Kubernetes\Web\NodeDetail;
-use Icinga\Module\Kubernetes\Web\NodeList;
 use ipl\Stdlib\Filter;
 use Ramsey\Uuid\Uuid;
 
@@ -33,7 +34,11 @@ public function indexAction(): void
             $this->httpNotFound($this->translate('Node not found'));
         }
 
-        $this->addControl((new NodeList([$node]))->setActionList(false));
+        $this->addControl(
+            (new ResourceList([$node]))
+                ->setDetailActionsDisabled()
+                ->setViewMode(ViewMode::Detailed)
+        );
 
         $this->addContent(new NodeDetail($node));
     }

application/controllers/NodesController.php

@@ -8,16 +8,10 @@
 use Icinga\Module\Kubernetes\Common\Database;
 use Icinga\Module\Kubernetes\Model\Node;
 use Icinga\Module\Kubernetes\Web\ListController;
-use Icinga\Module\Kubernetes\Web\NodeList;
 use ipl\Orm\Query;
 
 class NodesController extends ListController
 {
-    protected function getContentClass(): string
-    {
-        return NodeList::class;
-    }
-
     protected function getQuery(): Query
     {
         return Node::on(Database::connection());

application/controllers/PersistentvolumeController.php

@@ -6,8 +6,10 @@
 
 use Icinga\Module\Kubernetes\Common\Auth;
 use Icinga\Module\Kubernetes\Common\Database;
+use Icinga\Module\Kubernetes\Common\ViewMode;
 use Icinga\Module\Kubernetes\Model\PersistentVolume;
 use Icinga\Module\Kubernetes\Web\Controller;
+use Icinga\Module\Kubernetes\Web\ItemList\ResourceList;
 use Icinga\Module\Kubernetes\Web\PersistentVolumeDetail;
 use ipl\Stdlib\Filter;
 use Ramsey\Uuid\Uuid;
@@ -32,6 +34,12 @@ public function indexAction(): void
             $this->httpNotFound($this->translate('Persistent Volume not found'));
         }
 
+        $this->addControl(
+            (new ResourceList([$persistentVolume]))
+                ->setDetailActionsDisabled()
+                ->setViewMode(ViewMode::Detailed)
+        );
+
         $this->addContent(new PersistentVolumeDetail($persistentVolume));
     }
 }