tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-09-26 03:09:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pane: Implement DashboardEntry & add some return type decs & fixlets

Browse Source
This commit is contained in:
Yonas Habteab 2022-06-13 09:22:00 +02:00
parent 94d3fd2ac4
commit a6483e6e28
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
library/Icinga/Web/Dashboard/Pane.php
View File

@ -11,8 +11,9 @@ use Icinga\Exception\ProgrammingError;
use Icinga\Exception\ConfigurationError; use Icinga\Exception\ConfigurationError;
use Icinga\Model; use Icinga\Model;
use Icinga\Web\Dashboard\Common\DashboardEntries; use Icinga\Web\Dashboard\Common\DashboardEntries;
use Icinga\Web\Dashboard\Common\Sortable;
use Icinga\Util\DBUtils; use Icinga\Util\DBUtils;
use Icinga\Web\Dashboard\Common\DashboardEntry;
use Icinga\Web\Dashboard\Common\Sortable;
use Icinga\Web\Dashboard\Common\WidgetState; use Icinga\Web\Dashboard\Common\WidgetState;
use ipl\Stdlib\Filter; use ipl\Stdlib\Filter;
@ -21,7 +22,7 @@ use function ipl\Stdlib\get_php_type;
/** /**
* A pane, displaying different Dashboard dashlets * A pane, displaying different Dashboard dashlets
*/ */
class Pane extends BaseDashboard implements Sortable class Pane extends BaseDashboard implements DashboardEntry, Sortable
{ {
use DashboardEntries; use DashboardEntries;
use WidgetState; use WidgetState;
@ -42,7 +43,7 @@ class Pane extends BaseDashboard implements Sortable
* *
* @return ?DashboardHome * @return ?DashboardHome
*/ */
public function getHome() public function getHome(): ?DashboardHome
{ {
return $this->home; return $this->home;
} }
@ -175,7 +176,9 @@ class Pane extends BaseDashboard implements Sortable
$dashlets = is_array($entryOrEntries) ? $entryOrEntries : [$entryOrEntries]; $dashlets = is_array($entryOrEntries) ? $entryOrEntries : [$entryOrEntries];
// Highest priority is 0, so count($entries) are always lowest prio + 1 // Highest priority is 0, so count($entries) are always lowest prio + 1
$order = count($this->getEntries()); $order = $this->countEntries();
/** @var Dashlet $dashlet */
foreach ($dashlets as $dashlet) { foreach ($dashlets as $dashlet) {
if (is_array($dashlet)) { if (is_array($dashlet)) {
$this->manageEntry($dashlet, $origin, $manageRecursive); $this->manageEntry($dashlet, $origin, $manageRecursive);
@ -183,9 +186,9 @@ class Pane extends BaseDashboard implements Sortable
} }
$url = $dashlet->getUrl(); $url = $dashlet->getUrl();
$url = is_string($url) ?: $url->getRelativeUrl(); $url = is_string($url ?? '') ?: $url->getRelativeUrl();
$uuid = Dashboard::getSHA1($user . $home->getName() . $this->getName() . $dashlet->getName()); $uuid = Dashboard::getSHA1($user . $home->getName() . $this->getName() . $dashlet->getName());
$moveDashlet = $origin && $origin->hasEntry($dashlet->getName()); $moveDashlet = $origin && $origin->hasEntry($dashlet->getName()) && $this->getHome() !== $origin->getName();
if (! $this->hasEntry($dashlet->getName()) && ! $moveDashlet) { if (! $this->hasEntry($dashlet->getName()) && ! $moveDashlet) {
$conn->insert(Dashlet::TABLE, [ $conn->insert(Dashlet::TABLE, [
@ -257,13 +260,10 @@ class Pane extends BaseDashboard implements Sortable
public function toArray(bool $stringify = true): array public function toArray(bool $stringify = true): array
{ {
$arr = parent::toArray($stringify);
$home = $this->getHome(); $home = $this->getHome();
return [ $arr['home'] = ! $stringify ? $home : ($home ? $home->getName() : null);
'id' => $this->getUuid(),
'name' => $this->getName(), return $arr;
'label' => $this->getTitle(),
'home' => ! $stringify ? $home : ($home ? $home->getName() : null),
'priority' => $this->getPriority(),
];
} }
} }