Revert "[Tables] Fix to correct sorting in realtime tables"

platform/features/table/src/controllers/TelemetryTableController.js

@@ -52,15 +52,19 @@ define(
             this.$scope = $scope;
             this.columns = {}; //Range and Domain columns
             this.handle = undefined;
+            //this.pending = false;
             this.telemetryHandler = telemetryHandler;
             this.table = new TableConfiguration($scope.domainObject,
                 telemetryFormatter);
             this.changeListeners = [];
 
-            $scope.rows = [];
+            $scope.rows = undefined;
 
             // Subscribe to telemetry when a domain object becomes available
-            this.$scope.$watch('domainObject', function(){
+            this.$scope.$watch('domainObject', function(domainObject){
+                if (!domainObject)
+                    return;
+
                 self.subscribe();
                 self.registerChangeListeners();
             });
@@ -69,24 +73,16 @@ define(
             this.$scope.$on("$destroy", this.destroy.bind(this));
         }
 
-        /**
-         * @private
-         */
-        TelemetryTableController.prototype.unregisterChangeListeners = function () {
-            this.changeListeners.forEach(function (listener) {
-                return listener && listener();
-            });
-            this.changeListeners = [];
-        };
-
         /**
          * Defer registration of change listeners until domain object is
          * available in order to avoid race conditions
          * @private
          */
         TelemetryTableController.prototype.registerChangeListeners = function () {
-            this.unregisterChangeListeners();
-
+            this.changeListeners.forEach(function (listener) {
+                return listener && listener();
+            });
+            this.changeListeners = [];
             // When composition changes, re-subscribe to the various
             // telemetry subscriptions
             this.changeListeners.push(this.$scope.$watchCollection(
@@ -107,37 +103,25 @@ define(
             }
         };
 
-        /**
-         * Function for handling realtime data when it is available. This
-         * will be called by the telemetry framework when new data is
-         * available.
-         *
-         * Method should be overridden by specializing class.
-         */
-        TelemetryTableController.prototype.addRealtimeData = function () {
-        };
-
-        /**
-         * Function for handling historical data. Will be called by
-         * telemetry framework when requested historical data is available.
-         * Should be overridden by specializing class.
-         */
-        TelemetryTableController.prototype.addHistoricalData = function () {
-        };
-
         /**
          Create a new subscription. This can be overridden by children to
          change default behaviour (which is to retrieve historical telemetry
          only).
          */
         TelemetryTableController.prototype.subscribe = function () {
+            var self = this;
+
             if (this.handle) {
                 this.handle.unsubscribe();
             }
 
+            //Noop because not supporting realtime data right now
+            function noop(){
+            }
+
             this.handle = this.$scope.domainObject && this.telemetryHandler.handle(
                     this.$scope.domainObject,
-                    this.addRealtimeData.bind(this),
+                    noop,
                     true // Lossless
                 );
 
@@ -146,6 +130,28 @@ define(
             this.setup();
         };
 
+        /**
+         * Populates historical data on scope when it becomes available
+         * @private
+         */
+        TelemetryTableController.prototype.addHistoricalData = function () {
+            var rowData = [],
+                self = this;
+
+            this.handle.getTelemetryObjects().forEach(function (telemetryObject){
+                var series = self.handle.getSeries(telemetryObject) || {},
+                    pointCount = series.getPointCount ? series.getPointCount() : 0,
+                    i = 0;
+
+                for (; i < pointCount; i++) {
+                    rowData.push(self.table.getRowValues(telemetryObject,
+                        self.handle.makeDatum(telemetryObject, series, i)));
+                }
+            });
+
+            this.$scope.rows = rowData;
+        };
+
         /**
          * Setup table columns based on domain object metadata
          */
@@ -156,9 +162,7 @@ define(
 
             if (handle) {
                 handle.promiseTelemetryObjects().then(function () {
-                    self.$scope.headers = [];
-                    self.$scope.rows = [];
-                    table.populateColumns(handle.getMetadata());
+                    table.buildColumns(handle.getMetadata());
 
                     self.filterColumns();
 
@@ -172,14 +176,26 @@ define(
             }
         };
 
+        /**
+         * @private
+         * @param object The object for which data is available (table may
+         * be composed of multiple objects)
+         * @param datum The data received from the telemetry source
+         */
+        TelemetryTableController.prototype.updateRows = function (object, datum) {
+            this.$scope.rows.push(this.table.getRowValues(object, datum));
+        };
+
         /**
          * When column configuration changes, update the visible headers
          * accordingly.
          * @private
          */
-        TelemetryTableController.prototype.filterColumns = function () {
-            var columnConfig = this.table.buildColumnConfiguration();
-
+        TelemetryTableController.prototype.filterColumns = function (columnConfig) {
+            if (!columnConfig){
+                columnConfig = this.table.getColumnConfiguration();
+                this.table.saveColumnConfiguration(columnConfig);
+            }
             //Populate headers with visible columns (determined by configuration)
             this.$scope.headers = Object.keys(columnConfig).filter(function (column) {
                 return columnConfig[column];