upstream/icingadb-web
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb-web.git synced 2026-02-03 20:40:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

migrate: Drop backend selection

Browse source
This commit is contained in:
Johannes Meyer 2025-09-05 16:15:55 +02:00
parent 0d414c2f4f
commit c2543454b1
5 changed files with 3 additions and 314 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
application/controllers/MigrateController.php
View file

@ -5,16 +5,9 @@
namespace Icinga\Module\Icingadb\Controllers;
use Exception;
use GuzzleHttp\Psr7\ServerRequest;
use Icinga\Application\Hook;
use Icinga\Application\Icinga;
use Icinga\Exception\IcingaException;
use Icinga\Module\Icingadb\Compat\UrlMigrator;
use Icinga\Module\Icingadb\Forms\SetAsBackendForm;
use Icinga\Module\Icingadb\Hook\IcingadbSupportHook;
use Icinga\Module\Icingadb\Web\Controller;
use ipl\Html\HtmlString;
use ipl\Stdlib\Filter;
use ipl\Web\Filter\QueryString;
use ipl\Web\Url;
@ -107,63 +100,4 @@ class MigrateController extends Controller
$response->sendResponse();
}
public function checkboxStateAction()
{
$this->assertHttpMethod('get');
$form = new SetAsBackendForm();
$form->setAction(Url::fromPath('icingadb/migrate/checkbox-submit')->getAbsoluteUrl());
$this->getDocument()->addHtml($form);
}
public function checkboxSubmitAction()
{
$this->assertHttpMethod('post');
$this->addPart(HtmlString::create('"bogus"'), 'Behavior:Migrate');
(new SetAsBackendForm())->handleRequest(ServerRequest::fromGlobals());
}
public function backendSupportAction()
{
$this->assertHttpMethod('post');
if (! $this->getRequest()->isApiRequest()) {
$this->httpBadRequest('No API request');
}
if (
! preg_match('/([^;]*);?/', $this->getRequest()->getHeader('Content-Type'), $matches)
|| $matches[1] !== 'application/json'
) {
$this->httpBadRequest('No JSON content');
}
$moduleSupportStates = [];
if (
Icinga::app()->getModuleManager()->hasEnabled('monitoring')
&& $this->Auth()->hasPermission('module/monitoring')
) {
$supportList = [];
foreach (Hook::all('Icingadb/IcingadbSupport') as $hook) {
/** @var IcingadbSupportHook $hook */
$supportList[$hook->getModule()->getName()] = $hook->supportsIcingaDb();
}
$moduleSupportStates = [];
foreach ($this->getRequest()->getPost() as $moduleName) {
if (isset($supportList[$moduleName])) {
$moduleSupportStates[] = $supportList[$moduleName];
} else {
$moduleSupportStates[] = false;
}
}
}
$this->getResponse()
->json()
->setSuccessData($moduleSupportStates)
->sendResponse();
}
}

34
application/forms/SetAsBackendForm.php
View file

@ -1,34 +0,0 @@
<?php
/* Icinga DB Web | (c) 2021 Icinga GmbH | GPLv2 */
namespace Icinga\Module\Icingadb\Forms;
use Icinga\Module\Icingadb\Hook\IcingadbSupportHook;
use Icinga\Web\Session;
use ipl\Web\Compat\CompatForm;
class SetAsBackendForm extends CompatForm
{
protected $defaultAttributes = [
'id' => 'setAsBackendForm',
'class' => 'icinga-controls'
];
protected function assemble()
{
$this->addElement('checkbox', 'backend', [
'class' => 'autosubmit',
'label' => t('Use Icinga DB As Backend'),
'value' => IcingadbSupportHook::isIcingaDbSetAsPreferredBackend()
]);
}
public function onSuccess()
{
Session::getSession()->getNamespace('icingadb')->set(
IcingadbSupportHook::PREFERENCE_NAME,
$this->getElement('backend')->isChecked()
);
}
}

7
library/Icingadb/Hook/IcingadbSupportHook.php
View file

