tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

js: Also support `_self` and such target ids for response header `X-Icinga-Container` 

The server can now instruct the client to render the response in a different container
This commit is contained in:
Johannes Meyer 2021-02-24 16:56:11 +01:00
parent 6e8ca9cdda
commit 43dd89f946
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
public/js/icinga/loader.js
View File

@ -634,6 +634,31 @@
this.failureNotice = null;
}
var target = req.getResponseHeader('X-Icinga-Container');
var newBody = false;
var oldNotifications = false;
if (target) {
if (target === 'ignore') {
return;
}
var $newTarget = this.identifyLinkTarget(target, req.$target);
if ($newTarget.length) {
// If we change the target, oncomplete will fail to clean up
// This fixes the problem, not using req.$target would be better
delete this.requests[req.$target.attr('id')];
req.$target = $newTarget;
req.$redirectTarget = $newTarget;
if (target === 'layout') {
oldNotifications = $('#notifications li').detach();
this.icinga.ui.layout1col();
newBody = true;
}
}
}
this.icinga.logger.debug(
'Got response for ', req.$target, ', URL was ' + req.url
);
@ -652,35 +677,9 @@
_this.loadUrl(_this.url('/layout/announcements'), $('#announcements'));
}
var active = false;
var rendered = false;
var classes;
if (req.autorefresh) {
// TODO: next container url
active = $('[href].active', req.$target).attr('href');
}
var target = req.getResponseHeader('X-Icinga-Container');
var newBody = false;
var oldNotifications = false;
if (target) {
if (target === 'ignore') {
return;
}
// If we change the target, oncomplete will fail to clean up
// This fixes the problem, not using req.$target would be better
delete this.requests[req.$target.attr('id')];
req.$target = $('#' + target);
if (target === 'layout') {
oldNotifications = $('#notifications li').detach();
}
// We assume target === 'layout' right now. This might not be correct
this.icinga.ui.layout1col();
newBody = true;
}
if (target !== 'layout') {
var moduleName = req.getResponseHeader('X-Icinga-Module');
classes = $.grep(req.$target.classes(), function (el) {