ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-23 23:12:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Tables] Filtering fails when one or more cells contain undefined value #2493 (#2510)

Browse Source 
* [Tables] Filtering fails when one or more cells contain undefined value #2493

* refactored to handle edge cases first
This commit is contained in:
Nikhil 2019-10-10 12:46:25 -07:00 committed by Andrew Henry
parent ff5b88b544
commit 2ecff75da5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/telemetryTable/collections/FilteredTableRowCollection.js
View File

@ -87,14 +87,18 @@ define(
matchesFilters(row) {
let doesMatchFilters = true;
for (const key in this.columnFilters) {
if (!this.rowHasColumn(row, key)) {
if (!doesMatchFilters || !this.rowHasColumn(row, key)) {
return false;
} else {
let formattedValue = row.getFormattedValue(key).toLowerCase();
doesMatchFilters = doesMatchFilters &&
formattedValue.indexOf(this.columnFilters[key]) !== -1;
}
let formattedValue = row.getFormattedValue(key);
if (formattedValue === undefined) {
return false;
}
doesMatchFilters = formattedValue.toLowerCase().indexOf(this.columnFilters[key]) !== -1;
}
return doesMatchFilters;
}