Merge branch 'master' into topic-conditionals

src/plugins/telemetryTable/TelemetryTableColumn.js

@@ -56,6 +56,10 @@ define(function () {
                 return formattedValue;
             }
         }
+
+        getParsedValue(telemetryDatum) {
+            return this.formatter.parse(telemetryDatum);
+        }
     }
 
     return TelemetryTableColumn;

src/plugins/telemetryTable/TelemetryTableRow.js

@@ -42,6 +42,11 @@ define([], function () {
             return column && column.getFormattedValue(this.datum[key]);
         }
 
+        getParsedValue(key) {
+            let column = this.columns[key];
+            return column && column.getParsedValue(this.datum[key]);
+        }
+
         getCellComponentName(key) {
             let column = this.columns[key];
             return column &&

src/plugins/telemetryTable/collections/SortedTableRowCollection.js

@@ -201,7 +201,7 @@ define(
             sortBy(sortOptions) {
                 if (arguments.length > 0) {
                     this.sortOptions = sortOptions;
-                    this.rows = _.sortByOrder(this.rows, 'datum.' + sortOptions.key, sortOptions.direction);
+                    this.rows = _.sortByOrder(this.rows, (row) => row.getParsedValue(sortOptions.key) , sortOptions.direction);
                     this.emit('sort');
                 }
                 // Return duplicate to avoid direct modification of underlying object
@@ -222,7 +222,7 @@ define(
             }
 
             getValueForSortColumn(row) {
-                return row.datum[this.sortOptions.key];
+                return row.getParsedValue(this.sortOptions.key);
             }
 
             remove(removedRows) {

src/ui/router/Browse.js

@@ -63,6 +63,7 @@ define([
 
                 unobserve = this.openmct.objects.observe(openmct.router.path[0], '*', (newObject) => {
                     openmct.router.path[0] = newObject;
+                    browseObject = newObject;
                 });
 
                 openmct.layout.$refs.browseBar.domainObject = navigatedObject;