Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preserve group filters in details #1028

Merged
merged 5 commits into from
Jul 19, 2024
+253 −91
Merged

Preserve group filters in details #1028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8da16ea
css: Ensure compatibility with ipl v0.14.2
nilmerg Jul 19, 2024
a4a30c1
ObjectSuggestions: Support more base filters than restrictions
nilmerg Jul 19, 2024
648a544
hostgroups: Preserve filters in details
nilmerg Jul 19, 2024
32ab5e5
servicegroups: Preserve filters in details
nilmerg Jul 19, 2024
ceb87ea
phpstan: Update standard baseline
nilmerg Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 98 additions & 18 deletions application/controllers/HostgroupController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,79 +4,159 @@

namespace Icinga\Module\Icingadb\Controllers;

use Icinga\Exception\NotFoundError;
use Generator;
use Icinga\Module\Icingadb\Common\Links;
use Icinga\Module\Icingadb\Model\Host;
use Icinga\Module\Icingadb\Model\Hostgroupsummary;
use Icinga\Module\Icingadb\Redis\VolatileStateResults;
use Icinga\Module\Icingadb\Web\Control\SearchBar\ObjectSuggestions;
use Icinga\Module\Icingadb\Web\Control\ViewModeSwitcher;
use Icinga\Module\Icingadb\Web\Controller;
use Icinga\Module\Icingadb\Widget\ItemList\HostList;
use Icinga\Module\Icingadb\Widget\ItemTable\HostgroupTableRow;
use ipl\Html\Html;
use ipl\Stdlib\Filter;
use ipl\Web\Control\LimitControl;
use ipl\Web\Control\SortControl;
use ipl\Web\Url;

class HostgroupController extends Controller
{
/** @var Hostgroupsummary The host group object */
protected $hostgroup;
/** @var string */
protected $hostgroupName;

public function init()
{
$this->assertRouteAccess('hostgroups');
$this->hostgroupName = $this->params->shiftRequired('name');
}

$this->addTitleTab(t('Host Group'));

$name = $this->params->getRequired('name');

/**
* Fetch the host group object
*
* @return Hostgroupsummary
*/
protected function fetchHostgroup(): Hostgroupsummary
{
$query = Hostgroupsummary::on($this->getDb());

foreach ($query->getUnions() as $unionPart) {
$unionPart->filter(Filter::equal('hostgroup.name', $name));
$unionPart->filter(Filter::equal('hostgroup.name', $this->hostgroupName));
}

$this->applyRestrictions($query);

/** @var Hostgroupsummary $hostgroup */
$hostgroup = $query->first();
if ($hostgroup === null) {
throw new NotFoundError(t('Host group not found'));
$this->httpNotFound(t('Host group not found'));
}

$this->hostgroup = $hostgroup;
$this->setTitle($hostgroup->display_name);
return $hostgroup;
}

public function indexAction()
public function indexAction(): Generator
{
$db = $this->getDb();
$hostgroup = $this->fetchHostgroup();

$hosts = Host::on($db)->with(['state', 'state.last_comment', 'icon_image']);
$hosts
->setResultSetClass(VolatileStateResults::class)
->filter(Filter::equal('hostgroup.id', $this->hostgroup->id));
->filter(Filter::equal('hostgroup.id', $hostgroup->id));
$this->applyRestrictions($hosts);

$limitControl = $this->createLimitControl();
$paginationControl = $this->createPaginationControl($hosts);
$sortControl = $this->createSortControl(
$hosts,
[
'host.display_name' => t('Name'),
'host.state.severity desc,host.state.last_state_change desc' => t('Severity'),
'host.state.soft_state' => t('Current State'),
'host.state.last_state_change desc' => t('Last State Change')
]
);
$viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl);

$hostList = (new HostList($hosts->execute()))
->setViewMode($viewModeSwitcher->getViewMode());
$searchBar = $this->createSearchBar($hosts, [
$limitControl->getLimitParam(),
$sortControl->getSortParam(),
$viewModeSwitcher->getViewModeParam(),
'name'
])->setSuggestionUrl(Url::fromPath(
'icingadb/hostgroup/complete',
[
'name' => $this->hostgroupName,
'_disableLayout' => true,
'showCompact' => true
]
));

if ($searchBar->hasBeenSent() && ! $searchBar->isValid()) {
if ($searchBar->hasBeenSubmitted()) {
$filter = $this->getFilter();
} else {
$this->addControl($searchBar);
$this->sendMultipartUpdate();
return;
}
} else {
$filter = $searchBar->getFilter();
}

$hosts->filter($filter);

yield $this->export($hosts);

$hostList = (new HostList($hosts->execute()))
->setViewMode($viewModeSwitcher->getViewMode());

// ICINGAWEB_EXPORT_FORMAT is not set yet and $this->format is inaccessible, yeah...
if ($this->getRequest()->getParam('format') === 'pdf') {
$this->addContent(new HostgroupTableRow($this->hostgroup));
$this->addContent(new HostgroupTableRow($hostgroup));
$this->addContent(Html::tag('h2', null, t('Hosts')));
} else {
$this->addControl(new HostgroupTableRow($this->hostgroup));
$this->addControl(new HostgroupTableRow($hostgroup));
}

$this->addControl($paginationControl);
$this->addControl($viewModeSwitcher);
$this->addControl($sortControl);
$this->addControl($limitControl);
$this->addControl($viewModeSwitcher);
$this->addControl($searchBar);
$continueWith = $this->createContinueWith(Links::hostsDetails(), $searchBar);

$this->addContent($hostList);

if (! $searchBar->hasBeenSubmitted() && $searchBar->hasBeenSent()) {
$this->sendMultipartUpdate($continueWith);
}

$this->addTitleTab(t('Host Group'));
$this->setTitle($hostgroup->display_name);
$this->setAutorefreshInterval(10);
}

