wip

Author: jrauh01

library/Kubernetes/Common/BaseListItem.php

@@ -6,9 +6,11 @@
 
 use Icinga\Module\Kubernetes\Web\Factory;
 use Icinga\Module\Kubernetes\Web\MoveFavoriteForm;
+use ipl\Html\Attributes;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
 use ipl\Html\HtmlElement;
+use ipl\Web\Widget\Icon;
 use Ramsey\Uuid\Uuid;
 
 /**
@@ -52,7 +54,8 @@ protected function init(): void
 
     protected function assemble(): void
     {
-        if (isset($this->item->favorite->priority)) {
+        $draggable = isset($this->item->favorite->priority);
+        if ($draggable) {
             $this->add(
                 (new MoveFavoriteForm())
                     ->setAction(
@@ -61,13 +64,23 @@ protected function assemble(): void
                     ->populate([
                         'uuid'     => Uuid::fromBytes($this->item->uuid)->toString(),
                         'priority' => $this->item->favorite->priority,
-                    ]),
+                    ])
+                    ->setAttribute('data-base-target', '_self'),
             );
+            // TODO wait for feedback how to style
+//            $div = Html::tag('div', Attributes::create(['class' => 'vertical-align']));
+//            $div->addHtml(new Icon('bars', ['data-drag-initiator' => true]));
+//            $this->add($div);
         }
         $this->add([
             $this->createVisual(),
             $this->createMain()
         ]);
+        if ($draggable) {
+            $div = Html::tag('div', Attributes::create(['class' => 'vertical-align']));
+            $div->addHtml(new Icon('bars', ['data-drag-initiator' => true]));
+            $this->add($div);
+        }
     }
 
     protected function createVisual(): ?BaseHtmlElement

library/Kubernetes/Web/Factory.php

@@ -297,19 +297,20 @@ public static function getKindFromModel(Model $model): string
     {
         $kind = match (true) {
             $model instanceof ConfigMap,
-            $model instanceof CronJob,
-            $model instanceof DaemonSet,
-            $model instanceof Deployment,
-            $model instanceof Ingress,
-            $model instanceof Job,
-            $model instanceof PersistentVolume,
-            $model instanceof PersistentVolumeClaim,
-            $model instanceof Pod,
-            $model instanceof ReplicaSet,
-            $model instanceof Secret,
-            $model instanceof Service,
-            $model instanceof StatefulSet => basename(str_replace('\\', '/', get_class($model))),
-            default                       => null
+                $model instanceof CronJob,
+                $model instanceof DaemonSet,
+                $model instanceof Deployment,
+                $model instanceof Ingress,
+                $model instanceof Job,
+                $model instanceof Node,
+                $model instanceof PersistentVolume,
+                $model instanceof PersistentVolumeClaim,
+                $model instanceof Pod,
+                $model instanceof ReplicaSet,
+                $model instanceof Secret,
+                $model instanceof Service,
+                $model instanceof StatefulSet => basename(str_replace('\\', '/', get_class($model))),
+            default                           => null
         };
 
         return strtolower(str_replace(['_', '-'], '', $kind));
@@ -336,6 +337,7 @@ public static function fetchResource(string $kind, Connection $db = null): ?Quer
             'deployment'            => Deployment::on($database),
             'ingress'               => Ingress::on($database),
             'job'                   => Job::on($database),
+            'node'                  => Node::on($database),
             'persistentvolume'      => PersistentVolume::on($database),
             'persistentvolumeclaim' => PersistentVolumeClaim::on($database),
             'pod'                   => Pod::on($database),

library/Kubernetes/Web/PodListItem.php

@@ -84,12 +84,12 @@ protected function assembleFooter(BaseHtmlElement $footer): void
                 (new Icon('life-ring'))->addAttributes(['title' => $this->translate('Quality of Service')]),
                 $this->item->qos
             ),
-            (new HorizontalKeyValue(
-                $this->translate('IP'),
-                $this->item->ip ?? $this->translate('None')
-            ))
-                ->addAttributes(['class' => 'push-left']),
-            new HorizontalKeyValue(new Icon('share-nodes'), $this->item->node_name ?? $this->translate('None'))
+//            (new HorizontalKeyValue(
+//                $this->translate('IP'),
+//                $this->item->ip ?? $this->translate('None')
+//            ))
+//                ->addAttributes(['class' => 'push-left']),
+//            new HorizontalKeyValue(new Icon('share-nodes'), $this->item->node_name ?? $this->translate('None'))
         );
     }
 }

public/css/action-list.less

@@ -11,8 +11,9 @@
   }
 
   &[favorite-list] {
-    [data-action-item]:hover {
+    [data-drag-initiator]:hover {
       cursor: grab;
+      color: var(--text-color, var(--white, #ffffff));
     }
   }
 

public/css/lists.less

@@ -65,7 +65,7 @@ footer {
   // which also defines rules for this class, assumes a height of two lines.
   display: block;
   height: 1.5em;
-  white-space: nowrap;
+  white-space: pre-wrap;
 }
 
 .title {
@@ -117,3 +117,11 @@ footer {
     overflow: visible;
   }
 }
+
+.vertical-align {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding-left: 0.5em;
+}

public/js/action-list.js

@@ -611,7 +611,8 @@
             Sortable.create(favoriteList, {
                 scroll: true,
                 direction: 'vertical',
-                draggable: '.list-item'
+                draggable: '.list-item',
+                handle: '[data-drag-initiator]',
             });
         }