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

Discard old telemetry values in tables when date is formatted as a string (#2400)

Browse Source 
* Parse date values before comparison in BoundedTableRowCollection

* Reset table size when filter changes
This commit is contained in:
Andrew Henry 2019-05-23 14:42:37 -07:00 committed by Deep Tailor
parent abd7506b45
commit 35d0c02bc5
3 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/telemetryTable/collections/BoundedTableRowCollection.js
View File

@ -31,9 +31,9 @@ define(
) {
class BoundedTableRowCollection extends SortedTableRowCollection {
constructor (openmct) {
constructor(openmct) {
super();
this.futureBuffer = new SortedTableRowCollection();
this.openmct = openmct;
@ -46,12 +46,13 @@ define(
openmct.time.on('bounds', this.bounds);
}
addOne (item) {
addOne(item) {
let parsedValue = this.getValueForSortColumn(item);
// Insert into either in-bounds array, or the future buffer.
// Data in the future buffer will be re-evaluated for possible
// Data in the future buffer will be re-evaluated for possible
// insertion on next bounds change
let beforeStartOfBounds = this.parseTime(item.datum[this.sortOptions.key]) < this.lastBounds.start;
let afterEndOfBounds = this.parseTime(item.datum[this.sortOptions.key]) > this.lastBounds.end;
let beforeStartOfBounds = parsedValue < this.lastBounds.start;
let afterEndOfBounds = parsedValue > this.lastBounds.end;
if (!afterEndOfBounds && !beforeStartOfBounds) {
return super.addOne(item);
@ -86,13 +87,13 @@ define(
* @fires TelemetryCollection#discarded
* @param bounds
*/
bounds (bounds) {
bounds(bounds) {
let startChanged = this.lastBounds.start !== bounds.start;
let endChanged = this.lastBounds.end !== bounds.end;
let startIndex = 0;
let endIndex = 0;
let discarded = [];
let added = [];
let testValue = {
@ -135,9 +136,13 @@ define(
}
}
getValueForSortColumn(row) {
return this.parseTime(row.datum[this.sortOptions.key]);
}
destroy() {
this.openmct.time.off('bounds', this.bounds);
}
}
return BoundedTableRowCollection;
});
return BoundedTableRowCollection;
});

30
src/plugins/telemetryTable/collections/SortedTableRowCollection.js
View File

@ -60,7 +60,7 @@ define(
if (rowsAdded.length > 0) {
this.emit('add', rowsAdded);
}
this.dupeCheck = true;
this.dupeCheck = true;
} else {
let wasAdded = this.addOne(rows);
if (wasAdded) {
@ -115,11 +115,10 @@ define(
if (this.rows.length === 0) {
return 0;
}
const sortOptionsKey = this.sortOptions.key;
const testRowValue = testRow.datum[sortOptionsKey];
const firstValue = this.rows[0].datum[sortOptionsKey];
const lastValue = this.rows[this.rows.length - 1].datum[sortOptionsKey];
const testRowValue = this.getValueForSortColumn(testRow);
const firstValue = this.getValueForSortColumn(this.rows[0]);
const lastValue = this.getValueForSortColumn(this.rows[this.rows.length - 1]);
lodashFunction = lodashFunction || _.sortedIndex;
@ -133,7 +132,7 @@ define(
return 0;
} else {
return lodashFunction(rows, testRow, (thisRow) => {
return thisRow.datum[sortOptionsKey];
return this.getValueForSortColumn(thisRow);
});
}
} else {
@ -147,7 +146,7 @@ define(
} else {
// Use a custom comparison function to support descending sort.
return lodashFunction(rows, testRow, (thisRow) => {
const thisRowValue = thisRow.datum[sortOptionsKey];
const thisRowValue = this.getValueForSortColumn(thisRow);
if (testRowValue === thisRowValue) {
return EQUAL;
} else if (testRowValue < thisRowValue) {
@ -206,7 +205,7 @@ define(
this.emit('sort');
}
// Return duplicate to avoid direct modification of underlying object
return Object.assign({}, this.sortOptions);
return Object.assign({}, this.sortOptions);
}
removeAllRowsForObject(objectKeyString) {
@ -218,25 +217,32 @@ define(
}
return true;
});
this.emit('remove', removed);
}
getValueForSortColumn(row) {
return row.datum[this.sortOptions.key];
}
remove(removedRows) {
this.rows = this.rows.filter(row => {
return removedRows.indexOf(row) === -1;
});
this.emit('remove', removedRows);
}
getRows () {
getRows() {
return this.rows;
}
clear() {
let removedRows = this.rows;
this.rows = [];
this.emit('remove', removedRows);
}
}
return SortedTableRowCollection;
});
return SortedTableRowCollection;
});

2
src/plugins/telemetryTable/components/table.vue
View File

@ -472,10 +472,12 @@ export default {
},
filterChanged(columnKey) {
this.table.filteredRows.setColumnFilter(columnKey, this.filters[columnKey]);
this.setHeight();
},
clearFilter(columnKey) {
this.filters[columnKey] = '';
this.table.filteredRows.setColumnFilter(columnKey, '');
this.setHeight();
},
rowsAdded (rows) {
this.setHeight();