public function completeAction(): void
{
$suggestions = new ObjectSuggestions();
$suggestions->setModel(Host::class);
$suggestions->setBaseFilter(Filter::equal('hostgroup.name', $this->hostgroupName));
$suggestions->forRequest($this->getServerRequest());
$this->getDocument()->add($suggestions);
}

public function searchEditorAction(): void
{
$editor = $this->createSearchEditor(Host::on($this->getDb()), [
LimitControl::DEFAULT_LIMIT_PARAM,
SortControl::DEFAULT_SORT_PARAM,
ViewModeSwitcher::DEFAULT_VIEW_MODE_PARAM,
'name'
]);

$this->getDocument()->add($editor);
$this->setTitle(t('Adjust Filter'));
}
}
117 changes: 99 additions & 18 deletions application/controllers/ServicegroupController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,61 @@

namespace Icinga\Module\Icingadb\Controllers;

use Icinga\Exception\NotFoundError;
use Generator;
use Icinga\Module\Icingadb\Common\Links;
use Icinga\Module\Icingadb\Model\Service;
use Icinga\Module\Icingadb\Model\ServicegroupSummary;
use Icinga\Module\Icingadb\Redis\VolatileStateResults;
use Icinga\Module\Icingadb\Web\Control\SearchBar\ObjectSuggestions;
use Icinga\Module\Icingadb\Web\Control\ViewModeSwitcher;
use Icinga\Module\Icingadb\Web\Controller;
use Icinga\Module\Icingadb\Widget\ItemList\ServiceList;
use Icinga\Module\Icingadb\Widget\ItemTable\ServicegroupTableRow;
use ipl\Html\Html;
use ipl\Stdlib\Filter;
use ipl\Web\Control\LimitControl;
use ipl\Web\Control\SortControl;
use ipl\Web\Url;