@ -13,9 +13,6 @@ abstract class IcingadbSupportHook
{
use HookUtils;
/** @var string key name of preference */
const PREFERENCE_NAME = 'icingadb.as_backend';
/**
* Return whether your module supports IcingaDB or not
*
@ -33,9 +30,7 @@ abstract class IcingadbSupportHook
*/
final public static function isIcingaDbSetAsPreferredBackend(): bool
{
return (bool) Session::getSession()
->getNamespace('icingadb')
->get(self::PREFERENCE_NAME, false);
return true;
}
/**

18
public/css/widget/migrate-popup.less
View file

@ -156,24 +156,6 @@
}
}
form {
width: 100%;
.control-group {
display: flex;
align-items: center;
.control-label-group {
margin-right: .5em;
}
label {
margin-left: auto;
}
}
}
.search-migration-suggestions:not(:empty) ~ form,
.search-migration-suggestions:not(:empty) ~ .monitoring-migration-suggestions:not(:empty) {
margin-bottom: .5em;
}

192
public/js/migrate.js
View file

@ -13,7 +13,6 @@
' <ul class="search-migration-suggestions"></ul>\n' +
' <p class="search-migration-hint">Miss some results? Try the link(s) below</p>\n' +
' <ul class="monitoring-migration-suggestions"></ul>\n' +
' <p class="monitoring-migration-hint">Preview this in Icinga DB</p>\n' +
' </div>\n' +
' <div class="minimizer"><i class="icon-"></i></div>\n' +
' </div>\n' +
@ -36,11 +35,8 @@
super(icinga);
this.knownMigrations = {};
this.knownBackendSupport = {};
this.urlMigrationReadyState = null;
this.backendSupportReadyState = null;
this.searchMigrationReadyState = null;
this.backendSupportRelated = {};
this.$popup = null;
// Some persistence, we don't want to annoy our users too much
@ -60,19 +56,6 @@
this.storage.onChange('minimized', this.onMinimized, this);
}
update(data) {
if (data !== 'bogus') {
return;
}
$.each(this.backendSupportRelated, (id, _) => {
let $container = $('#' + id);
let req = this.icinga.loader.loadUrl($container.data('icingaUrl'), $container);
req.addToHistory = false;
req.scripted = true;
});
}
onRendered(event) {
var _this = event.data.self;
var $target = $(event.target);
@ -111,7 +94,6 @@
prepareMigration($target) {
let monitoringUrls = {};
let searchUrls = {};
let modules = {}
$target.each((_, container) => {
let $container = $(container);
@ -132,11 +114,6 @@
}
}
}
let moduleName = $container.data('icingaModule');
if (!! moduleName && moduleName !== 'default' && moduleName !== 'monitoring' && moduleName !== 'icingadb') {
modules[containerId] = moduleName;
}
});
if (Object.keys(monitoringUrls).length) {
@ -153,16 +130,8 @@
this.setSearchMigrationReadyState(null);
}
if (Object.keys(modules).length) {
this.setBackendSupportReadyState(false);
this.prepareBackendCheckboxForm(modules);
} else {
this.setBackendSupportReadyState(null);
}
if (
this.urlMigrationReadyState === null
&& this.backendSupportReadyState === null
&& this.searchMigrationReadyState === null
) {
this.cleanupPopup();
@ -193,21 +162,6 @@
}
});
let backendSupportRelated = { ..._this.backendSupportRelated };
$.each(backendSupportRelated, (id, module) => {
let $container = $('#' + id);
if (! $container.length || $container.data('icingaModule') !== module) {
let $newContainer = $('#main > .container').filter(function () {
return $(this).data('icingaModule') === module;
});
if ($newContainer.length) {
_this.backendSupportRelated[$newContainer.attr('id')] = module;
}
delete _this.backendSupportRelated[id];
}
});
_this.cleanupPopup();
}
@ -239,7 +193,7 @@
_this.knownMigrations[containerUrl] = false;
}
if (_this.Popup().find('li').length === 1 && ! _this.Popup().find('#setAsBackendForm').length) {
if (_this.Popup().find('li').length === 1) {
_this.hidePopup(function () {
// Let the transition finish first, looks cleaner
$suggestion.remove();
@ -329,87 +283,6 @@
this.addSuggestions(req.urls, req.suggestionType);
}
prepareBackendCheckboxForm(modules) {
let containerIds = [];
let moduleNames = [];
$.each(modules, (id, module) => {
if (typeof this.knownBackendSupport[module] === 'undefined') {
containerIds.push(id);
moduleNames.push(module);
}
});
if (moduleNames.length) {
let req = $.ajax({
context : this,
type : 'post',
url : this.icinga.config.baseUrl + '/icingadb/migrate/backend-support',
headers : { 'Accept': 'application/json' },
contentType : 'application/json',
data : JSON.stringify(moduleNames)
});
req.modules = modules;
req.moduleIndexToContainerId = containerIds;
req.done(this.processBackendSupportResults);
req.always(() => this.changeBackendSupportReadyState(true));
} else {
// All modules have already been checked once, show popup immediately
this.setupBackendCheckboxForm(modules);
this.changeBackendSupportReadyState(true);
}
}
processBackendSupportResults(data, textStatus, req) {
let result = data.data;
$.each(result, (i, state) => {
let containerId = req.moduleIndexToContainerId[i];
this.knownBackendSupport[req.modules[containerId]] = state;
});
this.setupBackendCheckboxForm(req.modules);
}
setupBackendCheckboxForm(modules) {
let supportedModules = {};
$.each(modules, (id, module) => {
if (this.knownBackendSupport[module]) {
supportedModules[id] = module;
}
});
if (Object.keys(supportedModules).length) {
this.backendSupportRelated = { ...this.backendSupportRelated, ...supportedModules };
let req = $.ajax({
context : this,
type : 'get',
url : this.icinga.config.baseUrl + '/icingadb/migrate/checkbox-state?showCompact'
});
req.done(this.setCheckboxState);
}
}
setCheckboxState(html, textStatus, req) {
let $form = this.Popup().find('.suggestion-area > #setAsBackendForm');
if (! $form.length) {
$form = $(html);
$form.attr('data-base-target', 'migrate-popup-backend-submit-blackhole');
$form.append('<div id="migrate-popup-backend-submit-blackhole"></div>');
this.Popup().find('.monitoring-migration-suggestions').before($form);
} else {
let $newForm = $(html);
$form.find('[name=backend]').prop('checked', $newForm.find('[name=backend]').is(':checked'));
}
this.showPopup();
}
addSuggestions(urls, type) {
var where;
if (type === 'monitoring') {
@ -490,53 +363,21 @@
return toBeRemoved;
}
cleanupBackendForm() {
let $form = this.Popup().find('#setAsBackendForm');
if (! $form.length) {
return false;
}
let stillRelated = {};
$.each(this.backendSupportRelated, (id, module) => {
let $container = $('#' + id);
if ($container.length && $container.data('icingaModule') === module) {
stillRelated[id] = module;
}
});
this.backendSupportRelated = stillRelated;
if (Object.keys(stillRelated).length) {
return true;
}
return $form;
}
cleanupPopup() {
let toBeRemoved = this.cleanupSuggestions();
let hasBackendForm = this.cleanupBackendForm();
if (hasBackendForm !== true && this.Popup().find('li').length === toBeRemoved.length) {
if (this.Popup().find('li').length === toBeRemoved.length) {
this.hidePopup(() => {
// Let the transition finish first, looks cleaner
$.each(toBeRemoved, function (_, $suggestion) {
$suggestion.remove();
});
if (typeof hasBackendForm === 'object') {
hasBackendForm.remove();
}
});
} else {
$.each(toBeRemoved, function (_, $suggestion) {
$suggestion.remove();
});
if (typeof hasBackendForm === 'object') {
hasBackendForm.remove();
}
// Let showPopup() handle the automatic minimization in case all search suggestions have been removed
this.showPopup();
}
@ -599,13 +440,6 @@
changeUrlMigrationReadyState(state) {
this.setUrlMigrationReadyState(state);
if (this.backendSupportReadyState !== false && this.searchMigrationReadyState !== false) {
this.searchMigrationReadyState = null;
this.backendSupportReadyState = null;
this.urlMigrationReadyState = null;
this.cleanupPopup();
}
}
setSearchMigrationReadyState(state) {
@ -614,28 +448,6 @@
changeSearchMigrationReadyState(state) {
this.setSearchMigrationReadyState(state);
if (this.backendSupportReadyState !== false && this.urlMigrationReadyState !== false) {
this.searchMigrationReadyState = null;
this.backendSupportReadyState = null;
this.urlMigrationReadyState = null;
this.cleanupPopup();
}
}
setBackendSupportReadyState(state) {
this.backendSupportReadyState = state;
}
changeBackendSupportReadyState(state) {
this.setBackendSupportReadyState(state);
if (this.urlMigrationReadyState !== false && this.searchMigrationReadyState !== false) {
this.searchMigrationReadyState = null;
this.backendSupportReadyState = null;
this.urlMigrationReadyState = null;
this.cleanupPopup();
}
}
Popup() {