[Channel Tables] Preserve order of channels (#27)

NASA-AMMOS · May 17, 2023 · e8846d3 · e8846d3
1 parent 96690f4
commit e8846d3
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 15 deletions.
diff --git a/loader.js b/loader.js
@@ -127,6 +127,10 @@ define([
             aboutHtml: insertBuildInfo(AboutTemplate),
         });
 
+        // do not show telemetry if it falls out of bounds
+        // even if there is no new telemetry
+        openmct.telemetry.greedyLAD(false);
+
         persistenceLoadedPromise.then(() => {
             openmct.start();
             window.openmct = openmct;

diff --git a/src/channelTable/channelTablePlugin/ChannelTable.js b/src/channelTable/channelTablePlugin/ChannelTable.js
@@ -35,14 +35,11 @@ define([
             this.tableRows = new ChannelTableRowCollection(this.openmct);
 
             let sortOptions = this.configuration.getConfiguration().sortOptions;
-
-            //If no persisted sort order, default to sorting by time system, ascending.
-            sortOptions = sortOptions || {
-                key: this.openmct.time.timeSystem().key,
-                direction: 'asc'
-            };
 
-            this.tableRows.sortBy(sortOptions);
+            if (sortOptions) {
+                this.tableRows.sortBy(sortOptions);
+            }
+
             this.tableRows.on('resetRowsFromAllData', this.resetRowsFromAllData);
         }
 

diff --git a/src/channelTable/channelTablePlugin/ChannelTableRowCollection.js b/src/channelTable/channelTablePlugin/ChannelTableRowCollection.js
@@ -23,8 +23,7 @@ define(
 
             addOrUpdateRow(row) {
                 if (this.isLADRow(row)) {
-                    this.removeRowsByObject(row.objectKeyString);
-                    super.addRows([row], 'add');
+                    this.addRows([row]);
                 }
             }
 
@@ -38,7 +37,7 @@ define(
                 return !isStaleData;
             }
 
-            addOne (item) {
+            addOne(item) {
                 if (item.isDummyRow) {
                     this.ladMap.set(item.objectKeyString, this.rows.length);
                     this.rows.push(item);
@@ -48,28 +47,52 @@ define(
 
                 if (this.isNewerThanLAD(item)) {
                     let rowIndex = this.ladMap.get(item.objectKeyString);
-                    let itemToReplace = this.rows[rowIndex];
                     this.rows[rowIndex] = item;
-                    this.emit('remove', [itemToReplace]);
+                    this.removeExistingByKeystring(item.objectKeyString);
                     this.emit('add', [item]);
                     return true;
                 }
                 return false;
             }
 
+            addRows(rows) {
+                let rowsToAdd = this.filterRows(rows);
+
+                if (rowsToAdd.length > 0) {
+                    rowsToAdd.forEach(this.addOne.bind(this));
+                    this.emit('add', rowsToAdd);
+                }
+            }
+
             removeAllRowsForObject(objectKeyString) {
                 super.removeAllRowsForObject(objectKeyString);
                 this.rebuildLadMap();
             }
 
+            removeExistingByKeystring(keyString) {
+                let removed = [];
+
+                this.rows.forEach((row) => {
+                    if (row.objectKeyString === keyString) {
+                        removed.push(row);
+
+                        return false;
+                    } else {
+                        return true;
+                    }
+                });
+
+                this.emit('remove', removed);
+            }
+
             rebuildLadMap() {
                 this.ladMap.clear();
                 this.rows.forEach((row, index) => {
                     this.ladMap.set(row.objectKeyString, index);
                 });
             }
 
-            reorder (reorderPlan) {
+            reorder(reorderPlan) {
                 let oldRows = this.rows.slice();
                 reorderPlan.forEach(reorderEvent => {
                     let item = oldRows[reorderEvent.oldIndex];

diff --git a/src/services/mcws/MIO.js b/src/services/mcws/MIO.js
@@ -78,8 +78,7 @@ export default class MIO {
     }
 
     async getMetadata() {
-        const response = await this.request(this.metadataUrl, 'GET', { output: 'json' });
-        const metadataResponse = await response.json();
+        const metadataResponse = await this.request(this.metadataUrl, 'GET', { output: 'json' });
 
         return {
             get(subject, predicate) {