diff --git a/package.json b/package.json
index ebb0123296..1fe82071e5 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
"description": "The Open MCT core platform",
"dependencies": {},
"devDependencies": {
+ "acorn": "6.2.0",
"angular": "1.4.14",
"angular-route": "1.4.14",
"babel-eslint": "8.2.6",
diff --git a/src/plugins/displayLayout/plugin.js b/src/plugins/displayLayout/plugin.js
index dd26e5f59d..e8b32d3d03 100644
--- a/src/plugins/displayLayout/plugin.js
+++ b/src/plugins/displayLayout/plugin.js
@@ -25,7 +25,7 @@ import Vue from 'vue'
import objectUtils from '../../api/objects/object-utils.js'
import DisplayLayoutType from './DisplayLayoutType.js'
import DisplayLayoutToolbar from './DisplayLayoutToolbar.js'
-import AlphaNumericFormatViewProvider from './AlphaNumericFormatViewProvider.js'
+import AlphaNumericFormatViewProvider from './AlphanumericFormatViewProvider.js'
export default function DisplayLayoutPlugin(options) {
return function (openmct) {
diff --git a/src/plugins/telemetryTable/TelemetryTable.js b/src/plugins/telemetryTable/TelemetryTable.js
index cbeebe2f12..e65ff41c96 100644
--- a/src/plugins/telemetryTable/TelemetryTable.js
+++ b/src/plugins/telemetryTable/TelemetryTable.js
@@ -133,13 +133,6 @@ define([
this.emit('object-removed', objectIdentifier);
}
- /**
- * @private
- */
- createRow(datum, columnMap, keyString, limitEvaluator) {
- return new TelemetryTableRow(datum, columnMap, keyString, limitEvaluator);
- }
-
requestDataFor(telemetryObject) {
this.incrementOutstandingRequests();
let requestOptions = this.buildOptionsFromConfiguration(telemetryObject);
@@ -152,14 +145,17 @@ define([
let keyString = this.openmct.objects.makeKeyString(telemetryObject.identifier);
let columnMap = this.getColumnMapForObject(keyString);
let limitEvaluator = this.openmct.telemetry.limitEvaluator(telemetryObject);
-
- let telemetryRows = telemetryData.map(datum => this.createRow(datum, columnMap, keyString, limitEvaluator));
- this.boundedRows.add(telemetryRows);
+ this.processHistoricalData(telemetryData, columnMap, keyString, limitEvaluator);
}).finally(() => {
this.decrementOutstandingRequests();
});
}
+ processHistoricalData(telemetryData, columnMap, keyString, limitEvaluator) {
+ let telemetryRows = telemetryData.map(datum => new TelemetryTableRow(datum, columnMap, keyString, limitEvaluator));
+ this.boundedRows.add(telemetryRows);
+ }
+
/**
* @private
*/
@@ -223,10 +219,14 @@ define([
if (!this.telemetryObjects.includes(telemetryObject)) {
return;
}
- this.boundedRows.add(this.createRow(datum, columnMap, keyString, limitEvaluator));
+ this.processRealtimeDatum(datum, columnMap, keyString, limitEvaluator);
}, subscribeOptions);
}
+ processRealtimeDatum(datum, columnMap, keyString, limitEvaluator) {
+ this.boundedRows.add(new TelemetryTableRow(datum, columnMap, keyString, limitEvaluator));
+ }
+
isTelemetryObject(domainObject) {
return domainObject.hasOwnProperty('telemetry');
}
diff --git a/src/plugins/telemetryTable/components/table.vue b/src/plugins/telemetryTable/components/table.vue
index 9e327b83be..35deb1f4ae 100644
--- a/src/plugins/telemetryTable/components/table.vue
+++ b/src/plugins/telemetryTable/components/table.vue
@@ -29,6 +29,7 @@
title="Export This View's Data">