Revert "modifying how we remove/replace rows in channel tables in order to keep original order"

This reverts commit bdf206a.

Author: jvigliotta

src/channelTable/channelTablePlugin/ChannelTable.js

@@ -37,15 +37,12 @@ define([
             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'
-            // };
+            sortOptions = sortOptions || {
+                key: this.openmct.time.timeSystem().key,
+                direction: 'asc'
+            };
 
-            if (sortOptions) {
-                this.tableRows.sortBy(sortOptions);
-            }
-
+            this.tableRows.sortBy(sortOptions);
             this.tableRows.on('resetRowsFromAllData', this.resetRowsFromAllData);
         }
 

src/channelTable/channelTablePlugin/ChannelTableRowCollection.js

@@ -23,8 +23,8 @@ define(
 
             addOrUpdateRow(row) {
                 if (this.isLADRow(row)) {
-                    this.removeExistingByKeystring(row.objectKeyString);
-                    this.addRows([row]);
+                    this.removeRowsByObject(row.objectKeyString);
+                    super.addRows([row], 'add');
                 }
             }
 
@@ -38,7 +38,7 @@ define(
                 return !isStaleData;
             }
 
-            addOne(item) {
+            addOne (item) {
                 if (item.isDummyRow) {
                     this.ladMap.set(item.objectKeyString, this.rows.length);
                     this.rows.push(item);
@@ -57,47 +57,19 @@ define(
                 return false;
             }
 
-            addRows(rows) {
-                let rowsToAdd = this.filterRows(rows);
-
-                rowsToAdd.forEach(this.addOne.bind(this));
-
-                // we emit filter no matter what to trigger
-                // an update of visible rows
-                if (rowsToAdd.length > 0) {
-                    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];

src/services/mcws/MCWSClient.js

@@ -52,23 +52,9 @@ class MCWSClient {
                 isJsonResponse = true;
             }
 
-            const urlObject = new URL(url);
-            const urlParam = decodeURIComponent(urlObject.searchParams.get('url'));
-
-            // if it's a proxy request, need to dedupe possible output=json params
-            if (urlParam) {
-                const urlParamUrl = new URL(urlParam);
-                const outputParam = urlParamUrl.searchParams.get('output');
-
-                if (isJsonResponse && outputParam === 'json') {
-                    delete options.params.output;
-                }
-            }
-
-            if (Object.keys(options.params).length > 0) {
-                url += `?${new URLSearchParams(options.params)}`;
-            }
+            const params = new URLSearchParams(options.params);
 
+            url += `?${params}`;
             delete options.params;
         }