[Telemetry Table] Telemetry mode bug fixes (#7601)

* source maps

* any tables without configuration will default to either default options or configured options

* prevent double unsubscribese

* remove source maps

* update coment

* moving defaults to plugin level

* whoops

* missed a spot, updated omment

* adding config values

* lint

* typos

* fixing broken ref

* fixing broken ref

* actually fixing ref

* setting rowLimit so initial change does not trigger a resubscribe of telemetry that was not subscribed yet

src/plugins/telemetryTable/TableConfigurationViewProvider.js

@@ -25,7 +25,7 @@ import mount from 'utils/mount';
 import TableConfigurationComponent from './components/TableConfiguration.vue';
 import TelemetryTableConfiguration from './TelemetryTableConfiguration.js';
 
-export default function TableConfigurationViewProvider(openmct) {
+export default function TableConfigurationViewProvider(openmct, options) {
   return {
     key: 'table-configuration',
     name: 'Config',
@@ -45,7 +45,7 @@ export default function TableConfigurationViewProvider(openmct) {
 
       return {
         show: function (element) {
-          tableConfiguration = new TelemetryTableConfiguration(domainObject, openmct);
+          tableConfiguration = new TelemetryTableConfiguration(domainObject, openmct, options);
           const { destroy } = mount(
             {
               el: element,

src/plugins/telemetryTable/TelemetryTable.js

@@ -32,14 +32,14 @@ import TelemetryTableRow from './TelemetryTableRow.js';
 import TelemetryTableUnitColumn from './TelemetryTableUnitColumn.js';
 
 export default class TelemetryTable extends EventEmitter {
-  constructor(domainObject, openmct) {
+  constructor(domainObject, openmct, options) {
     super();
 
     this.domainObject = domainObject;
     this.openmct = openmct;
     this.tableComposition = undefined;
     this.datumCache = [];
-    this.configuration = new TelemetryTableConfiguration(domainObject, openmct);
+    this.configuration = new TelemetryTableConfiguration(domainObject, openmct, options);
     this.telemetryMode = this.configuration.getTelemetryMode();
     this.rowLimit = this.configuration.getRowLimit();
     this.paused = false;

src/plugins/telemetryTable/TelemetryTableConfiguration.js

@@ -24,11 +24,12 @@ import EventEmitter from 'EventEmitter';
 import _ from 'lodash';
 
 export default class TelemetryTableConfiguration extends EventEmitter {
-  constructor(domainObject, openmct) {
+  constructor(domainObject, openmct, options) {
     super();
 
     this.domainObject = domainObject;
     this.openmct = openmct;
+    this.defaultOptions = options;
     this.columns = {};
 
     this.removeColumnsForObject = this.removeColumnsForObject.bind(this);
@@ -48,10 +49,12 @@ export default class TelemetryTableConfiguration extends EventEmitter {
     configuration.columnOrder = configuration.columnOrder || [];
     configuration.cellFormat = configuration.cellFormat || {};
     configuration.autosize = configuration.autosize === undefined ? true : configuration.autosize;
-    // anything that doesn't have a telemetryMode existed before the change and should stay as it was for consistency
+    // anything that doesn't have a telemetryMode existed before the change and should
-    configuration.telemetryMode = configuration.telemetryMode ?? 'unlimited';
+    // take the properties of any passed in defaults or the defaults from the plugin
-    configuration.persistModeChange = configuration.persistModeChange ?? true;
+    configuration.telemetryMode = configuration.telemetryMode ?? this.defaultOptions.telemetryMode;
-    configuration.rowLimit = configuration.rowLimit ?? 50;
+    configuration.persistModeChange =
+      configuration.persistModeChange ?? this.defaultOptions.persistModeChange;
+    configuration.rowLimit = configuration.rowLimit ?? this.defaultOptions.rowLimit;
 
     return configuration;
   }

src/plugins/telemetryTable/TelemetryTableType.js

@@ -20,8 +20,8 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-export default function getTelemetryTableType(options = {}) {
+export default function getTelemetryTableType(options) {
-  const { telemetryMode = 'performance', persistModeChange = true, rowLimit = 50 } = options;
+  let { telemetryMode, persistModeChange, rowLimit } = options;
 
   return {
     name: 'Telemetry Table',

src/plugins/telemetryTable/TelemetryTableView.js

@@ -33,7 +33,7 @@ export default class TelemetryTableView {
     this.component = null;
 
     Object.defineProperty(this, 'table', {
-      value: new TelemetryTable(domainObject, openmct),
+      value: new TelemetryTable(domainObject, openmct, options),
       enumerable: false,
       configurable: false
     });

src/plugins/telemetryTable/components/TableComponent.vue

@@ -398,15 +398,17 @@ export default {
       totalNumberOfRows: 0,
       rowContext: {},
       telemetryMode: configuration.telemetryMode,
+      rowLimit: configuration.rowLimit,
       persistModeChange: configuration.persistModeChange,
-      afterLoadActions: []
+      afterLoadActions: [],
+      existingConfiguration: configuration
     };
   },
   computed: {
     dropTargetStyle() {
       return {
-        top: this.$refs.headersTable.offsetTop + 'px',
+        top: this.$refs.headersHolderEl.offsetTop + 'px',
-        height: this.totalHeight + this.$refs.headersTable.offsetHeight + 'px',
+        height: this.totalHeight + this.$refs.headersHolderEl.offsetHeight + 'px',
         left: this.dropOffsetLeft && this.dropOffsetLeft + 'px'
       };
     },
@@ -595,23 +597,35 @@ export default {
     },
     handleConfigurationChanges(changes) {
       const { rowLimit, telemetryMode, persistModeChange } = changes;
+      const telemetryModeChanged = this.existingConfiguration.telemetryMode !== telemetryMode;
+      let rowLimitChanged = false;
 
       this.persistModeChange = persistModeChange;
 
+      // both rowLimit changes and telemetryMode changes
+      // require a re-request of telemetry
+
       if (this.rowLimit !== rowLimit) {
+        rowLimitChanged = true;
         this.rowLimit = rowLimit;
         this.table.updateRowLimit(rowLimit);
-
-        if (this.telemetryMode !== telemetryMode) {
-          // need to clear and resubscribe, if different, handled below
-          this.table.clearAndResubscribe();
-        }
       }
 
-      if (this.telemetryMode !== telemetryMode) {
+      // check for telemetry mode change, because you could technically have persist mode changes
+      // set to false, which could create a state where the configuration saved telemetry mode is
+      // different from the currently set telemetry mode
+      if (telemetryModeChanged && this.telemetryMode !== telemetryMode) {
         this.telemetryMode = telemetryMode;
+
+        // this method also re-requests telemetry
         this.table.updateTelemetryMode(telemetryMode);
       }
+
+      if (rowLimitChanged && !telemetryModeChanged) {
+        this.table.clearAndResubscribe();
+      }
+
+      this.existingConfiguration = changes;
     },
     updateVisibleRows() {
       if (!this.updatingView) {

src/plugins/telemetryTable/plugin.js

@@ -25,10 +25,12 @@ import getTelemetryTableType from './TelemetryTableType.js';
 import TelemetryTableViewProvider from './TelemetryTableViewProvider.js';
 import TelemetryTableViewActions from './ViewActions.js';
 
-export default function plugin(options) {
+export default function plugin(
+  options = { telemetryMode: 'performance', persistModeChange: true, rowLimit: 50 }
+) {
   return function install(openmct) {
     openmct.objectViews.addProvider(new TelemetryTableViewProvider(openmct, options));
-    openmct.inspectorViews.addProvider(new TableConfigurationViewProvider(openmct));
+    openmct.inspectorViews.addProvider(new TableConfigurationViewProvider(openmct, options));
     openmct.types.addType('table', getTelemetryTableType(options));
     openmct.composition.addPolicy((parent, child) => {
       if (parent.type === 'table') {

src/plugins/telemetryTable/pluginSpec.js

@@ -195,7 +195,10 @@ describe('the plugin', () => {
             utc: false,
             'some-key': false,
             'some-other-key': false
-          }
+          },
+          persistModeChange: true,
+          rowLimit: 50,
+          telemetryMode: 'performance'
         }
       };
       const testTelemetry = [