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

ChannelForm: Show message intead of stacktrace when no channel type found #290

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ChannelForm: Show message intead of stacktrace when no channel type found #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 23 additions & 9 deletions application/controllers/ChannelsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php

Check failure on line 1 in application/controllers/ChannelsController.php

View workflow job for this annotation

GitHub Actions / phpstan / Static analysis with phpstan and php 7.2 on ubuntu-latest 

Ignored error pattern #^Parameter \#1 \$name of method ipl\\Web\\Widget\\Tabs\:\:add\(\) expects string, mixed given\.$# in path /home/runner/work/icinga-notifications-web/icinga-notifications-web/application/controllers/ChannelsController.php was not matched in reported errors.

Check failure on line 1 in application/controllers/ChannelsController.php

View workflow job for this annotation

GitHub Actions / phpstan / Static analysis with phpstan and php 7.3 on ubuntu-latest 

Ignored error pattern #^Parameter \#1 \$name of method ipl\\Web\\Widget\\Tabs\:\:add\(\) expects string, mixed given\.$# in path /home/runner/work/icinga-notifications-web/icinga-notifications-web/application/controllers/ChannelsController.php was not matched in reported errors.

/* Icinga Notifications Web | (c) 2023 Icinga GmbH | GPLv2 */

Expand All @@ -6,6 +6,7 @@

use Icinga\Module\Notifications\Common\Database;
use Icinga\Module\Notifications\Forms\ChannelForm;
use Icinga\Module\Notifications\Model\AvailableChannelType;
use Icinga\Module\Notifications\Model\Channel;
use Icinga\Module\Notifications\Web\Control\SearchBar\ObjectSuggestions;
use Icinga\Module\Notifications\Widget\ItemList\ChannelList;
Expand All @@ -14,6 +15,7 @@
use Icinga\Web\Widget\Tabs;
use ipl\Html\ValidHtml;
use ipl\Sql\Connection;
use ipl\Sql\Expression;
use ipl\Stdlib\Filter;
use ipl\Web\Common\BaseItemList;
use ipl\Web\Compat\CompatController;
Expand All @@ -23,6 +25,7 @@
use ipl\Web\Filter\QueryString;
use ipl\Web\Url;
use ipl\Web\Widget\ButtonLink;
use ipl\Web\Widget\EmptyStateBar;

class ChannelsController extends CompatController
{
Expand Down Expand Up @@ -84,16 +87,27 @@
$this->addControl($sortControl);
$this->addControl($limitControl);
$this->addControl($searchBar);
$this->addContent(
(new ButtonLink(
t('Add Channel'),
Url::fromPath('notifications/channels/add'),
'plus'
))->setBaseTarget('_next')
->addAttributes(['class' => 'add-new-component'])
);

$this->addContent(new ChannelList($channels));
$typesExists = AvailableChannelType::on($this->db)
->columns([new Expression('1')])
->first() !== null;

if ($typesExists) {
$this->addContent(
(new ButtonLink(
t('Add Channel'),
Url::fromPath('notifications/channels/add'),
'plus'
))->setBaseTarget('_next')
->addAttributes(['class' => 'add-new-component'])
);

$this->addContent(new ChannelList($channels));
} else {
$this->addContent(new EmptyStateBar(
t('No channel types available. Make sure Icinga Notifications is running.')
));
}

if (! $searchBar->hasBeenSubmitted() && $searchBar->hasBeenSent()) {
$this->sendMultipartUpdate();
Expand Down Expand Up @@ -182,7 +196,7 @@
{
/** @var Tab $tab */
foreach ($tabs->getTabs() as $tab) {
$this->tabs->add($tab->getName(), $tab);

Check failure on line 199 in application/controllers/ChannelsController.php

View workflow job for this annotation

GitHub Actions / phpstan / Static analysis with phpstan and php 7.2 on ubuntu-latest 

Parameter #1 $name of method ipl\Web\Widget\Tabs::add() expects string, string|null given.

Check failure on line 199 in application/controllers/ChannelsController.php

View workflow job for this annotation

GitHub Actions / phpstan / Static analysis with phpstan and php 7.3 on ubuntu-latest 

Parameter #1 $name of method ipl\Web\Widget\Tabs::add() expects string, string|null given.
}
}
}
11 changes: 9 additions & 2 deletions application/forms/ChannelForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Icinga\Module\Notifications\Forms;

use Icinga\Exception\Http\HttpNotFoundException;
use Icinga\Exception\IcingaException;
use Icinga\Module\Notifications\Model\Channel;
use Icinga\Module\Notifications\Model\AvailableChannelType;
use Icinga\Module\Notifications\Model\Contact;
Expand Down Expand Up @@ -54,6 +55,14 @@ public function __construct(Connection $db)

protected function assemble()
{
$query = AvailableChannelType::on($this->db)
->columns(['type', 'name', 'config_attrs'])
->execute();

if (! $query->hasResult()) {
throw new IcingaException('No channel types available. Make sure Icinga Notifications is running.');
}

$this->addAttributes(['class' => 'channel-form']);
$this->addElement($this->createCsrfCounterMeasure(Session::getSession()->getId()));

Expand All @@ -67,8 +76,6 @@ protected function assemble()
]
);

$query = AvailableChannelType::on($this->db)->columns(['type', 'name', 'config_attrs']);

/** @var string[] $typesConfig */
$typesConfig = [];

Expand Down
Loading