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

Jump to bottom

Fix minor action-list.js issues #810

Merged
merged 2 commits into from
Jul 19, 2023
Merged

Fix minor action-list.js issues #810

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79d89f9
action-list.js: Activate list item depending on detail url
sukhwinder33445 Jul 19, 2023
b99bec8
action-list.js: Fix console error
sukhwinder33445 Jul 19, 2023
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
31 changes: 14 additions & 17 deletions public/js/action-list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,11 @@
let pressedArrowUpKey = event.key === 'ArrowUp';
let focusedElement = document.activeElement;

if (_this.isProcessingLoadMore || (
event.key.toLowerCase() !== 'a' && ! pressedArrowDownKey && ! pressedArrowUpKey
)) {
if (
_this.isProcessingLoadMore
|| ! event.key // input auto-completion is triggered
|| (event.key.toLowerCase() !== 'a' && ! pressedArrowDownKey && ! pressedArrowUpKey)
) {
return;
}

Expand Down Expand Up @@ -614,27 +616,21 @@
let _this = event.data.self;
let container = event.target;
let isTopLevelContainer = container.matches('#main > :scope');
let detailUrl = _this.icinga.utils.parseUrl(
_this.icinga.history.getCol2State().replace(/^#!/, '')
);
let list = null;
let toActiveItems = [];

if (event.currentTarget !== container || _this.isProcessingRequest) {
// Nested containers are not processed multiple times || still processing selection/navigation request
return;
} else if (isTopLevelContainer && container.id !== 'col1') {
if (isAutoRefresh) {
return;
}
// only for browser back/forward navigation
list = _this.findDetailUrlActionList();
} else {
list = container.querySelector('.action-list');
} else if (isAutoRefresh && isTopLevelContainer && container.id !== 'col1') {
return;
}

let list = _this.findDetailUrlActionList();

if (list && list.matches('[data-icinga-multiselect-url], [data-icinga-detail-url]')) {
let allItems = Array.from(list.querySelectorAll(':scope > [data-action-item]'));
let detailUrl = _this.icinga.utils.parseUrl(
_this.icinga.history.getCol2State().replace(/^#!/, '')
);
let toActiveItems = [];
if (list.dataset.icingaMultiselectUrl === detailUrl.path) {
for (const filter of _this.parseSelectionQuery(detailUrl.query.slice(1))) {
let item = list.querySelector(
Expand All @@ -655,6 +651,7 @@
}
}

let allItems = Array.from(list.querySelectorAll(':scope > [data-action-item]'));
_this.clearSelection(allItems.filter(item => ! toActiveItems.includes(item)));
_this.setActive(toActiveItems);

Expand Down