ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-04-20 09:01:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Entanglement] Refactor LocatingObjectDecorator

Browse Source 
Rearrange code in LocatingObjectDecorator to make it easier to
follow; add comments.
This commit is contained in:
Victor Woeltjen 2015-09-17 13:51:47 -07:00
parent 88b8528aaf
commit c4aed57165
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
platform/entanglement/src/services/LocatingObjectDecorator.js
View File

@ -47,28 +47,19 @@ define(
objectService = this.objectService,
result = {};
// Load a single object using location to establish a context
function loadObjectInContext(id, exclude) {
function attachContextById(domainObject, locationId) {
return loadObjectInContext(locationId, exclude)
.then(function (parent) {
return contextualize(domainObject, parent);
});
}
function attachContextForLocation(domainObject) {
var model = domainObject && domainObject.getModel(),
function attachContext(objects) {
var domainObject = (objects || {})[id],
model = domainObject && domainObject.getModel(),
location = (model || {}).location;
// Don't pursue a context if we encounter this
// object again during this sequence of invocations.
exclude[id] = true;
// If no location is defined, we can't look up a context.
if (!location) {
return domainObject;
}
return location ?
attachContextById(domainObject, location) :
domainObject;
}
return objectService.getObjects([id]).then(function (objects) {
// Avoid looping indefinitely on cyclical locations
if (exclude[id]) {
$log.warn([
"LocatingObjectDecorator detected a cycle",
@ -77,11 +68,21 @@ define(
"no context will be added and unexpected behavior",
"may follow."
].join(" "));
return objects[id];
return domainObject;
}
return attachContextForLocation(objects[id]);
});
// Record that we've visited this ID to detect cycles.
exclude[id] = true;
// Do the recursive step to get the parent...
return loadObjectInContext(location, exclude)
.then(function (parent) {
// ...and then contextualize with it!
return contextualize(domainObject, parent);
});
}
return objectService.getObjects([id]).then(attachContext);
}
ids.forEach(function (id) {