Skip to content

[release-1.10] NETOBSERV-2438: fix issues when filtering on subnet labels #1123

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

Closed
wants to merge 1 commit into from
Closed

[release-1.10] NETOBSERV-2438: fix issues when filtering on subnet labels #1123

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion web/src/model/filters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ export type TargetedFilterId =
| 'mac'
| 'port'
| 'host_address'
| 'host_name';
| 'host_name'
| 'subnet_label';

export type FilterId =
| 'cluster_name'
Expand Down
17 changes: 11 additions & 6 deletions web/src/model/topology.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,15 @@ const getDirFilterDefValue = (
});
}

// fallback on addr if not found
if (!def && fields.addr) {
def = findFilter(filterDefinitions, `${dir}_address`)!;
value = fields.addr!;
// fallback on addr and/or subnet label if not found
if (!def) {
if (fields.subnetLabel) {
def = findFilter(filterDefinitions, `${dir}_subnet_label`)!;
value = fields.subnetLabel!;
} else if (fields.addr) {
def = findFilter(filterDefinitions, `${dir}_address`)!;
value = fields.addr!;
}
}
return def && value ? { def, value } : undefined;
};
Expand Down Expand Up @@ -213,7 +218,7 @@ export const toggleDirElementFilter = (
const result = _.cloneDeep(filters);
const defValue = getDirFilterDefValue(nodeType, fields, dir, filterDefinitions);
if (!defValue) {
console.error("can't find defValue for fields", fields);
console.error("can't find directional filter definition and value for fields", fields);
return;
}
toggleFilter(result, defValue, isFiltered, setFilters);
Expand All @@ -229,7 +234,7 @@ export const toggleElementFilter = (
const result = _.cloneDeep(filters);
const defValue = getFilterDefValue(fields, filterDefinitions);
if (!defValue) {
console.error("can't find defValue for fields", fields);
console.error("can't find filter definition and value for fields", fields);
return;
}
toggleFilter(result, defValue, isFiltered, setFilters);
Expand Down
Loading