ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-18 20:57:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cherry-pick(#7121): Do not store state in singleton action (#7134)

Browse Source 
do not store state in singleton action (#7121)

Co-authored-by: David Tsay <3614296+davetsay@users.noreply.github.com>
This commit is contained in:
Andrew Henry 2023-10-10 16:17:36 -07:00 committed by GitHub
parent e43ddf6a4a
commit c1dd82cf5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,6 @@ export default class ImportAsJSONAction {
this.cssClass = 'icon-import';
this.group = 'import';
this.priority = 2;
this.newObjects = [];
this.openmct = openmct;
}
@ -83,9 +82,10 @@ export default class ImportAsJSONAction {
* @param {object} parent
* @param {object} tree
* @param {object} seen
* @param {Array} objectsToCreate tracks objects from import json that will need to be created
*/
_deepInstantiate(parent, tree, seen) {
let objectIdentifiers = this._getObjectReferenceIds(parent);
_deepInstantiate(parent, tree, seen, objectsToCreate) {
const objectIdentifiers = this._getObjectReferenceIds(parent);
if (objectIdentifiers.length) {
const parentId = this.openmct.objects.makeKeyString(parent.identifier);
@ -100,15 +100,16 @@ export default class ImportAsJSONAction {
const newModel = tree[keystring];
delete newModel.persisted;
this.newObjects.push(newModel);
objectsToCreate.push(newModel);
// make sure there weren't any errors saving
if (newModel) {
this._deepInstantiate(newModel, tree, seen);
this._deepInstantiate(newModel, tree, seen, objectsToCreate);
}
}
}
}
/**
* @private
* @param {object} parent
@ -170,19 +171,19 @@ export default class ImportAsJSONAction {
* @param {object} objTree
*/
async _importObjectTree(domainObject, objTree) {
const objectsToCreate = [];
const namespace = domainObject.identifier.namespace;
const tree = this._generateNewIdentifiers(objTree, namespace);
const rootId = tree.rootId;
const rootObj = tree.openmct[rootId];
delete rootObj.persisted;
this.newObjects.push(rootObj);
objectsToCreate.push(rootObj);
if (this.openmct.composition.checkPolicy(domainObject, rootObj)) {
this._deepInstantiate(rootObj, tree.openmct, []);
this._deepInstantiate(rootObj, tree.openmct, [], objectsToCreate);
try {
await Promise.all(this.newObjects.map(this._instantiate, this));
await Promise.all(objectsToCreate.map(this._instantiate, this));
} catch (error) {
this.openmct.notifications.error('Error saving objects');