mirror/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2026-04-16 05:19:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

ordering support for filters added #1616

Browse Source
This commit is contained in:
Jokob @NetAlertX
2026-04-16 09:05:48 +00:00
parent a5b4f2a2d7
commit 0b076cec0e
1 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
front/devices.php
View File

@@ -430,29 +430,35 @@ function initFilters() {
filters: []
};
// Group data by columnName
resultJSON.forEach(entry => {
const existingFilter = transformed.filters.find(filter => filter.column === entry.columnName);
// Build filters in the exact order of columnFilters
columnFilters.forEach(([columnName, headerKey]) => {
// Get matching entries for this column
const entries = resultJSON.filter(e => e.columnName === columnName);
if (existingFilter) {
// Add the unique columnValue to options if not already present
if (!existingFilter.options.some(opt => opt.value === entry.columnValue)) {
existingFilter.options.push({
value: entry.columnValue,
label: entry.columnLabel || entry.columnValue
});
if (entries.length === 0) return;
// Build options (unique)
const optionsMap = new Map();
entries.forEach(entry => {
const value = entry.columnValue;
const label = entry.columnLabel || value;
if (!optionsMap.has(value)) {
optionsMap.set(value, { value, label });
}
} else {
// Create a new filter entry
transformed.filters.push({
column: entry.columnName,
headerKey: entry.columnHeaderStringKey,
options: [{
value: entry.columnValue,
label: entry.columnLabel || entry.columnValue
}]
});
}
});
const options = Array.from(optionsMap.values());
// Sort options alphabetically
options.sort((a, b) => a.label.localeCompare(b.label));
transformed.filters.push({
column: columnName,
headerKey: headerKey,
options: options
});
});
// Sort options alphabetically by label for better readability