ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-22 06:27:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Tables] Addressed style concerns from code review

Browse Source
This commit is contained in:
Henry 2016-03-31 12:56:29 -07:00
parent 0c00061cbc
commit 200a426f17
2 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
platform/features/table/src/TableConfiguration.js
View File

@ -145,25 +145,23 @@ define(
{}).columns || {};
};
function equal(obj1, obj2) {
function configEqual(obj1, obj2) {
var obj1Keys = Object.keys(obj1),
obj2Keys = Object.keys(obj2);
return (obj1Keys.length === obj2Keys.length) &&
obj1Keys.every(function(key){
//To do a deep equals, could recurse here if typeof
// obj1 === Object
obj1Keys.every(function (key) {
return obj1[key] === obj2[key];
});
}
/**
* Set the established configuration on the domain object
* Set the established configuration on the domain object. Will noop
* if configuration is unchanged
* @private
*/
TableConfiguration.prototype.saveColumnConfiguration = function (columnConfig) {
var self = this;
//Don't bother mutating if column configuration is unchanged
if (!equal(this.columnConfiguration, columnConfig)) {
if (!configEqual(this.columnConfiguration, columnConfig)) {
this.domainObject.useCapability('mutation', function (model) {
model.configuration = model.configuration || {};
model.configuration.table = model.configuration.table || {};

38
platform/features/table/src/controllers/TelemetryTableController.js
View File

@ -203,24 +203,22 @@ define(
}
}
//if (handle) {
//Add telemetry metadata (if any) for parent object
addMetadata(domainObject);
//Add telemetry metadata (if any) for parent object
addMetadata(domainObject);
//If object is composed of multiple objects, also add
// telemetry metadata from children
if (domainObject.hasCapability('composition')) {
domainObject.useCapability('composition').then(function (composition) {
composition.forEach(addMetadata);
}).then(function () {
//Build columns based on available metadata
buildAndFilterColumns();
});
} else {
//Build columns based on collected metadata
//If object is composed of multiple objects, also add
// telemetry metadata from children
if (domainObject.hasCapability('composition')) {
domainObject.useCapability('composition').then(function (composition) {
composition.forEach(addMetadata);
}).then(function () {
//Build columns based on available metadata
buildAndFilterColumns();
}
// }
});
} else {
//Build columns based on collected metadata
buildAndFilterColumns();
}
};
/**
@ -228,11 +226,9 @@ define(
* accordingly.
* @private
*/
TelemetryTableController.prototype.filterColumns = function (columnConfig) {
if (!columnConfig){
columnConfig = this.table.getColumnConfiguration();
this.table.saveColumnConfiguration(columnConfig);
}
TelemetryTableController.prototype.filterColumns = function () {
var 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];