BaseItemTable: Introduce layout modes

This elevates the layout `table-layout`, previously introduced exclusively for host and service group tables, to the standard layout used for item tables. fixes #814
Icinga · Aug 11, 2023 · dd803f6 · dd803f6
1 parent 987a0a3
commit dd803f6
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 18 deletions.
diff --git a/library/Icingadb/Common/BaseItemTable.php b/library/Icingadb/Common/BaseItemTable.php
@@ -55,10 +55,22 @@ protected function init()
     {
     }
 
+    /**
+     * Get the table layout to use
+     *
+     * @return string
+     */
+    protected function getLayout(): string
+    {
+        return 'table-layout';
+    }
+
     abstract protected function getItemClass(): string;
 
     protected function assemble()
     {
+        $this->addAttributes(['class' => $this->getLayout()]);
+
         $itemClass = $this->getItemClass();
 
         foreach ($this->data as $data) {

diff --git a/library/Icingadb/Widget/ItemTable/HostgroupTable.php b/library/Icingadb/Widget/ItemTable/HostgroupTable.php
@@ -19,14 +19,17 @@ protected function init()
         $this->setDetailUrl(Url::fromPath('icingadb/hostgroup'));
     }
 
-    protected function getItemClass(): string
+    protected function getLayout(): string
     {
-        if ($this->getViewMode() === 'grid') {
-            $this->addAttributes(['class' => 'group-grid']);
-            return HostgroupGridCell::class;
-        }
+        return $this->getViewMode() === 'grid'
+            ? 'group-grid'
+            : parent::getLayout();
+    }
 
-        $this->addAttributes(['class' => 'table-layout']);
-        return HostgroupTableRow::class;
+    protected function getItemClass(): string
+    {
+        return $this->getViewMode() === 'grid'
+            ? HostgroupGridCell::class
+            : HostgroupTableRow::class;
     }
 }
diff --git a/library/Icingadb/Widget/ItemTable/ServicegroupTable.php b/library/Icingadb/Widget/ItemTable/ServicegroupTable.php
@@ -19,14 +19,17 @@ protected function init()
         $this->setDetailUrl(Url::fromPath('icingadb/servicegroup'));
     }
 
-    protected function getItemClass(): string
+    protected function getLayout(): string
     {
-        if ($this->getViewMode() === 'grid') {
-            $this->addAttributes(['class' => 'group-grid']);
-            return ServicegroupGridCell::class;
-        }
+        return $this->getViewMode() === 'grid'
+            ? 'group-grid'
+            : parent::getLayout();
+    }
 
-        $this->addAttributes(['class' => 'table-layout']);
-        return ServicegroupTableRow::class;
+    protected function getItemClass(): string
+    {
+        return $this->getViewMode() === 'grid'
+            ? ServicegroupGridCell::class
+            : ServicegroupTableRow::class;
     }
 }
diff --git a/public/css/common.less b/public/css/common.less
@@ -329,11 +329,11 @@ div.show-more {
     &.servicegroup-table {
       --columns: 1;
     }
-  }
 
-  &.user-table, // TODO: make them lists.....
-  &.usergroup-table {
-    --columns: 0;
+    &.user-table, // TODO: make them lists.....
+    &.usergroup-table {
+      --columns: 0;
+    }
   }
 }