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

[Action] Remove Action Merged

Browse Source 
Remove Action merged to allow removal of
parent or current selected object, then
navigation to lowest existing parent if
currently located in deleted object.
This commit is contained in:
Shivam Dave 2015-08-24 16:46:48 -07:00
parent 6a2bdd103b
commit aca06c6007
2 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
platform/commonUI/edit/src/actions/RemoveAction.js
View File

@ -41,7 +41,8 @@ define(
* @memberof module:editor/actions/remove-action
*/
function RemoveAction($q, navigationService, context) {
var object = (context || {}).domainObject;
var object = (context || {}).domainObject,
ROOT_ID = "ROOT";
/**
* Check whether an object ID matches the ID of the object being
@ -68,12 +69,25 @@ define(
var persistence = domainObject.getCapability('persistence');
return persistence && persistence.persist();
}
// Checks current object with object being removed
function checkCurrentObjectNavigation(object, parent) {
var currentObj = navigationService.getNavigation();
if (currentObj.getId() === object.getId()) {
navigationService.setNavigation(parent);
// Checks current object and ascendants of current
// object with object being removed, if the current
// object or any in the current object's path is being removed,
// navigate back to parent of removed object.
function checkObjectNavigation(object, parentObject) {
// Traverse object starts at current location
var traverseObject = navigationService.getNavigation();
// Stop at ROOT of folder path
while(traverseObject.getId() !== ROOT_ID) {
// If traverse object is object being removed
// navigate to parent of removed object
if (traverseObject.getId() === object.getId()) {
navigationService.setNavigation(parentObject);
return;
}
// Traverses to parent
traverseObject = traverseObject.getCapability('context').getParent();
}
}
@ -86,8 +100,8 @@ define(
function removeFromContext(object) {
var contextCapability = object.getCapability('context'),
parent = contextCapability.getParent();
// Navigates to parent if deleting current object
checkCurrentObjectNavigation(object, parent);
// Navigates through/ascendant if deleting current object
checkObjectNavigation(object, parent)
$q.when(
parent.useCapability('mutation', doMutate)
).then(function () {

19
platform/commonUI/edit/test/actions/RemoveActionSpec.js
View File

@ -31,6 +31,7 @@ define(
mockNavigationService,
mockDomainObject,
mockParent,
mockGrandparent,
mockContext,
mockMutation,
mockPersistence,
@ -56,7 +57,7 @@ define(
[ "getId", "getCapability" ]
);
mockQ = { when: mockPromise };
mockParent = {
mockGrandparent = {
getModel: function () {
return model;
},
@ -70,6 +71,20 @@ define(
return "test";
}
};
mockParent = {
getModel: function () {
return model;
},
getCapability: function (k) {
return capabilities[k];
},
useCapability: function (k, v) {
return capabilities[k].invoke(v);
},
getParent: function () {
return mockGrandparent;
}
};
mockContext = jasmine.createSpyObj("context", [ "getParent" ]);
mockMutation = jasmine.createSpyObj("mutation", [ "invoke" ]);
mockPersistence = jasmine.createSpyObj("persistence", [ "persist" ]);
@ -97,7 +112,7 @@ define(
type: mockType
};
model = {
composition: [ "a", "test", "b", "c" ]
composition: [ "a", "b", "test", "c" ]
};
actionContext = { domainObject: mockDomainObject };