ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-05-02 16:53:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.7.4 into master (#3985)

Browse Source 
catching any errors from a user canceling from dialog (#3968)
Fix navigation errors (#3970)
Only add listeners to observables on creation
Do not double destroy mutable objects
Disallow pause and play in time strip view for plots. (#3972)
Update version

Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
Co-authored-by: Andrew Henry <akhenry@gmail.com>
This commit is contained in:
Shefali Joshi 2021-06-29 09:40:30 -07:00 committed by GitHub
parent e3bf72e77f
commit cbb3f32d1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "openmct", "name": "openmct",
"version": "1.7.4-SNAPSHOT", "version": "1.7.4",
"description": "The Open MCT core platform", "description": "The Open MCT core platform",
"dependencies": {}, "dependencies": {},
"devDependencies": { "devDependencies": {

34
src/api/objects/ObjectAPI.js
View File

@ -399,25 +399,25 @@ ObjectAPI.prototype._toMutable = function (object) {
mutableObject = object; mutableObject = object;
} else { } else {
mutableObject = MutableDomainObject.createMutable(object, this.eventEmitter); mutableObject = MutableDomainObject.createMutable(object, this.eventEmitter);
}
// Check if provider supports realtime updates // Check if provider supports realtime updates
let identifier = utils.parseKeyString(mutableObject.identifier); let identifier = utils.parseKeyString(mutableObject.identifier);
let provider = this.getProvider(identifier); let provider = this.getProvider(identifier);
if (provider !== undefined if (provider !== undefined
&& provider.observe !== undefined && provider.observe !== undefined
&& this.SYNCHRONIZED_OBJECT_TYPES.includes(object.type)) { && this.SYNCHRONIZED_OBJECT_TYPES.includes(object.type)) {
let unobserve = provider.observe(identifier, (updatedModel) => { let unobserve = provider.observe(identifier, (updatedModel) => {
if (updatedModel.persisted > mutableObject.modified) { if (updatedModel.persisted > mutableObject.modified) {
//Don't replace with a stale model. This can happen on slow connections when multiple mutations happen //Don't replace with a stale model. This can happen on slow connections when multiple mutations happen
//in rapid succession and intermediate persistence states are returned by the observe function. //in rapid succession and intermediate persistence states are returned by the observe function.
mutableObject.$refresh(updatedModel); mutableObject.$refresh(updatedModel);
} }
}); });
mutableObject.$on('$_destroy', () => { mutableObject.$on('$_destroy', () => {
unobserve(); unobserve();
}); });
}
} }
return mutableObject; return mutableObject;

10
src/plugins/duplicate/DuplicateAction.js
View File

@ -37,7 +37,15 @@ export default class DuplicateAction {
let duplicationTask = new DuplicateTask(this.openmct); let duplicationTask = new DuplicateTask(this.openmct);
let originalObject = objectPath[0]; let originalObject = objectPath[0];
let parent = objectPath[1]; let parent = objectPath[1];
let userInput = await this.getUserInput(originalObject, parent); let userInput;
try {
userInput = await this.getUserInput(originalObject, parent);
} catch (error) {
// user most likely canceled
return;
}
let newParent = userInput.location; let newParent = userInput.location;
let inNavigationPath = this.inNavigationPath(originalObject); let inNavigationPath = this.inNavigationPath(originalObject);

2
src/plugins/plot/MctPlot.vue
View File

@ -102,7 +102,7 @@
> >
</button> </button>
</div> </div>
<div v-if="isRealTime" <div v-if="isRealTime && !options.compact"
class="c-button-set c-button-set--strip-h js-pause" class="c-button-set c-button-set--strip-h js-pause"
> >
<button v-if="!isFrozen" <button v-if="!isFrozen"

19
src/ui/router/Browse.js
View File

@ -10,7 +10,6 @@ define([
let unobserve = undefined; let unobserve = undefined;
let currentObjectPath; let currentObjectPath;
let isRoutingInProgress = false; let isRoutingInProgress = false;
let mutable;
openmct.router.route(/^\/browse\/?$/, navigateToFirstChildOfRoot); openmct.router.route(/^\/browse\/?$/, navigateToFirstChildOfRoot);
openmct.router.route(/^\/browse\/(.*)$/, (path, results, params) => { openmct.router.route(/^\/browse\/(.*)$/, (path, results, params) => {
@ -37,24 +36,10 @@ define([
} }
function viewObject(object, viewProvider) { function viewObject(object, viewProvider) {
if (mutable) {
openmct.objects.destroyMutable(mutable);
mutable = undefined;
}
if (openmct.objects.supportsMutation(object.identifier)) {
mutable = openmct.objects._toMutable(object);
}
currentObjectPath = openmct.router.path; currentObjectPath = openmct.router.path;
if (mutable !== undefined) { openmct.layout.$refs.browseObject.show(object, viewProvider.key, true, currentObjectPath);
openmct.layout.$refs.browseObject.show(mutable, viewProvider.key, true, currentObjectPath); openmct.layout.$refs.browseBar.domainObject = object;
openmct.layout.$refs.browseBar.domainObject = mutable;
} else {
openmct.layout.$refs.browseObject.show(object, viewProvider.key, true, currentObjectPath);
openmct.layout.$refs.browseBar.domainObject = object;
}
openmct.layout.$refs.browseBar.viewKey = viewProvider.key; openmct.layout.$refs.browseBar.viewKey = viewProvider.key;
} }