ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-19 05:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Persistability] Various checks in actions (Edit Properties, ImportFromJSON) (#4587)

Browse Source 
Co-authored-by: Joshi <simplyrender@gmail.com>
This commit is contained in:
Jamie V 2021-12-21 14:30:31 -08:00 committed by GitHub
parent 8e3947e48d
commit e634e09e32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/formActions/EditPropertiesAction.js
View File

@ -37,9 +37,11 @@ export default class EditPropertiesAction extends PropertiesAction {
}
appliesTo(objectPath) {
const definition = this._getTypeDefinition(objectPath[0].type);
const object = objectPath[0];
const definition = this._getTypeDefinition(object.type);
const persistable = this.openmct.objects.isPersistable(object.identifier);
return definition && definition.creatable;
return persistable && definition && definition.creatable;
}
invoke(objectPath) {

8
src/plugins/importFromJSONAction/ImportFromJSONAction.js
View File

@ -43,7 +43,13 @@ export default class ImportAsJSONAction {
*/
appliesTo(objectPath) {
const domainObject = objectPath[0];
if (domainObject && domainObject.locked) {
const locked = domainObject && domainObject.locked;
const persistable = this.openmct.objects.isPersistable(domainObject.identifier);
const TypeDefinition = this.openmct.types.get(domainObject.type);
const definition = TypeDefinition.definition;
const creatable = definition && definition.creatable;
if (locked || !persistable || !creatable) {
return false;
}

1
src/plugins/importFromJSONAction/ImportFromJSONActionSpec.js
View File

@ -97,6 +97,7 @@ describe("The import JSON action", function () {
domainObject
];
spyOn(openmct.types, 'get').and.returnValue({});
spyOn(openmct.composition, 'get').and.returnValue(false);
expect(importFromJSONAction.appliesTo(objectPath)).toBe(false);