upstream/icingadb-web
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb-web.git synced 2026-05-28 04:36:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

action-list: Take items with css propery display:contents into account (#1038)

Browse source
This commit is contained in:
Johannes Meyer 2024-07-31 11:38:47 +02:00 committed by GitHub
commit 0782c48207
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 49 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
public/js/action-list.js
View file

@ -133,11 +133,7 @@
let dashboard = list.closest('.dashboard');
if (dashboard) {
dashboard.querySelectorAll('.action-list').forEach(otherList => {
if (otherList !== list) {
toDeactivateItems.push(..._this.getAllItems(otherList));
}
})
_this.clearDashboardSelections(dashboard, list);
}
let lastActivatedUrl = null;
@ -151,11 +147,7 @@
_this.clearSelection(toDeactivateItems);
_this.setActive(toActiveItems);
if (! dashboard) {
_this.addSelectionCountToFooter(list);
}
_this.addSelectionCountToFooter(list);
_this.setLastActivatedItemUrl(lastActivatedUrl);
_this.loadDetailUrl(list, target.matches('a') ? target.getAttribute('href') : null);
}
@ -166,7 +158,7 @@
* @param list
*/
addSelectionCountToFooter(list) {
if (! list.matches('[data-icinga-multiselect-url]')) {
if (! list.matches('[data-icinga-multiselect-url]') || list.closest('.dashboard')) {
return;
}
@ -208,6 +200,8 @@
/**
* Key navigation for .action-list
*
* Only for primary lists (dashboard or lists in detail view are not taken into account)
*
* - `Shift + ArrowUp|ArrowDown` = Multiselect
* - `ArrowUp|ArrowDown` = Select next/previous
* - `Ctrl|cmd + A` = Select all on currect page
@ -432,14 +426,28 @@
* @param pressedKey Pressed key (`ArrowUp` or `ArrowDown`)
*/
scrollItemIntoView(item, pressedKey) {
item.scrollIntoView({block: "nearest"});
let directionalNext = this.getDirectionalNext(item, pressedKey);
if ("isDisplayContents" in item.parentElement.dataset) {
item = item.firstChild;
directionalNext = directionalNext ? directionalNext.firstChild : null;
}
// required when ArrowUp is pressed in new list OR after selecting all items with ctrl+A
item.scrollIntoView({block: "nearest"});
if (directionalNext) {
directionalNext.scrollIntoView({block: "nearest"});
}
}
clearDashboardSelections(dashboard, currentList) {
dashboard.querySelectorAll('.action-list').forEach(otherList => {
if (otherList !== currentList) {
this.clearSelection(this.getActiveItems(otherList));
}
})
}
/**
* Load the detail url with selected items
*
@ -737,6 +745,30 @@
list = _this.findDetailUrlActionList(container);
}
if (! list || ! ("isDisplayContents" in list.dataset)) {
// no detail view || ignore when already set
let actionLists = null;
if (! list) {
actionLists = document.querySelectorAll('.action-list');
} else {
actionLists = [list];
}
for (let actionList of actionLists) {
let firstSelectableItem = actionList.querySelector(':scope > [data-action-item]');
if (
firstSelectableItem
&& (
! firstSelectableItem.checkVisibility()
&& firstSelectableItem.firstChild
&& firstSelectableItem.firstChild.checkVisibility()
)
) {
actionList.dataset.isDisplayContents = "";
}
}
}
if (list && list.matches('[data-icinga-multiselect-url], [data-icinga-detail-url]')) {
let detailUrl = _this.icinga.utils.parseUrl(
_this.icinga.history.getCol2State().replace(/^#!/, '')
@ -762,6 +794,11 @@
}
}
let dashboard = list.closest('.dashboard');
if (dashboard) {
_this.clearDashboardSelections(dashboard, list);
}
_this.clearSelection(_this.getAllItems(list).filter(item => !toActiveItems.includes(item)));
_this.setActive(toActiveItems);
}