ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-20 17:33:23 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Composition] Return newly-contextualized object

Browse Source 
After adding to composition, return the newly-contextualized
object; this is regularly used by other services.
This commit is contained in:
Victor Woeltjen 2015-09-02 11:37:47 -07:00
parent ba6e542d08
commit b1238b0c96
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
platform/commonUI/browse/src/creation/CreationService.js
View File

@ -97,17 +97,7 @@ define(
}
return parentPersistence.persist().then(function () {
// Locate and return new Object in context of parent.
return parent
.useCapability('composition')
.then(function (children) {
var i;
for (i = 0; i < children.length; i += 1) {
if (children[i].getId() === id) {
return children[i];
}
}
});
return result;
});
});
}

25
platform/core/src/capabilities/CompositionCapability.js
View File

@ -59,11 +59,27 @@ define(
* @param {DomainObject|string} domainObject the domain object to add,
* or simply its identifier
* @param {number} [index] the index at which to add the object
* @returns {Promise.<boolean>} the mutation result
* @returns {Promise.<DomainObject>} a promise for the added object
* in its new context
*/
CompositionCapability.prototype.add = function (domainObject, index) {
var id = typeof domainObject === 'string' ?
domainObject : domainObject.getId();
var self = this,
id = typeof domainObject === 'string' ?
domainObject : domainObject.getId();
// Find the object with the above id, used to contextualize
function findObject(objects) {
var i;
for (i = 0; i < objects.length; i += 1) {
if (objects[i].getId() === id) {
return objects[i];
}
}
}
function contextualize(mutationResult) {
return mutationResult && self.invoke().then(findObject);
}
function addIdToModel(model) {
var composition = model.composition,
@ -90,7 +106,8 @@ define(
model.composition.splice(index, 0, id);
}
return this.domainObject.useCapability('mutation', addIdToModel);
return this.domainObject.useCapability('mutation', addIdToModel)
.then(contextualize);
};
/**

8
platform/entanglement/src/services/LinkService.js
View File

@ -68,10 +68,10 @@ define(
}
}
return composition.add(object).then(function () {
return parentObject.getCapability('persistence').persist();
}).then(function getObjectWithNewContext() {
return composition.invoke().then(findChild);
return composition.add(object).then(function (result) {
return parentObject.getCapability('persistence')
.persist()
.then(function () { return result; });
});
};