ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-05-31 14:40:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/open723' into open-master

Browse Source
This commit is contained in:
bwyu 2015-02-03 17:26:53 -08:00
commit 107ed51cfc
6 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/commonUI/edit/src/actions/EditAction.js
View File

@ -57,7 +57,11 @@ define(
* will be performed; should contain a `domainObject` property
*/
EditAction.appliesTo = function (context) {
return (context || {}).domainObject !== undefined;
var domainObject = (context || {}).domainObject,
type = domainObject && domainObject.getCapability('type');
// Only allow creatable types to be edited
return type && type.hasFeature('creation');
};
return EditAction;

11
platform/commonUI/edit/src/actions/PropertiesAction.js
View File

@ -70,9 +70,14 @@ define(
* context.
*/
PropertiesAction.appliesTo = function (context) {
return (context || {}).domainObject &&
(context || {}).domainObject.hasCapability("type") &&
(context || {}).domainObject.hasCapability("persistence");
var domainObject = (context || {}).domainObject,
type = domainObject && domainObject.getCapability('type'),
creatable = type && type.hasFeature('creation');
// Only allow creatable types to be edited
return domainObject &&
domainObject.hasCapability("persistence") &&
creatable;
};
return PropertiesAction;

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

@ -80,9 +80,14 @@ define(
RemoveAction.appliesTo = function (context) {
var object = (context || {}).domainObject,
contextCapability = object && object.getCapability("context"),
parent = contextCapability && contextCapability.getParent();
parent = contextCapability && contextCapability.getParent(),
parentType = parent && parent.getCapability('type'),
parentCreatable = parentType && parentType.hasFeature('creation');
// Only creatable types should be modifiable
return parent !== undefined &&
Array.isArray(parent.getModel().composition);
Array.isArray(parent.getModel().composition) &&
parentCreatable;
};
return RemoveAction;

10
platform/commonUI/edit/test/actions/EditActionSpec.js
View File

@ -10,6 +10,7 @@ define(
mockNavigationService,
mockLog,
mockDomainObject,
mockType,
actionContext,
action;
@ -30,6 +31,13 @@ define(
"domainObject",
[ "getId", "getModel", "getCapability" ]
);
mockType = jasmine.createSpyObj(
"type",
[ "hasFeature" ]
);
mockDomainObject.getCapability.andReturn(mockType);
mockType.hasFeature.andReturn(true);
actionContext = { domainObject: mockDomainObject };
@ -44,6 +52,8 @@ define(
it("is only applicable when a domain object is present", function () {
expect(EditAction.appliesTo(actionContext)).toBeTruthy();
expect(EditAction.appliesTo({})).toBeFalsy();
// Should have checked for creatability
expect(mockType.hasFeature).toHaveBeenCalledWith('creation');
});
it("changes URL path to edit mode when performed", function () {

8
platform/commonUI/edit/test/actions/PropertiesActionSpec.js
View File

@ -18,7 +18,10 @@ define(
beforeEach(function () {
capabilities = {
type: { getProperties: function () { return []; } },
type: {
getProperties: function () { return []; },
hasFeature: jasmine.createSpy('hasFeature')
},
persistence: jasmine.createSpyObj("persistence", ["persist"]),
mutation: jasmine.createSpy("mutation")
};
@ -38,6 +41,7 @@ define(
}
};
capabilities.type.hasFeature.andReturn(true);
capabilities.mutation.andReturn(true);
action = new PropertiesAction(dialogService, context);
@ -65,6 +69,8 @@ define(
it("is only applicable when a domain object is in context", function () {
expect(PropertiesAction.appliesTo(context)).toBeTruthy();
expect(PropertiesAction.appliesTo({})).toBeFalsy();
// Make sure it checked for creatability
expect(capabilities.type.hasFeature).toHaveBeenCalledWith('creation');
});
});
}

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

@ -12,6 +12,7 @@ define(
mockContext,
mockMutation,
mockPersistence,
mockType,
actionContext,
model,
capabilities,
@ -47,16 +48,18 @@ define(
mockContext = jasmine.createSpyObj("context", [ "getParent" ]);
mockMutation = jasmine.createSpyObj("mutation", [ "invoke" ]);
mockPersistence = jasmine.createSpyObj("persistence", [ "persist" ]);
mockType = jasmine.createSpyObj("type", [ "hasFeature" ]);
mockDomainObject.getId.andReturn("test");
mockDomainObject.getCapability.andReturn(mockContext);
mockContext.getParent.andReturn(mockParent);
mockType.hasFeature.andReturn(true);
capabilities = {
mutation: mockMutation,
persistence: mockPersistence
persistence: mockPersistence,
type: mockType
};
model = {
composition: [ "a", "test", "b", "c" ]
@ -73,6 +76,9 @@ define(
mockContext.getParent.andReturn(undefined);
expect(RemoveAction.appliesTo(actionContext)).toBeFalsy();
// Also verify that creatability was checked
expect(mockType.hasFeature).toHaveBeenCalledWith('creation');
});
it("mutates the parent when performed", function () {