class ServicegroupController extends Controller
{
/** @var ServicegroupSummary The service group object */
protected $servicegroup;
/** @var string */
protected $servicegroupName;

public function init()
{
$this->assertRouteAccess('servicegroups');
$this->servicegroupName = $this->params->shiftRequired('name');
}

$this->addTitleTab(t('Service Group'));

$name = $this->params->getRequired('name');

/**
* Fetch the service group object
*
* @return ServicegroupSummary
*/
protected function fetchServicegroup(): ServicegroupSummary
{
$query = ServicegroupSummary::on($this->getDb());

foreach ($query->getUnions() as $unionPart) {
$unionPart->filter(Filter::equal('servicegroup.name', $name));
$unionPart->filter(Filter::equal('servicegroup.name', $this->servicegroupName));
}

$this->applyRestrictions($query);

/** @var ServicegroupSummary $servicegroup */
$servicegroup = $query->first();
if ($servicegroup === null) {
throw new NotFoundError(t('Service group not found'));
$this->httpNotFound(t('Service group not found'));
}

$this->servicegroup = $servicegroup;
$this->setTitle($servicegroup->display_name);
return $servicegroup;
}

public function indexAction()
public function indexAction(): Generator
{
$db = $this->getDb();
$servicegroup = $this->fetchServicegroup();

$services = Service::on($db)->with([
'state',
Expand All @@ -57,33 +69,102 @@ public function indexAction()
]);
$services
->setResultSetClass(VolatileStateResults::class)
->filter(Filter::equal('servicegroup.id', $this->servicegroup->id));
->filter(Filter::equal('servicegroup.id', $servicegroup->id));

$this->applyRestrictions($services);

$limitControl = $this->createLimitControl();
$paginationControl = $this->createPaginationControl($services);
$sortControl = $this->createSortControl(
$services,
[
'service.display_name' => t('Name'),
'service.state.severity desc,service.state.last_state_change desc' => t('Severity'),
'service.state.soft_state' => t('Current State'),
'service.state.last_state_change desc' => t('Last State Change'),
'host.display_name' => t('Host')
]
);
$viewModeSwitcher = $this->createViewModeSwitcher($paginationControl, $limitControl);

$serviceList = (new ServiceList($services->execute()))
->setViewMode($viewModeSwitcher->getViewMode());
$searchBar = $this->createSearchBar($services, [
$limitControl->getLimitParam(),
$sortControl->getSortParam(),
$viewModeSwitcher->getViewModeParam(),
'name'
])->setSuggestionUrl(Url::fromPath(
'icingadb/servicegroup/complete',
[
'name' => $this->servicegroupName,
'_disableLayout' => true,
'showCompact' => true
]
));

if ($searchBar->hasBeenSent() && ! $searchBar->isValid()) {
if ($searchBar->hasBeenSubmitted()) {
$filter = $this->getFilter();
} else {
$this->addControl($searchBar);
$this->sendMultipartUpdate();
return;
}
} else {
$filter = $searchBar->getFilter();
}

$services->filter($filter);

yield $this->export($services);

$serviceList = (new ServiceList($services->execute()))
->setViewMode($viewModeSwitcher->getViewMode());

// ICINGAWEB_EXPORT_FORMAT is not set yet and $this->format is inaccessible, yeah...
if ($this->getRequest()->getParam('format') === 'pdf') {
$this->addContent(new ServicegroupTableRow($this->servicegroup));
$this->addContent(new ServicegroupTableRow($servicegroup));
$this->addContent(Html::tag('h2', null, t('Services')));
} else {
$this->addControl(new ServicegroupTableRow($this->servicegroup));
$this->addControl(new ServicegroupTableRow($servicegroup));
}

$this->addControl($paginationControl);
$this->addControl($viewModeSwitcher);
$this->addControl($sortControl);
$this->addControl($limitControl);
$this->addControl($viewModeSwitcher);
$this->addControl($searchBar);
$continueWith = $this->createContinueWith(Links::servicesDetails(), $searchBar);

$this->addContent($serviceList);

if (! $searchBar->hasBeenSubmitted() && $searchBar->hasBeenSent()) {
$this->sendMultipartUpdate($continueWith);
}

$this->addTitleTab(t('Service Group'));
$this->setTitle($servicegroup->display_name);
$this->setAutorefreshInterval(10);
}

public function completeAction(): void
{
$suggestions = new ObjectSuggestions();
$suggestions->setModel(Service::class);
$suggestions->setBaseFilter(Filter::equal('servicegroup.name', $this->servicegroupName));
$suggestions->forRequest($this->getServerRequest());
$this->getDocument()->add($suggestions);
}

public function searchEditorAction(): void
{
$editor = $this->createSearchEditor(Service::on($this->getDb()), [
LimitControl::DEFAULT_LIMIT_PARAM,
SortControl::DEFAULT_SORT_PARAM,
ViewModeSwitcher::DEFAULT_VIEW_MODE_PARAM,
'name'
]);

$this->getDocument()->add($editor);
$this->setTitle(t('Adjust Filter'));
}
}
Loading