Skip to content

[BUGFIX] gateway filter was not applied #289

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

Merged
maurerle merged 1 commit into from
Jan 23, 2026
Merged

[BUGFIX] gateway filter was not applied #289

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
62 changes: 27 additions & 35 deletions lib/proportions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ type Modifier = (value: any, ctx?: ObjectsLinksAndNodes) => string;

type MappingEntry = {
keys: string[];
modifier?: Modifier;
nodeValueModifier?: Modifier;
};

const statusFieldMapping: Record<string, MappingEntry> = {
"node.status": {
keys: ["is_online"],
modifier: function (d: any) {
nodeValueModifier: function (d: any) {
return d ? "online" : "offline";
},
},
Expand All @@ -35,7 +35,7 @@ const statusFieldMapping: Record<string, MappingEntry> = {
},
"node.deprecationStatus": {
keys: ["model"],
modifier: function (d: any) {
nodeValueModifier: function (d: any) {
if (window.config.deprecated && d && window.config.deprecated.includes(d)) return _.t("deprecation");
if (window.config.eol && d && window.config.eol.includes(d)) return _.t("eol");
return _.t("no");
Expand All @@ -46,13 +46,13 @@ const statusFieldMapping: Record<string, MappingEntry> = {
},
"node.visible": {
keys: ["location"],
modifier: function (d: any) {
nodeValueModifier: function (d: any) {
return d && d.longitude && d.latitude ? _.t("yes") : _.t("no");
},
},
"node.update": {
keys: ["autoupdater"],
modifier: function (d: any) {
nodeValueModifier: function (d: any) {
if (d.enabled) {
return d.branch;
}
Expand All @@ -61,27 +61,13 @@ const statusFieldMapping: Record<string, MappingEntry> = {
},
"node.selectedGatewayIPv4": {
keys: ["gateway"],
modifier: function (nodeid: string | null, data: ObjectsLinksAndNodes) {
let gateway = data.nodeDict[nodeid];
if (gateway) {
return gateway.hostname;
}
return null;
},
},
"node.selectedGatewayIPv6": {
keys: ["gateway6"],
modifier: function (nodeid: string | null, data: ObjectsLinksAndNodes) {
let gateway = data.nodeDict[nodeid];
if (gateway) {
return gateway.hostname;
}
return null;
},
},
"node.domain": {
keys: ["domain"],
modifier: function (d: any) {
nodeValueModifier: function (d: any) {
if (window.config.domainNames) {
window.config.domainNames.some(function (t) {
if (d === t.domain) {
Expand Down Expand Up @@ -116,15 +102,15 @@ export const Proportions = function (filterManager: ReturnType<typeof DataDistri
return String(s).replace(/\s+/g, " ").trim();
}

function count(nodes: Node[], keys: string[], f?: (k: any, ctx?: any) => any, ctx?: any) {
function count(nodes: Node[], keys: string[], nodeValueModifier?: (k: any, ctx?: any) => any, ctx?: any) {
const counts = new Map<any, number>();

nodes.forEach(function (node) {
// pass shallow copy of keys to dictGet
let dictKey = helper.dictGet(node, keys.slice(0));

if (f !== undefined) {
dictKey = f(dictKey, ctx);
if (nodeValueModifier !== undefined) {
dictKey = nodeValueModifier(dictKey, ctx);
}

if (dictKey === null) return;
Expand All @@ -134,7 +120,7 @@ export const Proportions = function (filterManager: ReturnType<typeof DataDistri

const result: any[] = [];
counts.forEach(function (countValue, k) {
result.push([k, countValue, keys, f]);
result.push([k, countValue, keys, nodeValueModifier]);
});

return result;
Expand Down Expand Up @@ -230,21 +216,29 @@ export const Proportions = function (filterManager: ReturnType<typeof DataDistri
let nodes = data.nodes.all;
time = data.timestamp;

// helper to fetch mapping entries from statusFieldMapping
function mapping(name: string) {
return (statusFieldMapping as any)[name] || { keys: [], modifier: undefined };
function gatewayNameFromNodeId(nodeid: string | null) {
let gateway = data.nodeDict[nodeid];
if (gateway) {
return gateway.hostname;
}
return null;
}

// set nodeValueModifier for selectedGatewayIP filter later
// so that access to data.nodeDict can be encapsulated
statusFieldMapping["node.selectedGatewayIPv4"].nodeValueModifier = gatewayNameFromNodeId;
statusFieldMapping["node.selectedGatewayIPv6"].nodeValueModifier = gatewayNameFromNodeId;

function sortVersionCountAndName(a, b) {
// descending by count
if (b[1] !== a[1]) {
return b[1] - a[1];
}
return compare(a[0], b[0]);
}
function processMapping(name: string, sorter?: (a: any, b: any) => number, ctx?: any) {
const m = mapping(name);
const arr = count(nodes, m.keys, m.modifier, ctx);
function processMapping(name: string, sorter?: (a: any, b: any) => number) {
const m = statusFieldMapping[name];
const arr = count(nodes, m.keys, m.nodeValueModifier, data);
const sorted = sorter
? arr.sort(sorter)
: arr.sort(function (a, b) {
Expand All @@ -261,12 +255,10 @@ export const Proportions = function (filterManager: ReturnType<typeof DataDistri
processMapping("node.hardware");
processMapping("node.visible");
processMapping("node.update");
processMapping("node.selectedGatewayIPv4", undefined, data);
processMapping("node.selectedGatewayIPv6", undefined, data);
processMapping("node.selectedGatewayIPv4");
processMapping("node.selectedGatewayIPv6");
processMapping("node.domain");

// tables filled above via processMapping

if (!appliedUrlFilters) {
applyFiltersFromHash();
}
Expand All @@ -292,7 +284,7 @@ export const Proportions = function (filterManager: ReturnType<typeof DataDistri
encodedValue = encodedValue.slice(1);
}

let filter = GenericNodeFilter(param, mapping.keys, normalizeKey(encodedValue), mapping.modifier);
let filter = GenericNodeFilter(param, mapping.keys, normalizeKey(encodedValue), mapping.nodeValueModifier);
if (negate) {
filter.setNegate(true);
}
Expand Down